Merge branch 'master' into 0.10

Author: karussell

.github/CONTRIBUTING.md

@@ -34,6 +34,8 @@ keep in mind that this requires storing your Email there. The same applies if yo
 Note, our CLA does not influence your rights on your contribution but it makes sure for others that you agree to the Apache License, Version 2.
 After this you'll appear in the <a href="CONTRIBUTORS.md">contributors list</a> and your pull request can also be discussed technically.
 
+Read more in [this issue](https://github.com/graphhopper/graphhopper/pull/1129#issuecomment-375820168) why it is not that easy to make this CLA-signing process simpler for first-time contributors and maintainers.
+
 For companies that would like that their developers work for us, we need an additional [corporate CLA signed](https://graphhopper.com/agreements/corporate-cla.html).
 
 ## Code formatting

.gitignore

@@ -43,4 +43,5 @@ local.properties
 /reader-overlay-data/nbproject/
 !malta-latest.osm.pbf
 /reader-json/nbproject/
-/graph-cache
+/graph-cache
+package-lock.json

README.md

@@ -13,8 +13,9 @@ We have a prosper community and welcome everyone. Let us know your problems, use
 
 To get started read through our documentation and install the GraphHopper Web Service locally:
 
- * unstable: [docs](https://github.com/graphhopper/graphhopper/blob/master/docs/index.md), [zip](https://oss.sonatype.org/content/groups/public/com/graphhopper/graphhopper-web/0.10-SNAPSHOT/), [Android APK](https://oss.sonatype.org/content/groups/public/com/graphhopper/graphhopper-android/0.10-SNAPSHOT/)
- * 0.9.0 latest stable: [announcement](https://www.graphhopper.com/blog/2017/05/31/graphhopper-routing-engine-0-9-released/), [docs](https://github.com/graphhopper/graphhopper/blob/0.9/docs/index.md), [zip](https://graphhopper.com/public/releases/graphhopper-web-0.9.0-bin.zip), [Android APK](https://graphhopper.com/public/releases/graphhopper-android-0.9.0.apk)
+ * unstable: [docs](https://github.com/graphhopper/graphhopper/blob/master/docs/index.md), [zip](https://oss.sonatype.org/content/groups/public/com/graphhopper/graphhopper-web/0.11-SNAPSHOT/), [Android APK](https://oss.sonatype.org/content/groups/public/com/graphhopper/graphhopper-android/0.11-SNAPSHOT/)
+ * 0.10.0 latest stable: [announcement](https://www.graphhopper.com/blog/2018/03/08/graphhopper-routing-engine-0-10-released/), [docs](https://github.com/graphhopper/graphhopper/blob/0.10/docs/index.md), [zip](https://graphhopper.com/public/releases/graphhopper-web-0.10.0-bin.zip), [Android APK](https://graphhopper.com/public/releases/graphhopper-android-0.10.0.apk)
+ * 0.9.0: [announcement](https://www.graphhopper.com/blog/2017/05/31/graphhopper-routing-engine-0-9-released/), [docs](https://github.com/graphhopper/graphhopper/blob/0.9/docs/index.md), [zip](https://graphhopper.com/public/releases/graphhopper-web-0.9.0-bin.zip), [Android APK](https://graphhopper.com/public/releases/graphhopper-android-0.9.0.apk)
  * 0.8.2: [announcement](https://www.graphhopper.com/blog/2016/10/18/graphhopper-routing-engine-0-8-released/), [docs](https://github.com/graphhopper/graphhopper/blob/0.8/docs/index.md), [zip](https://graphhopper.com/public/releases/graphhopper-web-0.8.2-bin.zip), [Android APK](https://graphhopper.com/public/releases/graphhopper-android-0.8.2.apk)
  * 0.7.0: [announcement](https://www.graphhopper.com/blog/2016/06/15/graphhopper-routing-engine-0-7-released/), [docs](https://github.com/graphhopper/graphhopper/blob/0.7/docs/index.md), [zip](https://graphhopper.com/public/releases/graphhopper-web-0.7.0-bin.zip), [Android APK](https://graphhopper.com/public/releases/graphhopper-android-0.7.0.apk)
 

android/app/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.graphhopper</groupId>
     <artifactId>graphhopper-android</artifactId>
-    <version>0.10-SNAPSHOT</version>
+    <version>0.11-SNAPSHOT</version>
     <name>GraphHopper Android</name>
     <packaging>apk</packaging>    
     <organization>
@@ -16,7 +16,7 @@
         <relativePath>../..</relativePath>
         <groupId>com.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>    	
-        <version>0.10-SNAPSHOT</version>
+        <version>0.11-SNAPSHOT</version>
     </parent>
     <properties>
         <vtm.version>0.9.2</vtm.version>

appveyor.yml

@@ -22,7 +22,7 @@ install:
   - cmd: mvn --version
   - cmd: java -version
 build_script:
-  - mvn clean package -DskipTest -B
+  - mvn clean install -DskipTests=true -B
 test_script:
   - mvn test verify -B && mvn checkstyle:check findbugs:check forbiddenapis:check -B
 cache:

client-hc/pom.xml

@@ -23,22 +23,16 @@
 
     <groupId>com.graphhopper</groupId>
     <artifactId>directions-api-client-hc</artifactId>
-    <version>0.10-SNAPSHOT</version>
+    <version>0.11-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>GraphHopper Directions API hand-crafted Java Client.</name>
 
     <parent>
         <groupId>com.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.11-SNAPSHOT</version>
     </parent>  
 
-    <properties>
-        <slf4j.version>1.7.21</slf4j.version>        
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-    
     <dependencies>
         <dependency>
             <groupId>com.graphhopper</groupId>
@@ -62,16 +56,13 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <!-- TODO how to sync with GH? -->
-            <version>2.8.4</version>
+            <version>${jackson.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
             <version>3.8.0</version>
         </dependency>
-        
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

client-hc/src/main/java/com/graphhopper/api/MatrixResponse.java

@@ -88,7 +88,7 @@ public void setDistanceRow(int row, int distanceRow[]) {
 
     public void setWeightRow(int row, double weightRow[]) {
         if (weights.length > 0) {
-            check(weights.length, toCount, "to weights");
+            check(weightRow.length, toCount, "to weights");
             weights[row] = weightRow;
         } else {
             throw new UnsupportedOperationException("Cannot call setWeightRow if weights are disabled");

client-hc/src/test/java/com/graphhopper/api/GraphHopperWebIT.java

@@ -67,10 +67,10 @@ public void testSimpleRoute() {
 
     @Test
     public void testAlternativeRoute() {
-        // https://graphhopper.com/maps/?point=52.044124%2C10.378346&point=52.043847%2C10.381994&algorithm=alternative_route&ch.disable=true
+        // https://graphhopper.com/maps/?point=52.042989%2C10.373926&point=52.042289%2C10.384043&algorithm=alternative_route&ch.disable=true
         GHRequest req = new GHRequest().
-                addPoint(new GHPoint(52.044124,10.378346)).
-                addPoint(new GHPoint(52.043847,10.381994));
+                addPoint(new GHPoint(52.042989, 10.373926)).
+                addPoint(new GHPoint(52.042289, 10.384043));
         req.setAlgorithm("alternative_route");
         req.getHints().put("instructions", true);
         req.getHints().put("calc_points", true);
@@ -82,13 +82,13 @@ public void testAlternativeRoute() {
 
         PathWrapper path = paths.get(0);
         isBetween(5, 20, path.getPoints().size());
-        isBetween(400, 500, path.getDistance());
+        isBetween(1000, 1100, path.getDistance());
         assertEquals("Wiesenstraße", path.getDescription().get(0));
 
         path = paths.get(1);
-        isBetween(3, 15, path.getPoints().size());
-        isBetween(350, 450, path.getDistance());
-        assertEquals("Schlopweg", path.getDescription().get(0));
+        isBetween(20, 30, path.getPoints().size());
+        isBetween(800, 900, path.getDistance());
+        assertEquals("Jacobistraße", path.getDescription().get(0));
     }
 
     @Test

core/pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.graphhopper</groupId>
     <artifactId>graphhopper-core</artifactId>
     <name>GraphHopper Core</name>
-    <version>0.10-SNAPSHOT</version>
+    <version>0.11-SNAPSHOT</version>
     <packaging>jar</packaging>
     <description>
         GraphHopper is a fast and memory efficient Java road routing engine
@@ -15,7 +15,7 @@
     <parent>
         <groupId>com.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.11-SNAPSHOT</version>
     </parent>
 
     <properties>

core/src/main/java/com/graphhopper/routing/lm/LMApproximator.java

@@ -79,7 +79,7 @@ public LMApproximator(Graph graph, int maxBaseNodes, LandmarkStorage lms, int ac
         this.maxBaseNodes = maxBaseNodes;
         int idxVirtNode = maxBaseNodes;
         virtNodeMap = new GHIntObjectHashMap(graph.getNodes() - idxVirtNode, 0.5f);
-        // virtual nodes handling: calculate the minium weight for the virt. nodes, i.e. pick the correct neighbouring node
+        // virtual nodes handling: calculate the minimum weight for the virtual nodes, i.e. pick the correct neighbouring node
         if (graph instanceof QueryGraph) {
             QueryGraph qGraph = (QueryGraph) graph;
             // there are at least two virtual nodes (start & destination)

core/src/main/java/com/graphhopper/routing/weighting/ShortFastestWeighting.java

@@ -55,7 +55,8 @@ public ShortFastestWeighting(FlagEncoder encoder, double distanceFactor) {
 
     @Override
     public double getMinWeight(double distance) {
-        return super.getMinWeight(distance * distanceFactor);
+        // TODO: Should we add the [+ distance * distanceFactor]. It improves the heuristic of the A*.
+        return super.getMinWeight(distance) * timeFactor + distance * distanceFactor;
     }
 
     @Override

core/src/main/java/com/graphhopper/storage/BaseGraph.java

@@ -703,6 +703,9 @@ void inPlaceNodeRemove(int removeNodeCount) {
                 setWayGeometry_(fetchWayGeometry_(edgePointer, true, 0, -1, -1), edgePointer, false);
         }
 
+        // clear N_EDGE_REF
+        initNodeRefs((nodeCount - removeNodeCount) * nodeEntryBytes, nodeCount * nodeEntryBytes);
+
         if (removeNodeCount >= nodeCount)
             throw new IllegalStateException("graph is empty after in-place removal but was " + removeNodeCount);
 

core/src/main/java/com/graphhopper/storage/change/ChangeGraphHelper.java

@@ -66,6 +66,9 @@ public void setLogging(boolean log) {
      * @return number of successfully applied edge changes
      */
     public long applyChanges(EncodingManager em, Collection<JsonFeature> features) {
+        if (em == null)
+            throw new NullPointerException("EncodingManager cannot be null to change existing graph");
+
         long updates = 0;
         for (JsonFeature jsonFeature : features) {
             if (!jsonFeature.hasProperties())

core/src/main/resources/com/graphhopper/util/ar.txt

@@ -6,32 +6,32 @@ turn_left=اتجه يساراً
 turn_right=اتجه يميناً
 turn_slight_left=إستدر لليسار قليلا
 turn_slight_right=إستدر لليمين قليلا
-turn_sharp_left=اتجه كليلاً لليسار
-turn_sharp_right=اتجه كليلاً لليمين
-keep_left=
-keep_right=
+turn_sharp_left=اتجه قليلاً لليسار
+turn_sharp_right=اتجه قليلاً لليمين
+keep_left=احفظ الشمال
+keep_right=احفظ اليمين
 turn_onto=%1$s خلال %1$s
-u_turn=
-unknown=
+u_turn=الدوران للإتجاه المعاكس
+unknown=علامة غير معرفة  '%1$s' 
 web.search_button=ابحث
 web.from_hint=من
 web.via_hint=خلال
 web.to_hint=إلي
 web.more_button=المزيد
 web.gpx_export_button=GPX التصدير
 web.route_info=%1$s ستاخذ %2$s
-web.pt_route_info=
-web.pt_route_info_walking=
+web.pt_route_info=وصول سعت %1$s من خلال %2$s انتقال (%3$s)
+web.pt_route_info_walking=الوصول عند %1$s مشياً (%2$s)
 web.locations_not_found=لا يوجد طريق من هذه المنطقة
 web.bike=دراجة
 web.racingbike=دراجة سباق
 web.mtb=دراجة جبلية
 web.car=سيارة
 web.foot=مشياً
-web.hike=
-web.small_truck=
-web.bus=
-web.truck=
+web.hike=نزهة
+web.small_truck=شاحنة صغيرة
+web.bus=باص
+web.truck=شاحنة
 web.staticlink=رابط ثابت
 web.motorcycle=دراجة نارية
 via=من خلال
@@ -47,33 +47,33 @@ road=طريق
 off_bike=انزل الدراجة
 cycleway=طريق دائري
 way=طريق
-small_way=
+small_way=طريق صغير
 paved=مرصوف
 unpaved=غير مرصوف
 stopover=توقف %1$s
 roundabout_enter=أدخل الدوران
 roundabout_exit=في الدوران ، أتخذ مخرج   %1$s
 roundabout_exit_onto=في الدوران ، أتخذ مخرج   %1$s من خلال %2$s
-total_ascend=
-total_descend=
-way_contains_ford=
-pt_start_trip=
-pt_end_trip=
-pt_transfer_to=
-web.start_label=
-web.intermediate_label=
-web.end_label=
-web.set_start=
-web.set_intermediate=
-web.set_end=
-web.center_map=
-web.show_coords=
-web.route=
-web.delete_from_route=
-web.marker=
-web.gh_offline_info=
-web.refresh_button=
-web.server_status=
-web.zoom_in=
-web.zoom_out=
-web.drag_to_reorder=
+total_ascend=%1$s اجمالى صعود
+total_descend=%1$s اجمالى نزول
+way_contains_ford=هناك مخاضة على طول الطريق
+pt_start_trip=ادخل %1$s
+pt_end_trip=مغادرة %1$s
+pt_transfer_to=انتقل الى %1$s
+web.start_label=البداية
+web.intermediate_label=نقطة عبور
+web.end_label=النهاية
+web.set_start=ادخل نقطة بدء
+web.set_intermediate=ادخل نقطة عبور
+web.set_end=ادخل نقطة وصول
+web.center_map=اجعل وسط الخريطة هنا
+web.show_coords=اظهر الاحداثيات
+web.route=المسار
+web.delete_from_route=احذف من المسار
+web.marker=رمز او علامة
+web.gh_offline_info= واجهة برمجة التطبيقات (API) بلا اتصال؟
+web.refresh_button=اعادة تنشيط
+web.server_status=الحالة
+web.zoom_in=تكبير
+web.zoom_out=تصغير
+web.drag_to_reorder=اسحب لاعادة الترتيب

core/src/main/resources/com/graphhopper/util/ca.txt

@@ -8,20 +8,20 @@ turn_slight_left=gira lleugerament a l'esquerra
 turn_slight_right=gira lleugerament a la dreta
 turn_sharp_left=gira just a l'esquerra
 turn_sharp_right=gira just a la dreta
-keep_left=
-keep_right=
+keep_left=estigues a l'esquerra
+keep_right=estigues a la dreta
 turn_onto=%1$s per %2$s
-u_turn=
-unknown=
+u_turn=dona la volta
+unknown=instrucció desconeguda «%1$s»
 web.search_button=Buscar
 web.from_hint=Des de
 web.via_hint=passant per
 web.to_hint=Cap a
 web.more_button=més
 web.gpx_export_button=Exportar GPX
 web.route_info=%1$s trigaràs %2$s
-web.pt_route_info=
-web.pt_route_info_walking=
+web.pt_route_info=arriba a les %1$s amb %2$s transbordaments (%3$s)
+web.pt_route_info_walking=arriba caminant a les %1$s (%2$s)
 web.locations_not_found=No hi ha cap ruta. El destí no es troba dins l'àrea.
 web.bike=Bicicleta
 web.racingbike=Bicicleta de carrera
@@ -56,10 +56,10 @@ roundabout_exit=A la rotonda, agafa la %1$s sortida
 roundabout_exit_onto=A la rotonda, agafa la sortida %1$s cap a %2$s
 total_ascend=%1$s pujada total
 total_descend=%1$s baixada total
-way_contains_ford=
-pt_start_trip=
-pt_end_trip=
-pt_transfer_to=
+way_contains_ford=hi ha un gual en el camí
+pt_start_trip=entra a %1$s
+pt_end_trip=surt de %1$s
+pt_transfer_to=canvia a %1$s
 web.start_label=Punt d'inici
 web.intermediate_label=Punt intermig
 web.end_label=Punt final