Rework topics

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Current Main
 
+### Bug Fixes
+
+- topics: rework road topics ([#878], [#880])
+- topics: remove covid19 related tags from topics ([#882])
+
+
+[#878]: https://github.com/GIScience/ohsome-quality-api/issues/878
+[#880]: https://github.com/GIScience/ohsome-quality-api/issues/880
+[#882]: https://github.com/GIScience/ohsome-quality-api/issues/882
+
+
 ## Release  1.8.3
 
 ### New Features

ohsome_quality_api/topics/presets.yaml

@@ -6,7 +6,7 @@
 ### CORE TOPICS ###
 
 building-count:
-  name: Building Count
+  name: Buildings (count)
   description: >-
     All buildings as defined by all objects tagged with 'building=*'.
   endpoint: elements
@@ -21,7 +21,7 @@ building-count:
     - bkg
 
 building-area:
-  name: Building Area
+  name: Buildings (area)
   description: >-
     All buildings as defined by all objects tagged with 'building=*'.
   endpoint: elements
@@ -34,18 +34,19 @@ building-area:
     - core
     - bkg
 
-roads:
-  name: Roads
+roads-all-highways:
+  name: Roads (all highways)
   description: >-
-    The road network defined by all objects which hold the principal tags for
-    the road network and their link roads as defined in the OSM Wiki`:`
-    https://wiki.openstreetmap.org/wiki/Key:highway
+    All linear OSM features holding the prinicipal tag `highway=*`. The
+    road network defined by all objects which hold the principal tags
+    for the road network and their link roads as defined in the OSM
+    Wiki`:` https://wiki.openstreetmap.org/wiki/Key:highway
   endpoint: elements
   aggregation_type: length
   filter: >-
-    highway=* and type:way
+    highway=* and geometry:line
   ratio_filter: >-
-    highway=* and type:way and name=*
+    highway=* and geometry:line and name=*
   source: https://wiki.openstreetmap.org/wiki/Key:highway
   indicators:
     - mapping-saturation
@@ -56,13 +57,19 @@ roads:
     - core
     - bkg
 
-car-roads:
-  name: Classified Roads
-  description: roads excluding simple forest paths and other small/ unclassified roads
+roads:
+  name: Roads (cars)
+  description: >-
+    All linear OSM features referring to a road usable by vehicles
+    (i.e. cars). The road network defined by all objects which hold
+    the principal tags for the road network and their link roads as
+    defined in the OSM Wiki`:`
+    https://wiki.openstreetmap.org/wiki/Highways#Roads_and_tracks
   endpoint: elements
   aggregation_type: length
   filter: >-
-    highway in (motorway, trunk, primary, secondary, tertiary, residential, service, living_street, trunk_link, motorway_link, primary_link, secondary_link, tertiary_link) and type:way
+    highway in (motorway, trunk, primary, secondary, tertiary, residential, service, living_street, trunk_link, motorway_link, primary_link, secondary_link, tertiary_link, unclassified) and geometry:line
+  source: https://wiki.openstreetmap.org/wiki/Highways#Roads_and_tracks
   indicators:
     - mapping-saturation
     - attribute-completeness
@@ -140,7 +147,6 @@ poi:
     or (tourism in (alpine_hut, apartment, aquarium, artwork, attraction, camp_site, caravan_site,
     chalet, gallery, museum, guest_house, hostel, hotel, motel, picnic_site, theme_park, viewpoint,
     wilderness_hut, zoo))
-    or (vaccination = covid19)
   indicators:
     - mapping-saturation
     - currentness
@@ -166,7 +172,7 @@ schools:
     - unicef
 
 kindergarten:
-  name: Kindergarten
+  name: Kindergartens
   description: Count of kindergarten.
   endpoint: elements
   aggregation_type: count
@@ -315,7 +321,7 @@ parks:
     - bkg
 
 sports-pitch:
-  name: Sports Pitch
+  name: Sports Pitches
   description: Count of sports pitches (an area designed for practising a particular sport)
   endpoint: elements
   aggregation_type: count

tests/integrationtests/api/conftest.py

@@ -27,7 +27,7 @@ def response_template():
 def metadata_topic_building_count():
     return {
         "building-count": {
-            "name": "Building Count",
+            "name": "Buildings (count)",
             "description": "All buildings as defined by all objects tagged with 'building=*'.",  # noqa
             "endpoint": "elements",
             "aggregationType": "count",

tests/integrationtests/approved/indicators/test_attribute_completeness.py-TestCalculation-test_calculate[indicator0].approved.txt

@@ -1 +1 @@
-39.8% of all "building count" features (all: 30263 elements) in your area of interest have the selected additional attribute height of buildings (matched: 12059 elements). 
+39.8% of all "buildings (count)" features (all: 30263 elements) in your area of interest have the selected additional attribute height of buildings (matched: 12059 elements). 

tests/integrationtests/approved/indicators/test_attribute_completeness.py-TestCalculation-test_calculate[indicator1].approved.txt

@@ -1 +1 @@
-39.8% of all "building count" features (all: 30263 elements) in your area of interest have the selected additional attribute Height (matched: 12059 elements). 
+39.8% of all "buildings (count)" features (all: 30263 elements) in your area of interest have the selected additional attribute Height (matched: 12059 elements). 

tests/integrationtests/approved/indicators/test_attribute_completeness.py-test_create_description_attribute_filter.approved.txt

@@ -1 +1 @@
-20.0% of all "building count" features (all: 10 elements) in your area of interest have the selected additional attribute Height (matched: 2 elements). 
+20.0% of all "buildings (count)" features (all: 10 elements) in your area of interest have the selected additional attribute Height (matched: 2 elements). 

tests/integrationtests/approved/indicators/test_attribute_completeness.py-test_create_description_attribute_keys_multiple.approved.txt

@@ -1 +1 @@
-20.0% of all "building count" features (all: 10 elements) in your area of interest have the selected additional attributes height of buildings, house number, street address (matched: 2 elements). 
+20.0% of all "buildings (count)" features (all: 10 elements) in your area of interest have the selected additional attributes height of buildings, house number, street address (matched: 2 elements). 

tests/integrationtests/approved/indicators/test_attribute_completeness.py-test_create_description_attribute_keys_single.approved.txt

@@ -1 +1 @@
-20.0% of all "building count" features (all: 10 elements) in your area of interest have the selected additional attribute height of buildings (matched: 2 elements). 
+20.0% of all "buildings (count)" features (all: 10 elements) in your area of interest have the selected additional attribute height of buildings (matched: 2 elements).