From 2da1bf0bd5d0c362d5f0859cba755813cd487086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Tue, 9 May 2017 13:16:36 +0200 Subject: [PATCH] add some more type hinting --- src/c3nav/mapdata/fields.py | 4 ++-- src/c3nav/mapdata/models/geometry/base.py | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/c3nav/mapdata/fields.py b/src/c3nav/mapdata/fields.py index 37a6668b..cf0c4701 100644 --- a/src/c3nav/mapdata/fields.py +++ b/src/c3nav/mapdata/fields.py @@ -15,9 +15,9 @@ validate_bssid_lines = RegexValidator(regex=r'^([0-9a-f]{2}(:[0-9a-f]{2}){5}(\r? message=_('please enter a newline seperated lowercase list of BSSIDs')) -def validate_geometry(geometry): +def validate_geometry(geometry: BaseGeometry): if not isinstance(geometry, BaseGeometry): - raise ValidationError('GeometryField expexted a Shapely BaseGeometry child-class.') + raise ValidationError('GeometryField expected a Shapely BaseGeometry child-class.') if not geometry.is_valid: raise ValidationError('Invalid geometry: %s' % validation.explain_validity(geometry)) diff --git a/src/c3nav/mapdata/models/geometry/base.py b/src/c3nav/mapdata/models/geometry/base.py index 1ebdb181..7a6a1dbd 100644 --- a/src/c3nav/mapdata/models/geometry/base.py +++ b/src/c3nav/mapdata/models/geometry/base.py @@ -2,7 +2,6 @@ from collections import OrderedDict from shapely.geometry import Point, mapping -from c3nav.mapdata.fields import GeometryField from c3nav.mapdata.models.base import EditorFormMixin from c3nav.mapdata.utils.json import format_geojson @@ -18,13 +17,13 @@ class GeometryMixin(EditorFormMixin): class Meta: abstract = True - def get_geojson_properties(self): + def get_geojson_properties(self) -> dict: return OrderedDict(( ('type', self.__class__.__name__.lower()), ('id', self.id), )) - def to_geojson(self): + def to_geojson(self) -> dict: return OrderedDict(( ('type', 'Feature'), ('properties', self.get_geojson_properties()), @@ -34,5 +33,5 @@ class GeometryMixin(EditorFormMixin): def get_shadow_geojson(self): pass - def contains(self, x, y): + def contains(self, x, y) -> bool: return self.geometry.contains(Point(x, y))