v6.4

5 files changed, 84 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33985634d4cf..698d96ae9aa0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = java-r5
 	pkgdesc = Conveyal R5 Routing Engine
-	pkgver = 6.2
-	pkgrel = 2
+	pkgver = 6.4
+	pkgrel = 1
 	url = https://github.com/conveyal/r5
 	arch = i686
 	arch = x86_64
@@ -10,12 +10,14 @@ pkgbase = java-r5
 	makedepends = git
 	depends = jdk11-openjdk
 	depends = java-environment
-	source = r5-6.2.tar.gz::https://github.com/conveyal/r5/archive/refs/tags/v6.2.tar.gz
-	source = 01-don-t-try-to-guess-git-version_v6.2.patch
+	source = r5-6.4.tar.gz::https://github.com/conveyal/r5/archive/refs/tags/v6.4.tar.gz
+	source = 01-don-t-try-to-guess-git-version_v6.4.patch
+	source = 02-path-result-max-destinations_v6.4.patch
 	source = r5-backend.service
 	source = r5-backend.sysusers
-	sha512sums = e2d3026904342c42dc7b3620a8f83f8779fc75944717d16c693eb1ebe00dc81320bdf1a4c24a70df1e76b5eabb4999bb823056239581d35b3c96f73d1020c5a2
-	sha512sums = 8a6f68768d9422e1fb6566e8dee0ea8b669d1ad0dfb0c2eae65d4727102c95fc9685715364a78cc410f41adb65ea84e17f7f2b1a7004581f3d181d0fa46ae66f
+	sha512sums = fbf418570a287aaad143cc3435c01aee1bd784e686fe68aa6292f1b46416d45aaf0527d3ad5ecf056e2ac47ab529248e443aa50a8dabcd37972293b681509d45
+	sha512sums = 1f6468bc25d253f355792414269c099716869e7d3f5d12c079f8c24bad22616fc38a712ba33149b40642a10e45419510077d4f73abbd70b1aefcf410bf9f9f91
+	sha512sums = b797e4ce01b974ea4ac2f1fc13bb99b01bea9d1f9701f3149b2eac1f193c571b4b84780892f6f95ad1302012965623266344f6fd4167cb9e6c126fc2ca4a8dd8
 	sha512sums = bbd8b1d60359bd1f33dd4aaf94752cdd7c338e2b46cb91e6488df4f7c27f262ffda1789d010c7621652234be72c9813601bd0775f6e77bad04b8a7ef2d1d3be7
 	sha512sums = 322e32156c18d323c9b62f97e2a3792c151a5f7b677b291061ea0da8697fc00cc6977dbcb3f723ea492ae339508dfb543d731fa1c4f857f7efc0e470c3d1fe09
 
