From 19dd609cb40ab09e75083166f6616101569f685d Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 3 Mar 2020 09:40:54 -0800 Subject: [PATCH] Update to temaki v3.19.0 (close #7409, re: #7068) --- css/35_aeroways.css | 5 ----- data/presets/presets.json | 14 +++++++------- data/presets/presets/aeroway/aerodrome.json | 2 +- data/presets/presets/aeroway/apron.json | 2 +- data/presets/presets/aeroway/gate.json | 2 +- data/presets/presets/aeroway/holding_position.json | 2 +- data/presets/presets/aeroway/parking_position.json | 2 +- data/presets/presets/aeroway/taxiway.json | 2 +- data/presets/presets/man_made/survey_point.json | 2 +- data/taginfo.json | 14 +++++++------- package.json | 2 +- 11 files changed, 22 insertions(+), 27 deletions(-) diff --git a/css/35_aeroways.css b/css/35_aeroways.css index 22b903331..982513c1a 100644 --- a/css/35_aeroways.css +++ b/css/35_aeroways.css @@ -39,11 +39,6 @@ path.line.stroke.tag-taxiway { stroke-width: 3; } -.preset-icon .icon.tag-aeroway-taxiway, -.preset-icon .icon.tag-taxiway { - color: #ff0; - fill: #666; -} path.line.stroke.tag-aeroway-taxiway, path.line.stroke.tag-taxiway { stroke: #ff0; diff --git a/data/presets/presets.json b/data/presets/presets.json index 1279a16c7..bfa939856 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -41,17 +41,17 @@ "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": "maki-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": "maki-airport", "geometry": ["area"], "terms": ["ramp"], "fields": ["ref", "surface"], "tags": {"aeroway": "apron"}, "name": "Apron"}, - "aeroway/gate": {"icon": "maki-airport", "geometry": ["point"], "fields": ["ref_aeroway_gate"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"}, + "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": "fas-warehouse", "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"], "terms": ["helicopter", "helipad", "heliport"], "tags": {"aeroway": "helipad"}, "name": "Helipad"}, - "aeroway/holding_position": {"icon": "maki-airport", "geometry": ["vertex"], "fields": ["ref"], "tags": {"aeroway": "holding_position"}, "name": "Aircraft Holding Position"}, + "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": "maki-airport", "geometry": ["vertex", "point", "line"], "fields": ["ref"], "tags": {"aeroway": "parking_position"}, "name": "Aircraft Parking Position"}, + "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": "fas-plane", "geometry": ["line"], "fields": ["ref_taxiway", "surface"], "tags": {"aeroway": "taxiway"}, "name": "Taxiway"}, + "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"}, "allotments/plot": {"geometry": ["area"], "fields": ["name", "ref"], "tags": {"allotments": "plot"}, "reference": {"key": "allotments", "value": "plot"}, "name": "Community Garden Plot"}, @@ -773,7 +773,7 @@ "man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "utility_semi", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"}, "man_made/surveillance": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"}, "man_made/surveillance/camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "moreFields": ["manufacturer"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"}, - "man_made/survey_point": {"icon": "maki-monument", "fields": ["ref", "elevation", "inscription"], "geometry": ["point", "vertex"], "terms": ["trig point", "triangulation pillar", "trigonometrical station"], "tags": {"man_made": "survey_point"}, "name": "Survey Point"}, + "man_made/survey_point": {"icon": "temaki-benchmark_disk", "fields": ["ref", "elevation", "inscription"], "geometry": ["point", "vertex"], "terms": ["trig point", "triangulation pillar", "trigonometrical station"], "tags": {"man_made": "survey_point"}, "name": "Survey Point"}, "man_made/torii": {"icon": "temaki-shinto", "fields": ["height", "material", "colour", "lit"], "moreFields": ["name", "operator", "ref"], "geometry": ["point", "vertex", "line"], "terms": ["Japanese gate", "Shinto shrine"], "tags": {"man_made": "torii"}, "name": "Torii"}, "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "building_area"], "moreFields": ["architect", "gnis/feature_id"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"}, "man_made/tower/bell_tower": {"icon": "fas-bell", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["belfry", "bell gable", "campanile", "church tower", "klockstapel"], "tags": {"man_made": "tower", "tower:type": "bell_tower"}, "reference": {"key": "tower:type", "value": "bell_tower"}, "name": "Bell Tower"}, diff --git a/data/presets/presets/aeroway/aerodrome.json b/data/presets/presets/aeroway/aerodrome.json index f5eb6e1ae..bfe7ed070 100644 --- a/data/presets/presets/aeroway/aerodrome.json +++ b/data/presets/presets/aeroway/aerodrome.json @@ -1,5 +1,5 @@ { - "icon": "maki-airport", + "icon": "temaki-airport", "geometry": [ "area", "point" diff --git a/data/presets/presets/aeroway/apron.json b/data/presets/presets/aeroway/apron.json index 304a6ffcb..40cac24ee 100644 --- a/data/presets/presets/aeroway/apron.json +++ b/data/presets/presets/aeroway/apron.json @@ -1,5 +1,5 @@ { - "icon": "maki-airport", + "icon": "temaki-planes", "geometry": [ "area" ], diff --git a/data/presets/presets/aeroway/gate.json b/data/presets/presets/aeroway/gate.json index ab805a44a..2c7a415df 100644 --- a/data/presets/presets/aeroway/gate.json +++ b/data/presets/presets/aeroway/gate.json @@ -1,5 +1,5 @@ { - "icon": "maki-airport", + "icon": "fas-plane", "geometry": [ "point" ], diff --git a/data/presets/presets/aeroway/holding_position.json b/data/presets/presets/aeroway/holding_position.json index d2f3384b9..61194b172 100644 --- a/data/presets/presets/aeroway/holding_position.json +++ b/data/presets/presets/aeroway/holding_position.json @@ -1,5 +1,5 @@ { - "icon": "maki-airport", + "icon": "temaki-plane_taxiing", "geometry": [ "vertex" ], diff --git a/data/presets/presets/aeroway/parking_position.json b/data/presets/presets/aeroway/parking_position.json index e176d0cc7..0153c7367 100644 --- a/data/presets/presets/aeroway/parking_position.json +++ b/data/presets/presets/aeroway/parking_position.json @@ -1,5 +1,5 @@ { - "icon": "maki-airport", + "icon": "temaki-plane_taxiing", "geometry": [ "vertex", "point", diff --git a/data/presets/presets/aeroway/taxiway.json b/data/presets/presets/aeroway/taxiway.json index 9e07a9593..ef5abf60d 100644 --- a/data/presets/presets/aeroway/taxiway.json +++ b/data/presets/presets/aeroway/taxiway.json @@ -1,5 +1,5 @@ { - "icon": "fas-plane", + "icon": "temaki-plane_taxiing", "geometry": [ "line" ], diff --git a/data/presets/presets/man_made/survey_point.json b/data/presets/presets/man_made/survey_point.json index c8efb8844..0c284249c 100644 --- a/data/presets/presets/man_made/survey_point.json +++ b/data/presets/presets/man_made/survey_point.json @@ -1,5 +1,5 @@ { - "icon": "maki-monument", + "icon": "temaki-benchmark_disk", "fields": [ "ref", "elevation", diff --git a/data/taginfo.json b/data/taginfo.json index bc469e9fd..4ef2ea138 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -45,17 +45,17 @@ {"key": "aerialway", "value": "rope_tow", "description": "🄿 Rope Tow Lift", "object_types": ["way"]}, {"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/mapbox/maki/icons/airport-15.svg"}, - {"key": "aeroway", "value": "apron", "description": "🄿 Apron", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"}, - {"key": "aeroway", "value": "gate", "description": "🄿 Airport Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"}, + {"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": "gate", "description": "🄿 Airport Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-plane.svg"}, {"key": "aeroway", "value": "hangar", "description": "🄿 Hangar", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"}, {"key": "aeroway", "value": "helipad", "description": "🄿 Helipad", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/heliport-15.svg"}, - {"key": "aeroway", "value": "holding_position", "description": "🄿 Aircraft Holding Position", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"}, + {"key": "aeroway", "value": "holding_position", "description": "🄿 Aircraft Holding Position", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/plane_taxiing.svg"}, {"key": "aeroway", "value": "jet_bridge", "description": "🄿 Jet Bridge", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian_walled.svg"}, - {"key": "aeroway", "value": "parking_position", "description": "🄿 Aircraft Parking Position", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"}, + {"key": "aeroway", "value": "parking_position", "description": "🄿 Aircraft Parking Position", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/plane_taxiing.svg"}, {"key": "aeroway", "value": "runway", "description": "🄿 Runway", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-plane-departure.svg"}, {"key": "aeroway", "value": "spaceport", "description": "🄿 Spaceport", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-space-shuttle.svg"}, - {"key": "aeroway", "value": "taxiway", "description": "🄿 Taxiway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-plane.svg"}, + {"key": "aeroway", "value": "taxiway", "description": "🄿 Taxiway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/plane_taxiing.svg"}, {"key": "aeroway", "value": "terminal", "description": "🄿 Airport Terminal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"}, {"key": "aeroway", "value": "windsock", "description": "🄿 Windsock", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/windsock.svg"}, {"key": "allotments", "value": "plot", "description": "🄿 Community Garden Plot", "object_types": ["area"]}, @@ -752,7 +752,7 @@ {"key": "man_made", "value": "street_cabinet", "description": "🄿 Street Cabinet", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-door-closed.svg"}, {"key": "man_made", "value": "surveillance", "description": "🄿 Surveillance", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/security_camera.svg"}, {"key": "surveillance:type", "value": "camera", "description": "🄿 Surveillance Camera, 🄵 Surveillance Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/security_camera.svg"}, - {"key": "man_made", "value": "survey_point", "description": "🄿 Survey Point", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/monument-15.svg"}, + {"key": "man_made", "value": "survey_point", "description": "🄿 Survey Point", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/benchmark_disk.svg"}, {"key": "man_made", "value": "torii", "description": "🄿 Torii", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/shinto.svg"}, {"key": "man_made", "value": "tower", "description": "🄿 Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tower.svg"}, {"key": "tower:type", "value": "bell_tower", "description": "🄿 Bell Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-bell.svg"}, diff --git a/package.json b/package.json index 7b1711f77..d3153fe15 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@fortawesome/free-brands-svg-icons": "~5.12.0", "@fortawesome/free-regular-svg-icons": "~5.12.0", "@fortawesome/free-solid-svg-icons": "~5.12.0", - "@ideditor/temaki": "~3.18.0", + "@ideditor/temaki": "~3.19.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.21.0", "@rollup/plugin-commonjs": "^11.0.1",