rename and refactor mapdata models

src/c3nav/mapdata/models/base.py

@@ -4,21 +4,34 @@ from django.db import models
 from django.db.models.base import ModelBase
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import get_language
+from shapely.geometry import mapping, Point
 
+from c3nav.mapdata.fields import GeometryField
 from c3nav.mapdata.lastupdate import set_last_mapdata_update
+from c3nav.mapdata.utils.json import format_geojson
 
-MAPITEM_TYPES = OrderedDict()
+FEATURE_TYPES = OrderedDict()
+GEOMETRY_FEATURE_TYPES = OrderedDict()
+LEVEL_FEATURE_TYPES = OrderedDict()
+AREA_FEATURE_TYPES = OrderedDict()
 
 
-class MapItemMeta(ModelBase):
+class FeatureBase(ModelBase):
     def __new__(mcs, name, bases, attrs):
         cls = super().__new__(mcs, name, bases, attrs)
         if not cls._meta.abstract and name != 'Source':
-            MAPITEM_TYPES[name.lower()] = cls
+            FEATURE_TYPES[name.lower()] = cls
+            if hasattr(cls, 'geometry'):
+                GEOMETRY_FEATURE_TYPES[name.lower()] = cls
+            if hasattr(cls, 'level'):
+                LEVEL_FEATURE_TYPES[name.lower()] = cls
+            if hasattr(cls, 'area'):
+                AREA_FEATURE_TYPES[name.lower()] = cls
+
         return cls
 
 
-class MapItem(models.Model, metaclass=MapItemMeta):
+class Feature(models.Model, metaclass=FeatureBase):
     name = models.SlugField(_('Name'), unique=True, max_length=50)
 
     EditorForm = None
@@ -42,3 +55,34 @@ class MapItem(models.Model, metaclass=MapItemMeta):
 
     class Meta:
         abstract = True
+
+
+class GeometryFeature(Feature):
+    """
+    A map feature with a geometry
+    """
+    geometry = GeometryField()
+
+    geomtype = None
+
+    class Meta:
+        abstract = True
+
+    def get_geojson_properties(self):
+        return OrderedDict((
+            ('type', self.__class__.__name__.lower()),
+            ('name', self.name),
+        ))
+
+    def to_geojson(self):
+        return OrderedDict((
+            ('type', 'Feature'),
+            ('properties', self.get_geojson_properties()),
+            ('geometry', format_geojson(mapping(self.geometry), round=False)),
+        ))
+
+    def get_shadow_geojson(self):
+        return None
+
+    def contains(self, x, y):
+        return self.geometry.contains(Point(x, y))