diff --git a/css/30_highways.css b/css/30_highways.css index 16022ccce..8d2c19a6d 100644 --- a/css/30_highways.css +++ b/css/30_highways.css @@ -440,6 +440,7 @@ path.line.stroke.tag-highway-bridleway { /* style for features that should have highway=footway but don't yet */ path.line.stroke.tag-crossing, +path.line.stroke.tag-footway-access_aisle, path.line.stroke.tag-public_transport-platform, path.line.stroke.tag-highway-platform, path.line.stroke.tag-railway-platform, @@ -451,7 +452,8 @@ path.line.casing.tag-highway-path, path.line.casing.tag-highway-path.tag-unpaved, path.line.casing.tag-highway-footway.tag-public_transport-platform, path.line.casing.tag-highway-footway.tag-man_made-pier, -path.line.casing.tag-highway.tag-crossing { +path.line.casing.tag-highway.tag-crossing, +path.line.casing.tag-highway.tag-footway-access_aisle { stroke: #dca; stroke-linecap: round; stroke-dasharray: none; @@ -496,7 +498,7 @@ path.stroke.tag-highway-footway.tag-footway-sidewalk, .preset-icon-container path.casing.tag-highway-footway.tag-footway-sidewalk { stroke: #d4b4b4; } -.preset-icon-container path.stroke.tag-highway-footway:not(.tag-crossing-marked):not(.tag-crossing-unmarked):not(.tag-man_made-pier):not(.tag-public_transport-platform) { +.preset-icon-container path.stroke.tag-highway-footway:not(.tag-crossing-marked):not(.tag-crossing-unmarked):not(.tag-footway-access_aisle):not(.tag-man_made-pier):not(.tag-public_transport-platform) { stroke: #fff; } @@ -599,6 +601,20 @@ path.line.stroke.tag-highway-cycleway.tag-crossing-marked { color: #446077; } +path.line.stroke.tag-highway.tag-footway-access_aisle { + stroke-dasharray: 4, 2; +} +.low-zoom path.line.stroke.tag-highway.tag-footway-access_aisle, +.preset-icon-container path.stroke.tag-highway.tag-footway-access_aisle { + stroke-dasharray: 2.5, 1.5; +} +path.line.stroke.tag-highway.tag-footway-access_aisle { + stroke: #4c4444; +} +.preset-icon .icon.tag-highway.tag-footway-access_aisle { + color: #4c4444; +} + /* highway midpoints */ g.midpoint.tag-highway-corridor .fill, diff --git a/data/presets.yaml b/data/presets.yaml index 0cd49103d..4a0fc1799 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -85,6 +85,9 @@ en: foot: Foot horse: Horses motor_vehicle: Motor Vehicles + access_aisle: + # access_aisle=* + label: Type access_simple: # access=* label: Allowed Access @@ -4843,6 +4846,11 @@ en: name: Foot Path # 'terms: hike,hiking,promenade,trackway,trail,walk' terms: '' + highway/footway/access_aisle: + # 'highway=footway, footway=access_aisle' + name: Access Aisle + # 'terms: accessible van loading zone,disabled parking access zone,handicap parking access zone,parking lot aisle,striped zone,tow zone,tow-away zone,towaway zone,wheelchair aisle' + terms: '' highway/footway/conveying: # 'highway=footway, conveying=*' name: Moving Walkway diff --git a/data/presets/fields.json b/data/presets/fields.json index 7b2289e24..6778e73a1 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1,5 +1,6 @@ { "fields": { + "access_aisle": {"key": "access_aisle", "type": "combo", "label": "Type"}, "access_simple": {"key": "access", "type": "combo", "label": "Allowed Access", "options": ["yes", "permissive", "private", "customers", "permit", "no"], "terms": ["permitted", "private", "public"]}, "access": {"keys": ["access", "foot", "motor_vehicle", "bicycle", "horse"], "reference": {"key": "access"}, "type": "access", "label": "Allowed Access", "placeholder": "Not Specified", "strings": {"types": {"access": "All", "foot": "Foot", "motor_vehicle": "Motor Vehicles", "bicycle": "Bicycles", "horse": "Horses"}, "options": {"yes": {"title": "Allowed", "description": "Access allowed by law; a right of way"}, "no": {"title": "Prohibited", "description": "Access not allowed to the general public"}, "permissive": {"title": "Permissive", "description": "Access allowed until such time as the owner revokes the permission"}, "private": {"title": "Private", "description": "Access allowed only with permission of the owner on an individual basis"}, "designated": {"title": "Designated", "description": "Access allowed according to signs or specific local laws"}, "destination": {"title": "Destination", "description": "Access allowed only to reach a destination"}, "dismount": {"title": "Dismount", "description": "Access allowed but rider must dismount"}, "permit": {"title": "Permit", "description": "Access allowed only with a valid permit or license"}}}}, "addr/interpolation": {"key": "addr:interpolation", "type": "combo", "label": "Type", "strings": {"options": {"all": "All", "even": "Even", "odd": "Odd", "alphabetic": "Alphabetic"}}}, diff --git a/data/presets/fields/access_aisle.json b/data/presets/fields/access_aisle.json new file mode 100644 index 000000000..896ae87ca --- /dev/null +++ b/data/presets/fields/access_aisle.json @@ -0,0 +1,5 @@ +{ + "key": "access_aisle", + "type": "combo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 2d537c1e3..617076607 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -505,6 +505,7 @@ "highway/footway/crossing": {"fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing"}, "addTags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "matchScore": 0.95, "searchable": false, "name": "Pedestrian Crossing"}, "highway/footway/zebra-raised": {"icon": "temaki-pedestrian_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "name": "Marked Crosswalk (Raised)", "searchable": false}, "highway/footway/zebra": {"icon": "temaki-pedestrian_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "name": "Marked Crosswalk", "searchable": false}, + "highway/footway/access_aisle": {"icon": "temaki-striped_way", "fields": ["access_aisle", "width", "surface", "tactile_paving", "access", "wheelchair"], "moreFields": ["covered", "dog", "incline", "lit", "maxweight_bridge", "name", "ref", "smoothness", "stroller", "structure"], "geometry": ["line"], "terms": ["accessible van loading zone", "disabled parking access zone", "handicap parking access zone", "parking lot aisle", "striped zone", "tow zone", "tow-away zone", "towaway zone", "wheelchair aisle"], "tags": {"highway": "footway", "footway": "access_aisle"}, "reference": {"key": "footway", "value": "access_aisle"}, "name": "Access Aisle"}, "highway/footway/conveying": {"icon": "temaki-pedestrian", "fields": ["name", "conveying", "access_simple", "lit", "width", "wheelchair"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"}, "highway/footway/marked-raised": {"icon": "temaki-pedestrian_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)"}, "highway/footway/marked": {"icon": "temaki-pedestrian_crosswalk", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "marked"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "marked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["marked foot path crossing", "marked crossing", "marked pedestrian crosswalk", "zebra crossing"], "name": "Marked Crosswalk"}, diff --git a/data/presets/presets/highway/footway/access_aisle.json b/data/presets/presets/highway/footway/access_aisle.json new file mode 100644 index 000000000..4eabe25fe --- /dev/null +++ b/data/presets/presets/highway/footway/access_aisle.json @@ -0,0 +1,46 @@ +{ + "icon": "temaki-striped_way", + "fields": [ + "access_aisle", + "width", + "surface", + "tactile_paving", + "access", + "wheelchair" + ], + "moreFields": [ + "covered", + "dog", + "incline", + "lit", + "maxweight_bridge", + "name", + "ref", + "smoothness", + "stroller", + "structure" + ], + "geometry": [ + "line" + ], + "terms": [ + "accessible van loading zone", + "disabled parking access zone", + "handicap parking access zone", + "parking lot aisle", + "striped zone", + "tow zone", + "tow-away zone", + "towaway zone", + "wheelchair aisle" + ], + "tags": { + "highway": "footway", + "footway": "access_aisle" + }, + "reference": { + "key": "footway", + "value": "access_aisle" + }, + "name": "Access Aisle" +} diff --git a/data/taginfo.json b/data/taginfo.json index fd5fce0dd..d3d202a30 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -494,6 +494,7 @@ {"key": "highway", "value": "emergency_bay", "description": "🄿 Emergency Stopping Place", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"}, {"key": "highway", "value": "footway", "description": "🄿 Foot Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"}, {"key": "footway", "value": "crossing", "description": "🄿 Pedestrian Crossing (unsearchable)", "object_types": ["way"]}, + {"key": "footway", "value": "access_aisle", "description": "🄿 Access Aisle", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/striped_way.svg"}, {"key": "conveying", "description": "🄿 Moving Walkway, 🄿 Escalator, 🄵 Escalator", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"}, {"key": "footway", "value": "sidewalk", "description": "🄿 Sidewalk", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"}, {"key": "highway", "value": "give_way", "description": "🄿 Yield Sign", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/yield.svg"}, @@ -1206,6 +1207,7 @@ {"key": "waterway", "value": "water_point", "description": "🄿 Marine Drinking Water", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"}, {"key": "waterway", "value": "waterfall", "description": "🄿 Waterfall", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waterfall-15.svg"}, {"key": "waterway", "value": "weir", "description": "🄿 Weir", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dam-15.svg"}, + {"key": "access_aisle", "description": "🄵 Type"}, {"key": "access", "description": "🄵 Allowed Access"}, {"key": "access", "value": "yes", "description": "🄵 Allowed Access"}, {"key": "access", "value": "permissive", "description": "🄵 Allowed Access"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index e8c44f24b..ea5dc900d 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2487,6 +2487,9 @@ } }, "fields": { + "access_aisle": { + "label": "Type" + }, "access_simple": { "label": "Allowed Access", "terms": "permitted,private,public" @@ -6651,6 +6654,10 @@ "highway/footway/zebra": { "name": "Marked Crosswalk" }, + "highway/footway/access_aisle": { + "name": "Access Aisle", + "terms": "accessible van loading zone,disabled parking access zone,handicap parking access zone,parking lot aisle,striped zone,tow zone,tow-away zone,towaway zone,wheelchair aisle" + }, "highway/footway/conveying": { "name": "Moving Walkway", "terms": "moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor" diff --git a/package.json b/package.json index 9fbf9af27..d04a4d281 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@fortawesome/free-brands-svg-icons": "^5.11.2", "@fortawesome/free-regular-svg-icons": "^5.11.2", "@fortawesome/free-solid-svg-icons": "^5.11.2", - "@ideditor/temaki": "~3.0.0", + "@ideditor/temaki": "~3.1.0", "@mapbox/maki": "^6.0.0", "@rollup/plugin-buble": "^0.20.0", "chai": "^4.1.0",