fix: Add join_or tag which is now required in the enhanced YAML format

hotosm · Sep 10, 2023 · 06f926f · 06f926f
1 parent d0f24cb
commit 06f926f
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 17 deletions.
diff --git a/osm_fieldwork/data_models/amenities.yaml b/osm_fieldwork/data_models/amenities.yaml
@@ -5,7 +5,8 @@ from:
     - ways_poly
 where:
   tags:
-    - { amenity: [brewery, cafe, bar, pub, fuel, fire_station, library,
+    - join_or:
+        - { amenity: [brewery, cafe, bar, pub, fuel, fire_station, library,
     townhall, courthouse, hospital, restaurant, clinic], shop:
     [alcohol, bakery, car_parts, hardware, convienience, general],
     cusine: not null}

diff --git a/osm_fieldwork/data_models/buildings.yaml b/osm_fieldwork/data_models/buildings.yaml
@@ -6,7 +6,8 @@ from:
     - ways_poly
 where:
   tags:
-    - { building: not null, amenity: not null, tourism: not null }
+    - join_or:
+        - { building: not null, amenity: not null, tourism: not null }
 keep:
     - building
     - building:levels

diff --git a/osm_fieldwork/data_models/camping.yaml b/osm_fieldwork/data_models/camping.yaml
@@ -5,7 +5,8 @@ from:
     - ways_poly
 where:
   tags:
-    - { tourism: [camp_site, camp_pitch] }
+    - join_or:
+        - { tourism: [camp_site, camp_pitch] }
 
 keep:
   - leisure

diff --git a/osm_fieldwork/data_models/cemeteries.yaml b/osm_fieldwork/data_models/cemeteries.yaml
@@ -4,4 +4,5 @@ from:
     - ways_poly
 where:
     tags:
-        - { amenity: [grave_yard], landuse: [cemetery] }
+        - join_or:
+            - { amenity: [grave_yard], landuse: [cemetery] }
diff --git a/osm_fieldwork/data_models/education.yaml b/osm_fieldwork/data_models/education.yaml
@@ -5,8 +5,8 @@ from:
     - ways_poly
 where:
     tags:
-        - { amenity:
-          [college, indergarten, school, music_school, language_school, university]}
+        - join_or:
+            - { amenity: [college, indergarten, school, music_school, language_school, university]}
 keep:
   - wheelchar
   - religion

diff --git a/osm_fieldwork/data_models/emergency.yaml b/osm_fieldwork/data_models/emergency.yaml
@@ -5,4 +5,5 @@ from:
     - ways_poly
 where:
     tags:
-        - { emergency: not null, fire_hydrant:type: not null }
+        - join_or:
+            - { emergency: not null, fire_hydrant:type: not null }
diff --git a/osm_fieldwork/data_models/health.yaml b/osm_fieldwork/data_models/health.yaml
@@ -5,7 +5,8 @@ from:
     - ways_poly
 where:
     tags:
-        - { healthcare: not null, social_facility: not null, healthcare:speciality: not null }
+        - join_or:
+            - { healthcare: not null, social_facility: not null, healthcare:speciality: not null }
 keep:
   - healthcare:type
   - healthcare

diff --git a/osm_fieldwork/data_models/highways.yaml b/osm_fieldwork/data_models/highways.yaml
@@ -5,7 +5,8 @@ from:
     - ways_line
 where:
   tags:
-    - { highway: not null }
+     - join_or:
+        - { highway: not null }
 keep:
     - name
     - smoothness

diff --git a/osm_fieldwork/data_models/landusage.yaml b/osm_fieldwork/data_models/landusage.yaml
@@ -4,4 +4,5 @@ from:
     - ways_poly
 where:
     tags:
-        - { landuse: not null }
+        - join_or:
+            - { landuse: not null }
diff --git a/osm_fieldwork/data_models/nature.yaml b/osm_fieldwork/data_models/nature.yaml
@@ -5,4 +5,5 @@ from:
     - ways_poly
 where:
     tags:
-        - { natural: not null }
+        - join_or:
+            - { natural: not null }
diff --git a/osm_fieldwork/data_models/places.yaml b/osm_fieldwork/data_models/places.yaml
@@ -5,4 +5,5 @@ from:
     - ways_poly
 where:
     tags:
-        - { place: not null }
+        - join_or:
+            - { place: not null }
diff --git a/osm_fieldwork/data_models/religious.yaml b/osm_fieldwork/data_models/religious.yaml
@@ -5,4 +5,5 @@ from:
     - ways_poly
 where:
     tags:
-        - { religion: not null }
+        - join_or:
+            - { religion: not null }
diff --git a/osm_fieldwork/data_models/toilets.yaml b/osm_fieldwork/data_models/toilets.yaml
@@ -5,4 +5,5 @@ from:
     - ways_poly
 where:
     tags:
-        - { amenity: not null,  toilets:access: not null, toilets:disposal: not null, toilets:position: not null, toilets:unisex: not null, toilets:wheelchair: not null }
+        - join_or:
+            - { amenity: not null,  toilets:access: not null, toilets:disposal: not null, toilets:position: not null, toilets:unisex: not null, toilets:wheelchair: not null }
diff --git a/osm_fieldwork/data_models/wastedisposal.yaml b/osm_fieldwork/data_models/wastedisposal.yaml
@@ -5,4 +5,5 @@ from:
     - ways_poly
 where:
     tags:
-        - { amenity: [waste_disposal, waste_dump_site, waste_transfer_station, waste_basket, recycling, landfill], waste: not null, recycling_type: not null, recycling: not null, recycling:aluminum: not null, recycling:glass: not null, recycling:hazardous_waste: not null }
+        - join_or:
+            - { amenity: [waste_disposal, waste_dump_site, waste_transfer_station, waste_basket, recycling, landfill], waste: not null, recycling_type: not null, recycling: not null, recycling:aluminum: not null, recycling:glass: not null, recycling:hazardous_waste: not null }
diff --git a/osm_fieldwork/data_models/waterpoints.yaml b/osm_fieldwork/data_models/waterpoints.yaml
@@ -5,4 +5,5 @@ from:
     - ways_poly
 where:
   tags:
-    - { drinking_water: not null, amenity: [drinking_water, water_point], man_made: [water_tap] }
+    - join_or:
+        - { drinking_water: not null, amenity: [drinking_water, water_point], man_made: [water_tap] }
diff --git a/osm_fieldwork/data_models/waterways.yaml b/osm_fieldwork/data_models/waterways.yaml
@@ -5,7 +5,8 @@ from:
     - ways_line
 where:
   tags:
-    - { waterway: not null }
+    - join_or:
+        - { waterway: not null }
 keep:
     - name
     - intermittent