diff --git a/src/c3nav/mapdata/fields.py b/src/c3nav/mapdata/fields.py index 059f655b..37a6668b 100644 --- a/src/c3nav/mapdata/fields.py +++ b/src/c3nav/mapdata/fields.py @@ -5,7 +5,7 @@ from django.core.validators import RegexValidator from django.db import models from django.utils.translation import ugettext_lazy as _ from shapely import validation -from shapely.geometry import mapping, shape, Polygon, LineString +from shapely.geometry import LineString, Polygon, mapping, shape from shapely.geometry.base import BaseGeometry from c3nav.mapdata.utils.geometry import clean_geometry diff --git a/src/c3nav/mapdata/models/__init__.py b/src/c3nav/mapdata/models/__init__.py index 7c51e961..24a9e083 100644 --- a/src/c3nav/mapdata/models/__init__.py +++ b/src/c3nav/mapdata/models/__init__.py @@ -1,3 +1,4 @@ from .section import Section # noqa from .source import Source # noqa +from .geometry.section import Space # noqa from .locations import AreaLocation, LocationGroup # noqa diff --git a/src/c3nav/mapdata/models/base.py b/src/c3nav/mapdata/models/base.py index 39f68be0..a0277a88 100644 --- a/src/c3nav/mapdata/models/base.py +++ b/src/c3nav/mapdata/models/base.py @@ -1,11 +1,7 @@ from collections import OrderedDict -from django.db import models -from django.db.models.base import ModelBase from django.utils.translation import get_language -from c3nav.mapdata.lastupdate import set_last_mapdata_update - FEATURE_TYPES = OrderedDict() diff --git a/src/c3nav/mapdata/models/geometry/base.py b/src/c3nav/mapdata/models/geometry/base.py index d5a41956..8c610104 100644 --- a/src/c3nav/mapdata/models/geometry/base.py +++ b/src/c3nav/mapdata/models/geometry/base.py @@ -1,4 +1,5 @@ from collections import OrderedDict + from shapely.geometry import Point, mapping from c3nav.mapdata.models.base import EditorFormMixin diff --git a/src/c3nav/mapdata/models/geometry/section.py b/src/c3nav/mapdata/models/geometry/section.py index 9854ec43..f7e0bc62 100644 --- a/src/c3nav/mapdata/models/geometry/section.py +++ b/src/c3nav/mapdata/models/geometry/section.py @@ -1,4 +1,5 @@ from collections import OrderedDict + from django.db import models from django.utils.translation import ugettext_lazy as _ diff --git a/src/c3nav/mapdata/models/geometry/space.py b/src/c3nav/mapdata/models/geometry/space.py index 70755613..0c536843 100644 --- a/src/c3nav/mapdata/models/geometry/space.py +++ b/src/c3nav/mapdata/models/geometry/space.py @@ -1,4 +1,5 @@ from collections import OrderedDict + from django.db import models from django.utils.translation import ugettext_lazy as _ from shapely.geometry import CAP_STYLE, JOIN_STYLE, mapping diff --git a/src/c3nav/mapdata/models/locations.py b/src/c3nav/mapdata/models/locations.py index 2b99ec8e..3631e1a3 100644 --- a/src/c3nav/mapdata/models/locations.py +++ b/src/c3nav/mapdata/models/locations.py @@ -1,12 +1,13 @@ -import numpy as np from collections import OrderedDict + +import numpy as np from django.core.cache import cache from django.db import models from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy -from c3nav.mapdata.fields import JSONField, validate_bssid_lines, GeometryField +from c3nav.mapdata.fields import GeometryField, JSONField, validate_bssid_lines from c3nav.mapdata.lastupdate import get_last_mapdata_update from c3nav.mapdata.models.base import EditorFormMixin from c3nav.mapdata.models.section import Section