Merge branch 'master' of git+ssh://github.com/graphhopper/graphhopper

Author: karussell

core/files/changelog.txt

@@ -1,7 +1,12 @@
+0.12
+    moved shp-reader into separate repository: https://github.com/graphhopper/graphhopper-reader-shp    
+    
 0.11
     web resources for dropwizard web framework (no servlets anymore)
     prefix -Dgraphhopper. for command line arguments necessary, see docs/web/quickstart.md or docs/core/quickstart-from-source.md#running--debbuging-with-intellij for details
     delegated reading properties to dropwizard, i.e. the new format yml is not read again in GraphHopper.init
+    changed file format for landmarks #1376
+
 0.9
     remove war bundling support #297
     rename of DefaultModule to GraphHopperModule and GHServletModule to GraphHopperServletModule

reader-gtfs/src/main/java/com/graphhopper/reader/gtfs/MultiCriteriaLabelSetting.java

@@ -74,9 +74,10 @@ public MultiCriteriaLabelSetting(GraphExplorer explorer, PtFlagEncoder flagEncod
 
         queueComparator = Comparator
                 .comparingLong(this::weight)
-                .thenComparingLong(l1 -> l1.nTransfers)
+                .thenComparingLong(l -> l.nTransfers)
+                .thenComparingLong(l -> l.walkTime)
                 .thenComparingLong(l -> departureTimeCriterion(l) != null ? departureTimeCriterion(l) : 0)
-                .thenComparingLong(l2 -> l2.impossible ? 1 : 0);
+                .thenComparingLong(l -> l.impossible ? 1 : 0);
         fromHeap = new PriorityQueue<>(queueComparator);
         fromMap = new IntObjectHashMap<>();
     }