From f2179d07e4e6566256151a066885cefaa3168ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sat, 13 May 2017 20:10:12 +0200 Subject: [PATCH] use less definitions in svg --- src/c3nav/mapdata/models/section.py | 25 ++++++++----------------- src/c3nav/mapdata/render/svg.py | 27 ++++++++++++++++----------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/c3nav/mapdata/models/section.py b/src/c3nav/mapdata/models/section.py index 66619f06..97c6b801 100644 --- a/src/c3nav/mapdata/models/section.py +++ b/src/c3nav/mapdata/models/section.py @@ -59,23 +59,20 @@ class Section(SpecificLocation, EditorFormMixin, models.Model): hole_geometries = cascaded_union(tuple(h.geometry for h in self.holes.all())) hole_geometries = hole_geometries.intersection(space_geometries['']) - hole_svg = svg.add_geometry(hole_geometries, defid='holes') - hole_mask = svg.add_mask(hole_svg, inverted=True, defid='holes-mask') lower_spaces_by_color = {} 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') + svg.add_geometry(geometries, 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_geometry = section_geometry.difference(hole_geometries) - section_clip = svg.add_geometry(section_geometry, defid='section', as_clip_path=True) - svg.use_geometry(fill_color='#d1d1d1', clip_path=section_clip) + section_clip = svg.register_geometry(section_geometry, defid='section', as_clip_path=True) + svg.add_geometry(fill_color='#d1d1d1', clip_path=section_clip) # color in spaces spaces_by_color = {} @@ -84,27 +81,22 @@ class Section(SpecificLocation, EditorFormMixin, models.Model): 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') + svg.add_geometry(geometries, 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') # 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='#000000', opacity=0.1, filter='wallblur', clip_path=section_clip) + svg.add_geometry(wall_dilated_geometry, fill_color='#000000', opacity=0.1, filter='wallblur', clip_path=section_clip) # draw walls - svg.use_geometry(wall_svg, fill_color='#929292') - svg.use_geometry(wall_svg, stroke_color='#333333', stroke_width=0.07) + svg.add_geometry(wall_geometry, fill_color='#929292', 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) + svg.add_geometry(door_geometries, fill_color='#ffffff', stroke_color='#929292', stroke_width=0.07) # draw upper spaces upper_spaces_by_color = {} @@ -112,7 +104,6 @@ class Section(SpecificLocation, EditorFormMixin, models.Model): 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') + svg.add_geometry(geometries, fill_color=color or '#d1d1d1') return svg.get_xml() diff --git a/src/c3nav/mapdata/render/svg.py b/src/c3nav/mapdata/render/svg.py index bd6cb2b7..556c4282 100644 --- a/src/c3nav/mapdata/render/svg.py +++ b/src/c3nav/mapdata/render/svg.py @@ -47,11 +47,8 @@ class SVGImage: self.def_i += 1 return defid - def add_geometry(self, geometry, defid=None, as_clip_path=False, comment=None): - if defid is None: - defid = self.new_defid() - - geometry = scale(geometry, xfact=1, yfact=-1, origin=(self.width/2, self.height/2)) + def _create_geometry(self, geometry): + geometry = scale(geometry, xfact=1, yfact=-1, origin=(self.width / 2, self.height / 2)) geometry = scale(geometry, xfact=self.scale, yfact=self.scale, origin=(0, 0)) re_string = re.sub(r'([0-9]+)\.0', r'\1', re.sub(r'([0-9]+\.[0-9])[0-9]+', r'\1', geometry.svg(0, '#FFFFFF'))) element = ET.fromstring(re_string) @@ -59,20 +56,25 @@ class SVGImage: new_element = ET.Element('g') new_element.append(element) element = new_element - if as_clip_path: - element.tag = 'clipPath' - paths = element.findall('polyline') if len(paths) == 0: paths = element.findall('path') - for path in paths: path.attrib.pop('opacity', None) path.attrib.pop('fill', None) path.attrib.pop('fill-rule', None) path.attrib.pop('stroke', None) path.attrib.pop('stroke-width', None) + return element + def register_geometry(self, geometry, defid=None, as_clip_path=False, comment=None): + if defid is None: + defid = self.new_defid() + + element = self._create_geometry(geometry) + + if as_clip_path: + element.tag = 'clipPath' element.set('id', defid) self.defs.append(element) return defid @@ -104,10 +106,13 @@ class SVGImage: self.defs.append(clippath) return defid - def use_geometry(self, geometry=None, fill_color=None, fill_opacity=None, opacity=None, mask=None, filter=None, + def add_geometry(self, geometry=None, fill_color=None, fill_opacity=None, opacity=None, mask=None, filter=None, stroke_width=0.0, stroke_color=None, stroke_opacity=None, stroke_linejoin=None, clip_path=None): if geometry: - element = ET.Element('use', {'xlink:href': '#'+geometry}) + if isinstance(geometry, str): + element = ET.Element('use', {'xlink:href': '#'+geometry}) + else: + element = self._create_geometry(geometry) else: element = ET.Element('rect', {'width': '100%', 'height': '100%'}) element.set('fill', fill_color or 'none')