diff --git a/src/c3nav/mapdata/management/commands/createsvg.py b/src/c3nav/mapdata/management/commands/createsvg.py deleted file mode 100644 index c94381a7..00000000 --- a/src/c3nav/mapdata/management/commands/createsvg.py +++ /dev/null @@ -1,38 +0,0 @@ -import os -from django.core.management.base import BaseCommand - -from c3nav.mapdata.models import Level - -svg_template = """ -{data} -""" - - -class Command(BaseCommand): - help = 'create svgs for each level' - - def add_arguments(self, parser): - parser.add_argument('folder', help='folder, where the svgs should be stored') - - def handle(self, *args, **options): - folder = options['folder'] - os.chdir(folder) - - for level in Level.objects.all(): - level_name = "level-{}.svg".format(level.name) - data = [] - for building in level.buildings.all(): - data.append(building.geometry.svg(fill_color="#c0c0c0")) - for area in level.areas.all(): - data.append(area.geometry.svg(fill_color="#a0a0a0")) - for obstacle in level.obstacles.all(): - data.append(obstacle.geometry.svg(fill_color="#ffa0a0")) - for door in level.doors.all(): - data.append(door.geometry.svg(fill_color="#f0a0f0")) - with open(level_name, 'w') as fh: - fh.write(svg_template.format(width=400, height=200, data='\n'.join(data))) diff --git a/src/c3nav/mapdata/management/commands/rendermap.py b/src/c3nav/mapdata/management/commands/rendermap.py new file mode 100644 index 00000000..3b365add --- /dev/null +++ b/src/c3nav/mapdata/management/commands/rendermap.py @@ -0,0 +1,10 @@ +from django.core.management.base import BaseCommand + +from c3nav.mapdata.render import render_all_levels + + +class Command(BaseCommand): + help = 'render the map' + + def handle(self, *args, **options): + render_all_levels() diff --git a/src/c3nav/mapdata/models/level.py b/src/c3nav/mapdata/models/level.py index 7826c1db..e0c35b57 100644 --- a/src/c3nav/mapdata/models/level.py +++ b/src/c3nav/mapdata/models/level.py @@ -1,5 +1,7 @@ from django.db import models +from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _ +from shapely.ops import cascaded_union from c3nav.mapdata.models.base import MapItem @@ -17,6 +19,10 @@ class Level(MapItem): verbose_name_plural = _('Levels') default_related_name = 'levels' + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.geometries = LevelGeometries(self) + def tofilename(self): return 'levels/%s.json' % self.name @@ -38,3 +44,16 @@ class Level(MapItem): result = super().tofile() result['altitude'] = float(self.altitude) return result + + +class LevelGeometries(): + def __init__(self, level): + self.level = level + + @cached_property + def buildings(self): + return cascaded_union([building.geometry for building in self.level.buildings.all()]) + + @cached_property + def areas(self): + return cascaded_union([area.geometry for area in self.level.areas.all()]) diff --git a/src/c3nav/mapdata/render/__init__.py b/src/c3nav/mapdata/render/__init__.py new file mode 100644 index 00000000..62bbd6b9 --- /dev/null +++ b/src/c3nav/mapdata/render/__init__.py @@ -0,0 +1,8 @@ +from c3nav.mapdata.models import Level +from c3nav.mapdata.render.renderer import LevelRenderer # noqa + + +def render_all_levels(): + for level in Level.objects.all(): + renderer = LevelRenderer(level) + renderer.write_svg() diff --git a/src/c3nav/mapdata/render/renderer.py b/src/c3nav/mapdata/render/renderer.py new file mode 100644 index 00000000..9eb39e63 --- /dev/null +++ b/src/c3nav/mapdata/render/renderer.py @@ -0,0 +1,98 @@ +import os +import xml.etree.ElementTree as ET + +from django.conf import settings +from django.db.models import Max, Min +from shapely.affinity import scale +from shapely.geometry import box + +from c3nav.mapdata.models import Package + + +class LevelRenderer(): + def __init__(self, level): + self.level = level + + @staticmethod + def get_dimensions(): + aggregate = Package.objects.all().aggregate(Max('right'), Min('left'), Max('top'), Min('bottom')) + return ( + (aggregate['right__max'] - aggregate['left__min']) * 10, + (aggregate['top__max'] - aggregate['bottom__min']) * 10 + ) + + @staticmethod + def polygon_svg(geometry, fill_color=None, stroke_width=0.0, stroke_color=None, filter=None): + element = ET.fromstring(scale(geometry, xfact=10, yfact=10, origin=(0, 0)).svg(0, fill_color or '#FFFFFF')) + if element.tag != 'g': + new_element = ET.Element('g') + new_element.append(element) + element = new_element + + for path in element.findall('path'): + path.attrib.pop('opacity') + path.set('stroke-width', str(stroke_width)) + + if fill_color is None and 'fill' in path.attrib: + path.attrib.pop('fill') + path.set('fill-opacity', '0') + + if stroke_color is not None: + path.set('stroke', stroke_color) + elif 'stroke' in path.attrib: + path.attrib.pop('stroke') + + if filter is not None: + path.set('filter', filter) + + return element + + def get_svg(self): + width, height = self.get_dimensions() + + svg = ET.Element('svg', { + 'width': str(width), + 'height': str(height), + 'xmlns:svg': 'http://www.w3.org/2000/svg', + 'xmlns': 'http://www.w3.org/2000/svg', + }) + + svg.append(ET.fromstring(""" + + + + + + + + + + + + + """)) + + contents = ET.Element('g', { + 'transform': 'scale(1 -1) translate(0 -%d)' % (height), + }) + svg.append(contents) + + contents.append(self.polygon_svg(box(0, 0, width, height), fill_color='#000000')) + + contents.append(self.polygon_svg(self.level.geometries.buildings, + fill_color='#949494', + stroke_color='#757575', + stroke_width=1.5)) + + contents.append(self.polygon_svg(self.level.geometries.areas, + fill_color='#D5D5D5', + filter='url(#area-filter)')) + contents.append(self.polygon_svg(self.level.geometries.areas, + stroke_color='#757575', + stroke_width=1.5)) + return ET.tostring(svg).decode() + + def write_svg(self): + filename = os.path.join(settings.RENDER_ROOT, 'level-%s.svg' % self.level.name) + with open(filename, 'w') as f: + f.write(self.get_svg()) diff --git a/src/c3nav/settings.py b/src/c3nav/settings.py index 9c42f685..8dbae944 100644 --- a/src/c3nav/settings.py +++ b/src/c3nav/settings.py @@ -19,6 +19,7 @@ DATA_DIR = config.get('c3nav', 'datadir', fallback=os.environ.get('DATA_DIR', 'd LOG_DIR = os.path.join(DATA_DIR, 'logs') MEDIA_ROOT = os.path.join(DATA_DIR, 'media') MAP_ROOT = os.path.join(DATA_DIR, 'map') +RENDER_ROOT = os.path.join(DATA_DIR, 'render') if not os.path.exists(DATA_DIR): os.mkdir(DATA_DIR) @@ -28,6 +29,8 @@ if not os.path.exists(MEDIA_ROOT): os.mkdir(MEDIA_ROOT) if not os.path.exists(MAP_ROOT): os.mkdir(MAP_ROOT) +if not os.path.exists(RENDER_ROOT): + os.mkdir(RENDER_ROOT) if config.has_option('django', 'secret'): SECRET_KEY = config.get('django', 'secret')