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.

Sign up for GitHub

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

Jump to bottom

automatically create pedestrian crossing line when joining sidewalk/road #10524

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

automatically create pedestrian crossing line when joining sidewalk/road #10524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions data/core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,6 +1950,7 @@ en:
title: Connect the features
connect_using_crossing:
title: Connect using a crossing
annotation: Connected using a crossing.
connect_using_ford:
title: Connect using a ford
continue_from_start:
Expand Down
117 changes: 83 additions & 34 deletions modules/validations/crossing_ways.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,28 @@ export function validationCrossingWays(context) {
if (allowsTunnel(selectedFeatureType) && !skipTunnelFix) {
fixes.push(makeAddBridgeOrTunnelFix('add_a_tunnel', 'temaki-tunnel', 'tunnel'));
}

// special case: if
// (1) we're about to join these lines with a highway=crossing node; and
// (2) one of the lines is a sidewalk
// then we will split the sidewalk and create a highway=crossing way
const isSidewalk = (
entities[0].tags.footway === 'sidewalk' ||
entities[1].tags.footway === 'sidewalk' ||
entities[0].tags.cycleway === 'sidewalk' ||
entities[1].tags.cycleway === 'sidewalk'
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this part needs more discussion, currently it only applies to footway=sidewalk and cycleway=sidewalk.

I think it would make sense to apply this autofix to any highway=X where X=crossing is a valid tag. This means it would apply to footway, cycleway, bridleway, and path

);
if (connectionTags.highway === 'crossing' && isSidewalk) {
const newAction = makeAddBridgeOrTunnelFix(
'connect_using_crossing',
'temaki-pedestrian',
'crossing',
connectionTags
);
// replace the default action with this action
fixes = fixes.filter(action => action.id !== newAction.id);
fixes.unshift(newAction);
}
}

// repositioning the features is always an option
Expand All @@ -498,7 +520,13 @@ export function validationCrossingWays(context) {
}
}

function makeAddBridgeOrTunnelFix(fixTitleID, iconName, bridgeOrTunnel){
/**
* @param {string} fixTitleID
* @param {string} iconName
* @param {'bridge' | 'tunnel' | 'crossing'} crossingType
* @param {Tags=} connectionTags
*/
function makeAddBridgeOrTunnelFix(fixTitleID, iconName, crossingType, connectionTags){
return new validationIssueFix({
icon: iconName,
title: t.append('issues.fix.' + fixTitleID + '.title'),
Expand Down Expand Up @@ -678,20 +706,35 @@ export function validationCrossingWays(context) {
});

var tags = Object.assign({}, structureWay.tags); // copy tags
if (bridgeOrTunnel === 'bridge'){
if (crossingType === 'bridge'){
tags.bridge = 'yes';
tags.layer = '1';
} else {
} else if (crossingType === 'tunnel') {
var tunnelValue = 'yes';
if (getFeatureType(structureWay, graph) === 'waterway') {
// use `tunnel=culvert` for waterways by default
tunnelValue = 'culvert';
}
tags.tunnel = tunnelValue;
tags.layer = '-1';
} else if (crossingType === 'crossing') {
// we know that the line will already have
// `footway=sidewalk` or `cycleway=sidewalk`
tags[tags.footway ? 'footway' : 'cycleway'] = 'crossing';
}

// apply the structure tags to the way
graph = actionChangeTags(structureWay.id, tags)(graph);

// for crossing, we also need to join the two lines
if (crossingType === 'crossing') {
const edgesToJoin = [
[structEndNode1.id, structEndNode2.id],
crossedEdge,
];
graph = actionConnectCrossingWays(crossingLoc, edgesToJoin, connectionTags)(graph);
}

return graph;
};

Expand All @@ -701,6 +744,42 @@ export function validationCrossingWays(context) {
});
}

/**
* @param {[number, number]} loc
* @param {[string, string][]} edges
* @param {Tags} connectionTags
*/
function actionConnectCrossingWays(loc, edges, connectionTags) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this function is not new, if you click hide whitespace changes, then the github UI understands that this function was simply deindented & moved 20 lines up.

return (graph) => {
// create the new node for the points
var node = osmNode({ loc: loc, tags: connectionTags });
graph = graph.replace(node);

var nodesToMerge = [node.id];
var mergeThresholdInMeters = 0.75;

edges.forEach(function(edge) {
var edgeNodes = [graph.entity(edge[0]), graph.entity(edge[1])];
var nearby = geoSphericalClosestNode(edgeNodes, loc);
// if there is already a suitable node nearby, use that
// use the node if node has no interesting tags or if it is a crossing node #8326
if ((!nearby.node.hasInterestingTags() || nearby.node.isCrossing()) && nearby.distance < mergeThresholdInMeters) {
nodesToMerge.push(nearby.node.id);
// else add the new node to the way
} else {
graph = actionAddMidpoint({loc: loc, edge: edge}, node)(graph);
}
});

if (nodesToMerge.length > 1) {
// if we're using nearby nodes, merge them with the new node
graph = actionMergeNodes(nodesToMerge, loc)(graph);
}

return graph;
};
}

function makeConnectWaysFix(connectionTags) {

var fixTitleID = 'connect_features';
Expand All @@ -718,38 +797,8 @@ export function validationCrossingWays(context) {
icon: fixIcon,
title: t.append('issues.fix.' + fixTitleID + '.title'),
onClick: function(context) {
var loc = this.issue.loc;
var edges = this.issue.data.edges;

context.perform(
function actionConnectCrossingWays(graph) {
// create the new node for the points
var node = osmNode({ loc: loc, tags: connectionTags });
graph = graph.replace(node);

var nodesToMerge = [node.id];
var mergeThresholdInMeters = 0.75;

edges.forEach(function(edge) {
var edgeNodes = [graph.entity(edge[0]), graph.entity(edge[1])];
var nearby = geoSphericalClosestNode(edgeNodes, loc);
// if there is already a suitable node nearby, use that
// use the node if node has no interesting tags or if it is a crossing node #8326
if ((!nearby.node.hasInterestingTags() || nearby.node.isCrossing()) && nearby.distance < mergeThresholdInMeters) {
nodesToMerge.push(nearby.node.id);
// else add the new node to the way
} else {
graph = actionAddMidpoint({loc: loc, edge: edge}, node)(graph);
}
});

if (nodesToMerge.length > 1) {
// if we're using nearby nodes, merge them with the new node
graph = actionMergeNodes(nodesToMerge, loc)(graph);
}

return graph;
},
actionConnectCrossingWays(this.issue.loc, this.issue.data.edges, connectionTags),
t('issues.fix.connect_crossing_features.annotation')
);
}
Expand Down
Loading