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

Move directions code from vertices to node.js

Browse Source
This commit is contained in:
Bryan Housel
2017-12-09 12:53:08 -05:00
parent 42043b2ce1
commit 34c98b94e6
2 changed files with 86 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/osm/node.js
+75 -1
View File
@@ -3,7 +3,7 @@ import _map from 'lodash-es/map';
import _some from 'lodash-es/some';
import { osmEntity } from './entity';
import { geoExtent } from '../geo';
import { geoAngle, geoExtent } from '../geo';
export function osmNode() {
@@ -49,6 +49,80 @@ _extend(osmNode.prototype, {
},
// Inspect tags and geometry to determine which direction(s) this node/vertex points
directions: function(resolver, projection) {
var val;
if (this.isHighwayIntersection(resolver) && (this.tags.stop || '').toLowerCase() === 'all') {
// all-way stop tag on a highway intersection
val = 'all';
} else {
// direction tag
val = (
this.tags['railway:signal:direction'] ||
this.tags['traffic_signals:direction'] ||
this.tags.direction ||
''
).toLowerCase();
}
// swap cardinal for numeric directions
var cardinal = {
north: 0, n: 0,
northnortheast: 22, nne: 22,
northeast: 45, ne: 45,
eastnortheast: 67, ene: 67,
east: 90, e: 90,
eastsoutheast: 112, ese: 112,
southeast: 135, se: 135,
southsoutheast: 157, sse: 157,
south: 180, s: 180,
southsouthwest: 202, ssw: 202,
southwest: 225, sw: 225,
westsouthwest: 247, wsw: 247,
west: 270, w: 270,
westnorthwest: 292, wnw: 292,
northwest: 315, nw: 315,
northnorthwest: 337, nnw: 337
};
if (cardinal[val] !== undefined) {
val = cardinal[val];
}
// if direction is numeric, return early
if (val !== '' && !isNaN(+val)) {
return [(+val)];
}
var lookBackward =
(this.tags['traffic_sign:backward'] || val === 'backward' || val === 'both' || val === 'all');
var lookForward =
(this.tags['traffic_sign:forward'] || val === 'forward' || val === 'both' || val === 'all');
if (!lookForward && !lookBackward) return null;
var nodeIds = {};
resolver.parentWays(this).forEach(function(parent) {
var nodes = parent.nodes;
for (var i = 0; i < nodes.length; i++) {
if (nodes[i] === this.id) { // match current entity
if (lookForward && i > 0) {
nodeIds[nodes[i - 1]] = true; // look back to prev node
}
if (lookBackward && i < nodes.length - 1) {
nodeIds[nodes[i + 1]] = true; // look ahead to next node
}
}
}
}, this);
return Object.keys(nodeIds).map(function(nodeId) {
// +90 because geoAngle returns angle from X axis, not Y (north)
return (geoAngle(this, resolver.entity(nodeId), projection) * (180 / Math.PI)) + 90;
}, this);
},
isEndpoint: function(resolver) {
return resolver.transient(this, 'isEndpoint', function() {
var id = this.id;
modules/svg/vertices.js
+11 -80
View File
@@ -1,7 +1,6 @@
import _values from 'lodash-es/values';
import { dataFeatureIcons } from '../../data';
import { geoAngle } from '../geo';
import { osmEntity } from '../osm';
import { svgPointTransform } from './index';
@@ -14,7 +13,7 @@ export function svgVertices(projection, context) {
fill: [1, 1.5, 1.5, 1.5]
};
var hover;
var _hover;
function siblingAndChildVertices(ids, graph, extent) {
@@ -76,87 +75,19 @@ export function svgVertices(projection, context) {
function getDirections(entity) {
if (entity.id in directions) return directions[entity.id];
var dir = '';
if (entity.isHighwayIntersection(graph) && (entity.tags.stop || '').toLowerCase() === 'all') {
// all-way stop tag on a highway intersection
dir = 'all';
} else {
// direction tag
dir = (
entity.tags['railway:signal:direction'] ||
entity.tags['traffic_signals:direction'] ||
entity.tags.direction ||
''
).toLowerCase();
}
// swap cardinal for numeric directions
var cardinal = {
north: 0, n: 0,
northnortheast: 22, nne: 22,
northeast: 45, ne: 45,
eastnortheast: 67, ene: 67,
east: 90, e: 90,
eastsoutheast: 112, ese: 112,
southeast: 135, se: 135,
southsoutheast: 157, sse: 157,
south: 180, s: 180,
southsouthwest: 202, ssw: 202,
southwest: 225, sw: 225,
westsouthwest: 247, wsw: 247,
west: 270, w: 270,
westnorthwest: 292, wnw: 292,
northwest: 315, nw: 315,
northnorthwest: 337, nnw: 337
};
if (cardinal[dir] !== undefined) {
dir = cardinal[dir];
}
// if direction tag is numeric, return early
if (dir !== '' && !isNaN(+dir)) {
directions[entity.id] = [(+dir) - 90]; // -90 because marker is oriented along Y not X
return directions[entity.id];
}
// determine which direction(s) this feature points
var goBackward =
(entity.tags['traffic_sign:backward'] || dir === 'backward' || dir === 'both' || dir === 'all');
var goForward =
(entity.tags['traffic_sign:forward'] || dir === 'forward' || dir === 'both' || dir === 'all');
if (!goForward && !goBackward) return;
var nodeIds = {};
graph.parentWays(entity).forEach(function (parent) {
var nodes = parent.nodes;
for (var i = 0; i < nodes.length; i++) {
if (nodes[i] === entity.id) { // match current entity
if (goForward && i > 0) {
nodeIds[nodes[i - 1]] = true; // viewfield points back to prev node
}
if (goBackward && i < nodes.length - 1) {
nodeIds[nodes[i + 1]] = true; // viewfield points ahead to next node
}
}
}
});
var dirAngles = Object.keys(nodeIds).map(function (nodeId) {
return geoAngle(entity, graph.entity(nodeId), projection) * (180 / Math.PI);
});
directions[entity.id] = dirAngles;
return directions[entity.id];
var angles = entity.directions(graph, projection);
if (angles) directions[entity.id] = angles;
return angles;
}
function setClass(klass) {
return function(entity) {
this.setAttribute('class', 'node vertex ' + klass + ' ' + entity.id);
};
}
function updateAttributes(selection) {
['shadow','stroke','fill'].forEach(function(klass) {
var rads = radiuses[klass];
@@ -185,7 +116,7 @@ export function svgVertices(projection, context) {
selection.selectAll('use')
.attr('visibility', (z === 0 ? 'hidden' : null));
selection.selectAll('.directiongroup')
selection.selectAll('.viewfieldgroup')
.attr('visibility', (zoom < 18 ? 'hidden' : null));
}
@@ -210,7 +141,7 @@ export function svgVertices(projection, context) {
.enter()
.append('path')
.attr('class', 'viewfield')
.attr('transform', function(d) { return 'rotate(' + (d + 90) + ')'; }) // +90 because marker is oriented along Y not X
.attr('transform', function(d) { return 'rotate(' + d + ')'; })
.attr('d', 'M0,0H0')
.attr('marker-start', 'url(#viewfield-marker)');
@@ -286,7 +217,7 @@ export function svgVertices(projection, context) {
function drawHover(selection, graph, extent, zoom) {
var hovered = hover ? siblingAndChildVertices([hover.id], graph, extent) : {};
var hovered = _hover ? siblingAndChildVertices([_hover.id], graph, extent) : {};
var layer = selection.selectAll('.layer-hit');
layer.selectAll('g.vertex.vertex-hover')
@@ -295,8 +226,8 @@ export function svgVertices(projection, context) {
drawVertices.drawHover = function(selection, graph, target, extent, zoom) {
if (target === hover) return;
hover = target;
if (target === _hover) return;
_hover = target;
drawHover(selection, graph, extent, zoom);
};