From 251d27b5f0a0105e0ad1ebedc59cb41f8256df70 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 5 Apr 2019 12:09:28 -0700 Subject: [PATCH] Add various tag deprecations --- data/deprecated.json | 96 +++++++++++++++++++++ data/presets/presets.json | 2 +- data/presets/presets/barrier/_entrance.json | 3 +- data/taginfo.json | 28 +++++- 4 files changed, 124 insertions(+), 5 deletions(-) diff --git a/data/deprecated.json b/data/deprecated.json index f58b6f4a2..2fd620fdc 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -24,6 +24,14 @@ "old": {"amenity": "community_center"}, "replace": {"amenity": "community_centre"} }, + { + "old": {"amenity": "dog_bin"}, + "replace": {"amenity": "waste_basket", "waste": "dog_excrement"} + }, + { + "old": {"amenity": "dog_waste_bin"}, + "replace": {"amenity": "waste_basket", "waste": "dog_excrement"} + }, { "old": {"amenity": "embassy"}, "replace": {"office": "diplomatic"} @@ -32,6 +40,10 @@ "old": {"amenity": "ev_charging"}, "replace": {"amenity": "charging_station"} }, + { + "old": {"amenity": "fire_hydrant"}, + "replace": {"emergency": "fire_hydrant"} + }, { "old": {"amenity": "firepit"}, "replace": {"leisure": "firepit"} @@ -44,6 +56,26 @@ "old": {"amenity": "garages"}, "replace": {"landuse": "garages"} }, + { + "old": {"amenity": "gym"}, + "replace": {"leisure": "fitness_centre"} + }, + { + "old": {"amenity": "hotel"}, + "replace": {"tourism": "hotel"} + }, + { + "old": {"amenity": "kiosk"}, + "replace": {"shop": "kiosk"} + }, + { + "old": {"amenity": "nursery"}, + "replace": {"amenity": "kindergarten"} + }, + { + "old": {"amenity": "preschool"}, + "replace": {"amenity": "kindergarten"} + }, { "old": {"amenity": "public_building"}, "replace": {"building": "public"} @@ -76,6 +108,10 @@ "old": {"amenity": "swimming_pool"}, "replace": {"leisure": "swimming_pool"} }, + { + "old": {"amenity": "ticket_booth"}, + "replace": {"shop": "ticket"} + }, { "old": {"amenity": "toilet"}, "replace": {"amenity": "toilets"} @@ -84,6 +120,10 @@ "old": {"amenity": "vending_machine", "vending": "news_papers"}, "replace": {"amenity": "vending_machine", "vending": "newspapers"} }, + { + "old": {"amenity": "winery"}, + "replace": {"craft": "winery"} + }, { "old": {"amenity": "youth_center"}, "replace": {"amenity": "community_centre", "community_centre:for": "juvenile"} @@ -92,6 +132,14 @@ "old": {"amenity": "youth_centre"}, "replace": {"amenity": "community_centre", "community_centre:for": "juvenile"} }, + { + "old": {"barrier": "curb"}, + "replace": {"barrier": "kerb"} + }, + { + "old": {"barrier": "entrance"}, + "replace": {"entrance": "*"} + }, { "old": {"barrier": "wire_fence"}, "replace": {"barrier": "fence", "fence_type": "chain"} @@ -291,6 +339,14 @@ "old": {"leisure": "club"}, "replace": {"club": "*"} }, + { + "old": {"leisure": "video_arcade"}, + "replace": {"leisure": "amusement_arcade"} + }, + { + "old": {"man_made": "cut_line"}, + "replace": {"man_made": "cutline"} + }, { "old": {"man_made": "jetty"}, "replace": {"highway": "footway", "man_made": "pier"} @@ -311,6 +367,10 @@ "old": {"man_made": "well"}, "replace": {"man_made": "water_well"} }, + { + "old": {"man_made": "winery"}, + "replace": {"craft": "winery"} + }, { "old": {"memorial": "plate"}, "replace": {"memorial": "plaque"} @@ -343,10 +403,18 @@ "old": {"postcode": "*"}, "replace": {"addr:postcode": "$1"} }, + { + "old": {"power": "busbar"}, + "replace": {"power": "line", "line": "busbar"} + }, { "old": {"power": "sub_station"}, "replace": {"power": "substation"} }, + { + "old": {"power": "underground_cable"}, + "replace": {"power": "cable", "location": "underground"} + }, { "old": {"power_source": "*"}, "replace": {"generator:source": "$1"} @@ -363,6 +431,18 @@ "old": {"route": "ncn"}, "replace": {"route": "bicycle", "network": "ncn"} }, + { + "old": {"shop": "adult"}, + "replace": {"shop": "erotic"} + }, + { + "old": {"shop": "antique"}, + "replace": {"shop": "antiques"} + }, + { + "old": {"shop": "auto_parts"}, + "replace": {"shop": "car_parts"} + }, { "old": {"shop": "betting"}, "replace": {"shop": "bookmaker"} @@ -371,6 +451,10 @@ "old": {"shop": "boutique"}, "replace": {"shop": "clothes"} }, + { + "old": {"shop": "dive"}, + "replace": {"shop": "scuba_diving"} + }, { "old": {"shop": "fashion"}, "replace": {"shop": "clothes"} @@ -391,6 +475,10 @@ "old": {"shop": "gallery"}, "replace": {"shop": "art"} }, + { + "old": {"shop": "moneylender"}, + "replace": {"shop": "money_lender"} + }, { "old": {"shop": "organic"}, "replace": {"shop": "supermarket", "organic": "only"} @@ -403,6 +491,14 @@ "old": {"shop": "real_estate"}, "replace": {"office": "estate_agent"} }, + { + "old": {"shop": "tickets"}, + "replace": {"shop": "ticket"} + }, + { + "old": {"shop": "winery"}, + "replace": {"craft": "winery"} + }, { "old": {"sloped_curb": "0"}, "replace": {"kerb": "flush"} diff --git a/data/presets/presets.json b/data/presets/presets.json index 19f812876..b5baa02bb 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -243,7 +243,7 @@ "attraction/train": {"icon": "maki-rail", "fields": ["{attraction}", "fee"], "geometry": ["point", "line"], "terms": ["theme park", "rackless train", "road train", "Tschu-Tschu train", "dotto train", "park train"], "tags": {"attraction": "train"}, "name": "Tourist Train"}, "attraction/water_slide": {"icon": "maki-swimming", "fields": ["{attraction}", "height"], "geometry": ["line", "area"], "terms": ["theme park", "aquatic park", "water park", "flumes", "water chutes", "hydroslides"], "tags": {"attraction": "water_slide"}, "name": "Water Slide"}, "barrier": {"icon": "maki-roadblock", "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "name": "Barrier", "matchScore": 0.4}, - "barrier/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"barrier": "entrance"}, "name": "Entrance", "searchable": false, "replacement": "entrance"}, + "barrier/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"barrier": "entrance"}, "name": "Entrance", "searchable": false}, "barrier/block": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"}, "barrier/bollard": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex", "line"], "tags": {"barrier": "bollard"}, "name": "Bollard"}, "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"}, diff --git a/data/presets/presets/barrier/_entrance.json b/data/presets/presets/barrier/_entrance.json index 48c10e0a7..a1240a4d9 100644 --- a/data/presets/presets/barrier/_entrance.json +++ b/data/presets/presets/barrier/_entrance.json @@ -7,6 +7,5 @@ "barrier": "entrance" }, "name": "Entrance", - "searchable": false, - "replacement": "entrance" + "searchable": false } diff --git a/data/taginfo.json b/data/taginfo.json index 09b15eaf9..bbdfcd0e7 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -240,7 +240,7 @@ {"key": "attraction", "value": "train", "description": "🄿 Tourist Train", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/rail-15.svg?sanitize=true"}, {"key": "attraction", "value": "water_slide", "description": "🄿 Water Slide", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/swimming-15.svg?sanitize=true"}, {"key": "barrier", "description": "🄿 Barrier, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, - {"key": "barrier", "value": "entrance", "description": "🄿 Entrance (unsearchable)", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-alt1-15.svg?sanitize=true"}, + {"key": "barrier", "value": "entrance", "description": "🄿 Entrance (unsearchable), 🄳 ➜ entrance=*", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-alt1-15.svg?sanitize=true"}, {"key": "barrier", "value": "block", "description": "🄿 Block", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "bollard", "description": "🄿 Bollard", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "border_control", "description": "🄿 Border Control", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, @@ -1662,23 +1662,35 @@ {"key": "windings:configuration", "value": "open", "description": "🄵 Windings Configuration"}, {"key": "windings:configuration", "value": "scott", "description": "🄵 Windings Configuration"}, {"key": "windings:configuration", "value": "leblanc", "description": "🄵 Windings Configuration"}, + {"key": "aerialway", "value": "canopy", "description": "🄳 ➜ aerialway=zip_line"}, {"key": "amenity", "value": "advertising", "description": "🄳 ➜ advertising=*"}, {"key": "amenity", "value": "artwork", "description": "🄳 ➜ tourism=artwork"}, {"key": "amenity", "value": "car_repair", "description": "🄳 ➜ shop=car_repair"}, {"key": "amenity", "value": "citymap_post", "description": "🄳 ➜ tourism=information"}, {"key": "amenity", "value": "community_center", "description": "🄳 ➜ amenity=community_centre"}, + {"key": "amenity", "value": "dog_bin", "description": "🄳 ➜ amenity=waste_basket + waste=dog_excrement"}, + {"key": "amenity", "value": "dog_waste_bin", "description": "🄳 ➜ amenity=waste_basket + waste=dog_excrement"}, {"key": "amenity", "value": "ev_charging", "description": "🄳 ➜ amenity=charging_station"}, + {"key": "amenity", "value": "fire_hydrant", "description": "🄳 ➜ emergency=fire_hydrant"}, {"key": "amenity", "value": "firepit", "description": "🄳 ➜ leisure=firepit"}, {"key": "amenity", "value": "garage", "description": "🄳 ➜ landuse=garages"}, {"key": "amenity", "value": "garages", "description": "🄳 ➜ landuse=garages"}, + {"key": "amenity", "value": "gym", "description": "🄳 ➜ leisure=fitness_centre"}, + {"key": "amenity", "value": "hotel", "description": "🄳 ➜ tourism=hotel"}, + {"key": "amenity", "value": "kiosk", "description": "🄳 ➜ shop=kiosk"}, + {"key": "amenity", "value": "nursery", "description": "🄳 ➜ amenity=kindergarten"}, + {"key": "amenity", "value": "preschool", "description": "🄳 ➜ amenity=kindergarten"}, {"key": "amenity", "value": "public_building", "description": "🄳 ➜ building=public"}, {"key": "amenity", "value": "real_estate", "description": "🄳 ➜ office=estate_agent"}, {"key": "amenity", "value": "sauna", "description": "🄳 ➜ leisure=sauna"}, {"key": "amenity", "value": "shop", "description": "🄳 ➜ shop=*"}, {"key": "amenity", "value": "sloped_curb", "description": "🄳 ➜ kerb=lowered"}, + {"key": "amenity", "value": "ticket_booth", "description": "🄳 ➜ shop=ticket"}, {"key": "amenity", "value": "toilet", "description": "🄳 ➜ amenity=toilets"}, + {"key": "amenity", "value": "winery", "description": "🄳 ➜ craft=winery"}, {"key": "amenity", "value": "youth_center", "description": "🄳 ➜ amenity=community_centre + community_centre:for=juvenile"}, {"key": "amenity", "value": "youth_centre", "description": "🄳 ➜ amenity=community_centre + community_centre:for=juvenile"}, + {"key": "barrier", "value": "curb", "description": "🄳 ➜ barrier=kerb"}, {"key": "barrier", "value": "wire_fence", "description": "🄳 ➜ barrier=fence + fence_type=chain"}, {"key": "barrier", "value": "wood_fence", "description": "🄳 ➜ barrier=fence + fence_type=wood"}, {"key": "building", "value": "family_house", "description": "🄳 ➜ building=house"}, @@ -1711,7 +1723,7 @@ {"key": "highway", "value": "stile", "description": "🄳 ➜ barrier=stile"}, {"key": "highway", "value": "incline", "description": "🄳 ➜ highway=road + incline=up"}, {"key": "highway", "value": "incline_steep", "description": "🄳 ➜ highway=road + incline=up"}, - {"key": "highway", "value": "unsurfaced", "description": "🄳 ➜ highway=road + incline=unpaved"}, + {"key": "highway", "value": "unsurfaced", "description": "🄳 ➜ highway=road + surface=unpaved"}, {"key": "kerb", "value": "dropped", "description": "🄳 ➜ kerb=lowered"}, {"key": "kerb", "value": "flat", "description": "🄳 ➜ kerb=flush"}, {"key": "landuse", "value": "conservation", "description": "🄳 ➜ boundary=protected_area"}, @@ -1719,11 +1731,14 @@ {"key": "landuse", "value": "wood", "description": "🄳 ➜ natural=wood"}, {"key": "leisure", "value": "beach", "description": "🄳 ➜ natural=beach"}, {"key": "leisure", "value": "club", "description": "🄳 ➜ club=*"}, + {"key": "leisure", "value": "video_arcade", "description": "🄳 ➜ leisure=amusement_arcade"}, + {"key": "man_made", "value": "cut_line", "description": "🄳 ➜ man_made=cutline"}, {"key": "man_made", "value": "jetty", "description": "🄳 ➜ highway=footway + man_made=pier"}, {"key": "man_made", "value": "mdf", "description": "🄳 ➜ telecom=exchange"}, {"key": "man_made", "value": "MDF", "description": "🄳 ➜ telecom=exchange"}, {"key": "man_made", "value": "water_tank", "description": "🄳 ➜ man_made=storage_tank + content=water"}, {"key": "man_made", "value": "well", "description": "🄳 ➜ man_made=water_well"}, + {"key": "man_made", "value": "winery", "description": "🄳 ➜ craft=winery"}, {"key": "memorial", "value": "plate", "description": "🄳 ➜ memorial=plaque"}, {"key": "mining_resource", "description": "🄳 ➜ resource=*"}, {"key": "natural", "value": "marsh", "description": "🄳 ➜ natural=wetland + wetland=marsh"}, @@ -1732,16 +1747,25 @@ {"key": "place_name", "description": "🄳 ➜ name=*"}, {"key": "pole", "value": "transition", "description": "🄳 ➜ location:transition=yes"}, {"key": "postcode", "description": "🄳 ➜ addr:postcode=*"}, + {"key": "power", "value": "busbar", "description": "🄳 ➜ power=line + line=busbar"}, + {"key": "power", "value": "underground_cable", "description": "🄳 ➜ power=cable + location=underground"}, {"key": "power_source", "description": "🄳 ➜ generator:source=*"}, {"key": "power_rating", "description": "🄳 ➜ generator:output=*"}, {"key": "roof:color", "description": "🄳 ➜ roof:colour=*"}, {"key": "route", "value": "ncn", "description": "🄳 ➜ route=bicycle + network=ncn"}, + {"key": "shop", "value": "adult", "description": "🄳 ➜ shop=erotic"}, + {"key": "shop", "value": "antique", "description": "🄳 ➜ shop=antiques"}, + {"key": "shop", "value": "auto_parts", "description": "🄳 ➜ shop=car_parts"}, {"key": "shop", "value": "betting", "description": "🄳 ➜ shop=bookmaker"}, + {"key": "shop", "value": "dive", "description": "🄳 ➜ shop=scuba_diving"}, {"key": "shop", "value": "fish", "description": "🄳 ➜ shop=seafood"}, {"key": "shop", "value": "gallery", "description": "🄳 ➜ shop=art"}, + {"key": "shop", "value": "moneylender", "description": "🄳 ➜ shop=money_lender"}, {"key": "shop", "value": "organic", "description": "🄳 ➜ shop=supermarket + organic=only"}, {"key": "shop", "value": "perfume", "description": "🄳 ➜ shop=perfumery"}, {"key": "shop", "value": "real_estate", "description": "🄳 ➜ office=estate_agent"}, + {"key": "shop", "value": "tickets", "description": "🄳 ➜ shop=ticket"}, + {"key": "shop", "value": "winery", "description": "🄳 ➜ craft=winery"}, {"key": "sloped_curb", "value": "0", "description": "🄳 ➜ kerb=flush"}, {"key": "sloped_curb", "value": "0.00", "description": "🄳 ➜ kerb=flush"}, {"key": "sloped_curb", "value": "0.01", "description": "🄳 ➜ kerb=lowered + kerb:height=1 cm"},