diff --git a/data/presets.yaml b/data/presets.yaml index e19531007..92e44fa0b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -904,6 +904,9 @@ en: kerb: # kerb=* label: Curb + kerb/height: + # 'kerb:height=*' + label: Height label: # label=* label: Label @@ -3302,6 +3305,15 @@ en: name: Lowered Curb # 'terms: curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp' terms: '' + barrier/kerb/raised: + # 'barrier=kerb, kerb=raised' + name: Raised Curb + terms: '' + barrier/kerb/rolled: + # 'barrier=kerb, kerb=rolled' + name: Rolled Curb + # 'terms: gutter' + terms: '' barrier/kissing_gate: # barrier=kissing_gate name: Kissing Gate diff --git a/data/presets/fields.json b/data/presets/fields.json index ca643b4a5..7c2e4a3bf 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -173,6 +173,7 @@ "junction_line": {"key": "junction", "type": "combo", "label": "Junction", "strings": {"options": {"roundabout": "Roundabout", "circular": "Traffic Circle", "jughandle": "Jughandle"}}}, "junction/ref_oneway": {"key": "junction:ref", "type": "text", "label": "Junction Number", "prerequisiteTag": {"key": "oneway", "value": "yes"}}, "kerb": {"key": "kerb", "type": "combo", "label": "Curb"}, + "kerb/height": {"key": "kerb:height", "type": "combo", "snake_case": false, "label": "Height"}, "label": {"key": "label", "type": "textarea", "label": "Label"}, "lamp_type": {"key": "lamp_type", "type": "combo", "label": "Type"}, "landuse": {"key": "landuse", "type": "typeCombo", "label": "Type"}, diff --git a/data/presets/fields/kerb/height.json b/data/presets/fields/kerb/height.json new file mode 100644 index 000000000..76de6fdd6 --- /dev/null +++ b/data/presets/fields/kerb/height.json @@ -0,0 +1,6 @@ +{ + "key": "kerb:height", + "type": "combo", + "snake_case": false, + "label": "Height" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 612efa3b7..6818762d4 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -257,6 +257,8 @@ "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/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/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/raised.json b/data/presets/presets/barrier/kerb/raised.json new file mode 100644 index 000000000..64d372a8c --- /dev/null +++ b/data/presets/presets/barrier/kerb/raised.json @@ -0,0 +1,20 @@ +{ + "fields": [ + "{barrier/kerb}", + "kerb/height" + ], + "geometry": [ + "vertex", + "line" + ], + "tags": { + "barrier": "kerb", + "kerb": "raised" + }, + "reference": { + "key": "kerb", + "value": "raised" + }, + "terms": [], + "name": "Raised Curb" +} diff --git a/data/presets/presets/barrier/kerb/rolled.json b/data/presets/presets/barrier/kerb/rolled.json new file mode 100644 index 000000000..790866f26 --- /dev/null +++ b/data/presets/presets/barrier/kerb/rolled.json @@ -0,0 +1,18 @@ +{ + "geometry": [ + "vertex", + "line" + ], + "tags": { + "barrier": "kerb", + "kerb": "rolled" + }, + "reference": { + "key": "kerb", + "value": "rolled" + }, + "terms": [ + "gutter" + ], + "name": "Rolled Curb" +} diff --git a/data/taginfo.json b/data/taginfo.json index 9070148c6..babc8a739 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -254,6 +254,8 @@ {"key": "barrier", "value": "kerb", "description": "🄿 Curb", "object_types": ["node", "way"]}, {"key": "kerb", "value": "flush", "description": "🄿 Flush Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"}, {"key": "kerb", "value": "lowered", "description": "🄿 Lowered Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"}, + {"key": "kerb", "value": "raised", "description": "🄿 Raised Curb", "object_types": ["node", "way"]}, + {"key": "kerb", "value": "rolled", "description": "🄿 Rolled Curb", "object_types": ["node", "way"]}, {"key": "barrier", "value": "kissing_gate", "description": "🄿 Kissing Gate", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"}, {"key": "barrier", "value": "lift_gate", "description": "🄿 Lift Gate", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/roadblock-15.svg?sanitize=true"}, {"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/wall.svg?sanitize=true"}, @@ -1321,6 +1323,7 @@ {"key": "interval", "description": "🄵 Interval"}, {"key": "junction:ref", "description": "🄵 Junction Number"}, {"key": "kerb", "description": "🄵 Curb"}, + {"key": "kerb:height", "description": "🄵 Height"}, {"key": "label", "description": "🄵 Label"}, {"key": "lamp_type", "description": "🄵 Type"}, {"key": "lanes", "description": "🄵 Lanes"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index c22c25de3..8347ce865 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2922,6 +2922,9 @@ "kerb": { "label": "Curb" }, + "kerb/height": { + "label": "Height" + }, "label": { "label": "Label" }, @@ -4976,6 +4979,14 @@ "name": "Lowered Curb", "terms": "curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp" }, + "barrier/kerb/raised": { + "name": "Raised Curb", + "terms": "" + }, + "barrier/kerb/rolled": { + "name": "Rolled Curb", + "terms": "gutter" + }, "barrier/kissing_gate": { "name": "Kissing Gate", "terms": ""