From dd3f0f0cf9672d22525d28876f90d368f7aa8de8 Mon Sep 17 00:00:00 2001 From: James Kingdom Date: Tue, 28 Apr 2020 22:03:39 +0100 Subject: [PATCH 1/2] Remove corridor from path category --- modules/renderer/features.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/renderer/features.js b/modules/renderer/features.js index e3a8c27f5..35d22443a 100644 --- a/modules/renderer/features.js +++ b/modules/renderer/features.js @@ -39,8 +39,7 @@ export function rendererFeatures(context) { 'cycleway': true, 'bridleway': true, 'steps': true, - 'pedestrian': true, - 'corridor': true + 'pedestrian': true }; var past_futures = { From 316bd627647c14bd3dae997902300e9aeffdb53d Mon Sep 17 00:00:00 2001 From: James Kingdom Date: Tue, 28 Apr 2020 22:17:48 +0100 Subject: [PATCH 2/2] Make tests pass --- test/spec/renderer/features.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/spec/renderer/features.js b/test/spec/renderer/features.js index 67b0605d3..1a8e174a5 100644 --- a/test/spec/renderer/features.js +++ b/test/spec/renderer/features.js @@ -121,7 +121,6 @@ describe('iD.rendererFeatures', function() { iD.osmWay({id: 'bridleway', tags: {highway: 'bridleway'}, version: 1}), iD.osmWay({id: 'steps', tags: {highway: 'steps'}, version: 1}), iD.osmWay({id: 'pedestrian', tags: {highway: 'pedestrian'}, version: 1}), - iD.osmWay({id: 'corridor', tags: {highway: 'corridor', indoor: 'yes'}, version: 1}), // Buildings iD.osmWay({id: 'building_yes', tags: {area: 'yes', amenity: 'school', building: 'yes'}, version: 1}), @@ -136,6 +135,7 @@ describe('iD.rendererFeatures', function() { iD.osmWay({id: 'room', tags: {area: 'yes', indoor: 'room'}, version: 1}), iD.osmWay({id: 'indoor_area', tags: {area: 'yes', indoor: 'area'}, version: 1}), iD.osmWay({id: 'indoor_bar', tags: {area: 'yes', indoor: 'room', amenity: 'bar'}, version: 1}), + iD.osmWay({id: 'corridor', tags: {highway: 'corridor', indoor: 'yes'}, version: 1}), // Pistes iD.osmWay({id: 'downhill_piste', tags: {'piste:type': 'downhill'}, version: 1}), @@ -306,13 +306,13 @@ describe('iD.rendererFeatures', function() { doMatch('paths', [ 'path', 'footway', 'cycleway', 'bridleway', - 'steps', 'pedestrian', 'corridor' + 'steps', 'pedestrian' ]); dontMatch('paths', [ 'point_bar', 'motorway', 'service', 'building_yes', 'forest', 'boundary', 'boundary_member', 'water', 'railway', 'power_line', - 'motorway_construction', 'fence' + 'motorway_construction', 'fence', 'corridor' ]); });