diff --git a/data/presets.yaml b/data/presets.yaml index c82ef2d9f..c354f567c 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2917,9 +2917,9 @@ en: terms: '' aeroway/apron: # aeroway=apron - name: Apron - # 'terms: ramp' - terms: '' + name: Airport Apron + # 'terms: aircraft parking,flight line,hardstand,ramp,tarmac,taxiway' + terms: '' aeroway/gate: # aeroway=gate name: Airport Gate diff --git a/data/presets/presets.json b/data/presets/presets.json index 0995362d1..91f3ca63b 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -41,19 +41,19 @@ "aerialway/rope_tow": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "rope_tow"}, "terms": ["bugel lift", "drag lift", "handle tow", "skiing", "snowboarding", "surface cable"], "name": "Rope Tow Lift"}, "aerialway/t-bar": {"icon": "temaki-t_bar_lift", "geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "t-bar"}, "terms": ["drag lift", "skiing", "surface cable", "tbar"], "name": "T-Bar Lift"}, "aerialway/zip_line": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/duration", "maxweight", "access_simple"], "tags": {"aerialway": "zip_line"}, "terms": ["aerial runway", "canopy", "flying fox", "foefie slide", "gravity propelled aerial ropeslide", "Tyrolean traverse", "zip wire", "zip-line", "zipline", "zipwire"], "name": "Zip Line"}, - "aeroway/aerodrome": {"icon": "temaki-airport", "geometry": ["area", "point"], "fields": ["name", "iata", "icao", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["gnis/feature_id"], "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "tags": {"aeroway": "aerodrome"}, "matchScore": 0.9, "name": "Airport"}, - "aeroway/apron": {"icon": "temaki-planes", "geometry": ["area"], "terms": ["ramp"], "fields": ["ref", "surface"], "tags": {"aeroway": "apron"}, "name": "Apron"}, - "aeroway/gate": {"icon": "fas-plane", "geometry": ["point"], "fields": ["ref_aeroway_gate"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"}, - "aeroway/hangar": {"icon": "temaki-hangar", "geometry": ["area"], "fields": ["name", "building_area"], "tags": {"aeroway": "hangar"}, "addTags": {"building": "hangar", "aeroway": "hangar"}, "name": "Hangar"}, - "aeroway/helipad": {"icon": "maki-heliport", "geometry": ["area", "point"], "fields": ["name", "ref", "operator", "surface", "lit"], "moreFields": ["access_simple", "address", "charge_fee", "fee", "opening_hours", "opening_hours/covid19"], "terms": ["helicopter", "helipad", "heliport"], "tags": {"aeroway": "helipad"}, "name": "Helipad"}, - "aeroway/holding_position": {"icon": "temaki-plane_taxiing", "geometry": ["vertex"], "fields": ["ref"], "tags": {"aeroway": "holding_position"}, "name": "Aircraft Holding Position"}, - "aeroway/jet_bridge": {"icon": "temaki-pedestrian_walled", "geometry": ["line"], "fields": ["ref_aeroway_gate", "width", "access_simple", "wheelchair"], "moreFields": ["manufacturer"], "terms": ["aerobridge", "air jetty", "airbridge", "finger", "gangway", "jet way", "jetway", "passenger boarding bridge", "PBB", "portal", "skybridge", "terminal gate connector"], "tags": {"aeroway": "jet_bridge"}, "addTags": {"aeroway": "jet_bridge", "highway": "corridor"}, "matchScore": 1.05, "name": "Jet Bridge"}, - "aeroway/parking_position": {"icon": "temaki-plane_taxiing", "geometry": ["vertex", "point", "line"], "fields": ["ref"], "tags": {"aeroway": "parking_position"}, "name": "Aircraft Parking Position"}, - "aeroway/runway": {"icon": "fas-plane-departure", "geometry": ["line", "area"], "terms": ["landing strip"], "fields": ["ref_runway", "surface", "length", "width"], "tags": {"aeroway": "runway"}, "name": "Runway"}, - "aeroway/spaceport": {"icon": "fas-space-shuttle", "geometry": ["area", "point"], "fields": ["name", "operator", "access_simple", "website", "wikidata"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone"], "terms": ["cosmodrome", "rocket launch center", "rocket launch complex", "rocket launch site", "rocket range", "space port"], "tags": {"aeroway": "spaceport"}, "name": "Spaceport"}, - "aeroway/taxiway": {"icon": "temaki-plane_taxiing", "geometry": ["line"], "fields": ["ref_taxiway", "surface"], "tags": {"aeroway": "taxiway"}, "name": "Taxiway"}, - "aeroway/terminal": {"icon": "maki-airport", "geometry": ["point", "area"], "terms": ["airport", "aerodrome"], "fields": ["name", "operator", "building_area", "wheelchair", "baby_feeding"], "moreFields": ["smoking"], "tags": {"aeroway": "terminal"}, "name": "Airport Terminal"}, - "aeroway/windsock": {"icon": "temaki-windsock", "geometry": ["point", "vertex"], "fields": ["ref", "lit", "height"], "moreFields": ["manufacturer"], "tags": {"aeroway": "windsock"}, "name": "Windsock"}, + "aeroway/aerodrome": {"icon": "temaki-airport", "fields": ["name", "iata", "icao", "address", "operator", "operator/type", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["area", "point"], "tags": {"aeroway": "aerodrome"}, "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "matchScore": 0.9, "name": "Airport"}, + "aeroway/apron": {"icon": "temaki-planes", "fields": ["ref", "surface"], "geometry": ["area"], "tags": {"aeroway": "apron"}, "terms": ["aircraft parking", "flight line", "hardstand", "ramp", "tarmac", "taxiway"], "name": "Airport Apron"}, + "aeroway/gate": {"icon": "fas-plane", "fields": ["ref_aeroway_gate"], "geometry": ["point"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"}, + "aeroway/hangar": {"icon": "temaki-hangar", "fields": ["name", "building_area"], "geometry": ["area"], "tags": {"aeroway": "hangar"}, "addTags": {"building": "hangar", "aeroway": "hangar"}, "name": "Hangar"}, + "aeroway/helipad": {"icon": "maki-heliport", "fields": ["name", "ref", "operator", "surface", "lit"], "moreFields": ["access_simple", "address", "charge_fee", "fee", "opening_hours", "opening_hours/covid19"], "geometry": ["area", "point"], "tags": {"aeroway": "helipad"}, "terms": ["helicopter", "helipad", "heliport"], "name": "Helipad"}, + "aeroway/holding_position": {"icon": "temaki-plane_taxiing", "fields": ["ref"], "geometry": ["vertex"], "tags": {"aeroway": "holding_position"}, "name": "Aircraft Holding Position"}, + "aeroway/jet_bridge": {"icon": "temaki-pedestrian_walled", "fields": ["ref_aeroway_gate", "width", "access_simple", "wheelchair"], "moreFields": ["manufacturer"], "geometry": ["line"], "tags": {"aeroway": "jet_bridge"}, "addTags": {"aeroway": "jet_bridge", "highway": "corridor"}, "terms": ["aerobridge", "air jetty", "airbridge", "finger", "gangway", "jet way", "jetway", "passenger boarding bridge", "PBB", "portal", "skybridge", "terminal gate connector"], "matchScore": 1.05, "name": "Jet Bridge"}, + "aeroway/parking_position": {"icon": "temaki-plane_taxiing", "fields": ["ref"], "geometry": ["vertex", "point", "line"], "tags": {"aeroway": "parking_position"}, "name": "Aircraft Parking Position"}, + "aeroway/runway": {"icon": "fas-plane-departure", "fields": ["ref_runway", "surface", "length", "width"], "geometry": ["line", "area"], "tags": {"aeroway": "runway"}, "terms": ["landing strip"], "name": "Runway"}, + "aeroway/spaceport": {"icon": "fas-space-shuttle", "fields": ["name", "operator", "access_simple", "website", "wikidata"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone"], "geometry": ["area", "point"], "tags": {"aeroway": "spaceport"}, "terms": ["cosmodrome", "rocket launch center", "rocket launch complex", "rocket launch site", "rocket range", "space port"], "name": "Spaceport"}, + "aeroway/taxiway": {"icon": "temaki-plane_taxiing", "fields": ["ref_taxiway", "surface"], "geometry": ["line"], "tags": {"aeroway": "taxiway"}, "name": "Taxiway"}, + "aeroway/terminal": {"icon": "maki-airport", "fields": ["name", "operator", "building_area", "wheelchair", "baby_feeding"], "moreFields": ["air_conditioning", "smoking"], "geometry": ["point", "area"], "tags": {"aeroway": "terminal"}, "terms": ["airport", "aerodrome"], "name": "Airport Terminal"}, + "aeroway/windsock": {"icon": "temaki-windsock", "fields": ["ref", "lit", "height"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"aeroway": "windsock"}, "name": "Windsock"}, "allotments/plot": {"icon": "temaki-garden_bed", "geometry": ["area"], "fields": ["name", "ref"], "tags": {"allotments": "plot"}, "reference": {"key": "allotments", "value": "plot"}, "name": "Community Garden Plot"}, "amenity/bus_station": {"icon": "temaki-bus", "fields": ["name", "building_area", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "bus_station"}, "name": "Bus Station / Terminal", "searchable": false, "replacement": "public_transport/station_bus"}, "amenity/coworking_space": {"icon": "maki-commercial", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "coworking_space"}, "name": "Coworking Space", "searchable": false}, diff --git a/data/presets/presets/aeroway/aerodrome.json b/data/presets/presets/aeroway/aerodrome.json index bfe7ed070..d5a108a88 100644 --- a/data/presets/presets/aeroway/aerodrome.json +++ b/data/presets/presets/aeroway/aerodrome.json @@ -1,21 +1,30 @@ { "icon": "temaki-airport", - "geometry": [ - "area", - "point" - ], "fields": [ "name", "iata", "icao", + "address", "operator", + "operator/type", "internet_access", "internet_access/fee", "internet_access/ssid" ], "moreFields": [ - "gnis/feature_id" + "email", + "fax", + "gnis/feature_id", + "phone", + "website" ], + "geometry": [ + "area", + "point" + ], + "tags": { + "aeroway": "aerodrome" + }, "terms": [ "aerodrome", "aeroway", @@ -24,9 +33,6 @@ "jet", "plane" ], - "tags": { - "aeroway": "aerodrome" - }, "matchScore": 0.9, "name": "Airport" } diff --git a/data/presets/presets/aeroway/apron.json b/data/presets/presets/aeroway/apron.json index 40cac24ee..f634eb33f 100644 --- a/data/presets/presets/aeroway/apron.json +++ b/data/presets/presets/aeroway/apron.json @@ -1,17 +1,22 @@ { "icon": "temaki-planes", - "geometry": [ - "area" - ], - "terms": [ - "ramp" - ], "fields": [ "ref", "surface" ], + "geometry": [ + "area" + ], "tags": { "aeroway": "apron" }, - "name": "Apron" + "terms": [ + "aircraft parking", + "flight line", + "hardstand", + "ramp", + "tarmac", + "taxiway" + ], + "name": "Airport Apron" } diff --git a/data/presets/presets/aeroway/gate.json b/data/presets/presets/aeroway/gate.json index 2c7a415df..48c4b0afb 100644 --- a/data/presets/presets/aeroway/gate.json +++ b/data/presets/presets/aeroway/gate.json @@ -1,11 +1,11 @@ { "icon": "fas-plane", - "geometry": [ - "point" - ], "fields": [ "ref_aeroway_gate" ], + "geometry": [ + "point" + ], "tags": { "aeroway": "gate" }, diff --git a/data/presets/presets/aeroway/hangar.json b/data/presets/presets/aeroway/hangar.json index 8ddab405d..deb1f3572 100644 --- a/data/presets/presets/aeroway/hangar.json +++ b/data/presets/presets/aeroway/hangar.json @@ -1,12 +1,12 @@ { "icon": "temaki-hangar", - "geometry": [ - "area" - ], "fields": [ "name", "building_area" ], + "geometry": [ + "area" + ], "tags": { "aeroway": "hangar" }, diff --git a/data/presets/presets/aeroway/helipad.json b/data/presets/presets/aeroway/helipad.json index 2ab31c271..af170afa6 100644 --- a/data/presets/presets/aeroway/helipad.json +++ b/data/presets/presets/aeroway/helipad.json @@ -1,9 +1,5 @@ { "icon": "maki-heliport", - "geometry": [ - "area", - "point" - ], "fields": [ "name", "ref", @@ -19,13 +15,17 @@ "opening_hours", "opening_hours/covid19" ], + "geometry": [ + "area", + "point" + ], + "tags": { + "aeroway": "helipad" + }, "terms": [ "helicopter", "helipad", "heliport" ], - "tags": { - "aeroway": "helipad" - }, "name": "Helipad" } diff --git a/data/presets/presets/aeroway/holding_position.json b/data/presets/presets/aeroway/holding_position.json index 61194b172..2d666d39d 100644 --- a/data/presets/presets/aeroway/holding_position.json +++ b/data/presets/presets/aeroway/holding_position.json @@ -1,11 +1,11 @@ { "icon": "temaki-plane_taxiing", - "geometry": [ - "vertex" - ], "fields": [ "ref" ], + "geometry": [ + "vertex" + ], "tags": { "aeroway": "holding_position" }, diff --git a/data/presets/presets/aeroway/jet_bridge.json b/data/presets/presets/aeroway/jet_bridge.json index b145a3ce8..08157c9ac 100644 --- a/data/presets/presets/aeroway/jet_bridge.json +++ b/data/presets/presets/aeroway/jet_bridge.json @@ -1,8 +1,5 @@ { "icon": "temaki-pedestrian_walled", - "geometry": [ - "line" - ], "fields": [ "ref_aeroway_gate", "width", @@ -12,6 +9,16 @@ "moreFields": [ "manufacturer" ], + "geometry": [ + "line" + ], + "tags": { + "aeroway": "jet_bridge" + }, + "addTags": { + "aeroway": "jet_bridge", + "highway": "corridor" + }, "terms": [ "aerobridge", "air jetty", @@ -26,13 +33,6 @@ "skybridge", "terminal gate connector" ], - "tags": { - "aeroway": "jet_bridge" - }, - "addTags": { - "aeroway": "jet_bridge", - "highway": "corridor" - }, "matchScore": 1.05, "name": "Jet Bridge" } diff --git a/data/presets/presets/aeroway/parking_position.json b/data/presets/presets/aeroway/parking_position.json index 0153c7367..46b562352 100644 --- a/data/presets/presets/aeroway/parking_position.json +++ b/data/presets/presets/aeroway/parking_position.json @@ -1,13 +1,13 @@ { "icon": "temaki-plane_taxiing", + "fields": [ + "ref" + ], "geometry": [ "vertex", "point", "line" ], - "fields": [ - "ref" - ], "tags": { "aeroway": "parking_position" }, diff --git a/data/presets/presets/aeroway/runway.json b/data/presets/presets/aeroway/runway.json index 80c6cc066..5f4086010 100644 --- a/data/presets/presets/aeroway/runway.json +++ b/data/presets/presets/aeroway/runway.json @@ -1,20 +1,20 @@ { "icon": "fas-plane-departure", - "geometry": [ - "line", - "area" - ], - "terms": [ - "landing strip" - ], "fields": [ "ref_runway", "surface", "length", "width" ], + "geometry": [ + "line", + "area" + ], "tags": { "aeroway": "runway" }, + "terms": [ + "landing strip" + ], "name": "Runway" } diff --git a/data/presets/presets/aeroway/spaceport.json b/data/presets/presets/aeroway/spaceport.json index 437d81816..7255ed1fe 100644 --- a/data/presets/presets/aeroway/spaceport.json +++ b/data/presets/presets/aeroway/spaceport.json @@ -1,9 +1,5 @@ { "icon": "fas-space-shuttle", - "geometry": [ - "area", - "point" - ], "fields": [ "name", "operator", @@ -19,6 +15,13 @@ "internet_access/ssid", "phone" ], + "geometry": [ + "area", + "point" + ], + "tags": { + "aeroway": "spaceport" + }, "terms": [ "cosmodrome", "rocket launch center", @@ -27,8 +30,5 @@ "rocket range", "space port" ], - "tags": { - "aeroway": "spaceport" - }, "name": "Spaceport" } diff --git a/data/presets/presets/aeroway/taxiway.json b/data/presets/presets/aeroway/taxiway.json index ef5abf60d..0f978d22c 100644 --- a/data/presets/presets/aeroway/taxiway.json +++ b/data/presets/presets/aeroway/taxiway.json @@ -1,12 +1,12 @@ { "icon": "temaki-plane_taxiing", - "geometry": [ - "line" - ], "fields": [ "ref_taxiway", "surface" ], + "geometry": [ + "line" + ], "tags": { "aeroway": "taxiway" }, diff --git a/data/presets/presets/aeroway/terminal.json b/data/presets/presets/aeroway/terminal.json index bc8ffd60c..2d66d45c9 100644 --- a/data/presets/presets/aeroway/terminal.json +++ b/data/presets/presets/aeroway/terminal.json @@ -1,13 +1,5 @@ { "icon": "maki-airport", - "geometry": [ - "point", - "area" - ], - "terms": [ - "airport", - "aerodrome" - ], "fields": [ "name", "operator", @@ -16,10 +8,19 @@ "baby_feeding" ], "moreFields": [ + "air_conditioning", "smoking" ], + "geometry": [ + "point", + "area" + ], "tags": { "aeroway": "terminal" }, + "terms": [ + "airport", + "aerodrome" + ], "name": "Airport Terminal" } diff --git a/data/presets/presets/aeroway/windsock.json b/data/presets/presets/aeroway/windsock.json index 11d057c50..2869ad9b0 100644 --- a/data/presets/presets/aeroway/windsock.json +++ b/data/presets/presets/aeroway/windsock.json @@ -1,9 +1,5 @@ { "icon": "temaki-windsock", - "geometry": [ - "point", - "vertex" - ], "fields": [ "ref", "lit", @@ -12,6 +8,10 @@ "moreFields": [ "manufacturer" ], + "geometry": [ + "point", + "vertex" + ], "tags": { "aeroway": "windsock" }, diff --git a/data/taginfo.json b/data/taginfo.json index fc0422b4e..e2687f2a4 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -46,7 +46,7 @@ {"key": "aerialway", "value": "t-bar", "description": "🄿 T-Bar Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/t_bar_lift.svg"}, {"key": "aerialway", "value": "zip_line", "description": "🄿 Zip Line", "object_types": ["way"]}, {"key": "aeroway", "value": "aerodrome", "description": "🄿 Airport", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/airport.svg"}, - {"key": "aeroway", "value": "apron", "description": "🄿 Apron", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/planes.svg"}, + {"key": "aeroway", "value": "apron", "description": "🄿 Airport Apron", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/planes.svg"}, {"key": "aeroway", "value": "gate", "description": "🄿 Airport Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-plane.svg"}, {"key": "aeroway", "value": "hangar", "description": "🄿 Hangar", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/hangar.svg"}, {"key": "aeroway", "value": "helipad", "description": "🄿 Helipad", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/heliport-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 17f0c9e33..fff08dd1e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5128,8 +5128,8 @@ "terms": "aerodrome,aeroway,airplane,airport,jet,plane" }, "aeroway/apron": { - "name": "Apron", - "terms": "ramp" + "name": "Airport Apron", + "terms": "aircraft parking,flight line,hardstand,ramp,tarmac,taxiway" }, "aeroway/gate": { "name": "Airport Gate",