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 22:08:18 +02:00
commit afa2547c2b
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 + 1)); b.append(" osmid ").append(obj.id >> (SHIFT_ID + 2));
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("'");
@ -555,23 +555,25 @@ public class BinaryInspector {
String[] names = obj.getPointNames(i); String[] names = obj.getPointNames(i);
int[] nametypes = obj.getPointNameTypes(i); int[] nametypes = obj.getPointNameTypes(i);
int[] types = obj.getPointTypes(i); int[] types = obj.getPointTypes(i);
b.append(" [" + (i + 1) + ". "); if (types != null || names != null) {
if(names != null) { b.append(" [ " + (i + 1) + ". ");
for(int k = 0; k < names.length; k++) { if (names != null) {
RouteTypeRule rr = obj.region.quickGetEncodingRule(nametypes[k]); for (int k = 0; k < names.length; k++) {
b.append(rr.getTag()).append("='").append(names[k]).append("'"); RouteTypeRule rr = obj.region.quickGetEncodingRule(nametypes[k]);
b.append(rr.getTag()).append("='").append(names[k]).append("' ");
}
} }
} if (types != null) {
if(types != null) { for (int k = 0; k < types.length; k++) {
for(int k = 0; k < types.length; k++) { RouteTypeRule rr = obj.region.quickGetEncodingRule(types[k]);
RouteTypeRule rr = obj.region.quickGetEncodingRule(types[k]); b.append(rr.getTag()).append("='").append(rr.getValue()).append("' ");
b.append(rr.getTag()).append("='").append(rr.getValue()).append("'"); }
}
if (vInfo.vmapCoordinates) {
float x = (float) MapUtils.get31LongitudeX(obj.getPoint31XTile(i));
float y = (float) MapUtils.get31LatitudeY(obj.getPoint31YTile(i));
b.append(y).append(" / ").append(x).append(" ");
} }
}
if(vInfo.vmapCoordinates && (types != null || names != null)) {
float x = (float) MapUtils.get31LongitudeX(obj.getPoint31XTile(i));
float y = (float) MapUtils.get31LatitudeY(obj.getPoint31YTile(i));
b.append(y).append(" / ").append(x).append(" ");
} }
b.append("]"); b.append("]");
} }
@ -948,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 + 1))); b.append(" osmid ").append((obj.getId() >> (SHIFT_ID + 2)));
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++) {