diff --git a/data/presets/presets.json b/data/presets/presets.json index 23ae84d6d..39f558270 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1037,14 +1037,14 @@ "railway/preserved": {"icon": "temaki-train_steam", "fields": ["railway", "{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "*", "railway:preserved": "yes"}, "addTags": {"railway": "rail", "railway:preserved": "yes"}, "reference": {"key": "railway:preserved"}, "terms": ["historic train", "preserved rail", "steam train", "tourist train"], "name": "Heritage Railway Track"}, "railway/rail": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["permanent way", "rail line", "railroad track", "railway track", "track", "train track"], "name": "Train Track"}, "railway/rail/highspeed": {"icon": "temaki-train_bullet", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Train Track"}, - "railway/railway_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "railway_crossing"}, "terms": ["diamond crossing", "flat crossing", "level junction", "railway railway crossing"], "name": "Railway-Railway Crossing"}, + "railway/railway_crossing": {"icon": "temaki-x_oblique", "geometry": ["vertex"], "tags": {"railway": "railway_crossing"}, "terms": ["diamond crossing", "flat crossing", "level junction", "railway railway crossing"], "name": "Railway-Railway Crossing"}, "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"}, "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level", "wheelchair"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"}, "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit", "underground railway"], "name": "Subway Track"}, "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"}, "railway/train_wash": {"icon": "temaki-train_wash", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"}, - "railway/tram_crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "tram_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "path tram crossing", "pedestrian crossing", "streetcar crossing", "tram path crossing", "tramway crossing", "trolley crossing"], "name": "Tram-Path Crossing"}, - "railway/tram_level_crossing": {"icon": "fas-car-side", "geometry": ["vertex"], "tags": {"railway": "tram_level_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "pedestrian crossing", "road tram crossing", "streetcar crossing", "tram road crossing", "tramway crossing", "trolley crossing"], "name": "Tram-Road Crossing"}, + "railway/tram_crossing": {"icon": "temaki-crossing_tram_striped", "geometry": ["vertex"], "tags": {"railway": "tram_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "path tram crossing", "pedestrian crossing", "streetcar crossing", "tram path crossing", "tramway crossing", "trolley crossing"], "name": "Tram-Path Crossing"}, + "railway/tram_level_crossing": {"icon": "temaki-crossing_tram_solid", "geometry": ["vertex"], "tags": {"railway": "tram_level_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "pedestrian crossing", "road tram crossing", "streetcar crossing", "tram road crossing", "tramway crossing", "trolley crossing"], "name": "Tram-Road Crossing"}, "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["electric street railway", "light rail", "streetcar", "tramway", "trolley"], "name": "Tram Track"}, "railway/yard": {"icon": "temaki-freight_car", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"}, "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"}, diff --git a/data/presets/presets/railway/railway_crossing.json b/data/presets/presets/railway/railway_crossing.json index 402169476..06c714cd9 100644 --- a/data/presets/presets/railway/railway_crossing.json +++ b/data/presets/presets/railway/railway_crossing.json @@ -1,5 +1,5 @@ { - "icon": "maki-cross", + "icon": "temaki-x_oblique", "geometry": [ "vertex" ], diff --git a/data/presets/presets/railway/tram_crossing.json b/data/presets/presets/railway/tram_crossing.json index 808738e43..3cabed05f 100644 --- a/data/presets/presets/railway/tram_crossing.json +++ b/data/presets/presets/railway/tram_crossing.json @@ -1,5 +1,5 @@ { - "icon": "temaki-pedestrian", + "icon": "temaki-crossing_tram_striped", "geometry": [ "vertex" ], diff --git a/data/presets/presets/railway/tram_level_crossing.json b/data/presets/presets/railway/tram_level_crossing.json index 90dc69d48..64e70de2a 100644 --- a/data/presets/presets/railway/tram_level_crossing.json +++ b/data/presets/presets/railway/tram_level_crossing.json @@ -1,5 +1,5 @@ { - "icon": "fas-car-side", + "icon": "temaki-crossing_tram_solid", "geometry": [ "vertex" ], diff --git a/data/taginfo.json b/data/taginfo.json index e1b25e330..042352e93 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -985,14 +985,14 @@ {"key": "railway:preserved", "value": "yes", "description": "🄿 Heritage Railway Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/train_steam.svg"}, {"key": "railway", "value": "rail", "description": "🄿 Train Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_track.svg"}, {"key": "highspeed", "value": "yes", "description": "🄿 High-Speed Train Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/train_bullet.svg"}, - {"key": "railway", "value": "railway_crossing", "description": "🄿 Railway-Railway Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cross-15.svg"}, + {"key": "railway", "value": "railway_crossing", "description": "🄿 Railway-Railway Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/x_oblique.svg"}, {"key": "railway", "value": "signal", "description": "🄿 Railway Signal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/railway_signals.svg"}, {"key": "railway", "value": "subway_entrance", "description": "🄿 Subway Entrance", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-15.svg"}, {"key": "railway", "value": "subway", "description": "🄿 Subway Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/subway.svg"}, {"key": "railway", "value": "switch", "description": "🄿 Railway Switch", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/junction.svg"}, {"key": "railway", "value": "wash", "description": "🄿 Train Wash", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/train_wash.svg"}, - {"key": "railway", "value": "tram_crossing", "description": "🄿 Tram-Path Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/pedestrian.svg"}, - {"key": "railway", "value": "tram_level_crossing", "description": "🄿 Tram-Road Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-car-side.svg"}, + {"key": "railway", "value": "tram_crossing", "description": "🄿 Tram-Path Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/crossing_tram_striped.svg"}, + {"key": "railway", "value": "tram_level_crossing", "description": "🄿 Tram-Road Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/crossing_tram_solid.svg"}, {"key": "railway", "value": "tram", "description": "🄿 Tram Track", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tram.svg"}, {"key": "railway", "value": "yard", "description": "🄿 Rail Yard", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/freight_car.svg"}, {"key": "route", "value": "ferry", "description": "🄿 Ferry Route", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ferry.svg"}, diff --git a/svg/fontawesome/fas-car-side.svg b/svg/fontawesome/fas-car-side.svg deleted file mode 100644 index a9eff2e20..000000000 --- a/svg/fontawesome/fas-car-side.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file