merge master->suspectscanner

brouter-core/src/main/java/btools/router/OsmPath.java

@@ -248,7 +248,7 @@ abstract class OsmPath implements OsmLinkHolder
       boolean isStartpoint = lon0 == -1 && lat0 == -1;
 
       // check turn restrictions (n detail mode (=final pass) no TR to not mess up voice hints)
-      if ( nsection == 0 && !isStartpoint )
+      if ( nsection == 0 && rc.considerTurnRestrictions && !detailMode&& !isStartpoint )
       {
         boolean hasAnyPositive = false;
         boolean hasPositive = false;

brouter-core/src/main/java/btools/router/OsmTrack.java

@@ -421,14 +421,25 @@ public final class OsmTrack
 
     if ( turnInstructionMode == 2 ) // locus style
     {
+      float lastRteTime = 0.f;
+
       for( VoiceHint hint: voiceHints.list )
       {
         sb.append( " <wpt lon=\"" ).append( formatILon( hint.ilon ) ).append( "\" lat=\"" )
           .append( formatILat( hint.ilat ) ).append( "\">" )
           .append( hint.selev == Short.MIN_VALUE ? "" : "<ele>" + (hint.selev / 4.) + "</ele>" )
           .append( "<name>" ).append( hint.getMessageString() ).append( "</name>" )
-          .append( "<extensions><locus:rteDistance>" ).append( "" + hint.distanceToNext ).append( "</locus:rteDistance>" )
+          .append( "<extensions><locus:rteDistance>" ).append( "" + hint.distanceToNext ).append( "</locus:rteDistance>" );
-          .append( "<locus:rtePointAction>" ).append( "" + hint.getLocusAction() ).append( "</locus:rtePointAction></extensions>" )
+        float rteTime = hint.getTime();
+        if ( rteTime != lastRteTime ) // add timing only if available
+        {
+          double t = rteTime - lastRteTime;
+          double speed = hint.distanceToNext / t;
+          sb.append( "<locus:rteTime>" ).append( "" + t ).append( "</locus:rteTime>" )
+            .append( "<locus:rteSpeed>" ).append( "" + speed ).append( "</locus:rteSpeed>" );
+          lastRteTime = rteTime;
+        }
+        sb.append( "<locus:rtePointAction>" ).append( "" + hint.getLocusAction() ).append( "</locus:rtePointAction></extensions>" )
           .append( "</wpt>\n" );
       }
     }

brouter-core/src/main/java/btools/router/VoiceHint.java

@@ -36,6 +36,11 @@ public class VoiceHint
   double distanceToNext;
   int indexInTrack;
 
+  public float getTime()
+  {
+    return goodWay == null ? 0.f : goodWay.time;
+  }
+
   float angle;
   boolean turnAngleConsumed;
   boolean needsRealTurn;

brouter-server/src/main/java/btools/server/SuspectManager.java

@@ -185,8 +185,17 @@ public class SuspectManager extends Thread
       double dlon = ( ilon - 180000000 ) / 1000000.;
       double dlat = ( ilat - 90000000 ) / 1000000.;
 
+      String profile = "car-eco";
+      File configFile = new File( "configs/" + country + ".cfg" );
+      if ( configFile.exists() )
+      {
+        BufferedReader br = new BufferedReader( new FileReader( configFile ) );
+        profile = br.readLine();
+        br.close();
+      }
+
       String url1 = "http://brouter.de/brouter-web/#zoom=18&lat=" + dlat + "&lon=" + dlon
-          + "&layer=OpenStreetMap&lonlats=" + dlon + "," + dlat + "&profile=car-eco-de";
+          + "&layer=OpenStreetMap&lonlats=" + dlon + "," + dlat + "&profile=" + profile;
 
       // String url1 = "http://localhost:8080/brouter-web/#map=18/" + dlat + "/"
       // + dlon + "/Mapsforge Tile Server&lonlats=" + dlon + "," + dlat;