Merge remote-tracking branch 'frodrigo/master'

* frodrigo/master: Update data source of analyser_merge_public_equipment_FR_lyon_toilets Update data source of analyser_merge_public_transport_FR_stan Update column name from datasource in analyser_merge_emergency_points_LU Update Spain subarea exclusion #1285 Only in usage road in analyser_merge_road_ES
osm-fr · Jun 28, 2022 · e0b6cfb · e0b6cfb
2 parents db7bb2e + 918cc7e
commit e0b6cfb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/analysers/analyser_merge_emergency_points_LU.py b/analysers/analyser_merge_emergency_points_LU.py
@@ -39,7 +39,7 @@ def __init__(self, config, logger=None):
                        resource="b8d9d38a-7894-49fb-ab88-94072fe2c722",
                        encoding="iso-8859-1"),
                 separator=";"),
-            Load_XY("GEOGRAPHISCHE LÄNGE", "GEOGRAPHISCHE BREITE"),
+            Load_XY("GEOGRAPHISCHE LAENGE", "GEOGRAPHISCHE BREITE"),
             Conflate(
                 select=Select(
                     types=["nodes"],

diff --git a/analysers/analyser_merge_public_equipment_FR_lyon_toilets.py b/analysers/analyser_merge_public_equipment_FR_lyon_toilets.py
@@ -43,13 +43,13 @@ def __init__(self, config, logger = None):
             title = T_('{0} toilets update', 'Grand Lyon'))
 
         self.init(
-            u"https://data.grandlyon.com/jeux-de-donnees/toilettes-publiques-metropole-lyon-v2-0-0",
-            u"Toilettes publiques",
-            GeoJSON(Source(attribution = u"Grand Lyon", millesime = "02/2020",
-                    fileUrl = u"https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&request=GetFeature&typename=adr_voie_lieu.toilettepublique_latest&outputFormat=application/json;%20subtype=geojson&SRSNAME=EPSG:4326&startIndex=0"),
+            "https://data.grandlyon.com/jeux-de-donnees/toilettes-publiques-metropole-lyon-v2/info",
+            "Toilettes publiques de la Métropole de Lyon",
+            GeoJSON(Source(attribution = "Métropole de Lyon", millesime = "06/2022",
+                    fileUrl = "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&request=GetFeature&typename=adr_voie_lieu.adrtoilettepublique_latest&outputFormat=application/json;%20subtype=geojson&SRSNAME=EPSG:4171"),
                 extractor = lambda geojson: geojson),
             Load_XY("geom_x", "geom_y",
-                 where = lambda res: res['provenance'] != 'Open Street Map'),
+                 where = lambda res: 'Open Street Map' not in res['provenance']),
             Conflate(
                 select = Select(
                     types = ["nodes", "ways"],

diff --git a/analysers/analyser_merge_public_transport_FR_stan.py b/analysers/analyser_merge_public_transport_FR_stan.py
@@ -21,7 +21,7 @@
 ###########################################################################
 
 from modules.OsmoseTranslation import T_
-from .Analyser_Merge import Analyser_Merge_Point, Source, GTFS, Load_XY, Conflate, Select, Mapping
+from .Analyser_Merge import Analyser_Merge_Point, SourceDataGouv, GTFS, Load_XY, Conflate, Select, Mapping
 
 
 class Analyser_Merge_Public_Transport_FR_stan(Analyser_Merge_Point):
@@ -34,10 +34,10 @@ def __init__(self, config, logger = None):
             title = T_('{0} stop, integration suggestion', place))
 
         self.init(
-            u"http://opendata.grandnancy.eu/jeux-de-donnees/detail-dune-fiche-de-donnees/?tx_icsoddatastore_pi1%5Buid%5D=108&tx_icsoddatastore_pi1%5BreturnID%5D=447",
-            u"Réseau Stan: horaires et lignes",
-            GTFS(Source(attribution = u"Métropole du Grand Nancy", millesime = "06/2017",
-                    fileUrl = u"http://opendata.grandnancy.eu/?eID=ics_od_datastoredownload&file=333")),
+            "https://www.data.gouv.fr/fr/datasets/arrets-horaires-et-parcours-theoriques-du-reseau-stan-gtfs/",
+            "Arrêts, horaires et parcours théoriques du réseau STAN | GTFS",
+            GTFS(SourceDataGouv(attribution = "Métropole du Grand Nancy",
+                    dataset = "5aa94714c751df666fefc80f", resource = "e7e78cd7-e186-4923-a272-9713fbc28b45")),
             Load_XY("stop_lon", "stop_lat"),
             Conflate(
                 select = Select(

diff --git a/analysers/analyser_merge_road_ES.py b/analysers/analyser_merge_road_ES.py
@@ -41,7 +41,9 @@ def __init__(self, config, logger = None):
                 zip='*/*/rt_tramo_vial.shp')),
             Load('geom', srid = 4258,
                 table_name = 'road_es_' + self.secuencialDescDir(config.options['country']),
-                select = {'claseD': ['Carretera convencional', 'Urbano', 'Autovía', 'Carretera multicarril']}),  # Exclude 'Senda' and 'Camino'
+                select = {
+                    'claseD': ['Carretera convencional', 'Urbano', 'Autovía', 'Carretera multicarril'],  # Exclude 'Senda' and 'Camino'
+                    'estadofis': '1'} ),
             Conflate(
                 select = Select(
                     types = ['ways'],

diff --git a/plugins/Name_Multiple.py b/plugins/Name_Multiple.py
@@ -27,7 +27,7 @@
 
 class Name_Multiple(Plugin):
 
-    not_for = ["ES-NC", "ES-PV", "ES-AS"]
+    not_for = ["ES-O", "ES-NA", "ES-BI", "ES-SS", "ES-VI"]
 
     def init(self, logger):
         Plugin.init(self, logger)