diff --git a/data/deprecated.json b/data/deprecated.json index ae0507fc0..b53b979b9 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -60,6 +60,10 @@ "old": {"amenity": "shop"}, "replace": {"shop": "*"} }, + { + "old": {"amenity": "sloped_curb"}, + "replace": {"kerb": "lowered"} + }, { "old": {"amenity": "swimming_pool"}, "replace": {"leisure": "swimming_pool"} @@ -144,6 +148,10 @@ "old": {"cuisine": "vegetarian"}, "replace": {"diet:vegetarian": "yes"} }, + { + "old": {"curb": "*"}, + "replace": {"kerb": "$1"} + }, { "old": {"drinkable": "*"}, "replace": {"drinking_water": "$1"} @@ -215,6 +223,14 @@ "old": {"highway": "unsurfaced"}, "replace": {"highway": "road", "incline": "unpaved"} }, + { + "old": {"kerb": "dropped"}, + "replace": {"kerb": "lowered"} + }, + { + "old": {"kerb": "flat"}, + "replace": {"kerb": "flush"} + }, { "old": {"landuse": "conservation"}, "replace": {"boundary": "protected_area"} @@ -339,6 +355,50 @@ "old": {"shop": "real_estate"}, "replace": {"office": "estate_agent"} }, + { + "old": {"sloped_curb": "0"}, + "replace": {"kerb": "flush"} + }, + { + "old": {"sloped_curb": "0.00"}, + "replace": {"kerb": "flush"} + }, + { + "old": {"sloped_curb": "0.01"}, + "replace": {"kerb": "lowered", "kerb:height": "1 cm"} + }, + { + "old": {"sloped_curb": "0.02"}, + "replace": {"kerb": "lowered", "kerb:height": "2 cm"} + }, + { + "old": {"sloped_curb": "0.03"}, + "replace": {"kerb": "lowered", "kerb:height": "3 cm"} + }, + { + "old": {"sloped_curb": "at_grade"}, + "replace": {"kerb": "flush"} + }, + { + "old": {"sloped_curb": "both"}, + "replace": {"kerb": "lowered"} + }, + { + "old": {"sloped_curb": "flush"}, + "replace": {"kerb": "flush"} + }, + { + "old": {"sloped_curb": "low"}, + "replace": {"kerb": "lowered"} + }, + { + "old": {"sloped_curb": "no"}, + "replace": {"kerb": "raised"} + }, + { + "old": {"sloped_curb": "yes"}, + "replace": {"kerb": "lowered"} + }, { "old": {"tourism": "bed_and_breakfast"}, "replace": {"tourism": "guest_house"} diff --git a/data/presets/presets.json b/data/presets/presets.json index 6818762d4..ae183b7c7 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -256,9 +256,9 @@ "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25}, "barrier/kerb": {"fields": ["kerb", "tactile_paving"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"}, "barrier/kerb/flush": {"icon": "maki-wheelchair", "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "flush"}, "reference": {"key": "kerb", "value": "flush"}, "terms": ["even curb", "level curb", "tactile curb"], "name": "Flush Curb"}, - "barrier/kerb/lowered": {"icon": "maki-wheelchair", "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"}, + "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"}, "barrier/kerb/raised": {"fields": ["{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "name": "Raised Curb"}, - "barrier/kerb/rolled": {"geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "name": "Rolled Curb"}, + "barrier/kerb/rolled": {"fields": ["{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "name": "Rolled Curb"}, "barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"}, "barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"}, "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"}, diff --git a/data/presets/presets/barrier/kerb/lowered.json b/data/presets/presets/barrier/kerb/lowered.json index 5ebabb490..20b02961e 100644 --- a/data/presets/presets/barrier/kerb/lowered.json +++ b/data/presets/presets/barrier/kerb/lowered.json @@ -1,5 +1,9 @@ { "icon": "maki-wheelchair", + "fields": [ + "{barrier/kerb}", + "kerb/height" + ], "geometry": [ "vertex", "line" diff --git a/data/presets/presets/barrier/kerb/rolled.json b/data/presets/presets/barrier/kerb/rolled.json index 790866f26..10ee679e4 100644 --- a/data/presets/presets/barrier/kerb/rolled.json +++ b/data/presets/presets/barrier/kerb/rolled.json @@ -1,4 +1,8 @@ { + "fields": [ + "{barrier/kerb}", + "kerb/height" + ], "geometry": [ "vertex", "line" diff --git a/data/taginfo.json b/data/taginfo.json index babc8a739..29c93f4d0 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1654,6 +1654,7 @@ {"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": "toilet", "description": "🄳 ➜ amenity=toilets"}, {"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"}, @@ -1688,6 +1689,8 @@ {"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": "kerb", "value": "dropped", "description": "🄳 ➜ kerb=lowered"}, + {"key": "kerb", "value": "flat", "description": "🄳 ➜ kerb=flush"}, {"key": "landuse", "value": "conservation", "description": "🄳 ➜ boundary=protected_area"}, {"key": "landuse", "value": "field", "description": "🄳 ➜ landuse=farmland"}, {"key": "landuse", "value": "wood", "description": "🄳 ➜ natural=wood"}, @@ -1715,6 +1718,17 @@ {"key": "shop", "value": "gallery", "description": "🄳 ➜ shop=art"}, {"key": "shop", "value": "perfume", "description": "🄳 ➜ shop=perfumery"}, {"key": "shop", "value": "real_estate", "description": "🄳 ➜ office=estate_agent"}, + {"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"}, + {"key": "sloped_curb", "value": "0.02", "description": "🄳 ➜ kerb=lowered + kerb:height=2 cm"}, + {"key": "sloped_curb", "value": "0.03", "description": "🄳 ➜ kerb=lowered + kerb:height=3 cm"}, + {"key": "sloped_curb", "value": "at_grade", "description": "🄳 ➜ kerb=flush"}, + {"key": "sloped_curb", "value": "both", "description": "🄳 ➜ kerb=lowered"}, + {"key": "sloped_curb", "value": "flush", "description": "🄳 ➜ kerb=flush"}, + {"key": "sloped_curb", "value": "low", "description": "🄳 ➜ kerb=lowered"}, + {"key": "sloped_curb", "value": "no", "description": "🄳 ➜ kerb=raised"}, + {"key": "sloped_curb", "value": "yes", "description": "🄳 ➜ kerb=lowered"}, {"key": "tourism", "value": "bed_and_breakfast", "description": "🄳 ➜ tourism=guest_house"}, {"key": "type", "value": "broad_leaved", "description": "🄳 ➜ leaf_type=broadleaved"}, {"key": "type", "value": "conifer", "description": "🄳 ➜ leaf_type=needleleaved"},