removed applyNodeTags as node handling is broken and needs a proper fix

Author: Peter

core/src/main/java/com/graphhopper/reader/OSMReader.java

@@ -104,11 +104,10 @@ public class OSMReader implements DataReader
     private LongIntMap osmNodeIdToInternalNodeMap;
     private TLongLongHashMap osmNodeIdToNodeFlagsMap;
     private TLongLongHashMap osmWayIdToRouteWeightMap;
-    // stores osm ids used by relations to identify which edge ids needs to be mapped later
+    // stores osm way ids used by relations to identify which edge ids needs to be mapped later
     private TLongHashSet osmIdStoreRequiredSet = new TLongHashSet();
-    ; 
-    private TIntLongMap edgeIdToOsmidMap;
-    private final TLongList barrierNodeIDs = new TLongArrayList();
+    private TIntLongMap edgeIdToOsmIdMap;
+    private final TLongList barrierNodeIds = new TLongArrayList();
     protected PillarInfo pillarInfo;
     private final DistanceCalc distCalc = new DistanceCalcEarth();
     private final DistanceCalc3D distCalc3D = new DistanceCalc3D();
@@ -117,7 +116,7 @@ public class OSMReader implements DataReader
     private int nextTowerId = 0;
     private int nextPillarId = 0;
     // negative but increasing to avoid clash with custom created OSM files
-    private long newUniqueOSMId = -Long.MAX_VALUE;
+    private long newUniqueOsmId = -Long.MAX_VALUE;
     private ElevationProvider eleProvider = ElevationProvider.NOOP;
     private boolean exitOnlyPillarNodeException = true;
     private File osmFile;
@@ -236,10 +235,10 @@ private TLongSet getOsmIdStoreRequiredSet()
 
     private TIntLongMap getEdgeIdToOsmidMap()
     {
-        if (edgeIdToOsmidMap == null)
-            edgeIdToOsmidMap = new TIntLongHashMap(getOsmIdStoreRequiredSet().size());
+        if (edgeIdToOsmIdMap == null)
+            edgeIdToOsmIdMap = new TIntLongHashMap(getOsmIdStoreRequiredSet().size());
 
-        return edgeIdToOsmidMap;
+        return edgeIdToOsmIdMap;
     }
 
     /**
@@ -411,9 +410,6 @@ void processWay( OSMWay way )
                     // remember barrier for processing the way behind it
                     lastBarrier = i;
                 }
-            } else if (nodeFlags < 0)
-            {
-                wayFlags = encodingManager.applyNodeFlags(wayFlags, -nodeFlags);
             }
         }
 
@@ -790,7 +786,7 @@ private int handlePillarNode( int tmpNode, long osmId, PointList pointList, bool
         return (int) tmpNode;
     }
 
-    void finishedReading()
+    protected void finishedReading()
     {
         printInfo("way");
         pillarInfo.clear();
@@ -799,7 +795,7 @@ void finishedReading()
         osmNodeIdToNodeFlagsMap = null;
         osmWayIdToRouteWeightMap = null;
         osmIdStoreRequiredSet = null;
-        edgeIdToOsmidMap = null;
+        edgeIdToOsmIdMap = null;
     }
 
     /**
@@ -827,7 +823,7 @@ long addBarrierNode( long nodeId )
 
     private long createNewNodeId()
     {
-        return newUniqueOSMId++;
+        return newUniqueOsmId++;
     }
 
     /**
@@ -838,10 +834,10 @@ Collection<EdgeIteratorState> addBarrierEdge( long fromId, long toId, long flags
         // clear barred directions from routing flags
         flags &= ~nodeFlags;
         // add edge
-        barrierNodeIDs.clear();
-        barrierNodeIDs.add(fromId);
-        barrierNodeIDs.add(toId);
-        return addOSMWay(barrierNodeIDs, flags, wayOsmId);
+        barrierNodeIds.clear();
+        barrierNodeIds.add(fromId);
+        barrierNodeIds.add(toId);
+        return addOSMWay(barrierNodeIds, flags, wayOsmId);
     }
 
     /**
@@ -893,12 +889,12 @@ boolean isInBounds( OSMNode node )
     /**
      * Maps OSM IDs (long) to internal node IDs (int)
      */
-    LongIntMap getNodeMap()
+    protected LongIntMap getNodeMap()
     {
         return osmNodeIdToInternalNodeMap;
     }
 
-    TLongLongMap getNodeFlagsMap()
+    protected TLongLongMap getNodeFlagsMap()
     {
         return osmNodeIdToNodeFlagsMap;
     }

core/src/main/java/com/graphhopper/routing/util/AbstractFlagEncoder.java

@@ -208,14 +208,6 @@ public long handleNodeTags( OSMNode node )
         return 0;
     }
 
