From 1a820e48dad2972f6456c28fecbfe4920e9bbd82 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sat, 4 May 2019 23:48:10 -0400 Subject: [PATCH] Adjust preset names for `natural=rock` `natural=stone` --- data/presets.yaml | 55 +++++++++++++++++++++++++ data/presets/presets.json | 12 ++++++ data/presets/presets/natural/rock.json | 6 ++- data/presets/presets/natural/stone.json | 18 ++++++++ data/taginfo.json | 14 +++++++ dist/locales/en.json | 48 +++++++++++++++++++++ 6 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 data/presets/presets/natural/stone.json diff --git a/data/presets.yaml b/data/presets.yaml index 64ad020007..5b0b4f95cb 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3095,6 +3095,10 @@ en: # amenity=social_facility name: Social Facility terms: '' + amenity/social_facility/ambulatory_care: + # 'amenity=social_facility, social_facility=ambulatory_care' + name: Ambulatory Care + terms: '' amenity/social_facility/food_bank: # 'amenity=social_facility, social_facility=food_bank' name: Food Bank @@ -3763,6 +3767,10 @@ en: # craft=* name: Craft terms: '' + craft/agricultural_engines: + # craft=agricultural_engines + name: Argricultural Engines Mechanic + terms: '' craft/basket_maker: # craft=basket_maker name: Basket Maker @@ -3834,6 +3842,10 @@ en: # craft=electronics_repair name: Electronics Repair Shop terms: '' + craft/floorer: + # craft=floorer + name: Floorer + terms: '' craft/gardener: # craft=gardener name: Gardener @@ -3860,6 +3872,11 @@ en: craft/jeweler: # craft=jeweler name: Jeweler + craft/joiner: + # craft=joiner + name: Joiner + # 'terms: furniture' + terms: '' craft/key_cutter: # craft=key_cutter name: Key Cutter @@ -3878,6 +3895,10 @@ en: # craft=painter name: Painter terms: '' + craft/parquet_layer: + # craft=parquet_layer + name: Parquet Layer + terms: '' craft/photographer: # craft=photographer name: Photographer @@ -3998,6 +4019,10 @@ en: # emergency=fire_extinguisher name: Fire Extinguisher terms: '' + emergency/fire_hose: + # emergency=fire_hose + name: Fire Hose + terms: '' emergency/fire_hydrant: # emergency=fire_hydrant name: Fire Hydrant @@ -5528,6 +5553,11 @@ en: name: Ridge # 'terms: crest' terms: '' + natural/rock: + # natural=rock + name: Attached Rock / Boulder + # 'terms: boulder,stone,rock' + terms: '' natural/saddle: # natural=saddle name: Saddle @@ -5557,6 +5587,11 @@ en: # natural=spring name: Spring terms: '' + natural/stone: + # natural=stone + name: Unattached Stone / Boulder + # 'terms: boulder,stone,rock' + terms: '' natural/tree: # natural=tree name: Tree @@ -5612,6 +5647,11 @@ en: name: Stream # 'terms: beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse' terms: '' + natural/water/wastewater: + # 'natural=water, water=wastewater' + name: Wastewater Basin + # 'terms: excrement,shit,sewage,wastewater,Settling Basin,Clarifier Basin' + terms: '' natural/wetland: # natural=wetland name: Wetland @@ -7269,6 +7309,21 @@ en: name: Zoo # 'terms: animal' terms: '' + tourism/zoo/petting: + # 'tourism=zoo, zoo=petting_zoo' + name: Petting Zoo + # 'terms: Children''s Zoo,Children''s Farm,Petting Farm,farm animals' + terms: '' + tourism/zoo/safari: + # 'tourism=zoo, zoo=safari_park' + name: Safari Park + # 'terms: Drive-Through Zoo,Drive-In Zoo' + terms: '' + tourism/zoo/wildlife: + # 'tourism=zoo, zoo=wildlife_park' + name: Wildlife Park + # 'terms: indigenous animals' + terms: '' traffic_calming: # traffic_calming=* name: Traffic Calming diff --git a/data/presets/presets.json b/data/presets/presets.json index ecf69505d7..6a2015d3fb 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -195,6 +195,7 @@ "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "moreFields": ["lit", "wheelchair", "covered"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"}, "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"}, "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"}, + "amenity/social_facility/ambulatory_care": {"icon": "maki-wheelchair", "geometry": ["point", "area"], "tags": {"amenity": "social_facility", "social_facility": "ambulatory_care"}, "reference": {"key": "social_facility", "value": "ambulatory_care"}, "name": "Ambulatory Care"}, "amenity/social_facility/food_bank": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility", "social_facility": "food_bank"}, "reference": {"key": "social_facility", "value": "food_bank"}, "name": "Food Bank"}, "amenity/social_facility/group_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["old", "senior", "living", "care home", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "group_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "group_home"}, "name": "Elderly Group Home"}, "amenity/social_facility/homeless_shelter": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": ["houseless", "unhoused", "displaced"], "tags": {"amenity": "social_facility", "social_facility": "shelter", "social_facility:for": "homeless"}, "reference": {"key": "social_facility", "value": "shelter"}, "name": "Homeless Shelter"}, @@ -345,6 +346,7 @@ "craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false}, "craft/optician": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "optician"}, "reference": {"key": "shop", "value": "optician"}, "name": "Optician", "searchable": false, "replacement": "shop/optician"}, "craft/tailor": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "terms": ["clothes", "suit"], "tags": {"craft": "tailor"}, "reference": {"key": "shop", "value": "tailor"}, "name": "Tailor", "searchable": false}, + "craft/agricultural_engines": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "agricultural_engines"}, "name": "Argricultural Engines Mechanic"}, "craft/basket_maker": {"icon": "maki-art-gallery", "geometry": ["point", "area"], "tags": {"craft": "basket_maker"}, "name": "Basket Maker"}, "craft/beekeeper": {"icon": "maki-farm", "geometry": ["point", "area"], "tags": {"craft": "beekeeper"}, "name": "Beekeeper"}, "craft/blacksmith": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "blacksmith"}, "name": "Blacksmith"}, @@ -361,14 +363,17 @@ "craft/dressmaker": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "terms": ["seamstress"], "tags": {"craft": "dressmaker"}, "name": "Dressmaker"}, "craft/electrician": {"icon": "temaki-power", "geometry": ["point", "area"], "terms": ["power", "wire"], "tags": {"craft": "electrician"}, "name": "Electrician"}, "craft/electronics_repair": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "electronics_repair"}, "name": "Electronics Repair Shop"}, + "craft/floorer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "floorer"}, "name": "Floorer"}, "craft/gardener": {"icon": "maki-garden-centre", "geometry": ["point", "area"], "terms": ["landscaper", "grounds keeper"], "tags": {"craft": "gardener"}, "name": "Gardener"}, "craft/glaziery": {"icon": "temaki-window", "geometry": ["point", "area"], "terms": ["glass", "stained-glass", "window"], "tags": {"craft": "glaziery"}, "name": "Glaziery"}, "craft/handicraft": {"icon": "maki-art-gallery", "geometry": ["point", "area"], "tags": {"craft": "handicraft"}, "name": "Handicraft"}, "craft/hvac": {"icon": "temaki-tools", "geometry": ["point", "area"], "terms": ["heat*", "vent*", "air conditioning"], "tags": {"craft": "hvac"}, "name": "HVAC"}, "craft/insulator": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "insulation"}, "name": "Insulator"}, + "craft/joiner": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "joiner"}, "terms": ["furniture"], "name": "Joiner"}, "craft/key_cutter": {"icon": "fas-key", "geometry": ["point", "area"], "tags": {"craft": "key_cutter"}, "name": "Key Cutter"}, "craft/metal_construction": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "metal_construction"}, "name": "Metal Construction"}, "craft/painter": {"icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"craft": "painter"}, "name": "Painter"}, + "craft/parquet_layer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "parquet_layer"}, "name": "Parquet Layer"}, "craft/photographer": {"icon": "maki-attraction", "geometry": ["point", "area"], "tags": {"craft": "photographer"}, "name": "Photographer"}, "craft/photographic_laboratory": {"icon": "fas-film", "geometry": ["point", "area"], "terms": ["film"], "tags": {"craft": "photographic_laboratory"}, "name": "Photographic Laboratory"}, "craft/plasterer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "plasterer"}, "name": "Plasterer"}, @@ -399,6 +404,7 @@ "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"}, "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"}, "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"}, + "emergency/fire_hose": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_hose"}, "name": "Fire Hose"}, "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["ref", "fire_hydrant/type", "colour", "water_source", "couplings"], "moreFields": ["fire_hydrant/pressure", "fire_hydrant/diameter", "water_volume", "survey/date"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well", "hydrant"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"}, "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "name": "First Aid Kit"}, "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["life buoy", "kisby ring", "kisbie ring", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"}, @@ -722,12 +728,14 @@ "natural/peak": {"icon": "maki-mountain", "fields": ["name", "elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "peak"}, "terms": ["acme", "aiguille", "alp", "climax", "crest", "crown", "hill", "mount", "mountain", "pinnacle", "summit", "tip", "top"], "name": "Peak"}, "natural/reef": {"icon": "temaki-beach", "geometry": ["point", "area"], "tags": {"natural": "reef"}, "terms": ["barrier", "coral", "ocean", "sand", "shoal"], "name": "Reef"}, "natural/ridge": {"geometry": ["line"], "tags": {"natural": "ridge"}, "terms": ["crest"], "name": "Ridge"}, + "natural/rock": {"fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "rock"}, "terms": ["boulder", "stone", "rock"], "name": "Attached Rock / Boulder"}, "natural/saddle": {"icon": "maki-triangle-stroked", "fields": ["elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "saddle"}, "terms": ["pass", "mountain pass", "top"], "name": "Saddle"}, "natural/sand": {"geometry": ["area"], "tags": {"natural": "sand"}, "terms": ["desert"], "name": "Sand"}, "natural/scree": {"geometry": ["area"], "tags": {"natural": "scree"}, "terms": ["loose rocks"], "name": "Scree"}, "natural/scrub": {"geometry": ["area"], "tags": {"natural": "scrub"}, "terms": ["bush", "shrubs"], "name": "Scrub"}, "natural/shingle": {"geometry": ["area"], "tags": {"natural": "shingle"}, "terms": ["beach", "gravel", "pebbles", "riverbed", "rounded rock fragments"], "name": "Shingle"}, "natural/spring": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["point", "vertex"], "tags": {"natural": "spring"}, "terms": [], "name": "Spring"}, + "natural/stone": {"fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "stone"}, "terms": ["boulder", "stone", "rock"], "name": "Unattached Stone / Boulder"}, "natural/tree_row": {"icon": "maki-park", "fields": ["leaf_type", "leaf_cycle", "denotation"], "geometry": ["line"], "tags": {"natural": "tree_row"}, "terms": [], "name": "Tree Row"}, "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"}, "natural/valley": {"icon": "maki-triangle-stroked", "fields": ["name", "elevation", "description"], "geometry": ["vertex", "point", "line"], "tags": {"natural": "valley"}, "terms": ["canyon", "dale", "dell", "dene", "depression", "glen", "gorge", "gully", "gulley", "gultch", "hollow", "ravine", "rift", "vale"], "name": "Valley"}, @@ -740,6 +748,7 @@ "natural/water/reservoir": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "water", "value": "reservoir"}, "name": "Reservoir"}, "natural/water/river": {"icon": "iD-waterway-river", "fields": ["{natural/water}", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "river"}, "reference": {"key": "water", "value": "river"}, "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "riverbank", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "name": "River"}, "natural/water/stream": {"icon": "iD-waterway-stream", "fields": ["{natural/water}"], "geometry": ["area"], "tags": {"natural": "water", "water": "stream"}, "reference": {"key": "water", "value": "stream"}, "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "name": "Stream"}, + "natural/water/wastewater": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "wastewater"}, "reference": {"key": "water", "value": "wastewater"}, "terms": ["excrement", "shit", "sewage", "wastewater", "Settling Basin", "Clarifier Basin"], "name": "Wastewater Basin"}, "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland", "salt", "tidal"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "fen", "marsh", "mire", "moor", "muskeg", "peatland", "quagmire", "reedbed", "saltmarsh", "swamp", "tidalflat", "wet meadow"], "name": "Wetland"}, "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "Wood"}, "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"}, @@ -1100,6 +1109,9 @@ "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"}, "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "fireplace"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"}, "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"}, + "tourism/zoo/petting": {"icon": "temaki-zoo", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "petting_zoo"}, "reference": {"key": "zoo", "value": "petting_zoo"}, "terms": ["Children's Zoo", "Children's Farm", "Petting Farm", "farm animals"], "name": "Petting Zoo"}, + "tourism/zoo/safari": {"icon": "temaki-zoo", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "safari_park"}, "reference": {"key": "zoo", "value": "safari_park"}, "terms": ["Drive-Through Zoo", "Drive-In Zoo"], "name": "Safari Park"}, + "tourism/zoo/wildlife": {"icon": "temaki-zoo", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "wildlife_park"}, "reference": {"key": "zoo", "value": "wildlife_park"}, "terms": ["indigenous animals"], "name": "Wildlife Park"}, "traffic_calming": {"icon": "temaki-diamond", "fields": ["traffic_calming", "surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "tags": {"traffic_calming": "*"}, "terms": ["bump", "hump", "slow", "speed"], "name": "Traffic Calming"}, "traffic_calming/bump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["hump", "speed", "slow"], "tags": {"traffic_calming": "bump"}, "name": "Speed Bump"}, "traffic_calming/chicane": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "terms": ["driveway link", "speed", "slow"], "tags": {"traffic_calming": "chicane"}, "name": "Traffic Chicane"}, diff --git a/data/presets/presets/natural/rock.json b/data/presets/presets/natural/rock.json index e63e85c92c..48477d0586 100644 --- a/data/presets/presets/natural/rock.json +++ b/data/presets/presets/natural/rock.json @@ -10,7 +10,9 @@ "natural": "rock" }, "terms": [ - "Rock" + "boulder", + "stone", + "rock" ], - "name": "Boulder" + "name": "Attached Rock / Boulder" } diff --git a/data/presets/presets/natural/stone.json b/data/presets/presets/natural/stone.json new file mode 100644 index 0000000000..67c53134d4 --- /dev/null +++ b/data/presets/presets/natural/stone.json @@ -0,0 +1,18 @@ +{ + "fields": [ + "name" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "natural": "stone" + }, + "terms": [ + "boulder", + "stone", + "rock" + ], + "name": "Unattached Stone / Boulder" +} diff --git a/data/taginfo.json b/data/taginfo.json index 8e68df2f3e..d804b47b58 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -193,6 +193,7 @@ {"key": "amenity", "value": "smoking_area", "description": "🄿 Smoking Area", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-smoking.svg?sanitize=true"}, {"key": "amenity", "value": "social_centre", "description": "🄿 Social Center", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-handshake.svg?sanitize=true"}, {"key": "amenity", "value": "social_facility", "description": "🄿 Social Facility", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/social_facility.svg?sanitize=true"}, + {"key": "social_facility", "value": "ambulatory_care", "description": "🄿 Ambulatory Care", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"}, {"key": "social_facility", "value": "food_bank", "description": "🄿 Food Bank", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/social_facility.svg?sanitize=true"}, {"key": "social_facility:for", "value": "senior", "description": "🄿 Elderly Group Home, 🄿 Nursing Home", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wheelchair-15.svg?sanitize=true"}, {"key": "social_facility:for", "value": "homeless", "description": "🄿 Homeless Shelter", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/social_facility.svg?sanitize=true"}, @@ -341,6 +342,7 @@ {"key": "craft", "value": "locksmith", "description": "🄿 Locksmith (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/marker-stroked-15.svg?sanitize=true"}, {"key": "craft", "value": "optician", "description": "🄿 Optician (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/marker-stroked-15.svg?sanitize=true"}, {"key": "craft", "value": "tailor", "description": "🄿 Tailor (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/clothing-store-15.svg?sanitize=true"}, + {"key": "craft", "value": "agricultural_engines", "description": "🄿 Argricultural Engines Mechanic", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, {"key": "craft", "value": "basket_maker", "description": "🄿 Basket Maker", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true"}, {"key": "craft", "value": "beekeeper", "description": "🄿 Beekeeper", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/farm-15.svg?sanitize=true"}, {"key": "craft", "value": "blacksmith", "description": "🄿 Blacksmith", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, @@ -357,14 +359,17 @@ {"key": "craft", "value": "dressmaker", "description": "🄿 Dressmaker", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/clothing-store-15.svg?sanitize=true"}, {"key": "craft", "value": "electrician", "description": "🄿 Electrician", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"}, {"key": "craft", "value": "electronics_repair", "description": "🄿 Electronics Repair Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, + {"key": "craft", "value": "floorer", "description": "🄿 Floorer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, {"key": "craft", "value": "gardener", "description": "🄿 Gardener", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/garden-centre-15.svg?sanitize=true"}, {"key": "craft", "value": "glaziery", "description": "🄿 Glaziery", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/window.svg?sanitize=true"}, {"key": "craft", "value": "handicraft", "description": "🄿 Handicraft", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true"}, {"key": "craft", "value": "hvac", "description": "🄿 HVAC", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, {"key": "craft", "value": "insulation", "description": "🄿 Insulator", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, + {"key": "craft", "value": "joiner", "description": "🄿 Joiner", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, {"key": "craft", "value": "key_cutter", "description": "🄿 Key Cutter", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-key.svg?sanitize=true"}, {"key": "craft", "value": "metal_construction", "description": "🄿 Metal Construction", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, {"key": "craft", "value": "painter", "description": "🄿 Painter", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-paint-roller.svg?sanitize=true"}, + {"key": "craft", "value": "parquet_layer", "description": "🄿 Parquet Layer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, {"key": "craft", "value": "photographer", "description": "🄿 Photographer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"}, {"key": "craft", "value": "photographic_laboratory", "description": "🄿 Photographic Laboratory", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-film.svg?sanitize=true"}, {"key": "craft", "value": "plasterer", "description": "🄿 Plasterer", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"}, @@ -395,6 +400,7 @@ {"key": "emergency", "value": "defibrillator", "description": "🄿 Defibrillator", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/defibrillator-15.svg?sanitize=true"}, {"key": "emergency", "value": "fire_alarm_box", "description": "🄿 Fire Alarm Call Box", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-bell.svg?sanitize=true"}, {"key": "emergency", "value": "fire_extinguisher", "description": "🄿 Fire Extinguisher", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-fire-extinguisher.svg?sanitize=true"}, + {"key": "emergency", "value": "fire_hose", "description": "🄿 Fire Hose", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-fire-extinguisher.svg?sanitize=true"}, {"key": "emergency", "value": "fire_hydrant", "description": "🄿 Fire Hydrant", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/fire_hydrant.svg?sanitize=true"}, {"key": "emergency", "value": "first_aid_kit", "description": "🄿 First Aid Kit", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-medkit.svg?sanitize=true"}, {"key": "emergency", "value": "life_ring", "description": "🄿 Life Ring", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-life-ring.svg?sanitize=true"}, @@ -694,11 +700,13 @@ {"key": "natural", "value": "peak", "description": "🄿 Peak", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/mountain-15.svg?sanitize=true"}, {"key": "natural", "value": "reef", "description": "🄿 Reef", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"}, {"key": "natural", "value": "ridge", "description": "🄿 Ridge", "object_types": ["way"]}, + {"key": "natural", "value": "rock", "description": "🄿 Attached Rock / Boulder", "object_types": ["node", "area"]}, {"key": "natural", "value": "saddle", "description": "🄿 Saddle", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/triangle-stroked-15.svg?sanitize=true"}, {"key": "natural", "value": "scree", "description": "🄿 Scree", "object_types": ["area"]}, {"key": "natural", "value": "scrub", "description": "🄿 Scrub", "object_types": ["area"]}, {"key": "natural", "value": "shingle", "description": "🄿 Shingle", "object_types": ["area"]}, {"key": "natural", "value": "spring", "description": "🄿 Spring", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, + {"key": "natural", "value": "stone", "description": "🄿 Unattached Stone / Boulder", "object_types": ["node", "area"]}, {"key": "natural", "value": "tree_row", "description": "🄿 Tree Row", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-15.svg?sanitize=true"}, {"key": "natural", "value": "tree", "description": "🄿 Tree", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-15.svg?sanitize=true"}, {"key": "natural", "value": "valley", "description": "🄿 Valley", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/triangle-stroked-15.svg?sanitize=true"}, @@ -710,6 +718,7 @@ {"key": "water", "value": "reservoir", "description": "🄿 Reservoir", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "water", "value": "river", "description": "🄿 River", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-river.svg?sanitize=true"}, {"key": "water", "value": "stream", "description": "🄿 Stream", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-stream.svg?sanitize=true"}, + {"key": "water", "value": "wastewater", "description": "🄿 Wastewater Basin", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"}, {"key": "natural", "value": "wetland", "description": "🄿 Wetland", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/wetland-15.svg?sanitize=true"}, {"key": "natural", "value": "wood", "description": "🄿 Wood", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-alt1-15.svg?sanitize=true"}, {"key": "noexit", "value": "yes", "description": "🄿 No Exit", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"}, @@ -1037,6 +1046,9 @@ {"key": "tourism", "value": "viewpoint", "description": "🄿 Viewpoint", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/binoculars.svg?sanitize=true"}, {"key": "tourism", "value": "wilderness_hut", "description": "🄿 Wilderness Hut", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/lodging-15.svg?sanitize=true"}, {"key": "tourism", "value": "zoo", "description": "🄿 Zoo", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/zoo.svg?sanitize=true"}, + {"key": "zoo", "value": "petting_zoo", "description": "🄿 Petting Zoo", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/zoo.svg?sanitize=true"}, + {"key": "zoo", "value": "safari_park", "description": "🄿 Safari Park", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/zoo.svg?sanitize=true"}, + {"key": "zoo", "value": "wildlife_park", "description": "🄿 Wildlife Park", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/zoo.svg?sanitize=true"}, {"key": "traffic_calming", "description": "🄿 Traffic Calming, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, {"key": "traffic_calming", "value": "bump", "description": "🄿 Speed Bump", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, {"key": "traffic_calming", "value": "chicane", "description": "🄿 Traffic Chicane", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"}, @@ -1765,6 +1777,8 @@ {"key": "building:type", "description": "🄳 ➜ building=*"}, {"key": "color", "description": "🄳 ➜ colour=*"}, {"key": "craft", "value": "glass", "description": "🄳 ➜ craft=glaziery"}, + {"key": "craft", "value": "catering", "description": "🄳 ➜ craft=caterer"}, + {"key": "craft", "value": "sculpter", "description": "🄳 ➜ craft=sculptor"}, {"key": "cuisine", "value": "gluten-free", "description": "🄳 ➜ diet:gluten_free=yes"}, {"key": "cuisine", "value": "halal", "description": "🄳 ➜ diet:halal=yes"}, {"key": "cuisine", "value": "kosher", "description": "🄳 ➜ diet:kosher=yes"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index f6426ccc3e..0ad98bf163 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5041,6 +5041,10 @@ "name": "Social Facility", "terms": "" }, + "amenity/social_facility/ambulatory_care": { + "name": "Ambulatory Care", + "terms": "" + }, "amenity/social_facility/food_bank": { "name": "Food Bank", "terms": "" @@ -5641,6 +5645,10 @@ "name": "Tailor", "terms": "clothes,suit" }, + "craft/agricultural_engines": { + "name": "Argricultural Engines Mechanic", + "terms": "" + }, "craft/basket_maker": { "name": "Basket Maker", "terms": "" @@ -5705,6 +5713,10 @@ "name": "Electronics Repair Shop", "terms": "" }, + "craft/floorer": { + "name": "Floorer", + "terms": "" + }, "craft/gardener": { "name": "Gardener", "terms": "landscaper,grounds keeper" @@ -5725,6 +5737,10 @@ "name": "Insulator", "terms": "" }, + "craft/joiner": { + "name": "Joiner", + "terms": "furniture" + }, "craft/key_cutter": { "name": "Key Cutter", "terms": "" @@ -5737,6 +5753,10 @@ "name": "Painter", "terms": "" }, + "craft/parquet_layer": { + "name": "Parquet Layer", + "terms": "" + }, "craft/photographer": { "name": "Photographer", "terms": "" @@ -5857,6 +5877,10 @@ "name": "Fire Extinguisher", "terms": "" }, + "emergency/fire_hose": { + "name": "Fire Hose", + "terms": "" + }, "emergency/fire_hydrant": { "name": "Fire Hydrant", "terms": "fire plug,fire water well,hydrant" @@ -7149,6 +7173,10 @@ "name": "Ridge", "terms": "crest" }, + "natural/rock": { + "name": "Attached Rock / Boulder", + "terms": "boulder,stone,rock" + }, "natural/saddle": { "name": "Saddle", "terms": "pass,mountain pass,top" @@ -7173,6 +7201,10 @@ "name": "Spring", "terms": "" }, + "natural/stone": { + "name": "Unattached Stone / Boulder", + "terms": "boulder,stone,rock" + }, "natural/tree_row": { "name": "Tree Row", "terms": "" @@ -7221,6 +7253,10 @@ "name": "Stream", "terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse" }, + "natural/water/wastewater": { + "name": "Wastewater Basin", + "terms": "excrement,shit,sewage,wastewater,Settling Basin,Clarifier Basin" + }, "natural/wetland": { "name": "Wetland", "terms": "bog,fen,marsh,mire,moor,muskeg,peatland,quagmire,reedbed,saltmarsh,swamp,tidalflat,wet meadow" @@ -8661,6 +8697,18 @@ "name": "Zoo", "terms": "animal" }, + "tourism/zoo/petting": { + "name": "Petting Zoo", + "terms": "Children's Zoo,Children's Farm,Petting Farm,farm animals" + }, + "tourism/zoo/safari": { + "name": "Safari Park", + "terms": "Drive-Through Zoo,Drive-In Zoo" + }, + "tourism/zoo/wildlife": { + "name": "Wildlife Park", + "terms": "indigenous animals" + }, "traffic_calming": { "name": "Traffic Calming", "terms": "bump,hump,slow,speed"