Changeset 11061 in josm for trunk/test/unit/org/openstreetmap/josm

Timestamp:

2016-09-27T20:47:19+02:00 (8 years ago)

Author:

simon04

Message:

fix #10260 - Warning on reversing ways with direction-dependent nodes

File:

• trunk/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.corrector;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
 
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.data.correction.TagCorrection;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -39 +49 @@
             assertSwitch(new Tag(k, "something"), new Tag(k, "something"));
         }
+        // direction=forward/backward/...
+        assertSwitch(new Tag("direction", "forward"), new Tag("direction", "backward"));
+        assertSwitch(new Tag("direction", "backward"), new Tag("direction", "forward"));
+        assertSwitch(new Tag("direction", "north"), new Tag("direction", "south"));
+        assertSwitch(new Tag("direction", "NNE"), new Tag("direction", "SSW"));
+        assertSwitch(new Tag("direction", "270"), new Tag("direction", "90"));
+        assertSwitch(new Tag("direction", "135"), new Tag("direction", "315"));
+        assertSwitch(new Tag("direction", "337"), new Tag("direction", "157"));
         // :left/:right with oneway (see #10977)
         assertSwitch(new Tag("cycleway:left:oneway", "-1"), new Tag("cycleway:right:oneway", "yes"));
@@ -99 +117 @@
         Assert.assertEquals(ReverseWayTagCorrector.TagSwitcher.apply(oldTag), newTag);
     }
+
+    /**
+     * Test tag correction on way nodes
+     */
+    @Test
+    public void testSwitchingWayNodes() {
+        final OsmPrimitive n1 = OsmUtils.createPrimitive("node");
+        final OsmPrimitive n2 = OsmUtils.createPrimitive("node direction=SSW");
+        final OsmPrimitive n3 = OsmUtils.createPrimitive("node");
+        final Way w = new Way();
+        Stream.of(n1, n2, n3).map(Node.class::cast).forEach(w::addNode);
+        final Map<OsmPrimitive, List<TagCorrection>> tagCorrections = ReverseWayTagCorrector.getTagCorrectionsMap(w);
+        Assert.assertEquals(1, tagCorrections.size());
+        Assert.assertEquals(Collections.singleton(n2),
+                tagCorrections.keySet());
+        Assert.assertEquals(Collections.singletonList(new TagCorrection("direction", "SSW", "direction", "NNE")),
+                tagCorrections.values().iterator().next());
+    }
 }