diff --git a/src/libkomwm.py b/src/libkomwm.py index 52b1274..53eafe8 100644 --- a/src/libkomwm.py +++ b/src/libkomwm.py @@ -237,21 +237,24 @@ def komap_mapswithme(options): # Parse style mapcss global style - style = MapCSS(options.minzoom, options.maxzoom + 1) + style = MapCSS(options.minzoom, options.maxzoom) style.parse(filename=options.filename, static_tags=mapcss_static_tags, dynamic_tags=mapcss_dynamic_tags) - # Build optimization tree - class/type -> StyleChoosers + # Build optimization tree - class/zoom/type -> StyleChoosers + clname_cltag_unique = set() for cl in class_order: clname = cl if cl.find('-') == -1 else cl[:cl.find('-')] # Get first tag of the class/type. cltag = next(iter(classificator[cl].keys())) - style.build_choosers_tree(clname, "line", cltag) - style.build_choosers_tree(clname, "area", cltag) - style.build_choosers_tree(clname, "node", cltag) - style.restore_choosers_order("line") - style.restore_choosers_order("area") - style.restore_choosers_order("node") + clname_cltag = clname + '$' + cltag + if clname_cltag not in clname_cltag_unique: + clname_cltag_unique.add(clname_cltag) + style.build_choosers_tree(clname, "line", cltag) + style.build_choosers_tree(clname, "area", cltag) + style.build_choosers_tree(clname, "node", cltag) + + style.finalize_choosers_tree() # Get colors section from style style_colors = {} diff --git a/src/mapcss/StyleChooser.py b/src/mapcss/StyleChooser.py index 6af83c1..b27b550 100644 --- a/src/mapcss/StyleChooser.py +++ b/src/mapcss/StyleChooser.py @@ -126,12 +126,6 @@ class StyleChooser: return rule.runtime_conditions def updateStyles(self, sl, ftype, tags, zoom, xscale, zscale, filter_by_runtime_conditions): - if zoom < self.selzooms[0] or zoom > self.selzooms[1]: - return sl - - #if ftype not in self.compatible_types: - #return sl - # Are any of the ruleChains fulfilled? rule_and_object_id = self.testChain(self.ruleChains, ftype, tags, zoom) diff --git a/src/mapcss/__init__.py b/src/mapcss/__init__.py index 13bfd13..feff12a 100644 --- a/src/mapcss/__init__.py +++ b/src/mapcss/__init__.py @@ -96,7 +96,7 @@ class MapCSS(): self.scalepair = (minscale, maxscale) self.choosers = [] self.choosers_by_type = {} - self.choosers_by_type_and_tag = {} + self.choosers_by_type_zoom_tag = {} self.variables = {} self.style_loaded = False @@ -113,34 +113,36 @@ class MapCSS(): logging.error("unparsed zoom: %s" % s) def build_choosers_tree(self, clname, type, cltag): - if type not in self.choosers_by_type_and_tag: - self.choosers_by_type_and_tag[type] = {} - if clname not in self.choosers_by_type_and_tag[type]: - self.choosers_by_type_and_tag[type][clname] = set() + if type not in self.choosers_by_type_zoom_tag: + self.choosers_by_type_zoom_tag[type] = {} + for zoom in range(self.minscale, self.maxscale + 1): + if zoom not in self.choosers_by_type_zoom_tag[type]: + self.choosers_by_type_zoom_tag[type][zoom] = {} + if clname not in self.choosers_by_type_zoom_tag[type][zoom]: + self.choosers_by_type_zoom_tag[type][zoom][clname] = {'arr': [], 'set': set()} if type in self.choosers_by_type: for chooser in self.choosers_by_type[type]: - for tag in chooser.extract_tags(): - if tag == "*" or tag == cltag: - if chooser not in self.choosers_by_type_and_tag[type][clname]: - self.choosers_by_type_and_tag[type][clname].add(chooser) - break + chooser_tags = chooser.extract_tags() + if '*' in chooser_tags or cltag in chooser_tags: + for zoom in range(int(chooser.selzooms[0]), int(chooser.selzooms[1]) + 1): + if chooser not in self.choosers_by_type_zoom_tag[type][zoom][clname]['set']: + self.choosers_by_type_zoom_tag[type][zoom][clname]['arr'].append(chooser) + self.choosers_by_type_zoom_tag[type][zoom][clname]['set'].add(chooser) - def restore_choosers_order(self, type): - ethalon_choosers = self.choosers_by_type[type] - for tag, choosers_for_tag in list(self.choosers_by_type_and_tag[type].items()): - tmp = [] - for ec in ethalon_choosers: - if ec in choosers_for_tag: - tmp.append(ec) - self.choosers_by_type_and_tag[type][tag] = tmp + def finalize_choosers_tree(self): + # Remove unneeded unique sets of choosers + for ftype in self.choosers_by_type_zoom_tag.keys(): + for zoom in self.choosers_by_type_zoom_tag[ftype].keys(): + for clname in self.choosers_by_type_zoom_tag[ftype][zoom].keys(): + self.choosers_by_type_zoom_tag[ftype][zoom][clname] = self.choosers_by_type_zoom_tag[ftype][zoom][clname]['arr'] def get_runtime_rules(self, clname, type, tags, zoom): """ Returns array of runtime_conditions which are used for clname/type/tags/zoom """ runtime_rules = [] - if type in self.choosers_by_type_and_tag: - for chooser in self.choosers_by_type_and_tag[type][clname]: + if type in self.choosers_by_type_zoom_tag: + for chooser in self.choosers_by_type_zoom_tag[type][zoom][clname]: runtime_conditions = chooser.get_runtime_conditions(type, tags, zoom) if runtime_conditions: runtime_rules.append(runtime_conditions) @@ -148,8 +150,8 @@ class MapCSS(): def get_style(self, clname, type, tags, zoom, xscale, zscale, filter_by_runtime_conditions): style = [] - if type in self.choosers_by_type_and_tag: - for chooser in self.choosers_by_type_and_tag[type][clname]: + if type in self.choosers_by_type_zoom_tag: + for chooser in self.choosers_by_type_zoom_tag[type][zoom][clname]: style = chooser.updateStyles(style, type, tags, zoom, xscale, zscale, filter_by_runtime_conditions) style = [x for x in style if x["object-id"] != "::*"] for x in style: