Changeset 17413 in josm for trunk

Timestamp:

2020-12-17T09:43:16+01:00 (4 years ago)

Author:

GerdP

Message:

see #20019: Warn about direction=forward/backward on invalid nodes.

• revert changes in DirectionNodes.java from 17412
• improve test coverage (nodes with positive ids)

Location:

trunk

Files:

• nodist/data/direction-nodes.osm (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/DirectionNodes.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/DirectionNodesTest.java (modified) (2 diffs)

trunk/nodist/data/direction-nodes.osm

@@ -1 +1 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <osm version='0.6' upload='never' generator='JOSM'>
+  <bounds minlat='53.2707779' minlon='10.4797161' maxlat='53.2820304' maxlon='10.5029633' origin='JOSM' />
   <node id='-144644' action='modify' lat='53.27687963931' lon='10.48026196529' />
   <node id='-144645' action='modify' lat='53.27753227122' lon='10.48343889291' />
@@ -255 +256 @@
     <tag k='railway:signal:minor:form' v='sign' />
     <tag k='railway:signal:position' v='in_track' />
+  </node>
+  <node id='111' version='1' lat='53.2769797' lon='10.5045821'>
+    <tag k='direction' v='forward' />
+    <tag k='josm_error_codes' v='none' />
+    <tag k='name' v='Oldtown' />
+    <tag k='traffic_sign' v='city_limit' />
+  </node>
+  <node id='112' version='1' lat='53.2752042' lon='10.5009577'>
+    <tag k='direction' v='forward' />
+    <tag k='josm_error_codes' v='4002' />
+    <tag k='name' v='Oldtown 2' />
+    <tag k='traffic_sign' v='city_limit' />
   </node>
   <way id='-102854' action='modify'>

trunk/src/org/openstreetmap/josm/data/validation/tests/DirectionNodes.java

@@ -92 +92 @@
                         marktr("Node with {0} on end of way"), tag);
             }
-        } else { // ways.size() > 1
+        } else if (ways.size() > 1) {
             builder = TestError.builder(this, Severity.OTHER, MULTIPLE_WAYS_CODE).message(DISPUTED_USE_MSG,
                     marktr("Node with {0} on a connection of multiple ways"), tag);

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DirectionNodesTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import java.util.stream.Collectors;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -29 +26 @@
      */
     @Test
-    void testMultipolygonFile() throws Exception {
+    void testDirectionsNodesTestFile() throws Exception {
         final DirectionNodes test = new DirectionNodes();
-        ValidatorTestUtils.testSampleFile("nodist/data/direction-nodes.osm",
-                ds -> ds.getNodes().stream().filter(OsmPrimitive::hasKeys).collect(Collectors.toList()),
-        null, test);
-
+        ValidatorTestUtils.testSampleFile("nodist/data/direction-nodes.osm", ds -> ds.getNodes(), null, test);
     }
-
 }