Merge remote-tracking branch 'frodrigo/master'

* frodrigo/master:
  mapcss: regenerated after mapcss2osmose fix #725
  mapcss: fix on !:closed #725
  Merge requirements-dev-python3.txt into requirements-dev.txt
  Revert Move merge_power_substation_minor_FR to France subpart to avoid hash conflict #560
  Better 'Already up to date' support

.travis.yml

@@ -24,7 +24,7 @@ addons:
     - pkg-config
     - protobuf-compiler
 install:
-  - pip install -r requirements.txt -r requirements-dev.txt -r requirements-dev-python3.txt
+  - pip install -r requirements.txt -r requirements-dev.txt
 before_script:
   # configure database
   - psql -c 'CREATE USER osmose;' -U postgres

mapcss/mapcss2osmose.py

@@ -588,7 +588,7 @@ def to_p(t):
         return ("not " if t['not'] else "") + to_p(t['predicate']) + (" in ('yes', 'true', '1')" if t['question_mark'] else "")
     elif t['type'] == 'pseudo_class':
         if t['pseudo_class'] in ('closed', 'closed2'):
-            return "nds[0] == nds[-1]"
+            return "nds[0] != nds[-1]" if t['not_class'] else "nds[0] == nds[-1]"
         else:
             raise NotImplementedError(t)
     elif t['type'] == 'declaration':

osmose_config.py

@@ -254,7 +254,6 @@ class gen(default_country):
     'osmosis_highway_motorway',
     'osmosis_highway_zone',
     'merge_shop_FR',
-    'merge_power_substation_minor_FR',
 ], **{'addr:city-admin_level': '8,9'})
 
 france_departement("alsace/bas_rhin", 7415, "FR-67", include=[
@@ -562,6 +561,7 @@ class gen(default_country):
 france_local_db.analyser["merge_power_substation_FR"] = "xxx"
 france_local_db.analyser["merge_power_tower_FR"] = "xxx"
 france_local_db.analyser["merge_restriction_motorway_FR"] = "xxx"
+france_local_db.analyser["merge_power_substation_minor_FR"] = "xxx"
 france_local_db.analyser["merge_wastewater_plant_FR"] = "xxx"
 france_local_db.analyser["merge_museum_FR"] = "xxx"
 france_local_db.analyser["merge_radio_support_FR"] = "xxx"

osmose_run.py

@@ -266,10 +266,10 @@ def execc(conf, logger, options, osmosis_manager):
                                         logger.sub().sub().sub().err('got an HTTP timeout status')
                                     else:
                                         dt = r.text.strip()
-                                        logger.sub().sub().sub().err((u"UPDATE ERROR %s/%s : %s\n"%(country, analyser_name, dt)).encode("utf8"))
-                                        if was_on_timeout and dt == "FAIL: Already up to date":
+                                        logger.sub().sub().sub().err(u"UPDATE ERROR %s/%s : %s\n"%(country, analyser_name, dt))
+                                        if dt == "FAIL: Already up to date":
                                             update_finished = True
-                                        else:
+                                        if not was_on_timeout:
                                             err_code |= 4
                                 except Exception as e:
                                     if isinstance(e, requests.exceptions.ConnectTimeout):

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")

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}")

requirements-dev.txt

@@ -1,3 +1,4 @@
 pytest
 xmltodict
 termcolor
+antlr4-python3-runtime