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

editor/overlay multipoint support (might still be a bit broken)

Browse source
This commit is contained in:
Gwendolyn 2024-12-20 09:54:00 +01:00
parent d231dec726
commit 0df0580f1b
6 changed files with 6026 additions and 5660 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c3nav/mapdata/fields.py
View file

@ -15,6 +15,7 @@ from django.utils.translation import gettext_lazy as _
from shapely import validation
from shapely.geometry import LineString, MultiPolygon, Point, Polygon, mapping, shape
from shapely.geometry.base import BaseGeometry
from shapely.geometry.multipoint import MultiPoint
from c3nav.mapdata.utils.geometry import WrappedGeometry, clean_geometry
from c3nav.mapdata.utils.json import format_geojson
@ -64,9 +65,9 @@ class GeometryField(models.JSONField):
def __init__(self, geomtype=None, default=None, null=False, blank=False, help_text=None):
if geomtype == 'polyline':
geomtype = 'linestring'
if geomtype not in (None, 'polygon', 'multipolygon', 'linestring', 'point'):
if geomtype not in (None, 'polygon', 'multipolygon', 'linestring', 'multipoint', 'point'):
raise ValueError('GeometryField.geomtype has to be '
'None, "polygon", "multipolygon", "linestring" or "point"')
'None, "polygon", "multipolygon", "linestring", "multipoint" or "point"')
self.geomtype = geomtype
super().__init__(default=default, null=null, blank=blank, help_text=help_text)
@ -108,6 +109,7 @@ class GeometryField(models.JSONField):
'polygon': (Polygon, ),
'multipolygon': (Polygon, MultiPolygon),
'linestring': (LineString, ),
'multipoint': (MultiPoint, ),
'point': (Point, )
}.get(self.geomtype, None)

2
src/c3nav/mapdata/utils/json.py
View file

@ -40,7 +40,7 @@ def format_geojson(data, rounded=True):
if coordinates is not None:
if data['type'] == 'Point':
coordinates = tuple(round(i, 2) for i in coordinates)
elif data['type'] == 'LineString':
elif data['type'] == 'LineString' or data['type'] == 'MultiPoint':
coordinates = round_coordinates(coordinates)
elif data['type'] == 'MultiLineString':
coordinates = tuple(round_coordinates(linestring) for linestring in coordinates)