CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-14 05:12:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update temaki to 3.1.0 (close #7084)

Browse Source 
Add Access Aisle preset and rendering (close #7083)
This commit is contained in:
Quincy Morgan
2019-12-03 13:20:50 -05:00
parent 707c275041
commit e48c469865
9 changed files with 89 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/30_highways.css
+18 -2
View File
@@ -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,
data/presets.yaml
+8
View File
@@ -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: '<translate with synonyms or related terms for ''Foot Path'', separated by commas>'
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: '<translate with synonyms or related terms for ''Access Aisle'', separated by commas>'
highway/footway/conveying:
# 'highway=footway, conveying=*'
name: Moving Walkway
data/presets/fields.json
+1
View File
@@ -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"}}},
data/presets/fields/access_aisle.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "access_aisle",
"type": "combo",
"label": "Type"
}
data/presets/presets.json
+1
View File
@@ -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"},
data/presets/presets/highway/footway/access_aisle.json
+46
View File
@@ -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"
}
data/taginfo.json
+2
View File
@@ -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"},
dist/locales/en.json
Vendored
+7
View File
@@ -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"
package.json
+1 -1
View File
@@ -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",