CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-21 19:26:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make the very close nodes validation work for any way (close #6326)

Browse Source
This commit is contained in:
Quincy Morgan
2019-05-07 12:28:59 -04:00
parent d3a53309b7
commit fd35e10aa7
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/validations/close_nodes.js
+3 -8
View File
@@ -2,7 +2,6 @@ import { operationMerge } from '../operations/index';
import { utilDisplayLabel } from '../util';
import { t } from '../util/locale';
import { validationIssue, validationIssueFix } from '../core/validation';
import { osmRoutableHighwayTagValues } from '../osm/tags';
import { geoSphericalDistance } from '../geo';
@@ -11,9 +10,7 @@ export function validationCloseNodes() {
var thresholdMeters = 0.2;
function getIssuesForWay(way, context) {
if (!way.tags.highway ||
!osmRoutableHighwayTagValues[way.tags.highway] ||
way.nodes.length < 2) return [];
if (way.nodes.length < 2) return [];
var issues = [],
nodes = context.graph().childNodes(way);
@@ -40,8 +37,6 @@ export function validationCloseNodes() {
for (var i = 0; i < parentWays.length; i++) {
var parentWay = parentWays[i];
if (!parentWay.tags.highway || !osmRoutableHighwayTagValues[parentWay.tags.highway]) continue;
var lastIndex = parentWay.nodes.length - 1;
for (var j = 0; j < parentWay.nodes.length; j++) {
if (j !== 0) {
@@ -72,7 +67,7 @@ export function validationCloseNodes() {
severity: 'warning',
message: t('issues.close_nodes.message', { way: utilDisplayLabel(way, context) }),
reference: showReference,
entityIds: [node1.id, node2.id, way.id],
entityIds: [way.id, node1.id, node2.id],
loc: node1.loc,
fixes: [
new validationIssueFix({
@@ -80,7 +75,7 @@ export function validationCloseNodes() {
title: t('issues.fix.merge_points.title'),
onClick: function() {
var entityIds = this.issue.entityIds;
var operation = operationMerge([entityIds[0], entityIds[1]], context);
var operation = operationMerge([entityIds[1], entityIds[2]], context);
operation();
}
}),