Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-03-06 02:01:32 +01:00
commit e3e6e7f223
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
View file

@ -61,7 +61,7 @@ public class BinaryInspector {
// "-vaddress", "-vcities", "-vstreets", "-vstreetgroups","-vbuildings", // "-vaddress", "-vcities", "-vstreets", "-vstreetgroups","-vbuildings",
//"-zoom=16", //"-zoom=16",
//"-bbox=4,55,7,50", //"-bbox=4,55,7,50",
// "/home/victor/projects/osmand/osm-gen/Test.obf" //"/home/victor/projects/osmand/osm-gen/Map.obf"
}); });
} else { } else {
in.inspector(args); 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"); RandomAccessFile r = new RandomAccessFile(file.getAbsolutePath(), "r");
printFileInformation(r, file.getName());
}
public void printFileInformation(RandomAccessFile r, String filename) throws IOException {
try { try {
BinaryMapIndexReader index = new BinaryMapIndexReader(r); BinaryMapIndexReader index = new BinaryMapIndexReader(r);
int i = 1; int i = 1;
println("Binary index " + file.getName() + " version = " + index.getVersion()); println("Binary index " + filename + " version = " + index.getVersion());
for(BinaryIndexPart p : index.getIndexes()){ for(BinaryIndexPart p : index.getIndexes()){
String partname = ""; String partname = "";
if(p instanceof MapIndex ){ if(p instanceof MapIndex ){
@ -474,7 +477,7 @@ public class BinaryInspector {
} catch (IOException e) { } 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; throw e;
} }

8
OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java
View file

@ -784,6 +784,14 @@ public class BinaryRoutePlanner {
return segStart; return segStart;
} }
public float getDistanceFromStart() {
return distanceFromStart;
}
public void setDistanceFromStart(float distanceFromStart) {
this.distanceFromStart = distanceFromStart;
}
public RouteDataObject getRoad() { public RouteDataObject getRoad() {
return road; return road;
} }

2
OsmAnd/res/values/strings.xml
View file

@ -25,6 +25,8 @@
<string name="tip_recent_changes_1_7_t">Changes in 1.7: <string name="tip_recent_changes_1_7_t">Changes in 1.7:
\n\t* Completely updated routing (fast and precise) \n\t* Completely updated routing (fast and precise)
\n\t* Active simulation in tunnels \n\t* Active simulation in tunnels
\n\t* Lots of small UX improvements &amp; usability fixes
\n\t* Speech rate accessibility setting
</string> </string>
<string name="complex_route_calculation_failed">Fast route calculation failed (%s), fallback to slow calculation.</string> <string name="complex_route_calculation_failed">Fast route calculation failed (%s), fallback to slow calculation.</string>
<string name="disable_complex_routing_descr">Disable 2-phase routing for car navigation</string> <string name="disable_complex_routing_descr">Disable 2-phase routing for car navigation</string>