diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
index c2edd50767..3f66fb2680 100644
--- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
@@ -49,6 +49,7 @@ import net.osmand.data.Building;
import net.osmand.data.City;
import net.osmand.data.MapObject;
import net.osmand.data.Street;
+import net.osmand.osm.MapRenderingTypes;
import net.osmand.osm.PoiCategory;
import net.osmand.util.MapUtils;
@@ -70,15 +71,15 @@ public class BinaryInspector {
// test cases show info
if ("test".equals(args[0])) {
in.inspector(new String[]{
- "-vpoi",
- "-vmap", "-vmapobjects", // "-vmapcoordinates",
+// "-vpoi",
+// "-vmap", "-vmapobjects", // "-vmapcoordinates",
"-vrouting",
- "-vaddress", "-vcities","-vstreetgroups",
- "-vstreets", "-vbuildings", "-vintersections",
- "-lang=ru",
- "-bbox=4.8486,52.3084,4.8747,52.2970",
-// "-osm="+System.getProperty("maps.dir")+"/map.obf.osm"
- System.getProperty("maps.dir")+"/Netherlands_noord-holland_europe.obf"
+// "-vaddress", "-vcities","-vstreetgroups",
+// "-vstreets", "-vbuildings", "-vintersections",
+// "-lang=ru",
+// "-bbox=4.8486,52.3084,4.8747,52.2970",
+ "-osm="+System.getProperty("maps.dir")+"/map.obf.osm",
+ System.getProperty("maps.dir")+"/Map.obf"
});
} else {
in.inspector(args);
@@ -532,14 +533,28 @@ public class BinaryInspector {
MapUtils.get31TileNumberX(vInfo.lonright), MapUtils.get31TileNumberY(vInfo.lattop),
MapUtils.get31TileNumberY(vInfo.latbottom), vInfo.getZoom(), null),
p.getSubregions());
+ if (vInfo.osm) {
+ printToFile("\n" +
+ "\n");
+ }
index.loadRouteIndexData(regions, new ResultMatcher() {
@Override
public boolean publish(RouteDataObject obj) {
mapObjectsCounter.value++;
+ if (vInfo.osm) {
+ b.setLength(0);
+ printOsmRouteDetails(obj, b);
+ try {
+ printToFile(b.toString());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
b.setLength(0);
b.append("Road ");
b.append(obj.id);
b.append(" osmid ").append(obj.getId() >> (SHIFT_ID));
+
for (int i = 0; i < obj.getTypes().length; i++) {
RouteTypeRule rr = obj.region.quickGetEncodingRule(obj.getTypes()[i]);
b.append(" ").append(rr.getTag()).append("='").append(rr.getValue()).append("'");
@@ -559,7 +574,7 @@ public class BinaryInspector {
int[] nametypes = obj.getPointNameTypes(i);
int[] types = obj.getPointTypes(i);
if (types != null || names != null) {
- b.append(" [ " + (i + 1) + ". ");
+ b.append("[" + (i + 1) + ". ");
if (names != null) {
for (int k = 0; k < names.length; k++) {
RouteTypeRule rr = obj.region.quickGetEncodingRule(nametypes[k]);
@@ -577,9 +592,10 @@ public class BinaryInspector {
float y = (float) MapUtils.get31LatitudeY(obj.getPoint31YTile(i));
b.append(y).append(" / ").append(x).append(" ");
}
+ b.append("]");
}
- b.append("]");
}
+ b.append("]");
}
if (obj.restrictions != null) {
b.append(" restrictions [");
@@ -587,7 +603,9 @@ public class BinaryInspector {
if (i > 0) {
b.append(", ");
}
- b.append(obj.getRestrictionId(i)).append(" (").append(obj.getRestrictionType(i)).append(") ");
+ b.append(obj.getRestrictionId(i)).append(" (").append(
+ MapRenderingTypes.getRestrictionValue(
+ obj.getRestrictionType(i))).append(") ");
}
b.append("] ");
@@ -610,6 +628,9 @@ public class BinaryInspector {
}
});
println("\tTotal map objects: " + mapObjectsCounter.value);
+ if (vInfo.osm) {
+ printToFile("\n");
+ }
}
private void printAddressDetailedInfo(VerboseInfo verbose, BinaryMapIndexReader index, AddressRegion region) throws IOException {
@@ -965,6 +986,83 @@ public class BinaryInspector {
private static int OSM_ID = 1;
+ private void printOsmRouteDetails(RouteDataObject obj, StringBuilder b) {
+ StringBuilder tags = new StringBuilder();
+ int[] types = obj.getTypes();
+ for (int j = 0; j < types.length; j++) {
+ RouteTypeRule rt = obj.region.quickGetEncodingRule(types[j]);
+ if (rt == null) {
+ throw new NullPointerException("Type " + types[j] + "was not found");
+ }
+ tags.append("\t\n");
+ }
+ TIntObjectHashMap names = obj.getNames();
+ if (names != null && !names.isEmpty()) {
+ int[] keys = names.keys();
+ for (int j = 0; j < keys.length; j++) {
+ RouteTypeRule rt = obj.region.quickGetEncodingRule(keys[j]);
+ if (rt == null) {
+ throw new NullPointerException("Type " + keys[j] + "was not found");
+ }
+ String name = quoteName(names.get(keys[j]));
+ tags.append("\t\n");
+ }
+ }
+
+ tags.append("\t\n");
+ tags.append("\t\n");
+
+ TLongArrayList ids = new TLongArrayList();
+ for (int i = 0; i < obj.getPointsLength(); i++) {
+ float lon = (float) MapUtils.get31LongitudeX(obj.getPoint31XTile(i));
+ float lat = (float) MapUtils.get31LatitudeY(obj.getPoint31YTile(i));
+ int id = OSM_ID++;
+ b.append("\t\n");
+ if (obj.getPointNames(i) != null) {
+ String[] vs = obj.getPointNames(i);
+ int[] keys = obj.getPointNameTypes(i);
+ for (int j = 0; j < keys.length; j++) {
+ RouteTypeRule rt = obj.region.quickGetEncodingRule(keys[j]);
+ String name = quoteName(vs[j]);
+ tags.append("\t\t\n");
+ }
+ }
+ if (obj.getPointTypes(i) != null) {
+ int[] keys = obj.getPointTypes(i);
+ for (int j = 0; j < keys.length; j++) {
+ RouteTypeRule rt = obj.region.quickGetEncodingRule(keys[j]);
+ tags.append("\t\t\n");
+ }
+ }
+ b.append("\t\n");
+ ids.add(id);
+ }
+ long idway = printWay(ids, b, tags);
+ if(obj.getRestrictionLength() > 0) {
+ for(int i = 0; i < obj.getRestrictionLength(); i ++) {
+ long ld = obj.getRestrictionId(i);
+ String tp = MapRenderingTypes.getRestrictionValue(obj.getRestrictionType(i));
+ int id = OSM_ID++;
+ b.append("\t\n");
+ b.append("\t\n");
+ b.append("\t\n");
+ b.append("\t\n");
+ b.append("\t\n");
+ b.append("\t\n");
+ b.append("\t\n");
+ b.append("\t\n");
+ }
+ }
+ }
+
+ private String quoteName(String name) {
+ name = name.replace("'", "'");
+ name = name.replace("&", "&");
+ return name;
+ }
+
private void printOsmMapDetails(BinaryMapDataObject obj, StringBuilder b) {
boolean multipolygon = obj.getPolygonInnerCoordinates() != null && obj.getPolygonInnerCoordinates().length > 0;
boolean point = obj.getPointsLength() == 1;
@@ -979,7 +1077,8 @@ public class BinaryInspector {
}
if (obj.getAdditionalTypes() != null && obj.getAdditionalTypes().length > 0) {
for (int j = 0; j < obj.getAdditionalTypes().length; j++) {
- TagValuePair pair = obj.getMapIndex().decodeType(obj.getAdditionalTypes()[j]);
+ int addtype = obj.getAdditionalTypes()[j];
+ TagValuePair pair = obj.getMapIndex().decodeType(addtype);
if (pair == null) {
throw new NullPointerException("Type " + obj.getAdditionalTypes()[j] + "was not found");
}
@@ -995,8 +1094,7 @@ public class BinaryInspector {
throw new NullPointerException("Type " + keys[j] + "was not found");
}
String name = names.get(keys[j]);
- name = name.replace("'", "'");
- name = name.replace("&", "&");
+ name = quoteName(name);
tags.append("\t\n");
}
}
@@ -1048,6 +1146,7 @@ public class BinaryInspector {
}
}
+
private long printWay(TLongArrayList ids, StringBuilder b, StringBuilder tags) {
int id = OSM_ID++;
b.append("\n");
diff --git a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
index 35841c3920..7010b10938 100644
--- a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
+++ b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
@@ -588,6 +588,26 @@ public abstract class MapRenderingTypes {
}
+ public static String getRestrictionValue(int i) {
+ switch (i) {
+ case RESTRICTION_NO_RIGHT_TURN:
+ return "NO_RIGHT_TURN".toLowerCase();
+ case RESTRICTION_NO_LEFT_TURN:
+ return "NO_LEFT_TURN".toLowerCase();
+ case RESTRICTION_NO_U_TURN:
+ return "NO_U_TURN".toLowerCase();
+ case RESTRICTION_NO_STRAIGHT_ON:
+ return "NO_STRAIGHT_ON".toLowerCase();
+ case RESTRICTION_ONLY_RIGHT_TURN:
+ return "ONLY_RIGHT_TURN".toLowerCase();
+ case RESTRICTION_ONLY_LEFT_TURN:
+ return "ONLY_LEFT_TURN".toLowerCase();
+ case RESTRICTION_ONLY_STRAIGHT_ON:
+ return "ONLY_STRAIGHT_ON".toLowerCase();
+ }
+ return "unkonwn";
+
+ }
}