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

add original_geometry to building in editor geometry api

Browse source
This commit is contained in:
Laura Klünder 2017-05-29 10:14:39 +02:00
parent 3188c4d667
commit c6a5ed399b
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/editor/api.py
View file

@ -38,6 +38,8 @@ class EditorViewSet(ViewSet):
spaces_geom = cascaded_union([space.geometry for space in spaces.values() if space.level == 'normal']) spaces_geom = cascaded_union([space.geometry for space in spaces.values() if space.level == 'normal'])
holes_geom = holes_geom.intersection(spaces_geom) holes_geom = holes_geom.intersection(spaces_geom)
doors = section.doors.all() doors = section.doors.all()
for building in buildings:
building.original_geometry = building.geometry
for obj in chain(buildings, (s for s in spaces.values() if s.level == 'normal')): for obj in chain(buildings, (s for s in spaces.values() if s.level == 'normal')):
obj.geometry = obj.geometry.difference(holes_geom) obj.geometry = obj.geometry.difference(holes_geom)

6
src/c3nav/mapdata/models/geometry/base.py
View file

@ -27,11 +27,15 @@ class GeometryMixin(EditorFormMixin):
return result return result
def to_geojson(self) -> dict: def to_geojson(self) -> dict:
return OrderedDict(( result = OrderedDict((
('type', 'Feature'), ('type', 'Feature'),
('properties', self.get_geojson_properties()), ('properties', self.get_geojson_properties()),
('geometry', format_geojson(mapping(self.geometry), round=False)), ('geometry', format_geojson(mapping(self.geometry), round=False)),
)) ))
original_geometry = getattr(self, 'original_geometry', None)
if original_geometry:
result['original_geometry'] = format_geojson(mapping(original_geometry), round=False)
return result
@classmethod @classmethod
def serialize_type(cls, geomtype=True, **kwargs): def serialize_type(cls, geomtype=True, **kwargs):