Merge branch 'master' into road-bike-speeds

Author: takb

.gitignore

@@ -19,6 +19,10 @@ openrouteservice/WebContent/WEB-INF/app.config*
 openrouteservice/src/main/resources/app.config*
 !openrouteservice/src/main/resources/app.config.sample
 
+# Ignore folders generated from docker
+docker/elevation_cache
+docker/conf
+
 app.config.local
 cgiar_provider/
 graphs/

CHANGELOG.md

@@ -5,8 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 ### Added
+- New fast isochrone algorithm based on preprocessed data
+### Fixed
+### Changed
+### Deprecated
+
+## [6.2.1] - 2020-08-13
+### Added
 - Check whether routing points are within different countries before routing and break if they are and all borders should be avoided
 ### Fixed
+- Updated Docker process to use Java 11 ([#777](https://github.com/GIScience/openrouteservice/issues/777))
+- Correctly resolve routing profile categories when initializing core edge filters in preprocessing ([#785](https://github.com/GIScience/openrouteservice/issues/785))
 ### Changed
 - Improved road bike average speed to be faster on cycleways and slower on bad road surface or certain road types such as footways.
 ### Deprecated

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk
+FROM openjdk:11-jdk
 
 ENV MAVEN_OPTS="-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
 ENV MAVEN_CLI_OPTS="--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
@@ -13,11 +13,11 @@ COPY $OSM_FILE /ors-core/data/osm_file.pbf
 COPY $APP_CONFIG /ors-core/openrouteservice/src/main/resources/app.config.sample
 
 # Install tomcat
-RUN wget -q https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.32/bin/apache-tomcat-8.0.32.tar.gz -O /tmp/tomcat.tar.gz && \
+RUN wget -q https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.39/bin/apache-tomcat-8.5.39.tar.gz -O /tmp/tomcat.tar.gz && \
     cd /tmp && \
     tar xvfz tomcat.tar.gz && \
-    mkdir /usr/local/tomcat && \
-    cp -R /tmp/apache-tomcat-8.0.32/* /usr/local/tomcat/ && \
+    mkdir /usr/local/tomcat /ors-conf && \
+    cp -R /tmp/apache-tomcat-8.5.39/* /usr/local/tomcat/ && \
     # Install dependencies and locales
     apt-get update -qq && apt-get install -qq -y locales nano maven moreutils jq && \
     locale-gen en_US.UTF-8 && \

docker-entrypoint.sh

@@ -9,7 +9,7 @@ if [ -z "${CATALINA_OPTS}" ]; then
 fi
 
 if [ -z "${JAVA_OPTS}" ]; then
-	export JAVA_OPTS="-Djava.awt.headless=true -server -XX:TargetSurvivorRatio=75 -XX:SurvivorRatio=64 -XX:MaxTenuringThreshold=3 -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 -Xms1g -Xmx2g"
+	export JAVA_OPTS="-Djava.awt.headless=true -server -XX:TargetSurvivorRatio=75 -XX:SurvivorRatio=64 -XX:MaxTenuringThreshold=3 -XX:+UseG1GC -XX:+ScavengeBeforeFullGC -XX:ParallelGCThreads=4 -Xms1g -Xmx2g"
 fi
 
 echo "CATALINA_OPTS=\"$CATALINA_OPTS\"" > /usr/local/tomcat/bin/setenv.sh
@@ -23,7 +23,9 @@ fi
 if [ -d "/usr/local/tomcat/webapps/ors" ]; then
 	cp -f /ors-conf/app.config $tomcat_appconfig
 else
-	cp -f $source_appconfig /ors-conf/app.config
+	if [ ! -f /ors-conf/app.config ]; then
+		cp -f $source_appconfig /ors-conf/app.config
+	fi
 	echo "### Package openrouteservice and deploy to Tomcat ###"
 	mvn -q -f /ors-core/openrouteservice/pom.xml package -DskipTests && \
 	cp -f /ors-core/openrouteservice/target/*.war /usr/local/tomcat/webapps/ors.war

docker/docker-compose.yml

@@ -4,6 +4,7 @@ services:
     container_name: ors-app
     ports:
       - 8080:8080
+      - 9001:9001
     image: openrouteservice/openrouteservice:latest
 #    build:
 #      context: ../
@@ -19,5 +20,5 @@ services:
       #- ./your_osm.pbf:/ors-core/data/osm_file.pbf
     environment:
       - BUILD_GRAPHS=False  # Forces the container to rebuild the graphs, e.g. when PBF is changed
-      - "JAVA_OPTS=-Djava.awt.headless=true -server -XX:TargetSurvivorRatio=75 -XX:SurvivorRatio=64 -XX:MaxTenuringThreshold=3 -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 -Xms1g -Xmx2g"
+      - "JAVA_OPTS=-Djava.awt.headless=true -server -XX:TargetSurvivorRatio=75 -XX:SurvivorRatio=64 -XX:MaxTenuringThreshold=3 -XX:+UseG1GC -XX:+ScavengeBeforeFullGC -XX:ParallelGCThreads=4 -Xms1g -Xmx2g"
       - "CATALINA_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9001 -Dcom.sun.management.jmxremote.rmi.port=9001 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost"

openrouteservice-api-tests/conf/app.config.test

@@ -27,6 +27,30 @@
             {profiles: "any", value: 18000}
             {profiles: "driving-car, driving-hgv", value: 3600}
           ],
+        fastisochrones: {
+          maximum_range_distance: [
+            {profiles: "any", value: 50000 }
+            {profiles: "driving-car, driving-hgv", value: 500000 }
+          ],
+          maximum_range_time: [
+            {profiles: "any", value: 18000 }
+            {profiles: "driving-car, driving-hgv", value: 10800 }
+          ].
+          profiles: {
+            default_params: {
+              enabled: false,
+              threads: 12,
+              weightings: "recommended",
+              maxcellnodes: 5000
+            },
+            profile-vehicles-hgv: {
+              enabled: true,
+              threads: 12,
+              weightings: "recommended, shortest",
+              maxcellnodes: 5000
+            }
+          }
+        },
         maximum_intervals: 10,
         maximum_locations: 2,
         allow_compute_area: true

openrouteservice-api-tests/pom.xml

@@ -37,11 +37,6 @@
                         <exclude>**/locations/ParametersValidationTest.java</exclude>
                         <exclude>**/locations/ResultsValidationTest.java</exclude>
                     </excludes>
-                    <dependencies><dependency>
-                      <groupId>org.ow2.asm</groupId>
-                      <artifactId>asm</artifactId>
-                      <version>6.2</version>
-                    </dependency></dependencies>
                 </configuration>
             </plugin>
             <plugin>