From 2896a847b0ba58fcc8b34c21a82ab10e982ec10c Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 22 Oct 2019 02:20:50 -0400 Subject: [PATCH] Move manholes to man_made folder, add types for different utilites --- data/presets.yaml | 50 +++++++++++++------ data/presets/presets.json | 16 +++--- .../presets/{ => man_made}/manhole.json | 0 .../presets/{ => man_made}/manhole/drain.json | 2 +- .../presets/presets/man_made/manhole/gas.json | 26 ++++++++++ .../presets/man_made/manhole/power.json | 27 ++++++++++ .../presets/man_made/manhole/sewer.json | 27 ++++++++++ .../{ => man_made}/manhole/telecom.json | 6 ++- .../presets/man_made/manhole/water.json | 26 ++++++++++ data/taginfo.json | 16 +++--- dist/locales/en.json | 40 ++++++++++----- 11 files changed, 194 insertions(+), 42 deletions(-) rename data/presets/presets/{ => man_made}/manhole.json (100%) rename data/presets/presets/{ => man_made}/manhole/drain.json (92%) create mode 100644 data/presets/presets/man_made/manhole/gas.json create mode 100644 data/presets/presets/man_made/manhole/power.json create mode 100644 data/presets/presets/man_made/manhole/sewer.json rename data/presets/presets/{ => man_made}/manhole/telecom.json (82%) create mode 100644 data/presets/presets/man_made/manhole/water.json diff --git a/data/presets.yaml b/data/presets.yaml index 4b23babcd..f06867ba2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5864,6 +5864,41 @@ en: # man_made=lighthouse name: Lighthouse terms: '' + man_made/manhole: + # manhole=* + name: Manhole + # 'terms: cover,hole,sewer,sewage,telecom' + terms: '' + man_made/manhole/drain: + # manhole=drain + name: Storm Drain + # 'terms: cover,drain,hole,rain,sewer,sewage,storm' + terms: '' + man_made/manhole/gas: + # manhole=gas + name: Gas Utility Manhole + # 'terms: cover,gas,heat,hole,utility' + terms: '' + man_made/manhole/power: + # manhole=power + name: Power Utility Manhole + # 'terms: cover,hole,electric,hole,power,utility' + terms: '' + man_made/manhole/sewer: + # manhole=sewer + name: Sewer Utility Manhole + # 'terms: cover,drain,hole,sewer,sewage,utility' + terms: '' + man_made/manhole/telecom: + # manhole=telecom + name: Telecom Utility Manhole + # 'terms: bt,cable,cover,phone,hole,telecom,telephone,utility' + terms: '' + man_made/manhole/water: + # manhole=water + name: Water Utility Manhole + # 'terms: cover,drinking,hole,utility,water' + terms: '' man_made/mast: # man_made=mast name: Mast @@ -6052,21 +6087,6 @@ en: name: Factory # 'terms: assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery' terms: '' - manhole: - # manhole=* - name: Manhole - # 'terms: cover,hole,sewer,sewage,telecom' - terms: '' - manhole/drain: - # manhole=drain - name: Storm Drain - # 'terms: cover,drain,hole,rain,sewer,sewage,storm' - terms: '' - manhole/telecom: - # manhole=telecom - name: Telecom Manhole - # 'terms: cover,phone,hole,telecom,telephone,bt' - terms: '' military/bunker: # military=bunker name: Military Bunker diff --git a/data/presets/presets.json b/data/presets/presets.json index 38a5f3a45..0f966892c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -729,6 +729,13 @@ "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"}, "man_made/groyne": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"}, "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["name", "operator", "building_area", "height"], "moreFields": ["address", "email", "fax", "phone", "seamark/type", "website"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "addTags": {"man_made": "lighthouse", "seamark:type": "light_major"}, "removeTags": {"man_made": "lighthouse", "seamark:type": "*"}, "name": "Lighthouse"}, + "man_made/manhole": {"icon": "temaki-manhole", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "addTags": {"man_made": "manhole", "manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"}, + "man_made/manhole/drain": {"icon": "temaki-manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"}, + "man_made/manhole/gas": {"icon": "temaki-gas_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "gas"}, "addTags": {"man_made": "manhole", "manhole": "gas"}, "terms": ["cover", "gas", "heat", "hole", "utility"], "name": "Gas Utility Manhole"}, + "man_made/manhole/power": {"icon": "temaki-power_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "power"}, "addTags": {"man_made": "manhole", "manhole": "power"}, "terms": ["cover", "hole", "electric", "hole", "power", "utility"], "name": "Power Utility Manhole"}, + "man_made/manhole/sewer": {"icon": "temaki-waste_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "sewer"}, "addTags": {"man_made": "manhole", "manhole": "sewer"}, "terms": ["cover", "drain", "hole", "sewer", "sewage", "utility"], "name": "Sewer Utility Manhole"}, + "man_made/manhole/telecom": {"icon": "temaki-cable_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["bt", "cable", "cover", "phone", "hole", "telecom", "telephone", "utility"], "name": "Telecom Utility Manhole"}, + "man_made/manhole/water": {"icon": "temaki-waste_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "water"}, "addTags": {"man_made": "manhole", "manhole": "water"}, "terms": ["cover", "drinking", "hole", "utility", "water"], "name": "Water Utility Manhole"}, "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["communication_multi", "manufacturer", "material"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"}, "man_made/mast/communication": {"icon": "maki-communications-tower", "fields": ["{man_made/mast}", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Mast"}, "man_made/mast/communication/mobile_phone": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "cell mast", "cell phone mast", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:mobile_phone": "yes"}, "reference": {"key": "communication:mobile_phone", "value": "yes"}, "name": "Mobile Phone Mast"}, @@ -768,9 +775,6 @@ "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"}, "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"}, "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"}, - "manhole": {"icon": "temaki-manhole", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "addTags": {"man_made": "manhole", "manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"}, - "manhole/drain": {"icon": "temaki-waste_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"}, - "manhole/telecom": {"icon": "temaki-cable_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["cover", "phone", "hole", "telecom", "telephone", "bt"], "name": "Telecom Manhole"}, "military/bunker": {"icon": "temaki-military", "fields": ["name", "bunker_type", "building_area"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"}, "military/checkpoint": {"icon": "maki-barrier", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Checkpoint"}, "military/nuclear_explosion_site": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "nuclear_explosion_site"}, "terms": ["atom", "blast", "bomb", "detonat*", "nuke", "site", "test"], "name": "Nuclear Explosion Site"}, @@ -915,9 +919,9 @@ "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"}, "power/pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"}, "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"}, - "power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"}, + "power/switch": {"icon": "temaki-power_switch", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"}, "power/tower": {"icon": "temaki-power_tower", "fields": ["ref", "operator", "design", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"}, - "power/transformer": {"icon": "temaki-power", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "manufacturer", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex"], "tags": {"power": "transformer"}, "name": "Transformer"}, + "power/transformer": {"icon": "temaki-power_transformer", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "manufacturer", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex"], "tags": {"power": "transformer"}, "name": "Transformer"}, "public_transport/platform_point": {"icon": "maki-rail", "fields": ["name", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "level", "lit", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6}, "public_transport/platform": {"icon": "temaki-pedestrian", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "level", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6}, "public_transport/platform/aerialway_point": {"icon": "maki-aerialway", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "searchable": false, "name": "Aerialway Stop / Platform"}, @@ -1018,7 +1022,7 @@ "shop/boat": {"icon": "temaki-boating", "geometry": ["point", "area"], "terms": ["fishing boat", "jetski", "motorboat", "rowboat", "sailboat", "vessel", "watercraft"], "tags": {"shop": "boat"}, "name": "Boat Store"}, "shop/bookmaker": {"icon": "temaki-money_hand", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["betting", "bookie"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"}, "shop/books": {"icon": "fas-book", "fields": ["{shop}", "internet_access"], "moreFields": ["{shop}", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"shop": "books"}, "name": "Book Store"}, - "shop/brewing_supplies": {"icon": "fas-beer", "geometry": ["point", "area"], "terms": ["brew shop", "homebrew supply store"], "tags": {"shop": "brewing_supplies"}, "name": "Brewing Supply Store"}, + "shop/brewing_supplies": {"icon": "temaki-storage_fermenter", "geometry": ["point", "area"], "terms": ["brew shop", "homebrew supply store"], "tags": {"shop": "brewing_supplies"}, "name": "Brewing Supply Store"}, "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["chicken", "beef", "lamb", "meat", "pork"], "tags": {"shop": "butcher"}, "name": "Butcher"}, "shop/candles": {"icon": "fas-burn", "geometry": ["point", "area"], "tags": {"shop": "candles"}, "terms": ["wax"], "name": "Candle Shop"}, "shop/cannabis": {"icon": "fas-cannabis", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["420", "marijuana", "pot", "reefer", "weed"], "tags": {"shop": "cannabis"}, "name": "Cannabis Shop"}, diff --git a/data/presets/presets/manhole.json b/data/presets/presets/man_made/manhole.json similarity index 100% rename from data/presets/presets/manhole.json rename to data/presets/presets/man_made/manhole.json diff --git a/data/presets/presets/manhole/drain.json b/data/presets/presets/man_made/manhole/drain.json similarity index 92% rename from data/presets/presets/manhole/drain.json rename to data/presets/presets/man_made/manhole/drain.json index 4833bad75..55dcdb18d 100644 --- a/data/presets/presets/manhole/drain.json +++ b/data/presets/presets/man_made/manhole/drain.json @@ -1,5 +1,5 @@ { - "icon": "temaki-waste_manhole", + "icon": "temaki-manhole", "fields": [ "operator", "ref" diff --git a/data/presets/presets/man_made/manhole/gas.json b/data/presets/presets/man_made/manhole/gas.json new file mode 100644 index 000000000..fdeaa2181 --- /dev/null +++ b/data/presets/presets/man_made/manhole/gas.json @@ -0,0 +1,26 @@ +{ + "icon": "temaki-gas_manhole", + "fields": [ + "operator", + "ref" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "manhole": "gas" + }, + "addTags": { + "man_made": "manhole", + "manhole": "gas" + }, + "terms": [ + "cover", + "gas", + "heat", + "hole", + "utility" + ], + "name": "Gas Utility Manhole" +} diff --git a/data/presets/presets/man_made/manhole/power.json b/data/presets/presets/man_made/manhole/power.json new file mode 100644 index 000000000..610b30a56 --- /dev/null +++ b/data/presets/presets/man_made/manhole/power.json @@ -0,0 +1,27 @@ +{ + "icon": "temaki-power_manhole", + "fields": [ + "operator", + "ref" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "manhole": "power" + }, + "addTags": { + "man_made": "manhole", + "manhole": "power" + }, + "terms": [ + "cover", + "hole", + "electric", + "hole", + "power", + "utility" + ], + "name": "Power Utility Manhole" +} diff --git a/data/presets/presets/man_made/manhole/sewer.json b/data/presets/presets/man_made/manhole/sewer.json new file mode 100644 index 000000000..3a1058f5b --- /dev/null +++ b/data/presets/presets/man_made/manhole/sewer.json @@ -0,0 +1,27 @@ +{ + "icon": "temaki-waste_manhole", + "fields": [ + "operator", + "ref" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "manhole": "sewer" + }, + "addTags": { + "man_made": "manhole", + "manhole": "sewer" + }, + "terms": [ + "cover", + "drain", + "hole", + "sewer", + "sewage", + "utility" + ], + "name": "Sewer Utility Manhole" +} diff --git a/data/presets/presets/manhole/telecom.json b/data/presets/presets/man_made/manhole/telecom.json similarity index 82% rename from data/presets/presets/manhole/telecom.json rename to data/presets/presets/man_made/manhole/telecom.json index e49915294..e6f59b62c 100644 --- a/data/presets/presets/manhole/telecom.json +++ b/data/presets/presets/man_made/manhole/telecom.json @@ -16,12 +16,14 @@ "manhole": "telecom" }, "terms": [ + "bt", + "cable", "cover", "phone", "hole", "telecom", "telephone", - "bt" + "utility" ], - "name": "Telecom Manhole" + "name": "Telecom Utility Manhole" } diff --git a/data/presets/presets/man_made/manhole/water.json b/data/presets/presets/man_made/manhole/water.json new file mode 100644 index 000000000..6b46aef38 --- /dev/null +++ b/data/presets/presets/man_made/manhole/water.json @@ -0,0 +1,26 @@ +{ + "icon": "temaki-waste_manhole", + "fields": [ + "operator", + "ref" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "manhole": "water" + }, + "addTags": { + "man_made": "manhole", + "manhole": "water" + }, + "terms": [ + "cover", + "drinking", + "hole", + "utility", + "water" + ], + "name": "Water Utility Manhole" +} diff --git a/data/taginfo.json b/data/taginfo.json index 28d884135..3c76989e4 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -706,6 +706,13 @@ {"key": "man_made", "value": "gasometer", "description": "🄿 Gasometer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_tank.svg"}, {"key": "man_made", "value": "groyne", "description": "🄿 Groyne", "object_types": ["way", "area"]}, {"key": "man_made", "value": "lighthouse", "description": "🄿 Lighthouse", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lighthouse-15.svg"}, + {"key": "manhole", "description": "🄿 Manhole, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/manhole.svg"}, + {"key": "manhole", "value": "drain", "description": "🄿 Storm Drain", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/manhole.svg"}, + {"key": "manhole", "value": "gas", "description": "🄿 Gas Utility Manhole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/gas_manhole.svg"}, + {"key": "manhole", "value": "power", "description": "🄿 Power Utility Manhole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power_manhole.svg"}, + {"key": "manhole", "value": "sewer", "description": "🄿 Sewer Utility Manhole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/waste_manhole.svg"}, + {"key": "manhole", "value": "telecom", "description": "🄿 Telecom Utility Manhole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/cable_manhole.svg"}, + {"key": "manhole", "value": "water", "description": "🄿 Water Utility Manhole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/waste_manhole.svg"}, {"key": "man_made", "value": "mast", "description": "🄿 Mast", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/communications-tower-15.svg"}, {"key": "tower:type", "value": "communication", "description": "🄿 Communication Mast, 🄿 Communication Tower", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/communications-tower-15.svg"}, {"key": "communication:mobile_phone", "value": "yes", "description": "🄿 Mobile Phone Mast", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/communications-tower-15.svg"}, @@ -744,9 +751,6 @@ {"key": "man_made", "value": "watermill", "description": "🄿 Watermill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/watermill-15.svg"}, {"key": "man_made", "value": "windmill", "description": "🄿 Windmill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/windmill-15.svg"}, {"key": "man_made", "value": "works", "description": "🄿 Factory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"}, - {"key": "manhole", "description": "🄿 Manhole, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/manhole.svg"}, - {"key": "manhole", "value": "drain", "description": "🄿 Storm Drain", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/waste_manhole.svg"}, - {"key": "manhole", "value": "telecom", "description": "🄿 Telecom Manhole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/cable_manhole.svg"}, {"key": "military", "value": "bunker", "description": "🄿 Military Bunker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/military.svg"}, {"key": "military", "value": "checkpoint", "description": "🄿 Checkpoint", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"}, {"key": "military", "value": "nuclear_explosion_site", "description": "🄿 Nuclear Explosion Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/danger-15.svg"}, @@ -889,9 +893,9 @@ {"key": "power", "value": "plant", "description": "🄿 Power Station Grounds", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"}, {"key": "power", "value": "pole", "description": "🄿 Power Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/utility_pole.svg"}, {"key": "power", "value": "substation", "description": "🄿 Substation", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power.svg"}, - {"key": "power", "value": "switch", "description": "🄿 Power Switch", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power.svg"}, + {"key": "power", "value": "switch", "description": "🄿 Power Switch", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power_switch.svg"}, {"key": "power", "value": "tower", "description": "🄿 High-Voltage Tower", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power_tower.svg"}, - {"key": "power", "value": "transformer", "description": "🄿 Transformer", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power.svg"}, + {"key": "power", "value": "transformer", "description": "🄿 Transformer", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power_transformer.svg"}, {"key": "public_transport", "value": "platform", "description": "🄿 Transit Stop / Platform, 🄿 Transit Platform", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"}, {"key": "aerialway", "value": "yes", "description": "🄿 Aerialway Stop / Platform (unsearchable), 🄿 Aerialway Platform, 🄿 Aerialway Station, 🄿 Aerialway Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"}, {"key": "ferry", "value": "yes", "description": "🄿 Ferry Stop / Platform (unsearchable), 🄿 Ferry Platform, 🄿 Ferry Station / Terminal, 🄿 Ferry Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/ferry-15.svg"}, @@ -962,7 +966,7 @@ {"key": "shop", "value": "boat", "description": "🄿 Boat Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/boating.svg"}, {"key": "shop", "value": "bookmaker", "description": "🄿 Bookmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/money_hand.svg"}, {"key": "shop", "value": "books", "description": "🄿 Book Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-book.svg"}, - {"key": "shop", "value": "brewing_supplies", "description": "🄿 Brewing Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-beer.svg"}, + {"key": "shop", "value": "brewing_supplies", "description": "🄿 Brewing Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_fermenter.svg"}, {"key": "shop", "value": "butcher", "description": "🄿 Butcher", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-bacon.svg"}, {"key": "shop", "value": "candles", "description": "🄿 Candle Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-burn.svg"}, {"key": "shop", "value": "cannabis", "description": "🄿 Cannabis Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cannabis.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 50b9aa94e..98de5c6fc 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7851,6 +7851,34 @@ "name": "Lighthouse", "terms": "" }, + "man_made/manhole": { + "name": "Manhole", + "terms": "cover,hole,sewer,sewage,telecom" + }, + "man_made/manhole/drain": { + "name": "Storm Drain", + "terms": "cover,drain,hole,rain,sewer,sewage,storm" + }, + "man_made/manhole/gas": { + "name": "Gas Utility Manhole", + "terms": "cover,gas,heat,hole,utility" + }, + "man_made/manhole/power": { + "name": "Power Utility Manhole", + "terms": "cover,hole,electric,hole,power,utility" + }, + "man_made/manhole/sewer": { + "name": "Sewer Utility Manhole", + "terms": "cover,drain,hole,sewer,sewage,utility" + }, + "man_made/manhole/telecom": { + "name": "Telecom Utility Manhole", + "terms": "bt,cable,cover,phone,hole,telecom,telephone,utility" + }, + "man_made/manhole/water": { + "name": "Water Utility Manhole", + "terms": "cover,drinking,hole,utility,water" + }, "man_made/mast": { "name": "Mast", "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower" @@ -8007,18 +8035,6 @@ "name": "Factory", "terms": "assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery" }, - "manhole": { - "name": "Manhole", - "terms": "cover,hole,sewer,sewage,telecom" - }, - "manhole/drain": { - "name": "Storm Drain", - "terms": "cover,drain,hole,rain,sewer,sewage,storm" - }, - "manhole/telecom": { - "name": "Telecom Manhole", - "terms": "cover,phone,hole,telecom,telephone,bt" - }, "military/bunker": { "name": "Military Bunker", "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"