diff --git a/brouter-codec/pom.xml b/brouter-codec/pom.xml index cef5728..803dcc1 100644 --- a/brouter-codec/pom.xml +++ b/brouter-codec/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.11 + 1.5.0 ../pom.xml brouter-codec diff --git a/brouter-core/pom.xml b/brouter-core/pom.xml index 9678493..c683efa 100644 --- a/brouter-core/pom.xml +++ b/brouter-core/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.11 + 1.5.0 ../pom.xml brouter-core diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java index 631b49b..b4987f9 100644 --- a/brouter-core/src/main/java/btools/router/OsmTrack.java +++ b/brouter-core/src/main/java/btools/router/OsmTrack.java @@ -435,7 +435,7 @@ public final class OsmTrack } else { - sb.append( " creator=\"BRouter-1.4.11\" version=\"1.1\">\n" ); + sb.append( " creator=\"BRouter-1.5.0\" version=\"1.1\">\n" ); } if ( turnInstructionMode == 3) // osmand style diff --git a/brouter-core/src/main/java/btools/router/RoutingEngine.java b/brouter-core/src/main/java/btools/router/RoutingEngine.java index 67bfb77..4b887bb 100644 --- a/brouter-core/src/main/java/btools/router/RoutingEngine.java +++ b/brouter-core/src/main/java/btools/router/RoutingEngine.java @@ -62,7 +62,7 @@ public class RoutingEngine extends Thread private Object[] extract; - private boolean directWeaving = Boolean.getBoolean( "directWeaving" ); + private boolean directWeaving = !Boolean.getBoolean( "disableDirectWeaving" ); public RoutingEngine( String outfileBase, String logfileBase, String segmentDir, List waypoints, RoutingContext rc ) @@ -808,21 +808,21 @@ public class RoutingEngine extends Thread synchronized( openSet ) { path = openSet.popLowestKeyValue(); - } - if ( path == null ) - { - if ( openBorderList.isEmpty() ) + if ( path == null ) { - break; + if ( openBorderList.isEmpty() ) + { + break; + } + for( OsmPath p : openBorderList ) + { + openSet.add( p.cost + (int)(p.airdistance*airDistanceCostFactor), p ); + } + openBorderList.clear(); + memoryPanicMode = false; + needNonPanicProcessing = true; + continue; } - for( OsmPath p : openBorderList ) - { - openSet.add( p.cost + (int)(p.airdistance*airDistanceCostFactor), p ); - } - openBorderList.clear(); - memoryPanicMode = false; - needNonPanicProcessing = true; - continue; } if ( path.airdistance == -1 ) @@ -841,29 +841,32 @@ public class RoutingEngine extends Thread int pathsBefore = openSet.getSize(); nodesCache.nodesMap.collectOutreachers(); - for(;;) + synchronized( openSet ) { - OsmPath p3 = openSet.popLowestKeyValue(); - if ( p3 == null ) break; - if ( p3.airdistance != -1 && nodesCache.nodesMap.canEscape( p3.getTargetNode() ) ) + for(;;) { - openBorderList.add( p3 ); + OsmPath p3 = openSet.popLowestKeyValue(); + if ( p3 == null ) break; + if ( p3.airdistance != -1 && nodesCache.nodesMap.canEscape( p3.getTargetNode() ) ) + { + openBorderList.add( p3 ); + } + } + for( OsmPath p : openBorderList ) + { + openSet.add( p.cost + (int)(p.airdistance*airDistanceCostFactor), p ); } } - for( OsmPath p : openBorderList ) - { - openSet.add( p.cost + (int)(p.airdistance*airDistanceCostFactor), p ); - } openBorderList.clear(); -System.out.println( "collected, nodes/paths before=" + nodesBefore + "/" + pathsBefore + " after=" + nodesCache.nodesMap.nodesCreated + "/" + openSet.getSize() ); + logInfo( "collected, nodes/paths before=" + nodesBefore + "/" + pathsBefore + " after=" + nodesCache.nodesMap.nodesCreated + "/" + openSet.getSize() + " maxTotalCost=" + maxTotalCost ); if ( !nodesCache.nodesMap.isInMemoryBounds( openSet.getSize()) ) // TODO { - if ( maxTotalCost < 1000000000 || needNonPanicProcessing ) + if ( maxTotalCost < 1000000000 || needNonPanicProcessing || fastPartialRecalc ) { throw new IllegalArgumentException( "memory limit reached" ); } memoryPanicMode = true; - System.out.println( "************************ memory limit reached, enabled memory panic mode *************************" ); + logInfo( "************************ memory limit reached, enabled memory panic mode *************************" ); } } } @@ -1248,7 +1251,7 @@ System.out.println( "collected, nodes/paths before=" + nodesBefore + "/" + paths private OsmTrack mergeTrack( OsmPathElement match, OsmTrack oldTrack ) { -System.out.println( "**************** merging match=" + match.cost + " with oldTrack=" + oldTrack.cost ); + logInfo( "**************** merging match=" + match.cost + " with oldTrack=" + oldTrack.cost ); OsmPathElement element = match; OsmTrack track = new OsmTrack(); track.cost = oldTrack.cost; diff --git a/brouter-expressions/pom.xml b/brouter-expressions/pom.xml index 9287517..27cdb55 100644 --- a/brouter-expressions/pom.xml +++ b/brouter-expressions/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.11 + 1.5.0 ../pom.xml brouter-expressions diff --git a/brouter-map-creator/pom.xml b/brouter-map-creator/pom.xml index 5c78b20..ead3d77 100644 --- a/brouter-map-creator/pom.xml +++ b/brouter-map-creator/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.11 + 1.5.0 ../pom.xml brouter-map-creator diff --git a/brouter-mapaccess/pom.xml b/brouter-mapaccess/pom.xml index bc09583..a93b774 100644 --- a/brouter-mapaccess/pom.xml +++ b/brouter-mapaccess/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.11 + 1.5.0 ../pom.xml brouter-mapaccess diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java b/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java index 93a9b1c..ebf4fe9 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java @@ -49,7 +49,7 @@ public final class NodesCache private long ghostSum = 0; private long ghostWakeup = 0; - private boolean directWeaving = Boolean.getBoolean( "directWeaving" ); + private boolean directWeaving = !Boolean.getBoolean( "disableDirectWeaving" ); public String formatStatus() { diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java index 723a4cd..4a9360f 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/OsmNodesMap.java @@ -73,7 +73,7 @@ public final class OsmNodesMap } catch( StackOverflowError soe ) { - System.out.println( "+++++++++++++++ StackOverflowError ++++++++++++++++" ); + // System.out.println( "+++++++++++++++ StackOverflowError ++++++++++++++++" ); } } } @@ -196,7 +196,6 @@ public final class OsmNodesMap { nodesCreated=0; -System.out.println( "collectOutreachers, currentMaxCost=" + currentMaxCost ); ArrayList nodes2check = new ArrayList(); for( OsmNode n : hmap.values() ) { diff --git a/brouter-routing-app/AndroidManifest.xml b/brouter-routing-app/AndroidManifest.xml index 0cd0e94..450ac8f 100644 --- a/brouter-routing-app/AndroidManifest.xml +++ b/brouter-routing-app/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="27" + android:versionName="1.5.0" package="btools.routingapp"> - + diff --git a/brouter-routing-app/assets/profiles2.zip b/brouter-routing-app/assets/profiles2.zip index 7164085..0ff9fae 100644 Binary files a/brouter-routing-app/assets/profiles2.zip and b/brouter-routing-app/assets/profiles2.zip differ diff --git a/brouter-routing-app/assets/readmes.zip b/brouter-routing-app/assets/readmes.zip index 0d5f9bd..318d23f 100644 Binary files a/brouter-routing-app/assets/readmes.zip and b/brouter-routing-app/assets/readmes.zip differ diff --git a/brouter-routing-app/pom.xml b/brouter-routing-app/pom.xml index f44d57d..0e8a2e4 100644 --- a/brouter-routing-app/pom.xml +++ b/brouter-routing-app/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.11 + 1.5.0 ../pom.xml brouter-routing-app @@ -60,9 +60,9 @@ ${project.build.directory}/${project.artifactId}.apk \sign\mystore - abrensch - peru1511 - peru1511 + myalias + mypasswd + mypasswd true diff --git a/brouter-routing-app/project.properties b/brouter-routing-app/project.properties index f049142..29e368b 100644 --- a/brouter-routing-app/project.properties +++ b/brouter-routing-app/project.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-10 +target=android-28 diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java index 06bd320..41796ac 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterView.java @@ -174,7 +174,7 @@ public class BRouterView extends View String basedir = fbd.getAbsolutePath(); AppLogger.log( "using basedir: " + basedir ); - String version = "v1.4.11"; + String version = "v1.5.0"; // create missing directories assertDirectoryExists( "project directory", basedir + "/brouter", null, null ); @@ -807,7 +807,7 @@ public class BRouterView extends View else { String memstat = memoryClass + "mb pathPeak " + ((cr.getPathPeak()+500)/1000) + "k"; - String result = "version = BRouter-1.4.11\n" + "mem = " + memstat + "\ndistance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend() + String result = "version = BRouter-1.5.0\n" + "mem = " + memstat + "\ndistance = " + cr.getDistance() / 1000. + " km\n" + "filtered ascend = " + cr.getAscend() + " m\n" + "plain ascend = " + cr.getPlainAscend() + " m\n" + "estimated time = " + cr.getTime(); rawTrack = cr.getFoundRawTrack(); diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java index cbcb67c..cfd5d4c 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java @@ -165,6 +165,8 @@ public class BRouterWorker n.ilon = (int)( ( lons[i] + 180. ) *1000000. + 0.5); n.ilat = (int)( ( lats[i] + 90. ) *1000000. + 0.5); n.isNogo = true; + n.nogoWeight = Double.NaN; + AppLogger.log( "added interface provided nogo: " + n ); nogoList.add( n ); } } diff --git a/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReader.java b/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReader.java index b15cb28..ccfca86 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReader.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/CoordinateReader.java @@ -140,6 +140,7 @@ public abstract class CoordinateReader else if ( n.name != null && n.name.startsWith( "nogo" ) ) { n.isNogo = true; + n.nogoWeight = Double.NaN; nogopoints.add( n ); } diff --git a/brouter-server/pom.xml b/brouter-server/pom.xml index 0d36e4e..cfccc68 100644 --- a/brouter-server/pom.xml +++ b/brouter-server/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.11 + 1.5.0 ../pom.xml brouter-server diff --git a/brouter-server/src/main/java/btools/server/BRouter.java b/brouter-server/src/main/java/btools/server/BRouter.java index 1481db9..33a96b3 100644 --- a/brouter-server/src/main/java/btools/server/BRouter.java +++ b/brouter-server/src/main/java/btools/server/BRouter.java @@ -88,7 +88,7 @@ public class BRouter } System.exit(0); } - System.out.println("BRouter 1.4.11 / 02042018"); + System.out.println("BRouter 1.5.0 / 30062019"); if ( args.length < 6 ) { System.out.println("Find routes in an OSM map"); diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index a4536cf..e92c1b8 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -260,7 +260,7 @@ public class RouteServer extends Thread public static void main(String[] args) throws Exception { - System.out.println("BRouter 1.4.11 / 02042018"); + System.out.println("BRouter 1.5.0 / 30062019"); if ( args.length != 5 && args.length != 6) { System.out.println("serve BRouter protocol"); diff --git a/brouter-util/pom.xml b/brouter-util/pom.xml index 7724d8b..78da59f 100644 --- a/brouter-util/pom.xml +++ b/brouter-util/pom.xml @@ -5,7 +5,7 @@ org.btools brouter - 1.4.11 + 1.5.0 ../pom.xml brouter-util diff --git a/pom.xml b/pom.xml index 2a646fe..eae5271 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.btools brouter - 1.4.11 + 1.5.0 pom http://brouter.de/brouter/ brouter @@ -53,7 +53,7 @@ gen true - 10 + 28