diff --git a/data/presets.yaml b/data/presets.yaml index 02302a148..29c8fd6ca 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3780,9 +3780,9 @@ en: terms: '' area/highway: # 'area:highway=*' - name: Road Surface + name: Road Area # 'terms: area:highway,edge of pavement,highway area,highway shape,pavement,road shape,street area' - terms: '' + terms: '' attraction: # attraction=* name: Attraction @@ -5817,8 +5817,8 @@ en: terms: '' man_made/bridge: # man_made=bridge - name: Bridge - terms: '' + name: Bridge Area + terms: '' man_made/bunker_silo: # man_made=bunker_silo name: Bunker Silo @@ -6060,9 +6060,9 @@ en: terms: '' man_made/tunnel: # man_made=tunnel - name: Tunnel + name: Tunnel Area # 'terms: bore,dig,shaft,underground passage,underpass' - terms: '' + terms: '' man_made/utility_pole: # man_made=utility_pole name: Utility Pole diff --git a/data/presets/presets.json b/data/presets/presets.json index 325bda08b..b555c5f63 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -273,7 +273,7 @@ "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"}, "amenity/weighbridge": {"icon": "fas-weight", "fields": ["ref", "operator", "access_simple", "maxweight"], "moreFields": ["address", "colour", "lit", "manufacturer", "material", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["weigh station", "weighbridge"], "tags": {"amenity": "weighbridge"}, "name": "Truck Scale"}, "area": {"fields": ["name"], "geometry": ["area"], "tags": {"area": "yes"}, "terms": ["polygon"], "name": "Area", "matchScore": 0.1}, - "area/highway": {"fields": ["name", "area/highway", "surface"], "geometry": ["area"], "terms": ["area:highway", "edge of pavement", "highway area", "highway shape", "pavement", "road shape", "street area"], "tags": {"area:highway": "*"}, "name": "Road Surface"}, + "area/highway": {"fields": ["name", "area/highway", "surface"], "geometry": ["area"], "terms": ["area:highway", "edge of pavement", "highway area", "highway shape", "pavement", "road shape", "street area"], "tags": {"area:highway": "*"}, "name": "Road Area"}, "attraction/amusement_ride": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "carnival ride"], "tags": {"attraction": "amusement_ride"}, "name": "Amusement Ride"}, "attraction/animal": {"icon": "maki-zoo", "fields": ["name", "operator", "species/wikidata"], "geometry": ["point", "area"], "terms": ["amphibian", "animal park", "aquarium", "bear", "bird", "fish", "insect", "lion", "mammal", "monkey", "penguin", "reptile", "safari", "theme park", "tiger", "zoo"], "tags": {"attraction": "animal"}, "name": "Animal Enclosure"}, "attraction/big_wheel": {"icon": "maki-amusement-park", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point"], "terms": ["ferris wheel", "theme park", "amusement ride"], "tags": {"attraction": "big_wheel"}, "name": "Big Wheel"}, @@ -718,7 +718,7 @@ "man_made/beacon": {"icon": "maki-communications-tower", "fields": ["name", "height"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"man_made": "beacon"}, "name": "Beacon", "matchScore": 0.5}, "man_made/beehive": {"icon": "fas-archive", "geometry": ["point", "area"], "fields": ["ref", "operator", "seasonal", "height", "colour"], "moreFields": ["manufacturer"], "terms": ["apiary", "beekeeper", "farm", "honey", "pollination"], "tags": {"man_made": "beehive"}, "name": "Beehive"}, "man_made/breakwater": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"}, - "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge", "matchScore": 0.85}, + "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge Area", "matchScore": 0.85}, "man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"}, "man_made/cairn": {"icon": "temaki-cairn", "geometry": ["point", "area"], "terms": ["rock pile", "stone stack", "stone pile", "càrn"], "tags": {"man_made": "cairn"}, "name": "Cairn"}, "man_made/chimney": {"icon": "temaki-chimney", "fields": ["operator", "material", "height"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"}, @@ -769,7 +769,7 @@ "man_made/tower/defensive": {"icon": "maki-castle", "geometry": ["point", "area"], "tags": {"man_made": "tower", "tower:type": "defensive"}, "reference": {"key": "tower:type", "value": "defensive"}, "terms": ["Defensive Tower", "Castle Tower"], "name": "Fortified Tower"}, "man_made/tower/minaret": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"}, "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"}, - "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel"}, + "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel Area"}, "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"}, "man_made/wastewater_plant": {"icon": "temaki-waste", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"}, "man_made/water_tower": {"icon": "maki-water", "fields": ["operator", "height"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"}, diff --git a/data/presets/presets/area/highway.json b/data/presets/presets/area/highway.json index d20b93d71..5a6c70237 100644 --- a/data/presets/presets/area/highway.json +++ b/data/presets/presets/area/highway.json @@ -19,5 +19,5 @@ "tags": { "area:highway": "*" }, - "name": "Road Surface" + "name": "Road Area" } diff --git a/data/presets/presets/man_made/bridge.json b/data/presets/presets/man_made/bridge.json index 042f9d178..8389332c2 100644 --- a/data/presets/presets/man_made/bridge.json +++ b/data/presets/presets/man_made/bridge.json @@ -29,6 +29,6 @@ "key": "man_made", "value": "bridge" }, - "name": "Bridge", + "name": "Bridge Area", "matchScore": 0.85 } diff --git a/data/presets/presets/man_made/tunnel.json b/data/presets/presets/man_made/tunnel.json index b49b8abad..d28b6c829 100644 --- a/data/presets/presets/man_made/tunnel.json +++ b/data/presets/presets/man_made/tunnel.json @@ -33,5 +33,5 @@ "underground passage", "underpass" ], - "name": "Tunnel" + "name": "Tunnel Area" } diff --git a/data/taginfo.json b/data/taginfo.json index d3b9bb0a9..e3a896dca 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -270,7 +270,7 @@ {"key": "amenity", "value": "watering_place", "description": "🄿 Animal Watering Place", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"}, {"key": "amenity", "value": "weighbridge", "description": "🄿 Truck Scale", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-weight.svg"}, {"key": "area", "value": "yes", "description": "🄿 Area, 🄿 Pedestrian Area", "object_types": ["area"]}, - {"key": "area:highway", "description": "🄿 Road Surface, 🄵 Type", "object_types": ["area"]}, + {"key": "area:highway", "description": "🄿 Road Area, 🄵 Type", "object_types": ["area"]}, {"key": "attraction", "value": "amusement_ride", "description": "🄿 Amusement Ride", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"}, {"key": "attraction", "value": "animal", "description": "🄿 Animal Enclosure", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/zoo-15.svg"}, {"key": "attraction", "value": "big_wheel", "description": "🄿 Big Wheel", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"}, @@ -695,7 +695,7 @@ {"key": "man_made", "value": "beacon", "description": "🄿 Beacon", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/communications-tower-15.svg"}, {"key": "man_made", "value": "beehive", "description": "🄿 Beehive", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-archive.svg"}, {"key": "man_made", "value": "breakwater", "description": "🄿 Breakwater", "object_types": ["way", "area"]}, - {"key": "man_made", "value": "bridge", "description": "🄿 Bridge", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bridge-15.svg"}, + {"key": "man_made", "value": "bridge", "description": "🄿 Bridge Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bridge-15.svg"}, {"key": "man_made", "value": "bunker_silo", "description": "🄿 Bunker Silo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"}, {"key": "man_made", "value": "cairn", "description": "🄿 Cairn", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/cairn.svg"}, {"key": "man_made", "value": "chimney", "description": "🄿 Chimney", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/chimney.svg"}, @@ -745,7 +745,7 @@ {"key": "tower:type", "value": "defensive", "description": "🄿 Fortified Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"}, {"key": "tower:type", "value": "minaret", "description": "🄿 Minaret", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tower.svg"}, {"key": "tower:type", "value": "observation", "description": "🄿 Observation Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tower.svg"}, - {"key": "man_made", "value": "tunnel", "description": "🄿 Tunnel", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009642.svg"}, + {"key": "man_made", "value": "tunnel", "description": "🄿 Tunnel Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009642.svg"}, {"key": "man_made", "value": "utility_pole", "description": "🄿 Utility Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/utility_pole.svg"}, {"key": "man_made", "value": "wastewater_plant", "description": "🄿 Wastewater Plant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/waste.svg"}, {"key": "man_made", "value": "water_tower", "description": "🄿 Water Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index e33c3c116..9e871b83b 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5700,7 +5700,7 @@ "terms": "polygon" }, "area/highway": { - "name": "Road Surface", + "name": "Road Area", "terms": "area:highway,edge of pavement,highway area,highway shape,pavement,road shape,street area" }, "attraction/amusement_ride": { @@ -7450,7 +7450,7 @@ "terms": "" }, "man_made/bridge": { - "name": "Bridge", + "name": "Bridge Area", "terms": "" }, "man_made/bunker_silo": { @@ -7654,7 +7654,7 @@ "terms": "lookout tower,fire tower" }, "man_made/tunnel": { - "name": "Tunnel", + "name": "Tunnel Area", "terms": "bore,dig,shaft,underground passage,underpass" }, "man_made/utility_pole": {