From e1698f348f7baf0e8e1dab65072ecbcd0d9a11ba Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Mon, 21 Sep 2015 20:08:34 +0300 Subject: [PATCH] Remove some unneeded functions and constants --- src/mapcss/Condition.py | 143 ------------------------------------- src/mapcss/Eval.py | 2 - src/mapcss/Rule.py | 40 ----------- src/mapcss/StyleChooser.py | 48 ------------- src/mapcss/__init__.py | 21 ------ 5 files changed, 254 deletions(-) diff --git a/src/mapcss/Condition.py b/src/mapcss/Condition.py index a476eb9..768919d 100644 --- a/src/mapcss/Condition.py +++ b/src/mapcss/Condition.py @@ -17,13 +17,6 @@ import re -INVERSIONS = {"eq": "ne", "true": "false", "set": "unset", "<": ">=", ">": "<="} -in2 = {} -for a, b in INVERSIONS.iteritems(): - in2[b] = a -INVERSIONS.update(in2) -del in2 - # Fast conditions class EqConditionDD: @@ -110,22 +103,11 @@ class Condition: self.regex = re.compile(self.params[0], re.I) self.compiled_regex = "" - def get_interesting_tags(self): - if self.params[0][:2] == "::": - return [] - return set([self.params[0]]) - def extract_tags(self): if self.params[0][:2] == "::" or self.type == "regex": return set(["*"]) # unknown return set([self.params[0]]) - def get_numerics(self): - if self.type in ("<", ">", ">=", "<="): - return self.params[0] - else: - return False - def test(self, tags): """ Test a hash against this condition @@ -167,137 +149,12 @@ class Condition: pass return False - def inverse(self): - """ - Get a not-A for condition A - """ - t = self.type - params = self.params - try: - return Condition(INVERSIONS[t], params) - if t == 'regex': - ### FIXME: learn how to invert regexes - return Condition("regex", params) - except KeyError: - pass - return self - - def get_sql(self): - # params = [re.escape(x) for x in self.params] - params = self.params - t = self.type - if t == 'eq': # don't compare tags against sublayers - if params[0][:2] == "::": - return ("", "") - try: - if t == 'eq': - return params[0], '"%s" = \'%s\'' % (params[0], params[1]) - if t == 'ne': - return params[0], '("%s" != \'%s\' or "%s" IS NULL)' % (params[0], params[1], params[0]) - if t == 'regex': - return params[0], '"%s" ~ \'%s\'' % (params[0], params[1].replace("'", "\\'")) - if t == 'true': - return params[0], '"%s" = \'yes\'' % (params[0]) - if t == 'untrue': - return params[0], '"%s" = \'no\'' % (params[0]) - if t == 'set': - return params[0], '"%s" IS NOT NULL' % (params[0]) - if t == 'unset': - return params[0], '"%s" IS NULL' % (params[0]) - - if t == '<': - return params[0], """(CASE WHEN "%s" ~ E'^[-]?[[:digit:]]+([.][[:digit:]]+)?$' THEN CAST ("%s" AS FLOAT) < %s ELSE false END) """ % (params[0], params[0], params[1]) - if t == '<=': - return params[0], """(CASE WHEN "%s" ~ E'^[-]?[[:digit:]]+([.][[:digit:]]+)?$' THEN CAST ("%s" AS FLOAT) <= %s ELSE false END)""" % (params[0], params[0], params[1]) - if t == '>': - return params[0], """(CASE WHEN "%s" ~ E'^[-]?[[:digit:]]+([.][[:digit:]]+)?$' THEN CAST ("%s" AS FLOAT) > %s ELSE false END) """ % (params[0], params[0], params[1]) - if t == '>=': - return params[0], """(CASE WHEN "%s" ~ E'^[-]?[[:digit:]]+([.][[:digit:]]+)?$' THEN CAST ("%s" AS FLOAT) >= %s ELSE false END) """ % (params[0], params[0], params[1]) - except KeyError: - pass - - def get_mapnik_filter(self): - # params = [re.escape(x) for x in self.params] - params = self.params - t = self.type - if t == 'eq': # don't compare tags against sublayers - if params[0][:2] == "::": - return '' - try: - if t == 'eq': - return '[%s] = \'%s\'' % (params[0], params[1]) - if t == 'ne': - return 'not([%s] = \'%s\')' % (params[0], params[1]) - if t == 'regex': - return '[%s].match(\'%s\')' % (params[0], params[1].replace("'", "\\'")) - if t == 'true': - return '[%s] = \'yes\'' % (params[0]) - if t == 'untrue': - return '[%s] = \'no\'' % (params[0]) - if t == 'set': - return '[%s] != \'\'' % (params[0]) - if t == 'unset': - return 'not([%s] != \'\')' % (params[0]) - - if t == '<': - return '[%s__num] < %s' % (params[0], float(params[1])) - if t == '<=': - return '[%s__num] <= %s' % (params[0], float(params[1])) - if t == '>': - return '[%s__num] > %s' % (params[0], float(params[1])) - if t == '>=': - return '[%s__num] >= %s' % (params[0], float(params[1])) - # return "" - except KeyError: - pass - def __repr__(self): return "%s %s " % (self.type, repr(self.params)) def __eq__(self, a): return (self.params == a.params) and (self.type == a.type) - def and_with(self, c2): - """ - merges two rules with AND. - """ - # TODO: possible other minimizations - if c2.params[0] == self.params[0]: - if c2.params == self.params: - if c2.type == INVERSIONS[self.type]: # for example, eq AND ne = 0 - return False - if c2.type == self.type: - return (self,) - - if self.type == ">=" and c2.type == "<=": # a<=2 and a>=2 --> a=2 - return (Condition("eq", self.params),) - if self.type == "<=" and c2.type == ">=": - return (Condition("eq", self.params),) - if self.type == ">" and c2.type == "<": - return False - if self.type == "<" and c2.type == ">": - return False - - if c2.type == "eq" and self.type in ("ne", "<", ">"): - if c2.params[1] != self.params[1]: - return (c2,) - if self.type == "eq" and c2.type in ("ne", "<", ">"): - if c2.params[1] != self.params[1]: - return (self,) - if self.type == "eq" and c2.type == "eq": - if c2.params[1] != self.params[1]: - return False - if c2.type == "set" and self.type in ("eq", "ne", "regex", "<", "<=", ">", ">="): # a is set and a == b -> a == b - return (self,) - if c2.type == "unset" and self.type in ("eq", "ne", "regex", "<", "<=", ">", ">="): # a is unset and a == b -> impossible - return False - if self.type == "set" and c2.type in ("eq", "ne", "regex", "<", "<=", ">", ">="): - return (c2,) - if self.type == "unset" and c2.type in ("eq", "ne", "regex", "<", "<=", ">", ">="): - return False - - return self, c2 - def Number(tt): """ Wrap float() not to produce exceptions diff --git a/src/mapcss/Eval.py b/src/mapcss/Eval.py index 3c32832..ab3225f 100644 --- a/src/mapcss/Eval.py +++ b/src/mapcss/Eval.py @@ -15,8 +15,6 @@ # You should have received a copy of the GNU General Public License # along with kothic. If not, see . -NONE = "" - class Eval(): def __init__(self, s='eval()'): diff --git a/src/mapcss/Rule.py b/src/mapcss/Rule.py index e2858d8..68c4048 100644 --- a/src/mapcss/Rule.py +++ b/src/mapcss/Rule.py @@ -52,25 +52,9 @@ class Rule(): subpart = res return subpart - def test_zoom(self, zoom): - return (zoom >= self.minZoom) and (zoom <= self.maxZoom) - def get_compatible_types(self): return type_matches.get(self.subject, (self.subject,)) - def get_interesting_tags(self, obj, zoom): - if obj: - if (self.subject != '') and not _test_feature_compatibility(obj, self.subject, {}): - return set() - - if zoom and not self.test_zoom(zoom): - return set() - - a = set() - for condition in self.conditions: - a.update(condition.get_interesting_tags()) - return a - def extract_tags(self): a = set() for condition in self.conditions: @@ -79,30 +63,6 @@ class Rule(): break return a - def get_numerics(self): - a = set() - for condition in self.conditions: - a.add(condition.get_numerics()) - a.discard(False) - return a - - def get_sql_hints(self, obj, zoom): - if obj: - if (self.subject != '') and not _test_feature_compatibility(obj, self.subject, {":area": "yes"}): - return set() - if not self.test_zoom(zoom): - return set() - a = set() - b = set() - for condition in self.conditions: - q = condition.get_sql() - if q: - if q[1]: - a.add(q[0]) - b.add(q[1]) - b = " AND ".join(b) - return a, b - def _test_feature_compatibility(f1, f2, tags={}): """ diff --git a/src/mapcss/StyleChooser.py b/src/mapcss/StyleChooser.py index b2cfb72..77e8d6c 100644 --- a/src/mapcss/StyleChooser.py +++ b/src/mapcss/StyleChooser.py @@ -88,31 +88,6 @@ class StyleChooser: self.compatible_types = set() self.has_evals = False - def get_numerics(self): - """ - Returns a set of number-compared values. - """ - a = set() - for r in self.ruleChains: - a.update(r.get_numerics()) - a.discard(False) - return a - - def get_interesting_tags(self, ztype, zoom): - """ - Returns a set of tags that were used in here. - """ - ### FIXME - a = set() - for r in self.ruleChains: - a.update(r.get_interesting_tags(ztype, zoom)) - if a: # FIXME: semi-illegal optimization, may wreck in future on tagless matches - for r in self.styles: - for c, b in r.iteritems(): - if type(b) == self.eval_type: - a.update(b.extract_tags()) - return a - def extract_tags(self): a = set() for r in self.ruleChains: @@ -131,29 +106,6 @@ class StyleChooser: a.add("*") return a - def get_sql_hints(self, type, zoom): - """ - Returns a set of tags that were used in here in form of SQL-hints. - """ - a = set() - b = "" - needed = set(["width", "casing-width", "fill-color", "fill-image", "icon-image", "text", "extrude", "background-image", "background-color", "pattern-image", "shield-text"]) - - if not needed.isdisjoint(set(self.styles[0].keys())): - for r in self.ruleChains: - p = r.get_sql_hints(type, zoom) - if p: - q = "(" + p[1] + ")" # [t[1] for t in p] - if q == "()": - q = "" - if b and q: - b += " OR " + q - else: - b = q - a.update(p[0]) - # no need to check for eval's - return a, b - def updateStyles(self, sl, ftype, tags, zoom, scale, zscale): # Are any of the ruleChains fulfilled? if self.selzooms: diff --git a/src/mapcss/__init__.py b/src/mapcss/__init__.py index 427c9db..a7aea62 100644 --- a/src/mapcss/__init__.py +++ b/src/mapcss/__init__.py @@ -177,27 +177,6 @@ class MapCSS(): d[x.get('object-id', '')].update(x) return d - def get_interesting_tags(self, type=None, zoom=None): - """ - Get set of interesting tags. - """ - tags = set() - for chooser in self.choosers: - tags.update(chooser.get_interesting_tags(type, zoom)) - return tags - - def get_sql_hints(self, type=None, zoom=None): - """ - Get set of interesting tags. - """ - hints = [] - for chooser in self.choosers: - p = chooser.get_sql_hints(type, zoom) - if p: - if p[0] and p[1]: - hints.append(p) - return hints - def subst_variables(self, t): """Expects an array from parseDeclaration.""" for k in t[0]: