r5py patches

Author: christophfink

.github/workflows/gradle.yml

@@ -50,5 +50,9 @@ jobs:
     - name: Publish to GH Packages
       # Supply access token to build.gradle (used in publishing.repositories.maven.credentials)
       env:
+        GITHUB_PACKAGE_REPOSITORY: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: gradle publish
+permissions:
+  contents: read
+  packages: write

build.gradle

@@ -54,7 +54,7 @@ publishing {
     repositories {
         maven {
             name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/conveyal/r5")
+            url = uri("https://maven.pkg.github.com/" + System.getenv("GITHUB_PACKAGE_REPOSITORY"))
             credentials {
                 username = System.getenv("GITHUB_ACTOR")
                 password = System.getenv("GITHUB_TOKEN")

src/main/java/com/conveyal/r5/kryo/KryoNetworkSerializer.java

@@ -131,12 +131,14 @@ public static TransportNetwork read (File file) throws Exception {
         byte[] header = new byte[HEADER.length];
         input.read(header, 0, header.length);
         if (!Arrays.equals(HEADER, header)) {
+            input.close();
             throw new RuntimeException("Unrecognized file header. Is this an R5 Kryo network?");
         }
         String formatVersion = kryo.readObject(input, String.class);
         String commit = kryo.readObject(input, String.class);
         LOG.info("Loading network from file format version {}, written by R5 commit {}", formatVersion, commit);
         if (!NETWORK_FORMAT_VERSION.equals(formatVersion)) {
+            input.close();
             throw new RuntimeException(
                 String.format("File format version is %s, this R5 requires %s", formatVersion, NETWORK_FORMAT_VERSION)
             );

src/main/java/com/conveyal/r5/transit/TransitLayer.java

@@ -175,7 +175,7 @@ public class TransitLayer implements Serializable, Cloneable {
     /** Whether to save detailed trip shapes from GTFS (e.g., for Conveyal Taui sites). Unless the default false
      * value is overwritten by a transportNetworkConfig file, straight line segments between stops will be used in
      * visualiations.*/
-    public boolean saveShapes = false;
+    public boolean saveShapes = true;
 
     /** Map from feed ID to feed CRC32 to ensure that we can't apply scenarios to the wrong feeds */
     public Map<String, Long> feedChecksums = new HashMap<>();