Merge pull request #200 from hotosm/fix/data-models

Fix data models, remove join_or syntax
hotosm · Oct 9, 2023 · 11c7777 · 11c7777
2 parents 694961d + a1118e7
commit 11c7777
Show file tree

Hide file tree

Showing 21 changed files with 244 additions and 189 deletions.
diff --git a/docs/about/make_data_extract.md b/docs/about/make_data_extract.md
@@ -24,15 +24,15 @@ ways, but needed to be automated to be used for FMTM.
 
 ## Examples
 
-Make\*data_extract uses a Postgres database to extract OSM data. By
+Make\*data*extract uses a Postgres database to extract OSM data. By
 default, the program uses **localhost** as the database host. If you
 use \**underpass*as the data base name, this will remotely access the
 [Humanitarian OpenStreetMap Team(HOT)](https://www.hotosm.org)
 maintained OSM database that covers the entire planet, and is updated
 every minute. The name of the database can be specified using the
-_--uri\*\* option. The program extracts the buildings category of OSM
+*--uri\*\* option. The program extracts the buildings category of OSM
 data by default. The size of the extracted data can be limited using
-the _--boundary\* option. The program outputs the data in GeoJSON
+the \_--boundary\* option. The program outputs the data in GeoJSON
 format.
 
 For raw OSM data, the existing country data is downloaded from [GeoFabrik](https://download.geofabrik.de/index.html), and imported using a

diff --git a/osm_fieldwork/data_models/__init__.py b/osm_fieldwork/data_models/__init__.py
@@ -7,14 +7,12 @@
 amenities = f"{data_models_path}/amenities.yaml"
 buildings = f"{data_models_path}/buildings.yaml"
 camping = f"{data_models_path}/camping.yaml"
-category = f"{data_models_path}/category.yaml"
 cemeteries = f"{data_models_path}/cemeteries.yaml"
 education = f"{data_models_path}/education.yaml"
 emergency = f"{data_models_path}/emergency.yaml"
 health = f"{data_models_path}/health.yaml"
 highways = f"{data_models_path}/highways.yaml"
 landusage = f"{data_models_path}/landusage.yaml"
-models = f"{data_models_path}/models.yaml"
 nature = f"{data_models_path}/nature.yaml"
 places = f"{data_models_path}/places.yaml"
 religious = f"{data_models_path}/religious.yaml"

diff --git a/osm_fieldwork/data_models/amenities.yaml b/osm_fieldwork/data_models/amenities.yaml
@@ -1,15 +1,31 @@
 select:
-    osm_id: id
+  osm_id: id
 from:
-    - nodes
-    - ways_poly
+  - nodes
+  - ways_poly
 where:
   tags:
-    - 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}
+    - amenity:
+        - brewery
+        - cafe
+        - bar
+        - pub
+        - fuel
+        - fire_station
+        - library
+        - townhall
+        - courthouse
+        - hospital
+        - restaurant
+        - clinic
+      shop:
+        - alcohol
+        - bakery
+        - car_parts
+        - hardware
+        - convienience
+        - general
+      cuisine: not null
 
 keep:
   - leisure
@@ -23,7 +39,7 @@ keep:
   - parking
   - amenity
   - shop
-  - cusine
+  - cuisine
   - amenity
   - convenience
   - diesel
diff --git a/osm_fieldwork/data_models/buildings.yaml b/osm_fieldwork/data_models/buildings.yaml
@@ -6,19 +6,21 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - { building: not null, amenity: not null, tourism: not null }
+    - building: not null
+      amenity: not null
+      tourism: not null
+
 keep:
-    - building
-    - building:levels
-    - building:material
-    - roof:material
-    - roof:shape
-    - roof:levels
-    - cusine
-    - amenity
-    - convenience
-    - diesel
-    - version
-    - name
-    - name:en
+  - building
+  - building:levels
+  - building:material
+  - roof:material
+  - roof:shape
+  - roof:levels
+  - cuisine
+  - amenity
+  - convenience
+  - diesel
+  - version
+  - name
+  - name:en
diff --git a/osm_fieldwork/data_models/camping.yaml b/osm_fieldwork/data_models/camping.yaml
@@ -5,8 +5,9 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - { tourism: [camp_site, camp_pitch] }
+    - tourism:
+        - camp_site
+        - camp_pitch
 
 keep:
   - leisure

diff --git a/osm_fieldwork/data_models/cemeteries.yaml b/osm_fieldwork/data_models/cemeteries.yaml
@@ -4,5 +4,7 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - { amenity: [grave_yard], landuse: [cemetery] }
+    - amenity:
+        - grave_yard
+      landuse:
+        - cemetery
diff --git a/osm_fieldwork/data_models/education.yaml b/osm_fieldwork/data_models/education.yaml
@@ -5,18 +5,14 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - {
-            amenity:
-              [
-                college,
-                indergarten,
-                school,
-                music_school,
-                language_school,
-                university,
-              ],
-          }
+    - 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,5 +5,5 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - { emergency: not null, fire_hydrant:type: not null }
+    - 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,12 +5,10 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - {
-            healthcare: not null,
-            social_facility: not null,
-            healthcare:speciality: not null,
-          }
+    - 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,8 +5,7 @@ from:
   - ways_line
 where:
   tags:
-    - join_or:
-        - { highway: not null }
+    - highway: not null
 keep:
   - name
   - smoothness

diff --git a/osm_fieldwork/data_models/landusage.yaml b/osm_fieldwork/data_models/landusage.yaml
@@ -4,5 +4,4 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - { landuse: not null }
+    - landuse: not null
diff --git a/osm_fieldwork/data_models/nature.yaml b/osm_fieldwork/data_models/nature.yaml
@@ -5,5 +5,4 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - { natural: not null }
+    - natural: not null
diff --git a/osm_fieldwork/data_models/places.yaml b/osm_fieldwork/data_models/places.yaml
@@ -5,5 +5,4 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - { place: not null }
+    - place: not null
diff --git a/osm_fieldwork/data_models/religious.yaml b/osm_fieldwork/data_models/religious.yaml
@@ -5,5 +5,4 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - { religion: not null }
+    - religion: not null
diff --git a/osm_fieldwork/data_models/toilets.yaml b/osm_fieldwork/data_models/toilets.yaml
@@ -5,12 +5,9 @@ from:
   - ways_poly
 where:
   tags:
-    - 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,
-          }
+    - 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,21 +5,16 @@ from:
   - ways_poly
 where:
   tags:
-    - 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,
-          }
+    - 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,9 +5,8 @@ from:
   - ways_poly
 where:
   tags:
-    - join_or:
-        - {
-            drinking_water: not null,
-            amenity: [drinking_water, water_point],
-            man_made: [water_tap],
-          }
+    - 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,8 +5,8 @@ from:
   - ways_line
 where:
   tags:
-    - join_or:
-        - { waterway: not null }
+    - waterway: not null
+
 keep:
   - name
   - intermittent