From 6fddce3fa7fcfefcdf9ba7163f01abfd416deeee Mon Sep 17 00:00:00 2001
From: Matija Nalis <mnalis-git@voyager.hr>
Date: Tue, 31 Dec 2024 02:18:44 +0100
Subject: [PATCH] update KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED

---
 .../westnordost/streetcomplete/osm/Place.kt   | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/Place.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/Place.kt
index 19ec809e31a..b35fa23d8b1 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/osm/Place.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/osm/Place.kt
@@ -322,8 +322,8 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
     "unisex", "male", "female", "gender", "gender_simple", "lgbtq(:.*)?", "gay", "female:signed",
     "male:signed",
     // healthcare
-    "healthcare(:.*)?", "healthcare_.*", "health", "health_.*", "medical_.*", "facility(:.*)?",
-    "activities", "healthcare_facility(:.*)?", "laboratory(:.*)?", "blood(:.*)?",
+    "healthcare(:.*)?", "healthcare_.*", "health", "health_.*", "medical_.*", "emergency_ward",
+    "facility(:.*)?", "activities", "healthcare_facility(:.*)?", "laboratory(:.*)?", "blood(:.*)?",
     "blood_components", "infection(:.*)?", "disease(:.*)?", "covid19(:.*)?", "COVID_.*",
     "CovidVaccineCenterId", "coronaquarantine", "hospital(:.*)?", "hospital_type_id",
     "emergency_room", "sample_collection(:.*)?", "bed_count", "capacity:beds", "part_time_beds",
@@ -340,7 +340,7 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
     "rooms", "stars", "accommodation", "beds", "capacity(:persons)?", "laundry_service",
     "guest_house",
     // amenity=place_of_worship
-    "deanery", "subject:(wikidata|wikipedia)",
+    "deanery", "subject:(wikidata|wikipedia|wikimedia_commons)", "church", "church:type",
     // schools
     "capacity:(pupils|teachers)", "grades", "population:pupils:.*",
     "school:(FR|gender|trust|type|type_idn)", "primary",
@@ -358,7 +358,8 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
     "music_genre", "length", "fire_station:type:FR", "cadet", "observatory:type", "tower:type",
     "zoo", "shooting", "commons", "groomer", "group_only", "hazard", "identity", "interaction",
     "logo", "maxheight", "provides", "regional", "scale", "site", "plots", "allotments",
-    "local_food", "monitoring:pedestrian", "recording:automated",
+    "local_food", "monitoring:pedestrian", "recording:automated", "yacht", "background_music",
+    "url:spaceapi",
     // misc specific attributes
     "clothes", "shoes", "tailor", "beauty", "tobacco", "carpenter", "furniture", "lottery",
     "sport", "dispensing", "tailor:.*", "gambling", "material", "raw_material", "stonemason",
@@ -369,16 +370,17 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
     "air_conditioning", "atm", "vending", "vending_machine", "recycling_type", "museum",
     "license_classes", "dance:.*", "isced:level", "school", "preschool", "university",
     "research_institution", "research", "member_of", "topic", "townhall:type", "parish", "police",
-    "government", "office", "administration", "administrative", "association", "transport",
-    "utility", "consulting", "Commercial", "commercial", "private", "taxi", "admin_level",
-    "official_status", "target", "liaison", "diplomatic(:.*)?", "embassy", "consulate", "aeroway",
-    "department", "faculty", "aerospace:product", "boundary", "population", "diocese", "depot",
-    "cargo", "function", "game", "party", "political_party.*", "telecom(munication)?",
-    "service_times", "kitchen:facilities", "it:(type|sales)", "cannabis:cbd", "bath:type",
-    "bath:(open_air|sand_bath)", "animal_boarding", "animal_shelter", "mattress", "screen",
-    "monitoring:weather", "public", "theatre", "culture", "library", "cooperative",
+    "government", "thw:(lv|rb|ltg)", "office", "administration", "administrative", "association",
+    "transport", "utility", "consulting", "Commercial", "commercial", "private", "taxi",
+    "admin_level", "official_status", "target", "liaison", "diplomatic(:.*)?", "embassy",
+    "consulate", "aeroway", "department", "faculty", "aerospace:product", "boundary", "population",
+    "diocese", "depot", "cargo", "function", "game", "party", "political_party.*",
+    "telecom(munication)?", "service_times", "kitchen:facilities", "it:(type|sales)",
+    "cannabis:cbd", "bath:type", "bath:(open_air|sand_bath)", "animal_boarding", "animal_shelter",
+    "mattress", "screen", "monitoring:weather", "public", "theatre", "culture", "library",
+    "cooperative",
     "camp_site", "camping", "emergency(:.*)?", "evacuation_cent(er|re)", "education",
     "engineering", "forestry", "foundation", "lawyer", "logistics", "military", "community_centre",
-    "bank", "operational",
+    "bank", "operational", "users_(PLWD|boy|elderly|female|girl|men)",
     "Comments?", "comments?", "entrance:(width|step_count|kerb:height)", "fenced", "motor_vehicle",
 ).map { it.toRegex() }