diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
index c9c411c8d1..90bc223619 100644
--- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
@@ -61,7 +61,7 @@ public class BinaryInspector {
// "-vaddress", "-vcities", "-vstreets", "-vstreetgroups","-vbuildings",
//"-zoom=16",
//"-bbox=4,55,7,50",
-// "/home/victor/projects/osmand/osm-gen/Test.obf"
+ //"/home/victor/projects/osmand/osm-gen/Map.obf"
});
} else {
in.inspector(args);
@@ -413,13 +413,16 @@ public class BinaryInspector {
}
-
- public void printFileInformation(File file) throws IOException {
+ public void printFileInformation(File file) throws IOException {
RandomAccessFile r = new RandomAccessFile(file.getAbsolutePath(), "r");
+ printFileInformation(r, file.getName());
+ }
+
+ public void printFileInformation(RandomAccessFile r, String filename) throws IOException {
try {
BinaryMapIndexReader index = new BinaryMapIndexReader(r);
int i = 1;
- println("Binary index " + file.getName() + " version = " + index.getVersion());
+ println("Binary index " + filename + " version = " + index.getVersion());
for(BinaryIndexPart p : index.getIndexes()){
String partname = "";
if(p instanceof MapIndex ){
@@ -474,7 +477,7 @@ public class BinaryInspector {
} catch (IOException e) {
- System.err.println("File is not valid index : " + file.getAbsolutePath());
+ System.err.println("File doesn't have valid structure : " + filename + " " + e.getMessage() );
throw e;
}
diff --git a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java
index e8091b06a4..5805c6d1ce 100644
--- a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java
+++ b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java
@@ -784,6 +784,14 @@ public class BinaryRoutePlanner {
return segStart;
}
+ public float getDistanceFromStart() {
+ return distanceFromStart;
+ }
+
+ public void setDistanceFromStart(float distanceFromStart) {
+ this.distanceFromStart = distanceFromStart;
+ }
+
public RouteDataObject getRoad() {
return road;
}
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 00c7e4ce60..4525199ffd 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -25,6 +25,8 @@
Changes in 1.7:
\n\t* Completely updated routing (fast and precise)
\n\t* Active simulation in tunnels
+ \n\t* Lots of small UX improvements & usability fixes
+ \n\t* Speech rate accessibility setting
Fast route calculation failed (%s), fallback to slow calculation.
Disable 2-phase routing for car navigation