Revert "Merged in flex direct transfer work"

This reverts commit d0c503a.
opentripplanner · Mar 8, 2017 · d3c3e9c · d3c3e9c
1 parent d0c503a
commit d3c3e9c
Show file tree

Hide file tree

Showing 18 changed files with 117 additions and 627 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,9 +10,9 @@
     <packaging>jar</packaging>
 
     <scm>
-        <connection>scm:git:http://github.com/camsys/OpenTripPlanner.git</connection>
+        <connection>scm:git:http://github.com/opentripplanner/OpenTripPlanner.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/camsys/OpenTripPlanner.git</developerConnection>
+        <developerConnection>scm:git:ssh://git@github.com/opentripplanner/OpenTripPlanner.git</developerConnection>
-        <url>http://github.com/camsys/OpenTripPlanner</url>
+        <url>http://github.com/opentripplanner/OpenTripPlanner</url>
     </scm>
 
     <properties>
@@ -24,15 +24,11 @@
 
     <distributionManagement>
         <repository>
-            <id>releases-obaweb-repo</id>
+            <!-- Also used as snapshotRepository by default -->
-            <name>OneBusAway OBAWEB Release Repo</name>
+            <id>conveyal-maven-repo</id>
-            <url>http://repo.obaweb.org:8080/archiva/repository/releases/</url>
+            <name>Conveyal Maven Repository</name>
+            <url>s3://maven.conveyal.com/</url>
         </repository>
-        <snapshotRepository>
-            <id>snapshots-obaweb-repo</id>
-            <name>OneBusAway OBAWEB Snapshot Repo</name>
-            <url>http://repo.obaweb.org:8080/archiva/repository/snapshots/</url>
-        </snapshotRepository>
     </distributionManagement>
 
     <build>
@@ -365,11 +361,6 @@
             <name>bintray</name>
             <url>http://dl.bintray.com/andimarek/graphql-java</url>
         </repository>
-        <repository>
-            <id>snapshots-obaweb-repo</id>
-            <name>OneBusAway OBAWEB Snapshot Repo</name>
-            <url>http://repo.obaweb.org:8080/archiva/repository/snapshots/</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -582,7 +573,7 @@
         <dependency>
             <groupId>org.onebusaway</groupId>
             <artifactId>onebusaway-gtfs</artifactId>
-            <version>1.3.5-vt-SNAPSHOT</version>
+            <version>1.3.5-conveyal-SNAPSHOT-2</version>
         </dependency>
         <!-- Processing is used for the debug GUI (though we could probably use just Java2D) -->
         <dependency>
@@ -743,6 +734,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- SerializationUtils used to deep clone TripPatterns for dynamic flag stops -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.5</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/src/main/java/org/opentripplanner/api/resource/PlannerResource.java b/src/main/java/org/opentripplanner/api/resource/PlannerResource.java
@@ -91,6 +91,7 @@ public Response plan(@Context UriInfo uriInfo, @Context Request grizzlyRequest)
             response.setPlan(plan);
 
         } catch (Exception e) {
+            e.printStackTrace();
             PlannerError error = new PlannerError(e);
             if(!PlannerError.isPlanningError(e.getClass()))
                 LOG.warn("Error while planning path: ", e);

diff --git a/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java b/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
@@ -18,7 +18,6 @@ the License, or (at your option) any later version.
 import org.opentripplanner.graph_builder.model.GtfsBundle;
 import org.opentripplanner.graph_builder.module.DirectTransferGenerator;
 import org.opentripplanner.graph_builder.module.EmbedConfig;
-import org.opentripplanner.graph_builder.module.FlexDirectTransferGenerator;
 import org.opentripplanner.graph_builder.module.GtfsModule;
 import org.opentripplanner.graph_builder.module.PruneFloatingIslands;
 import org.opentripplanner.graph_builder.module.StreetLinkerModule;
@@ -309,9 +308,6 @@ public static GraphBuilder forDirectory(CommandLineParameters params, File dir)
             if ( ! builderParams.useTransfersTxt) {
                 // This module will use streets or straight line distance depending on whether OSM data is found in the graph.
                 graphBuilder.addModule(new DirectTransferGenerator());
-                if (hasOSM) {
-                    graphBuilder.addModule(new FlexDirectTransferGenerator());
-                }
             }
         }
         graphBuilder.addModule(new EmbedConfig(builderConfig, routerConfig));