diff --git a/css/30_highways.css b/css/30_highways.css index cf8d41bfe..ebd866c43 100644 --- a/css/30_highways.css +++ b/css/30_highways.css @@ -413,10 +413,6 @@ path.line.casing.tag-service.tag-service { } /* unmaintained track roads */ -.preset-icon .icon.tag-highway-track { - color: #eaeaea; - fill: #c5b59f; -} path.line.stroke.tag-highway-track, path.line.stroke.tag-track { stroke: #c5b59f; diff --git a/data/presets/presets.json b/data/presets/presets.json index 44c0a5d8e..9d52c73c0 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -475,7 +475,7 @@ "highway/street_lamp": {"icon": "temaki-bulb", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"}, "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"}, "highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": ["road", "street"], "name": "Tertiary Road"}, - "highway/track": {"icon": "iD-highway-track", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", "covered"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"}, + "highway/track": {"icon": "fas-truck-monster", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", "covered"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"}, "highway/traffic_mirror": {"geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"highway": "traffic_mirror"}, "terms": ["blind spot", "convex", "corner", "curved", "roadside", "round", "safety", "sphere", "visibility"], "name": "Traffic Mirror"}, "highway/traffic_signals": {"icon": "temaki-traffic_signals", "geometry": ["vertex"], "tags": {"highway": "traffic_signals"}, "fields": ["traffic_signals", "traffic_signals/direction"], "terms": ["light", "stoplight", "traffic light"], "name": "Traffic Signals"}, "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["{highway/motorway_link}"], "moreFields": ["{highway/motorway_link}"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Trunk Link"}, diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json index 0dec007b4..bf256294c 100644 --- a/data/presets/presets/highway/track.json +++ b/data/presets/presets/highway/track.json @@ -1,5 +1,5 @@ { - "icon": "iD-highway-track", + "icon": "fas-truck-monster", "fields": [ "name", "tracktype", diff --git a/data/taginfo.json b/data/taginfo.json index 83162904a..e0975ce3c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -456,7 +456,7 @@ {"key": "highway", "value": "street_lamp", "description": "🄿 Street Lamp", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/bulb.svg?sanitize=true"}, {"key": "highway", "value": "tertiary_link", "description": "🄿 Tertiary Link", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-tertiary-link.svg?sanitize=true"}, {"key": "highway", "value": "tertiary", "description": "🄿 Tertiary Road", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-tertiary.svg?sanitize=true"}, - {"key": "highway", "value": "track", "description": "🄿 Unmaintained Track Road", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-track.svg?sanitize=true"}, + {"key": "highway", "value": "track", "description": "🄿 Unmaintained Track Road", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-truck-monster.svg?sanitize=true"}, {"key": "highway", "value": "traffic_mirror", "description": "🄿 Traffic Mirror", "object_types": ["node"]}, {"key": "highway", "value": "traffic_signals", "description": "🄿 Traffic Signals", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/traffic_signals.svg?sanitize=true"}, {"key": "highway", "value": "trunk_link", "description": "🄿 Trunk Link", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/highway-trunk-link.svg?sanitize=true"}, diff --git a/svg/fontawesome/fas-truck-monster.svg b/svg/fontawesome/fas-truck-monster.svg new file mode 100644 index 000000000..b63be124b --- /dev/null +++ b/svg/fontawesome/fas-truck-monster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/svg/iD-sprite/presets/highway-track.svg b/svg/iD-sprite/presets/highway-track.svg deleted file mode 100644 index eb76c8653..000000000 --- a/svg/iD-sprite/presets/highway-track.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -