From a44f10db9c384c4c4a2f861338ecaf8a6699d866 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Sun, 22 Jan 2023 16:32:37 +0000 Subject: [PATCH] Optimize looking for runtime conditions in selectors Signed-off-by: Konstantin Pastbin --- src/mapcss/StyleChooser.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mapcss/StyleChooser.py b/src/mapcss/StyleChooser.py index 2444152..091bf13 100644 --- a/src/mapcss/StyleChooser.py +++ b/src/mapcss/StyleChooser.py @@ -111,6 +111,14 @@ class StyleChooser: return a def get_runtime_conditions(self, ftype, tags, zoom): + has_rt_conds = False + for rule in self.ruleChains: + if (len(rule.runtime_conditions) > 0): + has_rt_conds = True + break + if not has_rt_conds: + return None + if self.selzooms: if zoom < self.selzooms[0] or zoom > self.selzooms[1]: return None @@ -143,7 +151,6 @@ class StyleChooser: return True def updateStyles(self, sl, ftype, tags, zoom, xscale, zscale, filter_by_runtime_conditions): - # Are any of the ruleChains fulfilled? if self.selzooms: if zoom < self.selzooms[0] or zoom > self.selzooms[1]: return sl @@ -151,6 +158,7 @@ class StyleChooser: #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) if not rule_and_object_id: