colorize spaces

src/c3nav/mapdata/models/geometry/section.py

@@ -77,6 +77,16 @@ class Space(SpecificLocation, LevelSectionGeometryMixin, models.Model):
             result['public'] = self.public
         return result
 
+    def get_color(self):
+        color = {
+            'stairs': '#dddddd',
+            'escalator': '#a9a9a9',
+            'elevator': '#00ffff',
+        }.get(self.category)
+        if not color:
+            color = super().get_color()
+        return color
+
 
 class Door(LevelSectionGeometryMixin, models.Model):
     """

src/c3nav/mapdata/models/locations.py

@@ -110,6 +110,14 @@ class Location(LocationSlug, EditorFormMixin, models.Model):
         return (next(iter(self.titles.values())) if self.titles else
                 (self._meta.verbose_name+' '+(self.slug or str(self.id))))
 
+    def get_color(self):
+        if self.color:
+            return self.color
+        color_group = self.groups.filter(color__isnull=False).order_by('-compiled_area', '-compiled_room').first()
+        if color_group:
+            return color_group.color
+        return None
+
 
 class SpecificLocation(Location, models.Model):
     groups = models.ManyToManyField('mapdata.LocationGroup', verbose_name=_('Location Groups'), blank=True)

src/c3nav/mapdata/models/section.py

@@ -1,6 +1,5 @@
 from django.conf import settings
 from django.db import models
-from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
 from shapely.geometry import JOIN_STYLE
 from shapely.ops import cascaded_union
@@ -27,14 +26,6 @@ class Section(SpecificLocation, EditorFormMixin, models.Model):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-    @cached_property
-    def public_geometries(self):
-        return SectionGeometries.by_section(self, only_public=True)
-
-    @cached_property
-    def geometries(self):
-        return SectionGeometries.by_section(self, only_public=False)
-
     def lower(self):
         return Section.objects.filter(altitude__lt=self.altitude).order_by('altitude')
 
@@ -71,32 +62,57 @@ class Section(SpecificLocation, EditorFormMixin, models.Model):
         hole_svg = svg.add_geometry(hole_geometries, defid='holes')
         hole_mask = svg.add_mask(hole_svg, inverted=True, defid='holes-mask')
 
-        space_lower_svg = svg.add_geometry(space_geometries['lower'], defid='spaces-lower')
+        lower_spaces_by_color = {}
-        svg.use_geometry(space_lower_svg, fill_color='#d1d1d1')
+        for space in space_levels['lower']:
+            lower_spaces_by_color.setdefault(space.get_color(), []).append(space)
+        for i, (color, color_spaces) in enumerate(lower_spaces_by_color.items()):
+            geometries = cascaded_union(tuple(space.geometry for space in color_spaces))
+            space_lower_svg = svg.add_geometry(geometries, defid='spaces-lower-'+str(i))
+            svg.use_geometry(space_lower_svg, fill_color=color or '#d1d1d1')
 
+        # draw space background
         door_geometries = cascaded_union(tuple(d.geometry for d in self.doors.all()))
         section_geometry = cascaded_union((space_geometries[''], building_geometries, door_geometries))
         section_svg = svg.add_geometry(section_geometry, defid='section')
         svg.use_geometry(section_svg, fill_color='#d1d1d1', mask=hole_mask)
 
+        # color in spaces
+        spaces_by_color = {}
+        for space in space_levels['']:
+            spaces_by_color.setdefault(space.get_color(), []).append(space)
+        spaces_by_color.pop(None, None)
+        for i, (color, color_spaces) in enumerate(spaces_by_color.items()):
+            geometries = cascaded_union(tuple(space.geometry for space in color_spaces))
+            space_svg = svg.add_geometry(geometries, defid='spaces-color-' + str(i))
+            svg.use_geometry(space_svg, fill_color=color or '#d1d1d1')
+
+        # calculate walls
         wall_geometry = building_geometries.difference(space_geometries['']).difference(door_geometries)
         wall_svg = svg.add_geometry(wall_geometry, 'walls')
-        svg.use_geometry(wall_svg, fill_color='#929292')
-
         accessible_mask = svg.add_mask(section_svg, wall_svg, hole_svg, subtract=True, defid='accessible')
 
+        # draw wall shadow
         wall_dilated_geometry = wall_geometry.buffer(0.7, join_style=JOIN_STYLE.mitre)
         wall_dilated_svg = svg.add_geometry(wall_dilated_geometry, 'wall-shadows')
         svg.use_geometry(wall_dilated_svg, fill_color='rgba(0, 0, 0, 0.1)', mask=accessible_mask, filter='wallblur')
 
+        # draw walls
+        svg.use_geometry(wall_svg, fill_color='#929292')
         svg.use_geometry(wall_svg, stroke_color='#333333', stroke_width=0.07)
 
+        # draw doors
         door_geometries = cascaded_union(tuple(d.geometry for d in self.doors.all()))
         door_geometries = door_geometries.difference(space_geometries[''])
         door_svg = svg.add_geometry(door_geometries, defid='doors')
         svg.use_geometry(door_svg, fill_color='#ffffff', stroke_color='#929292', stroke_width=0.07)
 
-        space_upper_svg = svg.add_geometry(space_geometries['upper'], defid='spaces-upper')
+        # draw upper spaces
-        svg.use_geometry(space_upper_svg, fill_color='#d1d1d1')
+        upper_spaces_by_color = {}
+        for space in space_levels['upper']:
+            upper_spaces_by_color.setdefault(space.get_color(), []).append(space)
+        for i, (color, color_spaces) in enumerate(upper_spaces_by_color.items()):
+            geometries = cascaded_union(tuple(space.geometry for space in color_spaces))
+            space_upper_svg = svg.add_geometry(geometries, defid='spaces-upper-' + str(i))
+            svg.use_geometry(space_upper_svg, fill_color=color or '#d1d1d1')
 
         return svg.get_xml()

src/c3nav/mapdata/render/svg.py

@@ -1,11 +1,8 @@
 import re
 import xml.etree.ElementTree as ET
-from abc import ABC
 
 from shapely.affinity import scale
 
-from c3nav.mapdata.utils.misc import get_render_dimensions
-
 
 class SVGGroup:
     def __init__(self, width: int, height: int, scale: float=1):