Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support highway=ladder #10257

Merged
merged 1 commit into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions css/30_highways.css
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ path.line.shadow.tag-highway-footway,
path.line.shadow.tag-highway-cycleway,
path.line.shadow.tag-highway-bridleway,
path.line.shadow.tag-highway-corridor,
path.line.shadow.tag-highway-ladder,
path.line.shadow.tag-highway-steps {
stroke-width: 16;
}
Expand All @@ -261,6 +262,7 @@ path.line.casing.tag-highway-footway,
path.line.casing.tag-highway-cycleway,
path.line.casing.tag-highway-bridleway,
path.line.casing.tag-highway-corridor,
path.line.casing.tag-highway-ladder,
path.line.casing.tag-highway-steps {
stroke-width: 5;
}
Expand All @@ -269,6 +271,7 @@ path.line.stroke.tag-highway-footway,
path.line.stroke.tag-highway-cycleway,
path.line.stroke.tag-highway-bridleway,
path.line.stroke.tag-highway-corridor,
path.line.stroke.tag-highway-ladder,
path.line.stroke.tag-highway-steps {
stroke-width: 3;
}
Expand Down Expand Up @@ -306,6 +309,7 @@ path.line.stroke.tag-highway-steps {
.low-zoom path.line.shadow.tag-highway-cycleway,
.low-zoom path.line.shadow.tag-highway-bridleway,
.low-zoom path.line.shadow.tag-highway-corridor,
.low-zoom path.line.shadow.tag-highway-ladder,
.low-zoom path.line.shadow.tag-highway-steps {
stroke-width: 12;
}
Expand All @@ -314,6 +318,7 @@ path.line.stroke.tag-highway-steps {
.low-zoom path.line.casing.tag-highway-cycleway,
.low-zoom path.line.casing.tag-highway-bridleway,
.low-zoom path.line.casing.tag-highway-corridor,
.low-zoom path.line.casing.tag-highway-ladder,
.low-zoom path.line.casing.tag-highway-steps {
stroke-width: 3;
}
Expand All @@ -322,6 +327,7 @@ path.line.stroke.tag-highway-steps {
.low-zoom path.line.stroke.tag-highway-cycleway,
.low-zoom path.line.stroke.tag-highway-bridleway,
.low-zoom path.line.stroke.tag-highway-corridor,
.low-zoom path.line.stroke.tag-highway-ladder,
.low-zoom path.line.stroke.tag-highway-steps {
stroke-width: 1;
}
Expand Down Expand Up @@ -565,27 +571,34 @@ path.line.stroke.tag-leisure-track,
}

/* steps */
.preset-icon .icon.tag-highway-steps {
.preset-icon .icon.tag-highway-steps,
.preset-icon .icon.tag-highway-ladder {
color: #81d25c;
fill: #fff;
}
path.line.stroke.tag-highway-steps {
path.line.stroke.tag-highway-steps,
path.line.stroke.tag-highway-ladder {
stroke-linecap: butt;
stroke-dasharray: 3, 3;
}
.low-zoom path.line.stroke.tag-highway-steps {
.low-zoom path.line.stroke.tag-highway-steps,
.low-zoom path.line.stroke.tag-highway-ladder {
stroke-dasharray: 2, 2;
}
path.line.casing.tag-highway-steps {
path.line.casing.tag-highway-steps,
path.line.casing.tag-highway-ladder {
stroke: #fff;
stroke-linecap: round;
stroke-dasharray: none;
}
path.line.stroke.tag-highway-steps,
.preset-icon-container path.line.casing.tag-highway-steps {
path.line.stroke.tag-highway-ladder,
.preset-icon-container path.line.casing.tag-highway-steps,
.preset-icon-container path.line.casing.tag-highway-ladder {
stroke: #81d25c;
}
.preset-icon-container path.line.stroke.tag-highway-steps {
.preset-icon-container path.line.stroke.tag-highway-steps,
.preset-icon-container path.line.stroke.tag-highway-ladder {
stroke: #fff;
}

Expand Down Expand Up @@ -638,6 +651,7 @@ path.line.stroke.tag-highway.tag-footway-access_aisle {
/* highway midpoints */
g.midpoint.tag-highway-corridor .fill,
g.midpoint.tag-highway-steps .fill,
g.midpoint.tag-highway-ladder .fill,
g.midpoint.tag-highway-path .fill,
g.midpoint.tag-highway-footway .fill,
g.midpoint.tag-highway-cycleway .fill,
Expand Down
28 changes: 21 additions & 7 deletions css/50_misc.css
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ path.line.shadow.tag-highway-pedestrian.tag-bridge,
path.line.shadow.tag-highway-service.tag-bridge,
path.line.shadow.tag-highway-track.tag-bridge,
path.line.shadow.tag-highway-steps.tag-bridge,
path.line.shadow.tag-highway-ladder.tag-bridge,
path.line.shadow.tag-highway-footway.tag-bridge,
path.line.shadow.tag-highway-cycleway.tag-bridge,
path.line.shadow.tag-highway-bridleway.tag-bridge {
Expand All @@ -300,6 +301,7 @@ path.line.casing.tag-highway-pedestrian.tag-bridge,
path.line.casing.tag-highway-service.tag-bridge,
path.line.casing.tag-highway-track.tag-bridge,
path.line.casing.tag-highway-steps.tag-bridge,
path.line.casing.tag-highway-ladder.tag-bridge,
path.line.casing.tag-highway-footway.tag-bridge,
path.line.casing.tag-highway-cycleway.tag-bridge,
path.line.casing.tag-highway-bridleway.tag-bridge {
Expand All @@ -314,6 +316,7 @@ path.line.casing.tag-highway-bridleway.tag-bridge {
.low-zoom path.line.shadow.tag-highway-service.tag-bridge,
.low-zoom path.line.shadow.tag-highway-track.tag-bridge,
.low-zoom path.line.shadow.tag-highway-steps.tag-bridge,
.low-zoom path.line.shadow.tag-highway-ladder.tag-bridge,
.low-zoom path.line.shadow.tag-highway-footway.tag-bridge,
.low-zoom path.line.shadow.tag-highway-cycleway.tag-bridge,
.low-zoom path.line.shadow.tag-highway-bridleway.tag-bridge {
Expand All @@ -327,6 +330,7 @@ path.line.casing.tag-highway-bridleway.tag-bridge {
.low-zoom path.line.casing.tag-highway-service.tag-bridge,
.low-zoom path.line.casing.tag-highway-track.tag-bridge,
.low-zoom path.line.casing.tag-highway-steps.tag-bridge,
.low-zoom path.line.casing.tag-highway-ladder.tag-bridge,
.low-zoom path.line.casing.tag-highway-footway.tag-bridge,
.low-zoom path.line.casing.tag-highway-cycleway.tag-bridge,
.low-zoom path.line.casing.tag-highway-bridleway.tag-bridge {
Expand Down Expand Up @@ -455,14 +459,18 @@ path.line.shadow.tag-highway.tag-status.tag-status-construction.tag-construction
path.line.shadow.tag-highway.tag-status.tag-status-construction.tag-construction-footway,
path.line.shadow.tag-highway.tag-status.tag-status-construction.tag-construction-cycleway,
path.line.shadow.tag-highway.tag-status.tag-status-construction.tag-construction-bridleway,
path.line.shadow.tag-highway.tag-status.tag-status-construction.tag-construction-steps {
path.line.shadow.tag-highway.tag-status.tag-status-construction.tag-construction-corridor,
path.line.shadow.tag-highway.tag-status.tag-status-construction.tag-construction-steps,
path.line.shadow.tag-highway.tag-status.tag-status-construction.tag-construction-ladder {
stroke-width: 15;
}
path.line.casing.tag-highway.tag-status.tag-status-construction.tag-construction-path,
path.line.casing.tag-highway.tag-status.tag-status-construction.tag-construction-footway,
path.line.casing.tag-highway.tag-status.tag-status-construction.tag-construction-cycleway,
path.line.casing.tag-highway.tag-status.tag-status-construction.tag-construction-bridleway,
path.line.casing.tag-highway.tag-status.tag-status-construction.tag-construction-steps {
path.line.casing.tag-highway.tag-status.tag-status-construction.tag-construction-corridor,
path.line.casing.tag-highway.tag-status.tag-status-construction.tag-construction-steps,
path.line.casing.tag-highway.tag-status.tag-status-construction.tag-construction-ladder {
stroke-width: 5;
stroke-linecap: butt;
stroke-dasharray: none
Expand All @@ -471,7 +479,9 @@ path.line.stroke.tag-highway.tag-status.tag-status-construction.tag-construction
path.line.stroke.tag-highway.tag-status.tag-status-construction.tag-construction-footway,
path.line.stroke.tag-highway.tag-status.tag-status-construction.tag-construction-cycleway,
path.line.stroke.tag-highway.tag-status.tag-status-construction.tag-construction-bridleway,
path.line.stroke.tag-highway.tag-status.tag-status-construction.tag-construction-steps {
path.line.stroke.tag-highway.tag-status.tag-status-construction.tag-construction-corridor,
path.line.stroke.tag-highway.tag-status.tag-status-construction.tag-construction-steps,
path.line.stroke.tag-highway.tag-status.tag-status-construction.tag-construction-ladder {
stroke-width: 4;
stroke-linecap: butt;
stroke-dasharray: 10, 10;
Expand All @@ -482,28 +492,32 @@ path.line.shadow.tag-highway.tag-status.tag-status-proposed.tag-proposed-path,
path.line.shadow.tag-highway.tag-status.tag-status-proposed.tag-proposed-footway,
path.line.shadow.tag-highway.tag-status.tag-status-proposed.tag-proposed-cycleway,
path.line.shadow.tag-highway.tag-status.tag-status-proposed.tag-proposed-bridleway,
path.line.shadow.tag-highway.tag-status.tag-status-proposed.tag-proposed-steps {
path.line.shadow.tag-highway.tag-status.tag-status-proposed.tag-proposed-steps,
path.line.shadow.tag-highway.tag-status.tag-status-proposed.tag-proposed-ladder {
stroke-width: 15;
}
path.line.casing.tag-highway.tag-status.tag-status-proposed.tag-proposed-path,
path.line.casing.tag-highway.tag-status.tag-status-proposed.tag-proposed-footway,
path.line.casing.tag-highway.tag-status.tag-status-proposed.tag-proposed-cycleway,
path.line.casing.tag-highway.tag-status.tag-status-proposed.tag-proposed-bridleway,
path.line.casing.tag-highway.tag-status.tag-status-proposed.tag-proposed-steps {
path.line.casing.tag-highway.tag-status.tag-status-proposed.tag-proposed-steps,
path.line.casing.tag-highway.tag-status.tag-status-proposed.tag-proposed-ladder {
stroke-width: 4.5;
}
path.line.casing.tag-highway.tag-bridge.tag-status.tag-status-proposed.tag-proposed-path,
path.line.casing.tag-highway.tag-bridge.tag-status.tag-status-proposed.tag-proposed-footway,
path.line.casing.tag-highway.tag-bridge.tag-status.tag-status-proposed.tag-proposed-cycleway,
path.line.casing.tag-highway.tag-bridge.tag-status.tag-status-proposed.tag-proposed-bridleway,
path.line.casing.tag-highway.tag-bridge.tag-status.tag-status-proposed.tag-proposed-steps {
path.line.casing.tag-highway.tag-bridge.tag-status.tag-status-proposed.tag-proposed-steps,
path.line.casing.tag-highway.tag-bridge.tag-status.tag-status-proposed.tag-proposed-ladder {
stroke-width: 10;
}
path.line.stroke.tag-highway.tag-status.tag-status-proposed.tag-proposed-path,
path.line.stroke.tag-highway.tag-status.tag-status-proposed.tag-proposed-footway,
path.line.stroke.tag-highway.tag-status.tag-status-proposed.tag-proposed-cycleway,
path.line.stroke.tag-highway.tag-status.tag-status-proposed.tag-proposed-bridleway,
path.line.stroke.tag-highway.tag-status.tag-status-proposed.tag-proposed-steps {
path.line.stroke.tag-highway.tag-status.tag-status-proposed.tag-proposed-steps,
path.line.stroke.tag-highway.tag-status.tag-status-proposed.tag-proposed-ladder {
stroke-width: 3;
}

Expand Down
4 changes: 2 additions & 2 deletions modules/osm/tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
export const osmLifecyclePrefixes = {
// nonexistent, might be built
proposed: true, planned: true,
// under maintentance or between groundbreaking and opening

Check failure on line 14 in modules/osm/tags.js

View workflow job for this annotation

GitHub Actions / Check for spelling errors

maintentance ==> maintenance
construction: true,
// existent but not functional
disused: true,
Expand Down Expand Up @@ -224,11 +224,11 @@
motorway: true, trunk: true, primary: true, secondary: true, tertiary: true, residential: true,
motorway_link: true, trunk_link: true, primary_link: true, secondary_link: true, tertiary_link: true,
unclassified: true, road: true, service: true, track: true, living_street: true, bus_guideway: true, busway: true,
path: true, footway: true, cycleway: true, bridleway: true, pedestrian: true, corridor: true, steps: true
path: true, footway: true, cycleway: true, bridleway: true, pedestrian: true, corridor: true, steps: true, ladder: true
};
// "highway" tag values that generally do not allow motor vehicles
export var osmPathHighwayTagValues = {
path: true, footway: true, cycleway: true, bridleway: true, pedestrian: true, corridor: true, steps: true
path: true, footway: true, cycleway: true, bridleway: true, pedestrian: true, corridor: true, steps: true, ladder: true
};

// "railway" tag values representing existing railroad tracks (purposely does not include 'abandoned')
Expand Down
2 changes: 1 addition & 1 deletion modules/osm/way.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Object.assign(osmWay.prototype, {
primary_link: 4, secondary_link: 4, tertiary_link: 4,
unclassified: 4, road: 4, living_street: 4, bus_guideway: 4, busway: 4, pedestrian: 4,
residential: 3.5, service: 3.5, track: 3, cycleway: 2.5,
bridleway: 2, corridor: 2, steps: 2, path: 1.5, footway: 1.5
bridleway: 2, corridor: 2, steps: 2, path: 1.5, footway: 1.5, ladder: 0.5,
},
railway: { // width includes ties and rail bed, not just track gauge
rail: 2.5, light_rail: 2.5, tram: 2.5, subway: 2.5,
Expand Down
1 change: 1 addition & 0 deletions modules/renderer/features.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export function rendererFeatures(context) {
'cycleway': true,
'bridleway': true,
'steps': true,
'ladder': true,
'pedestrian': true
};

Expand Down
6 changes: 6 additions & 0 deletions modules/ui/fields/access.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ export function uiFieldAccess(field, context) {
bicycle: 'no',
horse: 'no'
},
ladder: {
foot: 'yes',
motor_vehicle: 'no',
bicycle: 'no',
horse: 'no'
},
pedestrian: {
foot: 'yes',
motor_vehicle: 'no'
Expand Down
Loading