Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED #5926

Merged
merged 1 commit into from
Sep 26, 2024
Merged

update KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED #5926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 36 additions & 35 deletions app/src/main/java/de/westnordost/streetcomplete/osm/Place.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,19 +271,20 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
"security", "bakery", "bakehouse", "fishing", "doors", "kiosk", "market", "bathroom", "lamps",
"vacant", "insurance(:.*)?", "caravan", "gift", "bicycle", "bicycle_rental", "insulation",
"communication", "mall", "model", "empty", "wood", "hunting", "motorcycle", "trailer",
"camera", "water", "fireplace", "outdoor", "blacksmith",
"camera", "water", "fireplace", "outdoor", "blacksmith", "electronics", "fan", "piercing",
// obsoleted information
"abandoned(:.*)?", "disused(:.*)?", "was:.*", "not:.*", "damage", "source:damage",
"created_by", "check_date", "opening_date", "last_checked", "checked_exists:date",
"pharmacy_survey", "old_ref", "update", "import_uuid", "review",
"pharmacy_survey", "old_ref", "update", "import_uuid", "review", "fixme:atp",
// classifications / links to external databases
"fhrs:.*", "old_fhrs:.*", "fvst:.*", "ncat", "nat_ref", "gnis:.*", "winkelnummer",
"type:FR:FINESS", "type:FR:APE", "kvl_hro:amenity", "ref:DK:cvr(:.*)?", "certifications?",
"transiscope", "opendata:type", "local_ref", "official_ref",
// names and identifications
"name_?[1-9]?(:.*)?", ".*_name_?[1-9]?(:.*)?", "noname", "branch(:.*)?", "brand(:.*)?",
"not:brand(:.*)?", "network(:wikidata)?", "operator(:.*)?", "operator_type", "ref",
"ref:vatin", "designation", "SEP:CLAVEESC", "identifier",
"ref:vatin", "designation", "SEP:CLAVEESC", "identifier", "ref:FR:SIRET", "ref:FR:SIREN",
"ref:FR:NAF",
// contacts
"contact_person", "contact(:.*)?", "phone(:.*)?", "phone_?[1-9]?", "emergency:phone",
"emergency_telephone_code",
Expand All @@ -295,17 +296,17 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
"cash_withdrawal(:.*)?", "fee", "charge", "charge_fee", "money_transfer",
"donation:compensation",
// generic shop/craft attributes
"seasonal", "time", "opening_hours(:.*)?", "check_date:opening_hours", "wifi", "internet",
"internet_access(:.*)?", "second_hand", "self_service", "automated", "license:.*",
"bulk_purchase", ".*:covid19", "language:.*", "baby_feeding", "description(:.*)?",
"description[0-9]", "min_age", "max_age", "supermarket(:.*)?", "social_facility(:.*)?",
"functional", "trade", "wholesale", "sale", "smoking(:outside)?", "zero_waste", "origin",
"attraction", "strapline", "dog", "showroom", "toilets?(:.*)?", "sanitary_dump_station",
"changing_table", "wheelchair(.*)?", "blind", "company(:.*)?", "stroller", "walk-in",
"webshop", "operational_status.*", "drive_through", "surveillance(:.*)?", "outdoor_seating",
"indoor_seating", "colour", "access_simple", "floor", "product_category", "source_url",
"category", "kids_area", "kids_area:indoor", "resort", "since", "state", "operational_status",
"temporary", "self_checkout", "audio_loop",
"seasonal", "time", "opening_hours(:.*)?", "check_date:opening_hours", "check_(in|out)",
"wifi", "internet", "internet_access(:.*)?", "second_hand", "self_service", "automated",
"license:.*", "bulk_purchase", ".*:covid19", "language:.*", "baby_feeding",
"description(:.*)?", "description[0-9]", "min_age", "max_age", "supermarket(:.*)?",
"social_facility(:.*)?", "functional", "trade", "wholesale", "sale", "smoking(:outside)?",
"zero_waste", "origin", "attraction", "strapline", "dog", "showroom", "toilets?(:.*)?",
"sanitary_dump_station", "changing_table(:.*)?", "wheelchair(.*)?", "blind", "company(:.*)?",
"stroller", "walk-in", "webshop", "operational_status.*", "status", "drive_through",
"surveillance(:.*)?", "outdoor_seating", "indoor_seating", "colour", "access_simple", "floor",
"product_category", "source_url", "category", "kids_area", "kids_area:indoor", "resort",
"since", "state", "temporary", "self_checkout", "audio_loop",
// food and drink details
"bar", "cafe", "coffee", "microroasting", "microbrewery", "brewery", "real_ale", "taproom",
"training", "distillery", "drink(:.*)?", "cocktails", "alcohol", "wine([:_].*)?",
Expand All @@ -323,7 +324,7 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
// healthcare
"healthcare(:.*)?", "healthcare_.*", "health", "health_.*", "medical_.*", "facility(:.*)?",
"activities", "healthcare_facility(:.*)?", "laboratory(:.*)?", "blood(:.*)?",
"blood_components", "infection(:.*)?", "disease(:.*)?", "covid19(:.*)?",
"blood_components", "infection(:.*)?", "disease(:.*)?", "covid19(:.*)?", "COVID_.*",
"CovidVaccineCenterId", "coronaquarantine", "hospital(:.*)?", "hospital_type_id",
"emergency_room", "sample_collection(:.*)?", "bed_count", "capacity:beds", "part_time_beds",
"personnel:count", "staff_count(:.*)?", "admin_staff", "doctors", "doctors_num", "nurses_num",
Expand All @@ -334,7 +335,7 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
"post_addr", "scope", "ESTADO", "NIVSOCIO", "NO", "EMP_EST", "COD_HAB", "CLA_PERS", "CLA_PRES",
"snis_code:.*", "hfac_bed", "hfac_type", "nature", "moph_code", "IJSN:.*", "massgis:id",
"OGD-Stmk:.*", "paho:.*", "panchayath", "pbf_contract", "pcode", "pe:minsa:.*", "who:.*",
"pharmacy:category", "tactile_paving",
"pharmacy:category", "tactile_paving", "HF_(ID|TYPE|N_EN)", "RoadConn", "bin",
// accommodation & layout
"rooms", "stars", "accommodation", "beds", "capacity(:persons)?", "laundry_service",
"guest_house",
Expand All @@ -347,17 +348,17 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
"animal(_breeding|_training)?", "billiards(:.*)?", "board_game", "sport_1", "sport:boating",
"boat:type", "canoe(_rental|:service)?", "kayak(_rental|:service)?",
"sailboat(_rental|:service)?", "horse_riding", "rugby", "boules", "callsign", "card_games",
"car_service", "catastro:ref", "changing_table:fee", "chess(:.*)?", "children",
"climbing(:.*)?", "club(:.*)?", "communication(:amateur_radio.*)", "community_centre:for",
"dffr:network", "dormitory", "education_for:ages", "electrified", "esperanto", "events_venue",
"family", "federation", "free_flying(:.*)?", "freemasonry(:.*)?", "free_refill",
"gaelic_games(:.*)?", "membership", "military_service", "model_aerodrome(:.*)?",
"mode_of_organisation(:.*)?", "snowmobile", "social_centre(:for)?", "source_dat", "tennis",
"old_website", "organisation", "school_type", "scout(:type)?", "fraternity", "live_music",
"lockable", "playground(:theme)?", "nudism", "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",
"car_service", "catastro:ref", "chess(:.*)?", "children", "climbing(:.*)?", "club(:.*)?",
"communication(:amateur_radio.*)", "community_centre:for", "dffr:network", "dormitory",
"education_for:ages", "electrified", "esperanto", "events_venue", "family", "federation",
"free_flying(:.*)?", "freemasonry(:.*)?", "free_refill", "gaelic_games(:.*)?", "membership",
"military_service", "model_aerodrome(:.*)?", "mode_of_organisation(:.*)?", "snowmobile",
"social_centre(:for)?", "source_dat", "tennis", "old_website", "organisation", "school_type",
"scout(:type)?", "fraternity", "live_music", "lockable", "playground(:theme)?", "nudism",
"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",
// misc specific attributes
"clothes", "shoes", "tailor", "beauty", "tobacco", "carpenter", "furniture", "lottery",
"sport", "dispensing", "tailor:.*", "gambling", "material", "raw_material", "stonemason",
Expand All @@ -369,15 +370,15 @@ private val KEYS_THAT_SHOULD_BE_REMOVED_WHEN_PLACE_IS_REPLACED = listOf(
"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", "private", "taxi", "admin_level", "official_status",
"target", "liaison", "diplomatic(:.*)?", "embassy", "consulate", "aeroway", "department",
"faculty", "aerospace:product", "boundary", "population", "diocese", "depot", "cargo",
"function", "game", "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",
"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",
"comment", "entrance:(width|step_count|kerb:height)", "fenced", "motor_vehicle",
"Comments?", "comments?", "entrance:(width|step_count|kerb:height)", "fenced", "motor_vehicle",
).map { it.toRegex() }