Integrate PT (#1824)

* Refactor gtfsfeed ids (minor) * Put OSM filenames in cmdargs for gtfs * Put gtfs filenames in cmdargs for gtfs * Let create() return a full graphhopper * Let create() return a full graphhopper * import transit in custom hook method * Remove now unused attribute * Fix tests * Try to keep supporting gtfs without a road network * Factor out container from resource * Factor out container from resource * Factor out container from resource * Remove unused code * Re-create location index so that station nodes are in * Fix test * Adapt GraphHopperBundle (which was the whole point) * Streamline config of EncodingManager for PT * Fix test * Towards unifying GraphHopperBundle * Further towards unifying GraphHopperBundle * Move tests * Move pt resources to their own path; redirect ?vehicle=pt there * Let the regular Maps GUI be multimodal * Departure time GUI control must react to selected mode * Also integrate ImportCommand
graphhopper · Dec 12, 2019 · 7a6eca5 · 7a6eca5
1 parent 498e00d
commit 7a6eca5
Show file tree

Hide file tree

Showing 26 changed files with 820 additions and 1,009 deletions.
diff --git a/core/src/main/java/com/graphhopper/GraphHopper.java b/core/src/main/java/com/graphhopper/GraphHopper.java
@@ -521,6 +521,7 @@ public GraphHopper init(CmdArgs args) {
         if (!flagEncodersStr.isEmpty() || !encodedValueStr.isEmpty()) {
             if (!encodedValueStr.isEmpty())
                 emBuilder.addAll(tagParserFactory, encodedValueStr);
+            registerCustomEncodedValues(emBuilder);
             if (!flagEncodersStr.isEmpty())
                 emBuilder.addAll(flagEncoderFactory, flagEncodersStr);
             emBuilder.setEnableInstructions(args.getBool("datareader.instructions", true));
@@ -881,6 +882,8 @@ protected void postProcessing(boolean closeEarly) {
 
         initLocationIndex();
 
+        importPublicTransit();
+
         if (lmFactoryDecorator.isEnabled())
             lmFactoryDecorator.createPreparations(ghStorage, locationIndex);
         loadOrPrepareLM(closeEarly);
@@ -891,6 +894,14 @@ protected void postProcessing(boolean closeEarly) {
             prepareCH(closeEarly);
     }
 
+    protected void registerCustomEncodedValues(EncodingManager.Builder emBuilder) {
+
+    }
+
+    protected void importPublicTransit() {
+
+    }
+
     private static final String INTERPOLATION_KEY = "prepare.elevation_interpolation.done";
 
     private boolean hasInterpolated() {

diff --git a/reader-gtfs/src/main/java/com/conveyal/gtfs/TripPatternKey.java b/reader-gtfs/src/main/java/com/conveyal/gtfs/TripPatternKey.java
diff --git a/reader-gtfs/src/main/java/com/conveyal/gtfs/util/Deduplicator.java b/reader-gtfs/src/main/java/com/conveyal/gtfs/util/Deduplicator.java