From fdeef4debf79bcff6f273086d7f7535df252b2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= Date: Wed, 1 Jan 2020 16:37:38 +0100 Subject: [PATCH] mapcss: regenerated after mapcss2osmose fix #725 --- plugins/Josm_combinations.py | 2 +- plugins/Josm_geometry.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Josm_combinations.py b/plugins/Josm_combinations.py index 661fa3106..98ef9f87e 100644 --- a/plugins/Josm_combinations.py +++ b/plugins/Josm_combinations.py @@ -2114,7 +2114,7 @@ def way(self, data, tags, nds): match = False if not match: capture_tags = {} - try: match = (mapcss._tag_capture(capture_tags, 0, tags, u'water') and not mapcss.regexp_test(mapcss._value_const_capture(capture_tags, 1, self.re_521b2098, u'water|bay|strait'), mapcss._tag_capture(capture_tags, 1, tags, u'natural')) and mapcss._tag_capture(capture_tags, 2, tags, u'water') != mapcss._value_const_capture(capture_tags, 2, u'intermittent', u'intermittent') and mapcss._tag_capture(capture_tags, 3, tags, u'amenity') != mapcss._value_const_capture(capture_tags, 3, u'lavoir', u'lavoir') and nds[0] == nds[-1]) + try: match = (mapcss._tag_capture(capture_tags, 0, tags, u'water') and not mapcss.regexp_test(mapcss._value_const_capture(capture_tags, 1, self.re_521b2098, u'water|bay|strait'), mapcss._tag_capture(capture_tags, 1, tags, u'natural')) and mapcss._tag_capture(capture_tags, 2, tags, u'water') != mapcss._value_const_capture(capture_tags, 2, u'intermittent', u'intermittent') and mapcss._tag_capture(capture_tags, 3, tags, u'amenity') != mapcss._value_const_capture(capture_tags, 3, u'lavoir', u'lavoir') and nds[0] != nds[-1]) except mapcss.RuleAbort: pass if match: # group:tr("missing tag") diff --git a/plugins/Josm_geometry.py b/plugins/Josm_geometry.py index b5e267b2e..c642ea150 100644 --- a/plugins/Josm_geometry.py +++ b/plugins/Josm_geometry.py @@ -548,7 +548,7 @@ def way(self, data, tags, nds): except mapcss.RuleAbort: pass if not match: capture_tags = {} - try: match = (mapcss._tag_capture(capture_tags, 0, tags, u'power') == mapcss._value_capture(capture_tags, 0, u'tower') and nds[0] == nds[-1]) + try: match = (mapcss._tag_capture(capture_tags, 0, tags, u'power') == mapcss._value_capture(capture_tags, 0, u'tower') and nds[0] != nds[-1]) except mapcss.RuleAbort: pass if not match: capture_tags = {} @@ -641,7 +641,7 @@ def way(self, data, tags, nds): match = False if not match: capture_tags = {} - try: match = (mapcss._tag_capture(capture_tags, 0, tags, u'place') == mapcss._value_capture(capture_tags, 0, u'island') and nds[0] == nds[-1]) + try: match = (mapcss._tag_capture(capture_tags, 0, tags, u'place') == mapcss._value_capture(capture_tags, 0, u'island') and nds[0] != nds[-1]) except mapcss.RuleAbort: pass if match: # throwError:tr("Way with {0} not closed.","{0.tag}")