Skip to content

Commit 6c1db14

Browse files
authored
KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED: new categorisations, classify all ref:* (#6672)
1 parent d36f3d7 commit 6c1db14

File tree

1 file changed

+33
-20
lines changed
  • app/src/commonMain/kotlin/de/westnordost/streetcomplete/osm

1 file changed

+33
-20
lines changed

app/src/commonMain/kotlin/de/westnordost/streetcomplete/osm/Places.kt

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -257,26 +257,34 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
257257
"vacant", "insurance(:.*)?", "caravan", "gift", "bicycle", "bicycle_rental", "insulation",
258258
"communication", "mall", "model", "empty", "wood", "hunting", "motorcycle", "trailer",
259259
"camera", "water", "fireplace", "outdoor", "blacksmith", "electronics", "fan", "piercing",
260-
"stationery", "sensory_friendly(:.*)?", "street_vendor",
260+
"stationery", "sensory_friendly(:.*)?", "street_vendor", "sells(:.*)?", "safety_equipment",
261+
"battery", "frame", "paint",
261262
// obsoleted information
262263
"(demolished|abandoned|disused)(:(?!bui).+)?", "was:.*", "not:.*", "damage", "created_by",
263264
"check_date", "opening_date", "last_checked", "checked_exists:date", "pharmacy_survey",
264265
"old_ref", "update", "import_uuid", "review", "fixme:atp",
265266
// classifications / links to external databases
266267
"fhrs:.*", "old_fhrs:.*", "fvst:.*", "ncat", "nat_ref", "gnis:.*", "winkelnummer",
267268
"type:FR:FINESS", "type:FR:APE", "kvl_hro:amenity", "ref:DK:cvr(:.*)?", "certifications?",
268-
"transiscope", "opendata:type", "local_ref", "official_ref",
269+
"transiscope", "opendata:type", "local_ref", "official_ref", "ref:thw", "ref:nav",
270+
"ref:GR:kepId", "ref:bufa", "ref:walmart", "ref:rspo", "ref:cue", "ref:regon",
271+
"ref:BY:trade_register", "ref:vb", "ref:comfort", "ref:bademilj.", "ref:HU:vatin",
272+
"ref:HU:company", "ref:ico", "ref:scoutingnl", "ref:anlegg", "ref:FR:sport_equip",
273+
"ref:FR:RNA", "ref:FR:CRTA", "ref:charity",
269274
// names and identifications
270275
"name_?[1-9]?(:.*)?", ".*_name_?[1-9]?(:.*)?", "noname", "branch(:.*)?", "brand(:.*)?",
271-
"not:brand(:.*)?", "network(:.*)?", "operator(:.*)?", "operator_type", "ref", "ref:vatin",
272-
"designation", "SEP:CLAVEESC", "identifier", "ref:FR:SIRET", "ref:FR:SIREN", "ref:FR:NAF",
273-
"(old_)?ref:FR:prix-carburants",
276+
"nobrand", "not:brand(:.*)?", "network(:.*)?", "operator(:.*)?", "operator_type", "ref",
277+
"ref:vatin(:.*)?", "designation", "SEP:CLAVEESC", "identifier", "ref:FR:SIRET", "ref:FR:SIREN",
278+
"ref:FR:NAF", "(old_)?ref:FR:prix-carburants", "ref:HU:(vatin|company|om|ntak)", "ref:UAI",
279+
"ref:edubase(:group)?", "ref:mise", "ref:FR:LaPoste", "ref:Hermes", "ref:pol_id", "ref:isil",
280+
"ref:INEP", "ref:coop", "ref:shop:num", "ref:norgesgruppen", "ref:rema", "ref:tobacco",
281+
"ref:mekonomen", "ref:google",
274282
// contacts
275283
"contact_person", "contact(:.*)?", "phone(:.*)?", "phone_?[1-9]?", "emergency:phone",
276284
"emergency_telephone_code",
277-
"mobile", "fax", "facebook", "instagram", "twitter", "youtube", "telegram", "email",
285+
"mobile", "fax", "facebook", "instagram", "twitter", "youtube", "telegram", "tiktok", "email",
278286
"website_?[1-9]?(:.*)?", "app:.*", "ownership",
279-
"url", "url:official", "source_ref:url", "owner",
287+
"url", "url:official", "source_ref:url", "owner", "ref:website",
280288
// payments
281289
"payment(:.*)?", "payment_multi_fee", "currency(:.*)?", "cash_withdrawal(:.*)?", "fee",
282290
"charge", "charge_fee", "money_transfer", "donation:compensation", "paypoint",
@@ -285,7 +293,7 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
285293
"internet_access(:.*)?", "second_hand", "self_service", "automated", "license:.*",
286294
"bulk_purchase", ".*:covid19", "language:.*", "baby_feeding", "description(:.*)?",
287295
"description[0-9]", "min_age", "max_age", "supermarket(:.*)?", "social_facility(:.*)?",
288-
"functional", "trade", "wholesale", "sale", "smoking(:outside)?", "zero_waste", "origin",
296+
"functional", "trade", "wholesale", "sale", "smoking(:.*)?", "zero_waste", "origin",
289297
"attraction", "strapline", "dog", "showroom", "toilets?(:.*)?", "sanitary_dump_station",
290298
"changing_table(:.*)?", "wheelchair(.*)?", "blind", "company(:.*)?", "stroller", "walk-in",
291299
"webshop", "operational_status.*", "status", "drive_through", "surveillance(:.*)?",
@@ -301,34 +309,39 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
301309
"caterer", "real_fire", "flour_fortified", "highchair", "fast_food", "pub", "snack",
302310
"confectionery", "drinking_water:refill",
303311
// related to repair shops/crafts
304-
"service(:.*)?", "motorcycle:.*", "repair", ".*:repair", "electronics_repair(:.*)?",
312+
"services?(:.*)?", "motorcycle:.*", "repair", ".*:repair", "electronics_repair(:.*)?",
305313
"workshop",
306314
// shop=hairdresser, shop=clothes
307315
"unisex", "male", "female", "gender", "gender_simple", "lgbtq(:.*)?", "gay", "female:signed",
308316
"male:signed",
309317
// healthcare
310-
"healthcare(:.*)?", "healthcare_.*", "health", "health_.*", "medical_.*", "emergency_ward",
311-
"facility(:.*)?", "activities", "healthcare_facility(:.*)?", "laboratory(:.*)?", "blood(:.*)?",
312-
"blood_components", "infection(:.*)?", "disease(:.*)?", "covid19(:.*)?", "COVID_.*",
313-
"CovidVaccineCenterId", "coronaquarantine", "hospital(:.*)?", "hospital_type_id",
314-
"emergency_room", "sample_collection(:.*)?", "bed_count", "capacity:beds", "part_time_beds",
315-
"personnel:count", "staff_count(:.*)?", "admin_staff", "doctors", "doctors_num", "nurses_num",
316-
"counselling_type", "testing_centres", "toilets_number", "urgent_care", "vaccination",
317-
"clinic", "hospital", "pharmacy", "alternative", "laboratory", "sample_collection",
318-
"provided_for(:.*)?", "social_facility_for", "ambulance", "ward",
318+
"healthcare(:.*)?", "healthcare_.*", "health", "health_.*", "speciality", "medical_.*",
319+
"emergency_ward", "facility(:.*)?", "activities", "healthcare_facility(:.*)?",
320+
"laboratory(:.*)?", "blood(:.*)?", "blood_components", "infection(:.*)?", "disease(:.*)?",
321+
"covid19(:.*)?", "COVID_.*", "CovidVaccineCenterId", "coronaquarantine", "hospital(:.*)?",
322+
"hospital_type_id", "emergency_room", "sample_collection(:.*)?", "bed_count", "capacity:beds",
323+
"part_time_beds", "personnel:count", "staff_count(:.*)?", "admin_staff", "doctors",
324+
"doctors_num", "nurses_num", "counselling_type", "testing_centres", "toilets_number",
325+
"urgent_care", "vaccination", "clinic", "hospital", "pharmacy", "alternative", "laboratory",
326+
"sample_collection", "provided_for(:.*)?", "social_facility_for", "ambulance", "ward",
319327
"HSE_(code|hgid|hgroup|region)", "collection_centre", "design", "AUTORIZATIE", "reg_id",
320328
"post_addr", "scope", "ESTADO", "NIVSOCIO", "NO", "EMP_EST", "COD_HAB", "CLA_PERS", "CLA_PRES",
321329
"snis_code:.*", "hfac_bed", "hfac_type", "nature", "moph_code", "IJSN:.*", "massgis:id",
322330
"OGD-Stmk:.*", "paho:.*", "panchayath", "pbf_contract", "pcode", "pe:minsa:.*", "who:.*",
323331
"pharmacy:category", "tactile_paving", "HF_(ID|TYPE|N_EN)", "RoadConn", "bin", "hiv(:.*)?",
332+
"ref:ZonaSanitaria", "ref:cuie_codigo", "ref:sisa_(codigo|tipologia)", "ref:SUKL", "ref:sede",
333+
"ref:msal", "ref:(micro)?red", "ref:category", "ref:osakidetza", "ref:ogdsteiermark",
334+
"ref:luebeck", "ref:nmd", "ref:nhn", "ref:hvakostertannlegen", "ref:boots", "ref:apotek1",
335+
"ref:GB:nhs_ods", "ref:GB:cqc_location", "ref:FR:FINESS", "ref:FR:RPPS", "ref:fps_health(:.*)",
336+
"ref:doh", "ref:csioz", "ref:CNES",
324337
// accommodation & layout
325338
"rooms", "stars", "accommodation", "beds", "capacity(:persons)?", "laundry_service",
326339
"guest_house",
327340
// amenity=place_of_worship
328341
"deanery", "subject:(wikidata|wikipedia|wikimedia_commons)", "church", "church:type",
329342
// schools
330343
"capacity:(pupils|teachers)", "grades", "population:pupils(:.*)?",
331-
"school:(FR|gender|trust|type|type_idn)", "primary",
344+
"school:(FR|gender|trust|type|type_idn|group:type|selective)", "primary",
332345
// clubs
333346
"animal(_breeding|_training)?", "billiards(:.*)?", "board_game", "sport_1", "sport:boating",
334347
"boat:type", "canoe(_rental|:service)?", "kayak(_rental|:service)?",
@@ -344,7 +357,7 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
344357
"zoo", "shooting", "commons", "groomer", "group_only", "hazard", "identity", "interaction",
345358
"logo", "maxheight", "provides", "regional", "scale", "site", "plots", "allotments",
346359
"local_food", "monitoring:pedestrian", "recording:automated", "yacht", "background_music",
347-
"url:spaceapi", "openfire",
360+
"url:spaceapi", "openfire", "fraternity(:.*)?", "ref:DSV", "ref:FOS", "ref_fftt",
348361
// misc specific attributes
349362
"clothes", "shoes", "tailor", "beauty", "tobacco", "carpenter", "furniture", "lottery",
350363
"sport", "dispensing", "tailor:.*", "gambling", "material", "raw_material", "stonemason",

0 commit comments

Comments
 (0)