From 2e6799ac605479692f6526fba09b9080ebbb2a4b Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sat, 4 Aug 2018 21:55:14 -0400 Subject: [PATCH] Don't reverse cardinal direction roles on relations anymore re: https://github.com/openstreetmap/iD/pull/2004#issuecomment-407995998 Per thread https://twitter.com/bhousel/status/1025805098063208448 JOSM has stopped doing this too --- modules/actions/reverse.js | 6 +----- test/spec/actions/reverse.js | 12 ++++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/modules/actions/reverse.js b/modules/actions/reverse.js index d1181c5fc..abbfcb88a 100644 --- a/modules/actions/reverse.js +++ b/modules/actions/reverse.js @@ -40,11 +40,7 @@ export function actionReverse(wayID, options) { forward: 'backward', backward: 'forward', forwards: 'backward', - backwards: 'forward', - north: 'south', - south: 'north', - east: 'west', - west: 'east' + backwards: 'forward' }; var onewayReplacements = { yes: '-1', diff --git a/test/spec/actions/reverse.js b/test/spec/actions/reverse.js index 348179005..df1fd5ea9 100644 --- a/test/spec/actions/reverse.js +++ b/test/spec/actions/reverse.js @@ -286,7 +286,7 @@ describe('iD.actionReverse', function () { .entity('backwards').members[0].role).to.eql('forward', 'backwards'); }); - it('transforms role=north ⟺ role=south in member relations', function () { + it('doesn\'t transform role=north ⟺ role=south in member relations', function () { var graph = iD.coreGraph([ iD.osmNode({id: 'n1'}), iD.osmNode({id: 'n2'}), @@ -296,12 +296,12 @@ describe('iD.actionReverse', function () { ]); expect(iD.actionReverse('w1')(graph) - .entity('north').members[0].role).to.eql('south', 'north'); + .entity('north').members[0].role).to.eql('north', 'north'); expect(iD.actionReverse('w1')(graph) - .entity('south').members[0].role).to.eql('north', 'south'); + .entity('south').members[0].role).to.eql('south', 'south'); }); - it('transforms role=east ⟺ role=west in member relations', function () { + it('doesn\'t transform role=east ⟺ role=west in member relations', function () { var graph = iD.coreGraph([ iD.osmNode({id: 'n1'}), iD.osmNode({id: 'n2'}), @@ -311,9 +311,9 @@ describe('iD.actionReverse', function () { ]); expect(iD.actionReverse('w1')(graph) - .entity('east').members[0].role).to.eql('west', 'east'); + .entity('east').members[0].role).to.eql('east', 'east'); expect(iD.actionReverse('w1')(graph) - .entity('west').members[0].role).to.eql('east', 'west'); + .entity('west').members[0].role).to.eql('west', 'west'); }); it('ignores directionless roles in member relations', function () {