diff --git a/data/presets/presets.json b/data/presets/presets.json index d81c7167a..5c363ae94 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -272,11 +272,11 @@ "barrier/guard_rail": {"icon": "temaki-guard_rail", "fields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75}, "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25}, "barrier/height_restrictor": {"icon": "temaki-car_wash", "fields": ["maxheight"], "geometry": ["vertex"], "tags": {"barrier": "height_restrictor"}, "name": "Height Restrictor"}, - "barrier/kerb": {"fields": ["kerb", "tactile_paving"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"}, - "barrier/kerb/flush": {"icon": "maki-wheelchair", "fields": ["kerb", "{barrier/kerb}"], "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", "fields": ["kerb", "{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": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "name": "Raised Curb"}, - "barrier/kerb/rolled": {"fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "name": "Rolled Curb"}, + "barrier/kerb": {"icon": "temaki-kerb-raised", "fields": ["kerb", "tactile_paving"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"}, + "barrier/kerb/flush": {"icon": "temaki-kerb-flush", "fields": ["kerb", "{barrier/kerb}"], "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": "temaki-kerb-lowered", "fields": ["kerb", "{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": {"icon": "temaki-kerb-raised", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "name": "Raised Curb"}, + "barrier/kerb/rolled": {"icon": "temaki-kerb-rolled", "fields": ["kerb", "{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"}, @@ -418,7 +418,7 @@ "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "address"], "matchScore": 0.8, "name": "Entrance/Exit"}, "ford": {"geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"}, "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "reference": {"key": "golf", "value": "bunker"}, "name": "Sand Trap"}, - "golf/cartpath": {"icon": "maki-golf", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "reference": {"key": "golf", "value": "cartpath"}, "name": "Golf Cartpath"}, + "golf/cartpath": {"icon": "temaki-golf_cart", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "reference": {"key": "golf", "value": "cartpath"}, "name": "Golf Cartpath"}, "golf/driving_range": {"icon": "maki-golf", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"golf": "driving_range", "landuse": "grass"}, "reference": {"key": "golf", "value": "driving_range"}, "name": "Driving Range"}, "golf/fairway": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "fairway", "landuse": "grass"}, "reference": {"key": "golf", "value": "fairway"}, "name": "Fairway"}, "golf/green": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "green", "landuse": "grass", "leisure": "pitch", "sport": "golf"}, "reference": {"key": "golf", "value": "green"}, "name": "Putting Green"}, diff --git a/data/presets/presets/barrier/kerb.json b/data/presets/presets/barrier/kerb.json index 33bdbb370..78cbeb99f 100644 --- a/data/presets/presets/barrier/kerb.json +++ b/data/presets/presets/barrier/kerb.json @@ -1,4 +1,5 @@ { + "icon": "temaki-kerb-raised", "fields": [ "kerb", "tactile_paving" diff --git a/data/presets/presets/barrier/kerb/flush.json b/data/presets/presets/barrier/kerb/flush.json index ae83e6148..635297bd5 100644 --- a/data/presets/presets/barrier/kerb/flush.json +++ b/data/presets/presets/barrier/kerb/flush.json @@ -1,5 +1,5 @@ { - "icon": "maki-wheelchair", + "icon": "temaki-kerb-flush", "fields": [ "kerb", "{barrier/kerb}" diff --git a/data/presets/presets/barrier/kerb/lowered.json b/data/presets/presets/barrier/kerb/lowered.json index d266a998b..69b820f57 100644 --- a/data/presets/presets/barrier/kerb/lowered.json +++ b/data/presets/presets/barrier/kerb/lowered.json @@ -1,5 +1,5 @@ { - "icon": "maki-wheelchair", + "icon": "temaki-kerb-lowered", "fields": [ "kerb", "{barrier/kerb}", diff --git a/data/presets/presets/barrier/kerb/raised.json b/data/presets/presets/barrier/kerb/raised.json index bbec5a5f7..37cea3975 100644 --- a/data/presets/presets/barrier/kerb/raised.json +++ b/data/presets/presets/barrier/kerb/raised.json @@ -1,4 +1,5 @@ { + "icon": "temaki-kerb-raised", "fields": [ "kerb", "{barrier/kerb}", diff --git a/data/presets/presets/barrier/kerb/rolled.json b/data/presets/presets/barrier/kerb/rolled.json index d7b29f2e4..87ae9cd60 100644 --- a/data/presets/presets/barrier/kerb/rolled.json +++ b/data/presets/presets/barrier/kerb/rolled.json @@ -1,4 +1,5 @@ { + "icon": "temaki-kerb-rolled", "fields": [ "kerb", "{barrier/kerb}", diff --git a/data/presets/presets/golf/cartpath.json b/data/presets/presets/golf/cartpath.json index 37aeeaff5..2436f70c3 100644 --- a/data/presets/presets/golf/cartpath.json +++ b/data/presets/presets/golf/cartpath.json @@ -1,5 +1,5 @@ { - "icon": "maki-golf", + "icon": "temaki-golf_cart", "fields": [ "{golf/path}", "maxspeed" diff --git a/data/taginfo.json b/data/taginfo.json index 78a02c776..91a1263b8 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -269,11 +269,11 @@ {"key": "barrier", "value": "guard_rail", "description": "🄿 Guard Rail", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/guard_rail.svg?sanitize=true"}, {"key": "barrier", "value": "hedge", "description": "🄿 Hedge", "object_types": ["way", "area"]}, {"key": "barrier", "value": "height_restrictor", "description": "🄿 Height Restrictor", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/car_wash.svg?sanitize=true"}, - {"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": "kerb", "description": "🄿 Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/kerb-raised.svg?sanitize=true"}, + {"key": "kerb", "value": "flush", "description": "🄿 Flush Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/kerb-flush.svg?sanitize=true"}, + {"key": "kerb", "value": "lowered", "description": "🄿 Lowered Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/kerb-lowered.svg?sanitize=true"}, + {"key": "kerb", "value": "raised", "description": "🄿 Raised Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/kerb-raised.svg?sanitize=true"}, + {"key": "kerb", "value": "rolled", "description": "🄿 Rolled Curb", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/kerb-rolled.svg?sanitize=true"}, {"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"}, @@ -414,7 +414,7 @@ {"key": "entrance", "description": "🄿 Entrance/Exit, 🄵 Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-alt1-15.svg?sanitize=true"}, {"key": "ford", "value": "yes", "description": "🄿 Ford", "object_types": ["node"]}, {"key": "natural", "value": "sand", "description": "🄿 Sand Trap, 🄿 Sand", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, - {"key": "golf", "value": "cartpath", "description": "🄿 Golf Cartpath", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, + {"key": "golf", "value": "cartpath", "description": "🄿 Golf Cartpath", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/golf_cart.svg?sanitize=true"}, {"key": "landuse", "value": "grass", "description": "🄿 Driving Range, 🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Grass", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "sport", "value": "golf", "description": "🄿 Putting Green", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"}, {"key": "golf", "value": "hole", "description": "🄿 Golf Hole", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},