From 2d6c49b92ba39e6b25defae8e40363d123978c3c Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 21 Feb 2019 10:14:25 -0500 Subject: [PATCH] Ignore proposed features for crossings ways, almost junction, and disconnected way validations (close #5922) --- modules/validations/almost_junction.js | 5 ++++- modules/validations/crossing_ways.js | 7 ++++--- modules/validations/disconnected_way.js | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/validations/almost_junction.js b/modules/validations/almost_junction.js index d7a6fae2b..298bec323 100644 --- a/modules/validations/almost_junction.js +++ b/modules/validations/almost_junction.js @@ -24,7 +24,10 @@ export function validationAlmostJunction() { function isHighway(entity) { - return entity.type === 'way' && entity.tags.highway && entity.tags.highway !== 'no'; + return entity.type === 'way' && + entity.tags.highway && + entity.tags.highway !== 'no' && + entity.tags.highway !== 'proposed'; } function isNoexit(node) { diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js index 9693d9a0f..ac2bcdf06 100644 --- a/modules/validations/crossing_ways.js +++ b/modules/validations/crossing_ways.js @@ -56,12 +56,13 @@ export function validationCrossingWays() { // only validate certain waterway features var waterways = ['canal', 'ditch', 'drain', 'river', 'stream']; // ignore certain highway and railway features - var ignoredHighways = ['rest_area', 'services']; - var ignoredRailways = ['train_wash']; + var ignoredHighways = ['rest_area', 'services', 'proposed']; + var ignoredRailways = ['train_wash', 'proposed']; + var ignoredBuildings = ['proposed']; function getFeatureTypeForTags(tags) { - if (hasTag(tags, 'building')) return 'building'; + if (hasTag(tags, 'building') && ignoredBuildings.indexOf(tags.building) === -1) return 'building'; // don't check non-building areas if (hasTag(tags, 'area')) return null; diff --git a/modules/validations/disconnected_way.js b/modules/validations/disconnected_way.js index 5b8df9df8..5993d7663 100644 --- a/modules/validations/disconnected_way.js +++ b/modules/validations/disconnected_way.js @@ -10,7 +10,9 @@ export function validationDisconnectedWay() { function isDisconnectedHighway(entity, graph) { - if (!entity.tags.highway) return false; + if (!entity.tags.highway || + entity.tags.highway === 'no' || + entity.tags.highway === 'proposed') return false; if (entity.geometry(graph) !== 'line') return false; return graph.childNodes(entity)