2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

pickle WrappedGeometry objects correctly (fixes #98)

Browse source
This commit is contained in:
Gwendolyn 2023-12-03 23:04:38 +01:00
parent e5e3a6b7e2
commit 73c80f576c
1 changed files with 4 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/c3nav/mapdata/utils/geometry.py
View file

@ -33,7 +33,6 @@ def check_speedups(app_configs, **kwargs):
class WrappedGeometry(): class WrappedGeometry():
picklable = False
wrapped_geojson = None wrapped_geojson = None
def __init__(self, geojson): def __init__(self, geojson):
@ -45,32 +44,15 @@ class WrappedGeometry():
return GeometryCollection() return GeometryCollection()
return shapely_shape(self.wrapped_geojson) return shapely_shape(self.wrapped_geojson)
def __getstate__(self):
self.picklable = True
# make sure geometry is cached
if self.wrapped_geojson:
# noinspection PyStatementEffect
self.wrapped_geom
super().__getstate__()
def __getattr__(self, name): def __getattr__(self, name):
if name in ('__getstate__'):
self.picklable = True
# make sure geometry is cached
if self.wrapped_geojson:
# noinspection PyStatementEffect
self.wrapped_geom
raise AttributeError
if name in ('__reduce__', '__getstate__', '__setstate__', '__reduce_ex__',
'__getnewargs__', '__getnewargs_ex__'):
raise AttributeError
return getattr(self.wrapped_geom, name) return getattr(self.wrapped_geom, name)
@property @property
def __class__(self): def __class__(self):
result = WrappedGeometry if self.picklable else self.wrapped_geom.__class__ return self.wrapped_geom.__class__
self.__dict__.pop('picklable', None)
return result def __reduce__(self):
return WrappedGeometry, (self.wrapped_geojson, )
def unwrap_geom(geometry): def unwrap_geom(geometry):