diff --git a/01-don-t-try-to-guess-git-version_v6.2.patch b/01-don-t-try-to-guess-git-version_v6.2.patch
deleted file mode 100644
index d897c2c4a82f..000000000000
--- a/01-don-t-try-to-guess-git-version_v6.2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --unified --recursive --text a/build.gradle b/build.gradle
---- a/build.gradle	2021-10-18 12:09:38.389096998 +0000
-+++ b/build.gradle	2021-10-18 12:10:04.859168754 +0000
-@@ -2,7 +2,6 @@
-     id 'java'
-     id 'com.github.johnrengelman.shadow' version '6.0.0'
-     id 'maven-publish'
--    id 'com.palantir.git-version' version '0.12.3'
-     id 'com.google.cloud.tools.jib' version '2.6.0'
- }
-
-@@ -116,7 +115,7 @@
- }
-
- classes {
--    dependsOn createVersionProperties
-+    // dependsOn createVersionProperties
- }
-
- repositories {
-@@ -172,7 +171,7 @@
-     // Provides the EPSG coordinate reference system catalog as an HSQL database.
-     implementation group: 'org.geotools', version: geotoolsVersion, name: 'gt-epsg-hsql'
-
--    compile 'com.wdtinc:mapbox-vector-tile:3.1.0'
-+    implementation 'com.wdtinc:mapbox-vector-tile:3.1.0'
-
-     // Legacy JTS with com.vividsolutions package name. Newer Geotools compatible with Java 11 uses a newer version of
-     // JTS with the org.locationtech package name. But our MapDB format includes serialized JTS geometries with the
diff --git a/01-don-t-try-to-guess-git-version_v6.4.patch b/01-don-t-try-to-guess-git-version_v6.4.patch
new file mode 100644
index 000000000000..2a7ea49d77db
--- /dev/null
+++ b/01-don-t-try-to-guess-git-version_v6.4.patch
@@ -0,0 +1,35 @@
+diff --unified --recursive --text a/build.gradle b/build.gradle
+--- a/build.gradle	2021-10-14 15:56:23.135659680 +0000
++++ b/build.gradle	2021-10-14 16:06:01.380243952 +0000
+@@ -2,12 +2,11 @@
+     id 'java'
+     id 'com.github.johnrengelman.shadow' version '6.0.0'
+     id 'maven-publish'
+-    id 'com.palantir.git-version' version '0.12.3'
+ }
+
+ group = 'com.conveyal'
+ // set version to `git describe --tags --always --first-parent`, plus '.dirty' if local changes are present.
+-version gitVersion()
++version 'v6.4'
+
+ java {
+     sourceCompatibility = JavaVersion.VERSION_11
+@@ -93,14 +92,13 @@
+ // such as the full commit ID and branch name, rather than just the version available in the JAR manifest.
+ task createVersionProperties(dependsOn: processResources) {
+     doLast {
+-        def details = versionDetails()
+         def dir = new File(buildDir, "resources/main/com/conveyal/r5/")
+         mkdir(dir)
+         new File(dir, "version.properties").withWriter { w ->
+             Properties p = new Properties()
+-            p['version'] = project.version.toString()
+-            p['commit'] = details.gitHashFull
+-            p['branch'] = details.branchName ?: "NONE" // avoid NPE when building pushed tag
++            p['version'] = version
++            p['commit'] = ""
++            p['branch'] = ""
+             p.store w, null
+         }
+         // Also make a simple one-line version.txt for scripts to use
diff --git a/02-path-result-max-destinations_v6.4.patch b/02-path-result-max-destinations_v6.4.patch
new file mode 100644
index 000000000000..642df6c55554
--- /dev/null
+++ b/02-path-result-max-destinations_v6.4.patch
@@ -0,0 +1,29 @@
+diff --unified --recursive --text a/src/main/java/com/conveyal/r5/analyst/cluster/PathResult.java b/src/main/java/com/conveyal/r5/analyst/cluster/PathResult.java
+--- a/src/main/java/com/conveyal/r5/analyst/cluster/PathResult.java	2021-05-16 20:18:52.000000000 +0300
++++ b/src/main/java/com/conveyal/r5/analyst/cluster/PathResult.java	2021-10-27 11:00:31.245320268 +0300
+@@ -32,6 +32,14 @@
+ 
+ public class PathResult {
+ 
++    /**
++     * The maximum number of destinations for which we'll generate detailed path information in a single request.
++     * Detailed path information was added on to the original design, which returned a simple grid of travel times.
++     * These results are returned to the backend over an HTTP API so we don't want to risk making them too huge.
++     * This could be set to a higher number in cases where you know the result return channel can handle the size.
++     */
++    public static int maxDestinations = 5000;
++
+     private final int nDestinations;
+     /**
+      * Array with one entry per destination. Each entry is a map from a "path template" to the associated iteration
+@@ -62,8 +70,8 @@
+             // In regional analyses, return paths to all destinations
+             nDestinations = task.nTargetsPerOrigin();
+             // This limitation reflects the initial design, for use with freeform pointset destinations
+-            if (nDestinations > 5000) {
+-                throw new UnsupportedOperationException("Path results are limited to 5000 destinations");
++            if (nDestinations > maxDestinations) {
++                throw new UnsupportedOperationException("Number of detailed path destinations exceeds limit of " + maxDestinations);
+             }
+         }
+         iterationsForPathTemplates = new Multimap[nDestinations];
diff --git a/PKGBUILD b/PKGBUILD
index 0456fbd82826..e3f79b72d569 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=java-r5
 _pkgname=${pkgname#java-}
-pkgver=6.2
-pkgrel=2
+pkgver=6.4
+pkgrel=1
 
 pkgdesc="Conveyal R5 Routing Engine"
 url="https://github.com/conveyal/r5"
@@ -16,21 +16,27 @@ makedepends=("gradle" "git")
 
 source=(
     "${_pkgname}-${pkgver}.tar.gz::https://github.com/conveyal/${_pkgname}/archive/refs/tags/v${pkgver}.tar.gz"
-    "01-don-t-try-to-guess-git-version_v6.2.patch"
+    "01-don-t-try-to-guess-git-version_v6.4.patch"
+    "02-path-result-max-destinations_v6.4.patch"
     "r5-backend.service"
     "r5-backend.sysusers"
 
 )
 sha512sums=(
-    "e2d3026904342c42dc7b3620a8f83f8779fc75944717d16c693eb1ebe00dc81320bdf1a4c24a70df1e76b5eabb4999bb823056239581d35b3c96f73d1020c5a2"
-    "8a6f68768d9422e1fb6566e8dee0ea8b669d1ad0dfb0c2eae65d4727102c95fc9685715364a78cc410f41adb65ea84e17f7f2b1a7004581f3d181d0fa46ae66f"
+    "fbf418570a287aaad143cc3435c01aee1bd784e686fe68aa6292f1b46416d45aaf0527d3ad5ecf056e2ac47ab529248e443aa50a8dabcd37972293b681509d45"
+    "1f6468bc25d253f355792414269c099716869e7d3f5d12c079f8c24bad22616fc38a712ba33149b40642a10e45419510077d4f73abbd70b1aefcf410bf9f9f91"
+    "b797e4ce01b974ea4ac2f1fc13bb99b01bea9d1f9701f3149b2eac1f193c571b4b84780892f6f95ad1302012965623266344f6fd4167cb9e6c126fc2ca4a8dd8"
     "bbd8b1d60359bd1f33dd4aaf94752cdd7c338e2b46cb91e6488df4f7c27f262ffda1789d010c7621652234be72c9813601bd0775f6e77bad04b8a7ef2d1d3be7"
     "322e32156c18d323c9b62f97e2a3792c151a5f7b677b291061ea0da8697fc00cc6977dbcb3f723ea492ae339508dfb543d731fa1c4f857f7efc0e470c3d1fe09"
 )
 
 prepare() {
     cd "${_pkgname}-${pkgver}"
-    patch --forward --strip=1 --input="${srcdir}/01-don-t-try-to-guess-git-version_v6.2.patch"
+
+    for _patch in "${srcdir}/"[0-9][0-9]-*.patch; do
+        patch --forward --strip=1 --input="${_patch}"
+    done
+
     gradle --quiet clean
 }
 
@@ -74,5 +80,4 @@ package() {
         -Dm0644 \
         r5-backend.service \
         "${pkgdir}/usr/lib/systemd/system/r5-backend.service"
-
 }