-    /**
-     * This method is called after determining the node flags and way flags.
-     */
-    public long applyNodeFlags( long wayFlags, long nodeFlags )
-    {
-        return nodeFlags | wayFlags;
-    }
-
     @Override
     public boolean isForward( long flags )
     {

core/src/main/java/com/graphhopper/routing/util/EncodingManager.java

@@ -395,20 +395,6 @@ public long handleNodeTags( OSMNode node )
         return flags;
     }
 
-    /**
-     * When parsing the ways we have the node flags as long variable encoded in analyzeNode.
-     */
-    public long applyNodeFlags( long wayFlags, long nodeFlags )
-    {
-        long flags = 0;
-        for (AbstractFlagEncoder encoder : edgeEncoders)
-        {
-            flags |= encoder.applyNodeFlags(wayFlags & encoder.getWayBitMask(), nodeFlags);
-        }
-
-        return flags;
-    }
-
     private static int determineRequiredBits( int value )
     {
         int numberOfBits = 0;

core/src/test/java/com/graphhopper/reader/OSMReaderTest.java

@@ -580,16 +580,6 @@ public long handleNodeTags( OSMNode node )
                     return -objectEncoder.setValue(0, 1);
                 return 0;
             }
-
-            @Override
-            public long applyNodeFlags( long wayFlags, long nodeFlags )
-            {
-                double speed = getSpeed(wayFlags);
-                if (objectEncoder.getValue(nodeFlags) != 0)
-                    speed -= 5;
-
-                return setSpeed(0, speed);
-            }
         };
         EncodingManager manager = new EncodingManager(encoder);
         GraphStorage graph = newGraph(dir, manager, false, false);

core/src/test/java/com/graphhopper/routing/util/EncodingManagerTest.java

@@ -182,68 +182,6 @@ public void testFullBitMask()
         assertTrue(bitUtil.toBitString(foot.getNodeBitMask()).endsWith("00011111110000000"));
     }
 
-    @Test
-    public void testApplyNodeTags()
-    {
-        CarFlagEncoder car = new CarFlagEncoder();
-        CarFlagEncoder car2 = new CarFlagEncoder(7, 1)
-        {
-            protected EncodedValue nodeEncoder;
-
-            @Override
-            public int defineNodeBits( int index, int shift )
-            {
-                shift = super.defineNodeBits(index, shift);
-                nodeEncoder = new EncodedValue("nodeEnc", shift, 2, 1, 0, 3);
-                return shift + 2;
-            }
-
-            @Override
-            public long handleNodeTags( OSMNode node )
-            {
-                String tmp = node.getTag("test");
-                // return negative value to indicate that this is not a barrier
-                if (tmp == null)
-                    return -nodeEncoder.setValue(0, 1);
-                return -nodeEncoder.setValue(0, 2);
-            }
-
-            @Override
-            public long applyNodeFlags( long wayFlags, long nodeFlags )
-            {
-                double speed = speedEncoder.getDoubleValue(wayFlags);
-                double speedDecrease = nodeEncoder.getValue(nodeFlags);
-                return setSpeed(wayFlags, speed - speedDecrease);
-            }
-        };
-        EncodingManager manager = new EncodingManager(car, car2);
-
-        OSMNode node = new OSMNode(1, Double.NaN, Double.NaN);
-        OSMWay way = new OSMWay(2);
-        way.setTag("highway", "secondary");
-
-        long wayFlags = manager.handleWayTags(way, manager.acceptWay(way), 0);
-        long nodeFlags = manager.handleNodeTags(node);
-        wayFlags = manager.applyNodeFlags(wayFlags, -nodeFlags);
-        assertEquals(60, car.getSpeed(wayFlags), 1e-1);
-        assertEquals(59, car2.getSpeed(wayFlags), 1e-1);
-
-        node.setTag("test", "something");
-        wayFlags = manager.handleWayTags(way, manager.acceptWay(way), 0);
-        nodeFlags = manager.handleNodeTags(node);
-        wayFlags = manager.applyNodeFlags(wayFlags, -nodeFlags);
-        assertEquals(58, car2.getSpeed(wayFlags), 1e-1);
-        assertEquals(60, car.getSpeed(wayFlags), 1e-1);
-
-        way.setTag("maxspeed", "130");
-        wayFlags = manager.handleWayTags(way, manager.acceptWay(way), 0);
-        assertEquals(car.getMaxSpeed(), car2.getSpeed(wayFlags), 1e-1);
-        nodeFlags = manager.handleNodeTags(node);
-        wayFlags = manager.applyNodeFlags(wayFlags, -nodeFlags);
-        assertEquals(98, car2.getSpeed(wayFlags), 1e-1);
-        assertEquals(100, car.getSpeed(wayFlags), 1e-1);
-    }
-
     /**
      * Tests the combination of different turn cost flags by different encoders.
      */