remove unnecessary method DataReader.setEncodingManager

Author: karussell

core/src/main/java/com/graphhopper/GraphHopper.java

@@ -684,7 +684,6 @@ protected DataReader initDataReader(DataReader reader) {
         return reader.setFile(new File(dataReaderFile)).
                 setElevationProvider(eleProvider).
                 setWorkerThreads(dataReaderWorkerThreads).
-                setEncodingManager(encodingManager).
                 setWayPointMaxDistance(dataReaderWayPointMaxDistance);
     }
 

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

@@ -34,8 +34,6 @@ public interface DataReader {
 
     DataReader setWorkerThreads(int workerThreads);
 
-    DataReader setEncodingManager(EncodingManager em);
-
     DataReader setWayPointMaxDistance(double wayPointMaxDistance);
 
     /**

reader-osm/src/main/java/com/graphhopper/reader/osm/OSMReader.java

@@ -92,7 +92,7 @@ public class OSMReader implements DataReader {
     protected PillarInfo pillarInfo;
     private long locations;
     private long skippedLocations;
-    private EncodingManager encodingManager = null;
+    private final EncodingManager encodingManager;
     private int workerThreads = 2;
     // Using the correct Map<Long, Integer> is hard. We need a memory efficient and fast solution for big data sets!
     //
@@ -122,6 +122,7 @@ public OSMReader(GraphHopperStorage ghStorage) {
         this.ghStorage = ghStorage;
         this.graph = ghStorage;
         this.nodeAccess = graph.getNodeAccess();
+        this.encodingManager = ghStorage.getEncodingManager();
 
         osmNodeIdToInternalNodeMap = new GHLongIntBTree(200);
         osmNodeIdToNodeFlagsMap = new GHLongLongHashMap(200, .5f);
@@ -876,15 +877,6 @@ GHLongLongHashMap getRelFlagsMap() {
         return osmWayIdToRouteWeightMap;
     }
 
-    /**
-     * Specify the type of the path calculation (car, bike, ...).
-     */
-    @Override
-    public OSMReader setEncodingManager(EncodingManager em) {
-        this.encodingManager = em;
-        return this;
-    }
-
     @Override
     public OSMReader setWayPointMaxDistance(double maxDist) {
         doSimplify = maxDist > 0;

reader-osm/src/test/java/com/graphhopper/reader/osm/OSMReaderTest.java

@@ -170,7 +170,7 @@ protected DataReader createReader(GraphHopperStorage tmpGraph) {
                     public boolean isInBounds(ReaderNode node) {
                         return node.getLat() > 49 && node.getLon() > 8;
                     }
-                }.setEncodingManager(getEncodingManager());
+                };
             }
         };
 
@@ -419,8 +419,7 @@ public void testBarriersOnTowerNodes() {
     public void testRelation() {
         EncodingManager manager = new EncodingManager("bike");
         GraphHopperStorage ghStorage = new GraphHopperStorage(new RAMDirectory(), manager, false, new GraphExtension.NoOpExtension());
-        OSMReader reader = new OSMReader(ghStorage).
-                setEncodingManager(manager);
+        OSMReader reader = new OSMReader(ghStorage);
         ReaderRelation osmRel = new ReaderRelation(1);
         osmRel.add(new ReaderRelation.Member(ReaderRelation.WAY, 1, ""));
         osmRel.add(new ReaderRelation.Member(ReaderRelation.WAY, 2, ""));
@@ -601,7 +600,7 @@ Collection<EdgeIteratorState> addOSMWay(LongIndexedContainer osmNodeIds, long wa
                 return Collections.emptyList();
             }
         };
-        osmreader.setEncodingManager(manager);
+
         // save some node tags for first node
         ReaderNode osmNode = new ReaderNode(1, 1.1d, 1.0d);
         osmNode.setTag("test", "now");
@@ -698,7 +697,7 @@ public Collection<OSMTurnRelation.TurnCostTableEntry> analyzeTurnRelation(FlagEn
                     throw new IllegalArgumentException("illegal encoder " + encoder.toString());
                 }
             }
-        }.setEncodingManager(manager);
+        };
 
         // turn cost entries for car and foot are for the same relations (same viaNode, edgeFrom and edgeTo),
         // turn cost entry for bike is for another relation (different viaNode)

reader-shp/src/main/java/com/graphhopper/reader/shp/OSMShapeFileReader.java

@@ -102,13 +102,11 @@ void processJunctions() {
                     for (int i = 0; i < points.length; i++) {
                         Coordinate c = points[i];
 
-                        // don't add the same coord twice for the same edge
-                        // - happens with bad geometry, i.e.
-                        // duplicate coords or a road which forms a circle
-                        // (e.g. roundabout)
-                        if (tmpSet.contains(c)) {
+                        // don't add the same coord twice for the same edge - happens with bad geometry, i.e.
+                        // duplicate coords or a road which forms a circle (e.g. roundabout)
+                        if (tmpSet.contains(c))
                             continue;
-                        }
+
                         tmpSet.add(c);
 
                         // skip if its already a node

reader-shp/src/main/java/com/graphhopper/reader/shp/ShapeFileReader.java

@@ -55,6 +55,7 @@ public ShapeFileReader(GraphHopperStorage ghStorage) {
         this.graphStorage = ghStorage;
         this.graph = ghStorage;
         this.nodeAccess = graph.getNodeAccess();
+        this.encodingManager = ghStorage.getEncodingManager();
     }
 
     @Override
@@ -117,10 +118,4 @@ protected double lat(Coordinate coordinate) {
     protected void saveTowerPosition(int nodeId, Coordinate point) {
         nodeAccess.setNode(nodeId, lat(point), lng(point));
     }
-
-    @Override
-    public ShapeFileReader setEncodingManager(EncodingManager encodingManager) {
-        this.encodingManager = encodingManager;
-        return this;
-    }
 }