Merge pull request #10848 from osmandapp/draft_8788

Implement precision result from 26 zoom

OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java

@@ -37,7 +37,12 @@ public class BinaryMapPoiReaderAdapter {
 	private static final int CATEGORY_MASK = (1 << SHIFT_BITS_CATEGORY) - 1;
 	private static final int ZOOM_TO_SKIP_FILTER_READ = 6;
 	private static final int ZOOM_TO_SKIP_FILTER = 3;
-	private static final int BUCKET_SEARCH_BY_NAME = 15; // should be bigger 100? 
+	private static final int BUCKET_SEARCH_BY_NAME = 15; // should be bigger 100?
+	private static final int BASE_POI_SHIFT = SHIFT_BITS_CATEGORY;// 7
+	private static final int FINAL_POI_SHIFT = BinaryMapIndexReader.SHIFT_COORDINATES;// 5
+	private static final int BASE_POI_ZOOM = 31 - BASE_POI_SHIFT;// 24 zoom
+	private static final int FINAL_POI_ZOOM = 31 - FINAL_POI_SHIFT;// 26 zoom
+
 
 	public static class PoiSubType {
 		public boolean text;
@@ -714,6 +719,8 @@ public class BinaryMapPoiReaderAdapter {
 		Amenity am = null;
 		int x = 0;
 		int y = 0;
+		int precisionXY = 0;
+		boolean hasLocation = false;
 		StringBuilder retValue = new StringBuilder();
 		PoiCategory amenityType = null;
 		LinkedList<String> textTags = null;
@@ -740,12 +747,22 @@ public class BinaryMapPoiReaderAdapter {
 						am.setRoutePoint(arp);
 					}
 				}
+				if (hasLocation) {
+					if (precisionXY != 0) {
+						int[] xy = MapUtils.calculateFinalXYFromBaseAndPrecisionXY(BASE_POI_ZOOM, FINAL_POI_ZOOM, precisionXY, x >> BASE_POI_SHIFT, y >> BASE_POI_SHIFT, true);
+						int x31 = xy[0] << FINAL_POI_SHIFT;
+						int y31 = xy[1] << FINAL_POI_SHIFT;
+						am.setLocation(MapUtils.get31LatitudeY(y31), MapUtils.get31LongitudeX(x31));
+					} else {
+						am.setLocation(MapUtils.get31LatitudeY(y), MapUtils.get31LongitudeX(x));
+					}
+				}
 				return am;
 			case OsmandOdb.OsmAndPoiBoxDataAtom.DX_FIELD_NUMBER:
-				x = (codedIS.readSInt32() + (px << (24 - zoom))) << 7;
+				x = (codedIS.readSInt32() + (px << (BASE_POI_ZOOM - zoom))) << BASE_POI_SHIFT;
 				break;
 			case OsmandOdb.OsmAndPoiBoxDataAtom.DY_FIELD_NUMBER:
-				y = (codedIS.readSInt32() + (py << (24 - zoom))) << 7;
+				y = (codedIS.readSInt32() + (py << (BASE_POI_ZOOM - zoom))) << BASE_POI_SHIFT;
 				req.numberOfVisitedObjects++;
 				if (checkBounds) {
 					if (left31 > x || right31 < x || top31 > y || bottom31 < y) {
@@ -754,7 +771,8 @@ public class BinaryMapPoiReaderAdapter {
 					}
 				}
 				am = new Amenity();
-				am.setLocation(MapUtils.get31LatitudeY(y), MapUtils.get31LongitudeX(x));
+				hasLocation = true;
+				//am.setLocation(MapUtils.get31LatitudeY(y), MapUtils.get31LongitudeX(x)); // set precise coordinates
 				break;
 			case OsmandOdb.OsmAndPoiBoxDataAtom.SUBCATEGORIES_FIELD_NUMBER:
 				int subtypev = codedIS.readUInt32();
@@ -827,6 +845,11 @@ public class BinaryMapPoiReaderAdapter {
 			case OsmandOdb.OsmAndPoiBoxDataAtom.NOTE_FIELD_NUMBER:
 				am.setDescription(codedIS.readString());
 				break;
+			case OsmandOdb.OsmAndPoiBoxDataAtom.PRECISIONXY_FIELD_NUMBER:
+				if (hasLocation) {
+					precisionXY = codedIS.readInt32();
+				}
+				break;
 			default:
 				skipUnknownField(t);
 				break;

OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java

@@ -54371,6 +54371,24 @@ public final class OsmandOdb {
      */
     com.google.protobuf.ByteString
         getTextValuesBytes(int index);
+
+    // optional int32 precisionXY = 16;
+    /**
+     * <code>optional int32 precisionXY = 16;</code>
+     *
+     * <pre>
+     * precision in 1-xy-xy-xy binary format
+     * </pre>
+     */
+    boolean hasPrecisionXY();
+    /**
+     * <code>optional int32 precisionXY = 16;</code>
+     *
+     * <pre>
+     * precision in 1-xy-xy-xy binary format
+     * </pre>
+     */
+    int getPrecisionXY();
   }
   /**
    * Protobuf type {@code OsmAnd.OBF.OsmAndPoiBoxDataAtom}
@@ -54539,6 +54557,11 @@ public final class OsmandOdb {
               textValues_.add(input.readBytes());
               break;
             }
+            case 128: {
+              bitField0_ |= 0x00000200;
+              precisionXY_ = input.readInt32();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -55048,6 +55071,30 @@ public final class OsmandOdb {
       return textValues_.getByteString(index);
     }
 
+    // optional int32 precisionXY = 16;
+    public static final int PRECISIONXY_FIELD_NUMBER = 16;
+    private int precisionXY_;
+    /**
+     * <code>optional int32 precisionXY = 16;</code>
+     *
+     * <pre>
+     * precision in 1-xy-xy-xy binary format
+     * </pre>
+     */
+    public boolean hasPrecisionXY() {
+      return ((bitField0_ & 0x00000200) == 0x00000200);
+    }
+    /**
+     * <code>optional int32 precisionXY = 16;</code>
+     *
+     * <pre>
+     * precision in 1-xy-xy-xy binary format
+     * </pre>
+     */
+    public int getPrecisionXY() {
+      return precisionXY_;
+    }
+
     private void initFields() {
       dx_ = 0;
       dy_ = 0;
@@ -55062,6 +55109,7 @@ public final class OsmandOdb {
       note_ = "";
       textCategories_ = java.util.Collections.emptyList();
       textValues_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      precisionXY_ = 0;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -55122,6 +55170,9 @@ public final class OsmandOdb {
       for (int i = 0; i < textValues_.size(); i++) {
         output.writeBytes(15, textValues_.getByteString(i));
       }
+      if (((bitField0_ & 0x00000200) == 0x00000200)) {
+        output.writeInt32(16, precisionXY_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -55203,6 +55254,10 @@ public final class OsmandOdb {
         size += dataSize;
         size += 1 * getTextValuesList().size();
       }
+      if (((bitField0_ & 0x00000200) == 0x00000200)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(16, precisionXY_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -55345,6 +55400,8 @@ public final class OsmandOdb {
         bitField0_ = (bitField0_ & ~0x00000800);
         textValues_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00001000);
+        precisionXY_ = 0;
+        bitField0_ = (bitField0_ & ~0x00002000);
         return this;
       }
 
@@ -55430,6 +55487,10 @@ public final class OsmandOdb {
           bitField0_ = (bitField0_ & ~0x00001000);
         }
         result.textValues_ = textValues_;
+        if (((from_bitField0_ & 0x00002000) == 0x00002000)) {
+          to_bitField0_ |= 0x00000200;
+        }
+        result.precisionXY_ = precisionXY_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -55525,6 +55586,9 @@ public final class OsmandOdb {
           }
           onChanged();
         }
+        if (other.hasPrecisionXY()) {
+          setPrecisionXY(other.getPrecisionXY());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -56506,6 +56570,55 @@ public final class OsmandOdb {
         return this;
       }
 
+      // optional int32 precisionXY = 16;
+      private int precisionXY_ ;
+      /**
+       * <code>optional int32 precisionXY = 16;</code>
+       *
+       * <pre>
+       * precision in 1-xy-xy-xy binary format
+       * </pre>
+       */
+      public boolean hasPrecisionXY() {
+        return ((bitField0_ & 0x00002000) == 0x00002000);
+      }
+      /**
+       * <code>optional int32 precisionXY = 16;</code>
+       *
+       * <pre>
+       * precision in 1-xy-xy-xy binary format
+       * </pre>
+       */
+      public int getPrecisionXY() {
+        return precisionXY_;
+      }
+      /**
+       * <code>optional int32 precisionXY = 16;</code>
+       *
+       * <pre>
+       * precision in 1-xy-xy-xy binary format
+       * </pre>
+       */
+      public Builder setPrecisionXY(int value) {
+        bitField0_ |= 0x00002000;
+        precisionXY_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 precisionXY = 16;</code>
+       *
+       * <pre>
+       * precision in 1-xy-xy-xy binary format
+       * </pre>
+       */
+      public Builder clearPrecisionXY() {
+        bitField0_ = (bitField0_ & ~0x00002000);
+        precisionXY_ = 0;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:OsmAnd.OBF.OsmAndPoiBoxDataAtom)
     }
 
@@ -65008,37 +65121,38 @@ public final class OsmandOdb {
       "tegories\030\003 \003(\r\022\025\n\rsubcategories\030\005 \003(\r\"i\n" +
       "\020OsmAndPoiBoxData\022\014\n\004zoom\030\001 \001(\r\022\t\n\001x\030\002 \001" +
       "(\r\022\t\n\001y\030\003 \001(\r\0221\n\007poiData\030\005 \003(\0132 .OsmAnd." +
-      "OBF.OsmAndPoiBoxDataAtom\"\360\001\n\024OsmAndPoiBo",
+      "OBF.OsmAndPoiBoxDataAtom\"\205\002\n\024OsmAndPoiBo",
       "xDataAtom\022\n\n\002dx\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\022\n\ncat" +
       "egories\030\004 \003(\r\022\025\n\rsubcategories\030\005 \003(\r\022\014\n\004" +
       "name\030\006 \001(\t\022\016\n\006nameEn\030\007 \001(\t\022\n\n\002id\030\010 \001(\004\022\024" +
       "\n\014openingHours\030\n \001(\t\022\014\n\004site\030\013 \001(\t\022\r\n\005ph" +
       "one\030\014 \001(\t\022\014\n\004note\030\r \001(\t\022\026\n\016textCategorie" +
-      "s\030\016 \003(\r\022\022\n\ntextValues\030\017 \003(\t\"\032\n\007IdTable\022\017" +
+      "s\030\016 \003(\r\022\022\n\ntextValues\030\017 \003(\t\022\023\n\013precision" +
-      "\n\007routeId\030\001 \003(\022\"F\n\017RestrictionData\022\014\n\004ty" +
+      "XY\030\020 \001(\005\"\032\n\007IdTable\022\017\n\007routeId\030\001 \003(\022\"F\n\017" +
-      "pe\030\001 \002(\005\022\014\n\004from\030\002 \002(\005\022\n\n\002to\030\003 \002(\005\022\013\n\003vi" +
+      "RestrictionData\022\014\n\004type\030\001 \002(\005\022\014\n\004from\030\002 " +
-      "a\030\004 \001(\005\"x\n\tRouteData\022\016\n\006points\030\001 \002(\014\022\022\n\n" +
+      "\002(\005\022\n\n\002to\030\003 \002(\005\022\013\n\003via\030\004 \001(\005\"x\n\tRouteDat" +
-      "pointTypes\030\004 \001(\014\022\022\n\npointNames\030\005 \001(\014\022\r\n\005",
+      "a\022\016\n\006points\030\001 \002(\014\022\022\n\npointTypes\030\004 \001(\014\022\022\n",
-      "types\030\007 \002(\014\022\017\n\007routeId\030\014 \002(\005\022\023\n\013stringNa" +
+      "\npointNames\030\005 \001(\014\022\r\n\005types\030\007 \002(\014\022\017\n\007rout" +
-      "mes\030\016 \001(\014\"\304\005\n\022OsmAndRoutingIndex\022\014\n\004name" +
+      "eId\030\014 \002(\005\022\023\n\013stringNames\030\016 \001(\014\"\304\005\n\022OsmAn" +
-      "\030\001 \002(\t\022?\n\005rules\030\002 \003(\01320.OsmAnd.OBF.OsmAn" +
+      "dRoutingIndex\022\014\n\004name\030\001 \002(\t\022?\n\005rules\030\002 \003" +
-      "dRoutingIndex.RouteEncodingRule\022>\n\trootB" +
+      "(\01320.OsmAnd.OBF.OsmAndRoutingIndex.Route" +
-      "oxes\030\003 \003(\0132+.OsmAnd.OBF.OsmAndRoutingInd" +
+      "EncodingRule\022>\n\trootBoxes\030\003 \003(\0132+.OsmAnd" +
-      "ex.RouteDataBox\022A\n\014basemapBoxes\030\004 \003(\0132+." +
+      ".OBF.OsmAndRoutingIndex.RouteDataBox\022A\n\014" +
-      "OsmAnd.OBF.OsmAndRoutingIndex.RouteDataB" +
+      "basemapBoxes\030\004 \003(\0132+.OsmAnd.OBF.OsmAndRo" +
-      "ox\022=\n\006blocks\030\005 \003(\0132-.OsmAnd.OBF.OsmAndRo" +
+      "utingIndex.RouteDataBox\022=\n\006blocks\030\005 \003(\0132" +
-      "utingIndex.RouteDataBlock\032;\n\021RouteEncodi" +
+      "-.OsmAnd.OBF.OsmAndRoutingIndex.RouteDat" +
-      "ngRule\022\013\n\003tag\030\003 \002(\t\022\r\n\005value\030\005 \002(\t\022\n\n\002id",
+      "aBlock\032;\n\021RouteEncodingRule\022\013\n\003tag\030\003 \002(\t",
-      "\030\007 \001(\r\032\231\001\n\014RouteDataBox\022\014\n\004left\030\001 \002(\021\022\r\n" +
+      "\022\r\n\005value\030\005 \002(\t\022\n\n\002id\030\007 \001(\r\032\231\001\n\014RouteDat" +
-      "\005right\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\022\016\n\006bottom\030\004 \002(" +
+      "aBox\022\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top" +
-      "\021\022\023\n\013shiftToData\030\005 \001(\007\022:\n\005boxes\030\007 \003(\0132+." +
+      "\030\003 \002(\021\022\016\n\006bottom\030\004 \002(\021\022\023\n\013shiftToData\030\005 " +
-      "OsmAnd.OBF.OsmAndRoutingIndex.RouteDataB" +
+      "\001(\007\022:\n\005boxes\030\007 \003(\0132+.OsmAnd.OBF.OsmAndRo" +
-      "ox\032\303\001\n\016RouteDataBlock\022$\n\007idTable\030\005 \001(\0132\023" +
+      "utingIndex.RouteDataBox\032\303\001\n\016RouteDataBlo" +
-      ".OsmAnd.OBF.IdTable\022*\n\013dataObjects\030\006 \003(\013" +
+      "ck\022$\n\007idTable\030\005 \001(\0132\023.OsmAnd.OBF.IdTable" +
-      "2\025.OsmAnd.OBF.RouteData\0221\n\014restrictions\030" +
+      "\022*\n\013dataObjects\030\006 \003(\0132\025.OsmAnd.OBF.Route" +
-      "\007 \003(\0132\033.OsmAnd.OBF.RestrictionData\022,\n\013st" +
+      "Data\0221\n\014restrictions\030\007 \003(\0132\033.OsmAnd.OBF." +
-      "ringTable\030\010 \001(\0132\027.OsmAnd.OBF.StringTable" +
+      "RestrictionData\022,\n\013stringTable\030\010 \001(\0132\027.O" +
-      "B\036\n\021net.osmand.binaryB\tOsmandOdb"
+      "smAnd.OBF.StringTableB\036\n\021net.osmand.bina",
+      "ryB\tOsmandOdb"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -65296,7 +65410,7 @@ public final class OsmandOdb {
           internal_static_OsmAnd_OBF_OsmAndPoiBoxDataAtom_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_OsmAnd_OBF_OsmAndPoiBoxDataAtom_descriptor,
-              new java.lang.String[] { "Dx", "Dy", "Categories", "Subcategories", "Name", "NameEn", "Id", "OpeningHours", "Site", "Phone", "Note", "TextCategories", "TextValues", });
+              new java.lang.String[] { "Dx", "Dy", "Categories", "Subcategories", "Name", "NameEn", "Id", "OpeningHours", "Site", "Phone", "Note", "TextCategories", "TextValues", "PrecisionXY", });
           internal_static_OsmAnd_OBF_IdTable_descriptor =
             getDescriptor().getMessageTypes().get(36);
           internal_static_OsmAnd_OBF_IdTable_fieldAccessorTable = new

OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java

@@ -49,6 +49,47 @@ public class MapUtils {
         '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '_', '~'
     };
 
+	public static int calculateFromBaseZoomPrecisionXY(int baseZoom, int finalZoom, int xFinal, int yFinal) {
+		int px = xFinal;
+		int py = yFinal;
+		int precisionNumber = 1;
+		for (int zoom = finalZoom - 1; zoom >= baseZoom; zoom--) {
+			int x = px / 2; // (int) MapUtils.getTileNumberX(zoom, lon);
+			int y = py / 2; // (int) MapUtils.getTileNumberY(zoom, lat);
+			int deltax = px - x * 2;
+			int deltay = py - y * 2;
+			precisionNumber = (precisionNumber << 2) + (deltax << 1) + deltay;
+			// StringBuilder spaces = new StringBuilder();
+			// for (int i = 0; i < 32 - zoom; i++) {
+			//	spaces.append(' ');
+			// }
+			// System.out.println(String.format("%d %s + %d %s %s + %d", zoom, Integer.toBinaryString(x), deltax, spaces.toString(), Integer.toBinaryString(y), deltay));
+			px = x;
+			py = y;
+		}
+		// System.out.println(String.format("Bits: %d %s (%d)", Integer.toBinaryString(precisionNumber).length(), Integer.toBinaryString(precisionNumber), precisionNumber));
+		return precisionNumber;
+	}
+
+	public static int[] calculateFinalXYFromBaseAndPrecisionXY(int bazeZoom, int finalZoom,
+			int precisionXY, int xBase, int yBase, boolean ignoreNotEnoughPrecision) {
+		// System.out.println(String.format("Base x, y at zoom %d: %d %d", zoomToStart, xBaseApproximation, yBaseApproximation));
+		// calculate finish approximation using precisionNumber
+		int finalX = xBase;
+		int finalY = yBase;
+		int precisionCalc = precisionXY;
+		for (int zoom = bazeZoom; zoom < finalZoom; zoom++) {
+			if (precisionCalc <= 1 && precisionCalc > 0 && !ignoreNotEnoughPrecision) {
+				 throw new IllegalArgumentException("Not enough bits to retrieve zoom approximation");
+			}
+			finalY = finalY * 2 + (precisionXY & 1);
+			finalX = finalX * 2 + ((precisionXY & 2) >> 1);
+			precisionXY = precisionXY >> 2;
+		}
+		// System.out.println(String.format("Calc x, y at zoom %d: %d %d", finalZoom, finalX, finalY));
+		return new int[] { finalX, finalY };
+	}
+
 
 
 	public static double getDistance(LatLon l, double latitude, double longitude) {