Move merge_power_substation_minor_FR to France subpart to avoid hash …

…conflict osm-fr#560
frodrigo · Oct 4, 2019 · cfcd7cb · cfcd7cb
1 parent e5cfe74
commit cfcd7cb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/osmose_config.py b/osmose_config.py
@@ -254,6 +254,7 @@ 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=[
@@ -550,7 +551,6 @@ 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"