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 2016-04-26 23:00:10 +02:00
commit a3c79fad1a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,7 @@ public class BinaryInspector {
public static final int BUFFER_SIZE = 1 << 20; public static final int BUFFER_SIZE = 1 << 20;
private static final int SHIFT_ID = 6; public static final int SHIFT_ID = 6;
private VerboseInfo vInfo; private VerboseInfo vInfo;
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
@ -536,7 +536,7 @@ public class BinaryInspector {
b.setLength(0); b.setLength(0);
b.append("Road "); b.append("Road ");
b.append(obj.id); b.append(obj.id);
b.append(" osmid ").append(obj.id >> (SHIFT_ID + 2)); b.append(" osmid ").append(obj.getId() >> (SHIFT_ID));
for (int i = 0; i < obj.getTypes().length; i++) { for (int i = 0; i < obj.getTypes().length; i++) {
RouteTypeRule rr = obj.region.quickGetEncodingRule(obj.getTypes()[i]); RouteTypeRule rr = obj.region.quickGetEncodingRule(obj.getTypes()[i]);
b.append(" ").append(rr.getTag()).append("='").append(rr.getValue()).append("'"); b.append(" ").append(rr.getTag()).append("='").append(rr.getValue()).append("'");
@ -950,7 +950,7 @@ public class BinaryInspector {
} }
b.append(" id ").append(obj.getId()); b.append(" id ").append(obj.getId());
b.append(" osmid ").append((obj.getId() >> (SHIFT_ID + 2))); b.append(" osmid ").append((obj.getId() >> (SHIFT_ID + 1)));
if (vmapCoordinates) { if (vmapCoordinates) {
b.append(" lat/lon : "); b.append(" lat/lon : ");
for (int i = 0; i < obj.getPointsLength(); i++) { for (int i = 0; i < obj.getPointsLength(); i++) {

4
OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
View file

@ -12,6 +12,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.binary.BinaryInspector;
import net.osmand.binary.BinaryMapIndexReader; import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule; import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule;
import net.osmand.binary.RouteDataObject; import net.osmand.binary.RouteDataObject;
@ -325,7 +326,8 @@ public class RouteResultPreparation {
additional.append("start_bearing = \"").append(res.getBearingBegin()).append("\" "); additional.append("start_bearing = \"").append(res.getBearingBegin()).append("\" ");
additional.append("end_bearing = \"").append(res.getBearingEnd()).append("\" "); additional.append("end_bearing = \"").append(res.getBearingEnd()).append("\" ");
additional.append("description = \"").append(res.getDescription()).append("\" "); additional.append("description = \"").append(res.getDescription()).append("\" ");
println(MessageFormat.format("\t<segment id=\"{0}\" start=\"{1}\" end=\"{2}\" {3}/>", (res.getObject().getId()) + "", println(MessageFormat.format("\t<segment id=\"{0}\" oid=\"{1}\" start=\"{2}\" end=\"{3}\" {4}/>",
(res.getObject().getId() >> (BinaryInspector.SHIFT_ID )) + "", res.getObject().getId() + "",
res.getStartPointIndex() + "", res.getEndPointIndex() + "", additional.toString())); res.getStartPointIndex() + "", res.getEndPointIndex() + "", additional.toString()));
printAdditionalPointInfo(res); printAdditionalPointInfo(res);
} }