getSubtypesList() {
@@ -47399,7 +47554,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public int getSubtypesCount() {
@@ -47415,7 +47570,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public net.osmand.binary.OsmandOdb.OsmAndPoiSubtype getSubtypes(int index) {
@@ -47431,7 +47586,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public Builder setSubtypes(
@@ -47454,7 +47609,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public Builder setSubtypes(
@@ -47474,7 +47629,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public Builder addSubtypes(net.osmand.binary.OsmandOdb.OsmAndPoiSubtype value) {
@@ -47496,7 +47651,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public Builder addSubtypes(
@@ -47519,7 +47674,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public Builder addSubtypes(
@@ -47539,7 +47694,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public Builder addSubtypes(
@@ -47559,7 +47714,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public Builder addAllSubtypes(
@@ -47579,7 +47734,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public Builder clearSubtypes() {
@@ -47598,7 +47753,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public Builder removeSubtypes(int index) {
@@ -47617,7 +47772,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public net.osmand.binary.OsmandOdb.OsmAndPoiSubtype.Builder getSubtypesBuilder(
@@ -47630,7 +47785,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public net.osmand.binary.OsmandOdb.OsmAndPoiSubtypeOrBuilder getSubtypesOrBuilder(
@@ -47646,7 +47801,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public java.util.List
@@ -47663,7 +47818,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public net.osmand.binary.OsmandOdb.OsmAndPoiSubtype.Builder addSubtypesBuilder() {
@@ -47676,7 +47831,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public net.osmand.binary.OsmandOdb.OsmAndPoiSubtype.Builder addSubtypesBuilder(
@@ -47690,7 +47845,7 @@ public final class OsmandOdb {
*
* id calculated
* 1. if subtypes_order <= 31 : ( (subtypeValue << 5) | subtypes_order) << 1
- * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
+ * 2. if subtypes_order > 31 : ( (subtypeValue << 16) | subtypes_order) << 1 + 1
*
*/
public java.util.List
@@ -59017,10 +59172,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
boolean hasIdTable();
@@ -59029,10 +59184,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
net.osmand.binary.OsmandOdb.IdTable getIdTable();
@@ -59041,10 +59196,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
net.osmand.binary.OsmandOdb.IdTableOrBuilder getIdTableOrBuilder();
@@ -59260,10 +59415,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public boolean hasIdTable() {
@@ -59274,10 +59429,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public net.osmand.binary.OsmandOdb.IdTable getIdTable() {
@@ -59288,10 +59443,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public net.osmand.binary.OsmandOdb.IdTableOrBuilder getIdTableOrBuilder() {
@@ -59787,10 +59942,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public boolean hasIdTable() {
@@ -59801,10 +59956,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public net.osmand.binary.OsmandOdb.IdTable getIdTable() {
@@ -59819,10 +59974,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public Builder setIdTable(net.osmand.binary.OsmandOdb.IdTable value) {
@@ -59843,10 +59998,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public Builder setIdTable(
@@ -59865,10 +60020,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public Builder mergeIdTable(net.osmand.binary.OsmandOdb.IdTable value) {
@@ -59892,10 +60047,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public Builder clearIdTable() {
@@ -59913,10 +60068,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public net.osmand.binary.OsmandOdb.IdTable.Builder getIdTableBuilder() {
@@ -59929,10 +60084,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
public net.osmand.binary.OsmandOdb.IdTableOrBuilder getIdTableOrBuilder() {
@@ -59947,10 +60102,10 @@ public final class OsmandOdb {
*
*
* coordinates can take much space 4*4*count of data blocks=
- * required sint32 left = 1; // delta encoded
- * required sint32 right = 2; // delta encoded
- * required sint32 top = 3; // delta encoded
- * required sint32 bottom = 4; // delta encoded
+ * required sint32 left = 1; // delta encoded
+ * required sint32 right = 2; // delta encoded
+ * required sint32 top = 3; // delta encoded
+ * required sint32 bottom = 4; // delta encoded
*
*/
private com.google.protobuf.SingleFieldBuilder<
@@ -62753,157 +62908,157 @@ public final class OsmandOdb {
"OBF.OsmAndMapIndex.MapDataBox\"v\n\014MapData",
"Block\022\016\n\006baseId\030\n \001(\004\022(\n\013dataObjects\030\014 \003" +
"(\0132\023.OsmAnd.OBF.MapData\022,\n\013stringTable\030\017" +
- " \001(\0132\027.OsmAnd.OBF.StringTable\"\266\001\n\007MapDat" +
+ " \001(\0132\027.OsmAnd.OBF.StringTable\"\320\001\n\007MapDat" +
"a\022\023\n\013coordinates\030\001 \001(\014\022\027\n\017areaCoordinate" +
"s\030\002 \001(\014\022\037\n\027polygonInnerCoordinates\030\004 \003(\014" +
"\022\027\n\017additionalTypes\030\006 \001(\014\022\r\n\005types\030\007 \002(\014" +
- "\022\023\n\013stringNames\030\n \001(\014\022\n\n\002id\030\014 \002(\022\022\023\n\013ras" +
- "terBytes\030\017 \001(\014\"\364\003\n\022OsmAndAddressIndex\022\014\n" +
- "\004name\030\001 \002(\t\022\017\n\007name_en\030\002 \001(\t\022-\n\nboundari" +
- "es\030\003 \001(\0132\031.OsmAnd.OBF.OsmAndTileBox\0223\n\022a",
- "ttributeTagsTable\030\004 \001(\0132\027.OsmAnd.OBF.Str" +
- "ingTable\022:\n\006cities\030\006 \003(\0132*.OsmAnd.OBF.Os" +
- "mAndAddressIndex.CitiesIndex\0229\n\tnameInde" +
- "x\030\007 \001(\0132&.OsmAnd.OBF.OsmAndAddressNameIn" +
- "dexData\032\343\001\n\013CitiesIndex\022C\n\004type\030\002 \002(\01625." +
- "OsmAnd.OBF.OsmAndAddressIndex.CitiesInde" +
- "x.CitiesType\022%\n\006cities\030\005 \003(\0132\025.OsmAnd.OB" +
- "F.CityIndex\022*\n\006blocks\030\007 \003(\0132\032.OsmAnd.OBF" +
- ".CityBlockIndex\"<\n\nCitiesType\022\021\n\rCitiesO" +
- "rTowns\020\001\022\r\n\tPostcodes\020\002\022\014\n\010Villages\020\003\"\342\001",
- "\n\032OsmAndAddressNameIndexData\022-\n\005table\030\004 " +
- "\002(\0132\036.OsmAnd.OBF.IndexedStringTable\022I\n\004a" +
- "tom\030\007 \003(\0132;.OsmAnd.OBF.OsmAndAddressName" +
- "IndexData.AddressNameIndexData\032J\n\024Addres" +
- "sNameIndexData\0222\n\004atom\030\004 \003(\0132$.OsmAnd.OB" +
- "F.AddressNameIndexDataAtom\"\204\001\n\030AddressNa" +
- "meIndexDataAtom\022\014\n\004name\030\001 \001(\t\022\016\n\006nameEn\030" +
- "\002 \001(\t\022\014\n\004type\030\003 \002(\r\022\024\n\014shiftToIndex\030\005 \003(" +
- "\005\022\030\n\020shiftToCityIndex\030\006 \003(\005\022\014\n\004xy16\030\007 \003(" +
- "\r\"\260\001\n\tCityIndex\022\021\n\tcity_type\030\001 \001(\r\022\014\n\004na",
- "me\030\002 \002(\t\022\017\n\007name_en\030\003 \001(\t\022\n\n\002id\030\004 \001(\004\022\t\n" +
- "\001x\030\005 \002(\r\022\t\n\001y\030\006 \002(\r\022\027\n\017attributeTagIds\030\007" +
- " \003(\r\022\027\n\017attributeValues\030\010 \003(\t\022\035\n\025shiftTo" +
- "CityBlockIndex\030\n \001(\007\"\202\001\n\016CityBlockIndex\022" +
- "\030\n\020shiftToCityIndex\030\004 \001(\007\022,\n\tbuildings\030\n" +
- " \003(\0132\031.OsmAnd.OBF.BuildingIndex\022(\n\007stree" +
- "ts\030\014 \003(\0132\027.OsmAnd.OBF.StreetIndex\"\345\001\n\013St" +
- "reetIndex\022\014\n\004name\030\001 \002(\t\022\017\n\007name_en\030\002 \001(\t" +
- "\022\t\n\001x\030\003 \002(\021\022\t\n\001y\030\004 \002(\021\0225\n\rintersections\030" +
- "\005 \003(\0132\036.OsmAnd.OBF.StreetIntersection\022\n\n",
- "\002id\030\006 \001(\004\022\027\n\017attributeTagIds\030\007 \003(\r\022\027\n\017at" +
- "tributeValues\030\010 \003(\t\022,\n\tbuildings\030\014 \003(\0132\031" +
- ".OsmAnd.OBF.BuildingIndex\"\221\001\n\022StreetInte" +
- "rsection\022\014\n\004name\030\002 \002(\t\022\017\n\007name_en\030\003 \001(\t\022" +
- "\024\n\014intersectedX\030\004 \002(\021\022\024\n\014intersectedY\030\005 " +
- "\002(\021\022\027\n\017attributeTagIds\030\007 \003(\r\022\027\n\017attribut" +
- "eValues\030\010 \003(\t\"\230\002\n\rBuildingIndex\022\014\n\004name\030" +
- "\001 \002(\t\022\017\n\007name_en\030\002 \001(\t\022\r\n\005name2\030\003 \001(\t\022\020\n" +
- "\010name_en2\030\004 \001(\t\022\025\n\rinterpolation\030\005 \001(\021\022\t" +
- "\n\001x\030\007 \002(\021\022\t\n\001y\030\010 \002(\021\022\n\n\002x2\030\t \001(\021\022\n\n\002y2\030\n",
- " \001(\021\022\n\n\002id\030\r \001(\004\022\020\n\010postcode\030\016 \001(\t\022\027\n\017at" +
- "tributeTagIds\030\017 \003(\r\022\027\n\017attributeValues\030\020" +
- " \003(\t\022\030\n\020attributeTagIds2\030\021 \003(\r\022\030\n\020attrib" +
- "uteValues2\030\022 \003(\t\"=\n\017TransportRoutes\022*\n\006r" +
- "outes\030\006 \003(\0132\032.OsmAnd.OBF.TransportRoute\"" +
- "\300\002\n\016TransportRoute\022\n\n\002id\030\001 \002(\004\022\014\n\004type\030\003" +
- " \001(\r\022\020\n\010operator\030\004 \001(\r\022\013\n\003ref\030\005 \001(\t\022\014\n\004n" +
- "ame\030\006 \001(\r\022\017\n\007name_en\030\007 \001(\r\022\020\n\010distance\030\010" +
- " \001(\r\022\r\n\005color\030\t \001(\r\0223\n\013directStops\030\017 \003(\013" +
- "2\036.OsmAnd.OBF.TransportRouteStop\0224\n\014reve",
- "rseStops\030\020 \003(\0132\036.OsmAnd.OBF.TransportRou" +
- "teStop\022\020\n\010geometry\030\021 \001(\014\0228\n\014scheduleTrip" +
- "\030\022 \003(\0132\".OsmAnd.OBF.TransportRouteSchedu" +
- "le\"\244\001\n\026TransportRouteSchedule\022\030\n\020avgStop" +
- "Intervals\030\001 \001(\014\022\030\n\020avgWaitIntervals\030\002 \001(" +
- "\014\022\025\n\rtripIntervals\030\003 \001(\014\022?\n\nexceptions\030\010" +
- " \003(\0132+.OsmAnd.OBF.TransportRouteSchedule" +
- "Exception\"\313\001\n\037TransportRouteScheduleExce" +
- "ption\022\023\n\013tripIndexes\030\001 \003(\r\022\023\n\013stopIndexe" +
- "s\030\002 \003(\r\022\021\n\tavailable\030\003 \001(\010\022\024\n\014delayArriv",
- "al\030\005 \003(\r\022\031\n\021deltaWaitInterval\030\006 \003(\005\022\034\n\024d" +
- "ayOfWeekRestriction\030\007 \003(\r\022\034\n\024dayOfYearRe" +
- "striction\030\010 \003(\r\"W\n\022TransportRouteStop\022\n\n" +
- "\002id\030\001 \002(\022\022\n\n\002dx\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\014\n\004nam" +
- "e\030\006 \002(\r\022\017\n\007name_en\030\007 \001(\r\"\332\001\n\rTransportSt" +
- "op\022\n\n\002dx\030\001 \002(\021\022\n\n\002dy\030\002 \002(\021\022\n\n\002id\030\005 \002(\022\022\014" +
- "\n\004name\030\006 \002(\r\022\017\n\007name_en\030\007 \001(\r\022\033\n\023additio" +
- "nalNamePairs\030\010 \001(\014\022,\n\005exits\030\t \003(\0132\035.OsmA" +
- "nd.OBF.TransportStopExit\022\016\n\006routes\030\020 \003(\r" +
- "\022\030\n\020deletedRoutesIds\030\024 \003(\004\022\021\n\troutesIds\030",
- "\026 \003(\004\"8\n\021TransportStopExit\022\n\n\002dx\030\001 \002(\021\022\n" +
- "\n\002dy\030\002 \002(\021\022\013\n\003ref\030\003 \002(\r\"\272\001\n\022TransportSto" +
- "psTree\022\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003t" +
- "op\030\003 \002(\021\022\016\n\006bottom\030\004 \002(\021\0220\n\010subtrees\030\007 \003" +
- "(\0132\036.OsmAnd.OBF.TransportStopsTree\022(\n\005le" +
- "afs\030\010 \003(\0132\031.OsmAnd.OBF.TransportStop\022\016\n\006" +
- "baseId\030\020 \001(\004\"\256\001\n\024OsmAndTransportIndex\022\014\n" +
- "\004name\030\001 \001(\t\022+\n\006routes\030\003 \001(\0132\033.OsmAnd.OBF" +
- ".TransportRoutes\022-\n\005stops\030\006 \001(\0132\036.OsmAnd" +
- ".OBF.TransportStopsTree\022,\n\013stringTable\030\t",
- " \002(\0132\027.OsmAnd.OBF.StringTable\"\312\002\n\016OsmAnd" +
- "PoiIndex\022\014\n\004name\030\001 \002(\t\022-\n\nboundaries\030\002 \002" +
- "(\0132\031.OsmAnd.OBF.OsmAndTileBox\0228\n\017categor" +
- "iesTable\030\003 \003(\0132\037.OsmAnd.OBF.OsmAndCatego" +
- "ryTable\0221\n\tnameIndex\030\004 \001(\0132\036.OsmAnd.OBF." +
- "OsmAndPoiNameIndex\0226\n\rsubtypesTable\030\005 \001(" +
- "\0132\037.OsmAnd.OBF.OsmAndSubtypesTable\022\'\n\005bo" +
- "xes\030\006 \003(\0132\030.OsmAnd.OBF.OsmAndPoiBox\022-\n\007p" +
- "oiData\030\t \003(\0132\034.OsmAnd.OBF.OsmAndPoiBoxDa" +
- "ta\"\331\001\n\022OsmAndPoiNameIndex\022-\n\005table\030\003 \002(\013",
- "2\036.OsmAnd.OBF.IndexedStringTable\022C\n\004data" +
- "\030\005 \003(\01325.OsmAnd.OBF.OsmAndPoiNameIndex.O" +
- "smAndPoiNameIndexData\032O\n\026OsmAndPoiNameIn" +
- "dexData\0225\n\005atoms\030\003 \003(\0132&.OsmAnd.OBF.OsmA" +
- "ndPoiNameIndexDataAtom\"Q\n\032OsmAndPoiNameI" +
- "ndexDataAtom\022\014\n\004zoom\030\002 \001(\r\022\t\n\001x\030\003 \001(\r\022\t\n" +
- "\001y\030\004 \001(\r\022\017\n\007shiftTo\030\016 \001(\007\">\n\023OsmAndCateg" +
- "oryTable\022\020\n\010category\030\001 \002(\t\022\025\n\rsubcategor" +
- "ies\030\003 \003(\t\"E\n\023OsmAndSubtypesTable\022.\n\010subt" +
- "ypes\030\004 \003(\0132\034.OsmAnd.OBF.OsmAndPoiSubtype",
- "\"\205\001\n\020OsmAndPoiSubtype\022\014\n\004name\030\001 \002(\t\022\017\n\007t" +
- "agname\030\002 \001(\t\022\016\n\006isText\030\003 \002(\010\022\021\n\tfrequenc" +
- "y\030\005 \001(\r\022\031\n\021subtypeValuesSize\030\006 \001(\r\022\024\n\014su" +
- "btypeValue\030\010 \003(\t\"\255\001\n\014OsmAndPoiBox\022\014\n\004zoo" +
- "m\030\001 \002(\r\022\014\n\004left\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\0223\n\nca" +
- "tegories\030\004 \001(\0132\037.OsmAnd.OBF.OsmAndPoiCat" +
- "egories\022*\n\010subBoxes\030\n \003(\0132\030.OsmAnd.OBF.O" +
- "smAndPoiBox\022\023\n\013shiftToData\030\016 \001(\007\"@\n\023OsmA" +
- "ndPoiCategories\022\022\n\ncategories\030\003 \003(\r\022\025\n\rs" +
- "ubcategories\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\007po" +
- "iData\030\005 \003(\0132 .OsmAnd.OBF.OsmAndPoiBoxDat" +
- "aAtom\"\360\001\n\024OsmAndPoiBoxDataAtom\022\n\n\002dx\030\002 \002" +
- "(\021\022\n\n\002dy\030\003 \002(\021\022\022\n\ncategories\030\004 \003(\r\022\025\n\rsu" +
- "bcategories\030\005 \003(\r\022\014\n\004name\030\006 \001(\t\022\016\n\006nameE" +
- "n\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\005phone\030\014 \001(\t\022\014\n\004note\030\r" +
- " \001(\t\022\026\n\016textCategories\030\016 \003(\r\022\022\n\ntextValu" +
- "es\030\017 \003(\t\"\032\n\007IdTable\022\017\n\007routeId\030\001 \003(\022\"F\n\017" +
- "RestrictionData\022\014\n\004type\030\001 \002(\005\022\014\n\004from\030\002 ",
- "\002(\005\022\n\n\002to\030\003 \002(\005\022\013\n\003via\030\004 \001(\005\"x\n\tRouteDat" +
- "a\022\016\n\006points\030\001 \002(\014\022\022\n\npointTypes\030\004 \001(\014\022\022\n" +
- "\npointNames\030\005 \001(\014\022\r\n\005types\030\007 \002(\014\022\017\n\007rout" +
- "eId\030\014 \002(\005\022\023\n\013stringNames\030\016 \001(\014\"\304\005\n\022OsmAn" +
- "dRoutingIndex\022\014\n\004name\030\001 \002(\t\022?\n\005rules\030\002 \003" +
- "(\01320.OsmAnd.OBF.OsmAndRoutingIndex.Route" +
- "EncodingRule\022>\n\trootBoxes\030\003 \003(\0132+.OsmAnd" +
- ".OBF.OsmAndRoutingIndex.RouteDataBox\022A\n\014" +
- "basemapBoxes\030\004 \003(\0132+.OsmAnd.OBF.OsmAndRo" +
- "utingIndex.RouteDataBox\022=\n\006blocks\030\005 \003(\0132",
- "-.OsmAnd.OBF.OsmAndRoutingIndex.RouteDat" +
- "aBlock\032;\n\021RouteEncodingRule\022\013\n\003tag\030\003 \002(\t" +
- "\022\r\n\005value\030\005 \002(\t\022\n\n\002id\030\007 \001(\r\032\231\001\n\014RouteDat" +
- "aBox\022\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top" +
- "\030\003 \002(\021\022\016\n\006bottom\030\004 \002(\021\022\023\n\013shiftToData\030\005 " +
- "\001(\007\022:\n\005boxes\030\007 \003(\0132+.OsmAnd.OBF.OsmAndRo" +
- "utingIndex.RouteDataBox\032\303\001\n\016RouteDataBlo" +
- "ck\022$\n\007idTable\030\005 \001(\0132\023.OsmAnd.OBF.IdTable" +
- "\022*\n\013dataObjects\030\006 \003(\0132\025.OsmAnd.OBF.Route" +
- "Data\0221\n\014restrictions\030\007 \003(\0132\033.OsmAnd.OBF.",
- "RestrictionData\022,\n\013stringTable\030\010 \001(\0132\027.O" +
- "smAnd.OBF.StringTableB\036\n\021net.osmand.bina" +
- "ryB\tOsmandOdb"
+ "\022\030\n\020labelcoordinates\030\010 \001(\014\022\023\n\013stringName" +
+ "s\030\n \001(\014\022\n\n\002id\030\014 \002(\022\022\023\n\013rasterBytes\030\017 \001(\014" +
+ "\"\364\003\n\022OsmAndAddressIndex\022\014\n\004name\030\001 \002(\t\022\017\n" +
+ "\007name_en\030\002 \001(\t\022-\n\nboundaries\030\003 \001(\0132\031.Osm",
+ "And.OBF.OsmAndTileBox\0223\n\022attributeTagsTa" +
+ "ble\030\004 \001(\0132\027.OsmAnd.OBF.StringTable\022:\n\006ci" +
+ "ties\030\006 \003(\0132*.OsmAnd.OBF.OsmAndAddressInd" +
+ "ex.CitiesIndex\0229\n\tnameIndex\030\007 \001(\0132&.OsmA" +
+ "nd.OBF.OsmAndAddressNameIndexData\032\343\001\n\013Ci" +
+ "tiesIndex\022C\n\004type\030\002 \002(\01625.OsmAnd.OBF.Osm" +
+ "AndAddressIndex.CitiesIndex.CitiesType\022%" +
+ "\n\006cities\030\005 \003(\0132\025.OsmAnd.OBF.CityIndex\022*\n" +
+ "\006blocks\030\007 \003(\0132\032.OsmAnd.OBF.CityBlockInde" +
+ "x\"<\n\nCitiesType\022\021\n\rCitiesOrTowns\020\001\022\r\n\tPo",
+ "stcodes\020\002\022\014\n\010Villages\020\003\"\342\001\n\032OsmAndAddres" +
+ "sNameIndexData\022-\n\005table\030\004 \002(\0132\036.OsmAnd.O" +
+ "BF.IndexedStringTable\022I\n\004atom\030\007 \003(\0132;.Os" +
+ "mAnd.OBF.OsmAndAddressNameIndexData.Addr" +
+ "essNameIndexData\032J\n\024AddressNameIndexData" +
+ "\0222\n\004atom\030\004 \003(\0132$.OsmAnd.OBF.AddressNameI" +
+ "ndexDataAtom\"\204\001\n\030AddressNameIndexDataAto" +
+ "m\022\014\n\004name\030\001 \001(\t\022\016\n\006nameEn\030\002 \001(\t\022\014\n\004type\030" +
+ "\003 \002(\r\022\024\n\014shiftToIndex\030\005 \003(\005\022\030\n\020shiftToCi" +
+ "tyIndex\030\006 \003(\005\022\014\n\004xy16\030\007 \003(\r\"\260\001\n\tCityInde",
+ "x\022\021\n\tcity_type\030\001 \001(\r\022\014\n\004name\030\002 \002(\t\022\017\n\007na" +
+ "me_en\030\003 \001(\t\022\n\n\002id\030\004 \001(\004\022\t\n\001x\030\005 \002(\r\022\t\n\001y\030" +
+ "\006 \002(\r\022\027\n\017attributeTagIds\030\007 \003(\r\022\027\n\017attrib" +
+ "uteValues\030\010 \003(\t\022\035\n\025shiftToCityBlockIndex" +
+ "\030\n \001(\007\"\202\001\n\016CityBlockIndex\022\030\n\020shiftToCity" +
+ "Index\030\004 \001(\007\022,\n\tbuildings\030\n \003(\0132\031.OsmAnd." +
+ "OBF.BuildingIndex\022(\n\007streets\030\014 \003(\0132\027.Osm" +
+ "And.OBF.StreetIndex\"\345\001\n\013StreetIndex\022\014\n\004n" +
+ "ame\030\001 \002(\t\022\017\n\007name_en\030\002 \001(\t\022\t\n\001x\030\003 \002(\021\022\t\n" +
+ "\001y\030\004 \002(\021\0225\n\rintersections\030\005 \003(\0132\036.OsmAnd",
+ ".OBF.StreetIntersection\022\n\n\002id\030\006 \001(\004\022\027\n\017a" +
+ "ttributeTagIds\030\007 \003(\r\022\027\n\017attributeValues\030" +
+ "\010 \003(\t\022,\n\tbuildings\030\014 \003(\0132\031.OsmAnd.OBF.Bu" +
+ "ildingIndex\"\221\001\n\022StreetIntersection\022\014\n\004na" +
+ "me\030\002 \002(\t\022\017\n\007name_en\030\003 \001(\t\022\024\n\014intersected" +
+ "X\030\004 \002(\021\022\024\n\014intersectedY\030\005 \002(\021\022\027\n\017attribu" +
+ "teTagIds\030\007 \003(\r\022\027\n\017attributeValues\030\010 \003(\t\"" +
+ "\230\002\n\rBuildingIndex\022\014\n\004name\030\001 \002(\t\022\017\n\007name_" +
+ "en\030\002 \001(\t\022\r\n\005name2\030\003 \001(\t\022\020\n\010name_en2\030\004 \001(" +
+ "\t\022\025\n\rinterpolation\030\005 \001(\021\022\t\n\001x\030\007 \002(\021\022\t\n\001y",
+ "\030\010 \002(\021\022\n\n\002x2\030\t \001(\021\022\n\n\002y2\030\n \001(\021\022\n\n\002id\030\r \001" +
+ "(\004\022\020\n\010postcode\030\016 \001(\t\022\027\n\017attributeTagIds\030" +
+ "\017 \003(\r\022\027\n\017attributeValues\030\020 \003(\t\022\030\n\020attrib" +
+ "uteTagIds2\030\021 \003(\r\022\030\n\020attributeValues2\030\022 \003" +
+ "(\t\"=\n\017TransportRoutes\022*\n\006routes\030\006 \003(\0132\032." +
+ "OsmAnd.OBF.TransportRoute\"\300\002\n\016TransportR" +
+ "oute\022\n\n\002id\030\001 \002(\004\022\014\n\004type\030\003 \001(\r\022\020\n\010operat" +
+ "or\030\004 \001(\r\022\013\n\003ref\030\005 \001(\t\022\014\n\004name\030\006 \001(\r\022\017\n\007n" +
+ "ame_en\030\007 \001(\r\022\020\n\010distance\030\010 \001(\r\022\r\n\005color\030" +
+ "\t \001(\r\0223\n\013directStops\030\017 \003(\0132\036.OsmAnd.OBF.",
+ "TransportRouteStop\0224\n\014reverseStops\030\020 \003(\013" +
+ "2\036.OsmAnd.OBF.TransportRouteStop\022\020\n\010geom" +
+ "etry\030\021 \001(\014\0228\n\014scheduleTrip\030\022 \003(\0132\".OsmAn" +
+ "d.OBF.TransportRouteSchedule\"\244\001\n\026Transpo" +
+ "rtRouteSchedule\022\030\n\020avgStopIntervals\030\001 \001(" +
+ "\014\022\030\n\020avgWaitIntervals\030\002 \001(\014\022\025\n\rtripInter" +
+ "vals\030\003 \001(\014\022?\n\nexceptions\030\010 \003(\0132+.OsmAnd." +
+ "OBF.TransportRouteScheduleException\"\313\001\n\037" +
+ "TransportRouteScheduleException\022\023\n\013tripI" +
+ "ndexes\030\001 \003(\r\022\023\n\013stopIndexes\030\002 \003(\r\022\021\n\tava",
+ "ilable\030\003 \001(\010\022\024\n\014delayArrival\030\005 \003(\r\022\031\n\021de" +
+ "ltaWaitInterval\030\006 \003(\005\022\034\n\024dayOfWeekRestri" +
+ "ction\030\007 \003(\r\022\034\n\024dayOfYearRestriction\030\010 \003(" +
+ "\r\"W\n\022TransportRouteStop\022\n\n\002id\030\001 \002(\022\022\n\n\002d" +
+ "x\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\014\n\004name\030\006 \002(\r\022\017\n\007nam" +
+ "e_en\030\007 \001(\r\"\332\001\n\rTransportStop\022\n\n\002dx\030\001 \002(\021" +
+ "\022\n\n\002dy\030\002 \002(\021\022\n\n\002id\030\005 \002(\022\022\014\n\004name\030\006 \002(\r\022\017" +
+ "\n\007name_en\030\007 \001(\r\022\033\n\023additionalNamePairs\030\010" +
+ " \001(\014\022,\n\005exits\030\t \003(\0132\035.OsmAnd.OBF.Transpo" +
+ "rtStopExit\022\016\n\006routes\030\020 \003(\r\022\030\n\020deletedRou",
+ "tesIds\030\024 \003(\004\022\021\n\troutesIds\030\026 \003(\004\"8\n\021Trans" +
+ "portStopExit\022\n\n\002dx\030\001 \002(\021\022\n\n\002dy\030\002 \002(\021\022\013\n\003" +
+ "ref\030\003 \002(\r\"\272\001\n\022TransportStopsTree\022\014\n\004left" +
+ "\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\022\016\n\006bo" +
+ "ttom\030\004 \002(\021\0220\n\010subtrees\030\007 \003(\0132\036.OsmAnd.OB" +
+ "F.TransportStopsTree\022(\n\005leafs\030\010 \003(\0132\031.Os" +
+ "mAnd.OBF.TransportStop\022\016\n\006baseId\030\020 \001(\004\"\256" +
+ "\001\n\024OsmAndTransportIndex\022\014\n\004name\030\001 \001(\t\022+\n" +
+ "\006routes\030\003 \001(\0132\033.OsmAnd.OBF.TransportRout" +
+ "es\022-\n\005stops\030\006 \001(\0132\036.OsmAnd.OBF.Transport",
+ "StopsTree\022,\n\013stringTable\030\t \002(\0132\027.OsmAnd." +
+ "OBF.StringTable\"\312\002\n\016OsmAndPoiIndex\022\014\n\004na" +
+ "me\030\001 \002(\t\022-\n\nboundaries\030\002 \002(\0132\031.OsmAnd.OB" +
+ "F.OsmAndTileBox\0228\n\017categoriesTable\030\003 \003(\013" +
+ "2\037.OsmAnd.OBF.OsmAndCategoryTable\0221\n\tnam" +
+ "eIndex\030\004 \001(\0132\036.OsmAnd.OBF.OsmAndPoiNameI" +
+ "ndex\0226\n\rsubtypesTable\030\005 \001(\0132\037.OsmAnd.OBF" +
+ ".OsmAndSubtypesTable\022\'\n\005boxes\030\006 \003(\0132\030.Os" +
+ "mAnd.OBF.OsmAndPoiBox\022-\n\007poiData\030\t \003(\0132\034" +
+ ".OsmAnd.OBF.OsmAndPoiBoxData\"\331\001\n\022OsmAndP",
+ "oiNameIndex\022-\n\005table\030\003 \002(\0132\036.OsmAnd.OBF." +
+ "IndexedStringTable\022C\n\004data\030\005 \003(\01325.OsmAn" +
+ "d.OBF.OsmAndPoiNameIndex.OsmAndPoiNameIn" +
+ "dexData\032O\n\026OsmAndPoiNameIndexData\0225\n\005ato" +
+ "ms\030\003 \003(\0132&.OsmAnd.OBF.OsmAndPoiNameIndex" +
+ "DataAtom\"Q\n\032OsmAndPoiNameIndexDataAtom\022\014" +
+ "\n\004zoom\030\002 \001(\r\022\t\n\001x\030\003 \001(\r\022\t\n\001y\030\004 \001(\r\022\017\n\007sh" +
+ "iftTo\030\016 \001(\007\">\n\023OsmAndCategoryTable\022\020\n\010ca" +
+ "tegory\030\001 \002(\t\022\025\n\rsubcategories\030\003 \003(\t\"E\n\023O" +
+ "smAndSubtypesTable\022.\n\010subtypes\030\004 \003(\0132\034.O",
+ "smAnd.OBF.OsmAndPoiSubtype\"\205\001\n\020OsmAndPoi" +
+ "Subtype\022\014\n\004name\030\001 \002(\t\022\017\n\007tagname\030\002 \001(\t\022\016" +
+ "\n\006isText\030\003 \002(\010\022\021\n\tfrequency\030\005 \001(\r\022\031\n\021sub" +
+ "typeValuesSize\030\006 \001(\r\022\024\n\014subtypeValue\030\010 \003" +
+ "(\t\"\255\001\n\014OsmAndPoiBox\022\014\n\004zoom\030\001 \002(\r\022\014\n\004lef" +
+ "t\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\0223\n\ncategories\030\004 \001(\013" +
+ "2\037.OsmAnd.OBF.OsmAndPoiCategories\022*\n\010sub" +
+ "Boxes\030\n \003(\0132\030.OsmAnd.OBF.OsmAndPoiBox\022\023\n" +
+ "\013shiftToData\030\016 \001(\007\"@\n\023OsmAndPoiCategorie" +
+ "s\022\022\n\ncategories\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\024OsmA" +
+ "ndPoiBoxDataAtom\022\n\n\002dx\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021" +
+ "\022\022\n\ncategories\030\004 \003(\r\022\025\n\rsubcategories\030\005 " +
+ "\003(\r\022\014\n\004name\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\005phone\030\014 \001(\t\022\014\n\004note\030\r \001(\t\022\026\n\016textCa" +
+ "tegories\030\016 \003(\r\022\022\n\ntextValues\030\017 \003(\t\"\032\n\007Id" +
+ "Table\022\017\n\007routeId\030\001 \003(\022\"F\n\017RestrictionDat",
+ "a\022\014\n\004type\030\001 \002(\005\022\014\n\004from\030\002 \002(\005\022\n\n\002to\030\003 \002(" +
+ "\005\022\013\n\003via\030\004 \001(\005\"x\n\tRouteData\022\016\n\006points\030\001 " +
+ "\002(\014\022\022\n\npointTypes\030\004 \001(\014\022\022\n\npointNames\030\005 " +
+ "\001(\014\022\r\n\005types\030\007 \002(\014\022\017\n\007routeId\030\014 \002(\005\022\023\n\013s" +
+ "tringNames\030\016 \001(\014\"\304\005\n\022OsmAndRoutingIndex\022" +
+ "\014\n\004name\030\001 \002(\t\022?\n\005rules\030\002 \003(\01320.OsmAnd.OB" +
+ "F.OsmAndRoutingIndex.RouteEncodingRule\022>" +
+ "\n\trootBoxes\030\003 \003(\0132+.OsmAnd.OBF.OsmAndRou" +
+ "tingIndex.RouteDataBox\022A\n\014basemapBoxes\030\004" +
+ " \003(\0132+.OsmAnd.OBF.OsmAndRoutingIndex.Rou",
+ "teDataBox\022=\n\006blocks\030\005 \003(\0132-.OsmAnd.OBF.O" +
+ "smAndRoutingIndex.RouteDataBlock\032;\n\021Rout" +
+ "eEncodingRule\022\013\n\003tag\030\003 \002(\t\022\r\n\005value\030\005 \002(" +
+ "\t\022\n\n\002id\030\007 \001(\r\032\231\001\n\014RouteDataBox\022\014\n\004left\030\001" +
+ " \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\022\016\n\006bott" +
+ "om\030\004 \002(\021\022\023\n\013shiftToData\030\005 \001(\007\022:\n\005boxes\030\007" +
+ " \003(\0132+.OsmAnd.OBF.OsmAndRoutingIndex.Rou" +
+ "teDataBox\032\303\001\n\016RouteDataBlock\022$\n\007idTable\030" +
+ "\005 \001(\0132\023.OsmAnd.OBF.IdTable\022*\n\013dataObject" +
+ "s\030\006 \003(\0132\025.OsmAnd.OBF.RouteData\0221\n\014restri",
+ "ctions\030\007 \003(\0132\033.OsmAnd.OBF.RestrictionDat" +
+ "a\022,\n\013stringTable\030\010 \001(\0132\027.OsmAnd.OBF.Stri" +
+ "ngTableB\036\n\021net.osmand.binaryB\tOsmandOdb"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -62969,7 +63124,7 @@ public final class OsmandOdb {
internal_static_OsmAnd_OBF_MapData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_MapData_descriptor,
- new java.lang.String[] { "Coordinates", "AreaCoordinates", "PolygonInnerCoordinates", "AdditionalTypes", "Types", "StringNames", "Id", "RasterBytes", });
+ new java.lang.String[] { "Coordinates", "AreaCoordinates", "PolygonInnerCoordinates", "AdditionalTypes", "Types", "Labelcoordinates", "StringNames", "Id", "RasterBytes", });
internal_static_OsmAnd_OBF_OsmAndAddressIndex_descriptor =
getDescriptor().getMessageTypes().get(7);
internal_static_OsmAnd_OBF_OsmAndAddressIndex_fieldAccessorTable = new
diff --git a/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java b/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java
index 629514bdb9..07ed57126c 100644
--- a/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java
+++ b/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java
@@ -691,31 +691,21 @@ public class OsmandRegions {
}
}
- public List getWoldRegionsAt(LatLon latLon) throws IOException {
- List result = new ArrayList<>();
- List mapDataObjects = getBinaryMapDataObjectsAt(latLon);
- for (BinaryMapDataObject obj : mapDataObjects) {
- String fullName = getFullName(obj);
- if (fullName != null) {
- WorldRegion reg = getRegionData(fullName);
- if (reg != null) {
- result.add(reg);
- }
- }
- }
- return result;
+ public List getWorldRegionsAt(LatLon latLon) throws IOException {
+ Map mapDataObjects = getBinaryMapDataObjectsWithRegionsAt(latLon);
+ return new ArrayList<>(mapDataObjects.keySet());
}
- public BinaryMapDataObject getSmallestBinaryMapDataObjectAt(LatLon latLon) throws IOException {
- List mapDataObjects = getBinaryMapDataObjectsAt(latLon);
- return getSmallestBinaryMapDataObjectAt(mapDataObjects);
+ public Map.Entry getSmallestBinaryMapDataObjectAt(LatLon latLon) throws IOException {
+ Map mapDataObjectsWithRegions = getBinaryMapDataObjectsWithRegionsAt(latLon);
+ return getSmallestBinaryMapDataObjectAt(mapDataObjectsWithRegions);
}
- public BinaryMapDataObject getSmallestBinaryMapDataObjectAt(List mapDataObjects) {
- BinaryMapDataObject res = null;
+ public Map.Entry getSmallestBinaryMapDataObjectAt(Map mapDataObjectsWithRegions) {
+ Map.Entry res = null;
double smallestArea = -1;
- for (BinaryMapDataObject o : mapDataObjects) {
- double area = OsmandRegions.getArea(o);
+ for (Map.Entry o : mapDataObjectsWithRegions.entrySet()) {
+ double area = OsmandRegions.getArea(o.getValue());
if (smallestArea == -1) {
smallestArea = area;
res = o;
@@ -727,10 +717,10 @@ public class OsmandRegions {
return res;
}
- private List getBinaryMapDataObjectsAt(LatLon latLon) throws IOException {
+ private Map getBinaryMapDataObjectsWithRegionsAt(LatLon latLon) throws IOException {
int point31x = MapUtils.get31TileNumberX(latLon.getLongitude());
int point31y = MapUtils.get31TileNumberY(latLon.getLatitude());
-
+ Map foundObjects = new LinkedHashMap<>();
List mapDataObjects;
try {
mapDataObjects = queryBboxNoInit(point31x, point31x, point31y, point31y, true);
@@ -743,25 +733,18 @@ public class OsmandRegions {
while (it.hasNext()) {
BinaryMapDataObject o = it.next();
if (o.getTypes() != null) {
- boolean isRegion = true;
- for (int i = 0; i < o.getTypes().length; i++) {
- TagValuePair tp = o.getMapIndex().decodeType(o.getTypes()[i]);
- if ("boundary".equals(tp.value)) {
- isRegion = false;
- break;
- }
- }
WorldRegion downloadRegion = getRegionData(getFullName(o));
- if (!isRegion
- || downloadRegion == null
+ if ( downloadRegion == null
|| !downloadRegion.isRegionMapDownload()
|| !contain(o, point31x, point31y)) {
it.remove();
+ } else {
+ foundObjects.put(downloadRegion, o);
}
}
}
}
- return mapDataObjects;
+ return foundObjects;
}
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 1a762b81f2..de0128e61b 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -3401,8 +3401,8 @@ Indikas lokon: %1$s x %2$s"
Ĉu rekomencigi ĉiujn agordojn pri profiloj\?
%1$s: %2$s
%1$s %2$s
- La dosiero “%1$s” ne enhavas regulojn pri kurs‑difinado, bonvolu elekti alian dosieron.
- Nesubtenata tipo de dosiero. Elektu dosieron kun la finaĵo %1$s.
+ Neniuj reguloj pri kurs‑difinado en “%1$s”. Bonvolu elekti alian dosieron.
+ Bonvolu elekti dosieron kun la subtenata finaĵo %1$s.
Enporti el dosiero
Enporti dosieron de kurs‑difinado
Enporti profilon
@@ -3427,5 +3427,7 @@ Indikas lokon: %1$s x %2$s"
OSM
La emblemo montriĝos nur dum navigi aŭ dum moviĝi.
Map‑emblemo montriĝas nur dum foliumi mapon kaj ŝanĝiĝas dum navigi al la emblemo de navigo.
- Tie ĉi vi povas legi kaj kunhavigi protokolojn de la aplikaĵo
+ Legi kaj kunhavigi detalajn protokolojn de la aplikaĵo
+ Permeso estas necesa por uzi tiun ĉi eblaĵon.
+ Tiu ĉi filtrilo preventas registri punktojn sub difinita rapidlimo. Tiel registritaj spuroj aspektos pli glate dum vidiĝi sur la mapo.
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 70057891d3..9b48719030 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -3466,4 +3466,6 @@ Lon %2$s
El icono del mapa sólo se muestra en el mapa.
Comprueba y comparte los registros detallados de la aplicación
No se puede analizar la geointención «%s».
+ Se necesita permiso para usar esta opción.
+ Se trata de un filtro de corte de baja velocidad para no grabar puntos por debajo de una cierta velocidad. Esto puede hacer que las trazas grabadas se vean más suaves cuando se muestran en el mapa.
\ No newline at end of file
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index bc0afbf1da..9a3fe969d3 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1434,7 +1434,7 @@ Ces informations sont visibles sur le Tableau de bord comme sur la carte. Un rap
Damage des pistes
%1$s libre
Mémoire de l\'appareil
- Notes OSM
+ Notes audio / vidéo
Carte en ligne
Routes uniquement
Pistes de ski
@@ -3441,4 +3441,7 @@ représentant la zone : %1$s x %2$s
Filtre interrompant l\'enregistrement en dessous d\'une certaines vitesse. Rend les traces enregistrées plus régulières lorsqu\'elles sont affichées sur la carte.
Durée de la mémoire tampon
Indiquez l\'adresse web avec la syntaxe suivante pour les paramètres : lat = {0}, lon = {1}, horodatage = {2}, hdop = {3}, altitude = {4}, vitesse = {5}, direction = {6}.
+ Recommandation : il est difficile de prédire ce qui sera enregistré et ce qui ne le sera pas, il peut être préférable de désactiver ce filtre.
+ Ce filtre limite l\'enregistrement de points en double lorsque les déplacements sont très lents donnant une apparence plus régulière aux traces.
+ Recommandation : un paramètre de 5 mètres est adapté si vous n\'avez pas besoin de détails et ne souhaitez pas enregistrer des points au repos.
\ No newline at end of file
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 343cf85537..4d4af2ead0 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -2388,7 +2388,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
A–Z
Hozzáadva
Rendezés alapja:
- "Válassza ki, hogyan jelenjék meg a térképen a térképjelölők távolsága és iránya:"
+ Válassza ki, hogyan jelenjék meg a térképen a térképjelölők távolsága és iránya:
Válaszd ki, mekkora sebesség alatt váltson a térkép forgatása „Haladási irány”-ról „Iránytű”-re.
Minden térképjelölő áthelyezve az előzményekbe
Térképjelölő áthelyezve az előzményekhez
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 07a39b8133..4da7fd57cc 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -344,7 +344,7 @@
Copiando arquivos de dados…
"Calcular rota off-line "
Caminhão
- Visão intermediária
+ Para nível intermediário
Zoom mínimo: %1$s
A fonte da quadrícula %1$s foi salva
Moderadores de tráfego
@@ -537,8 +537,8 @@
"Simular usando a rota calculada "
Simular usando trilha GPX
Sem zoom automático
- Aproximar
- Afastar
+ Para nível aproximado
+ Para nível afastado
Lupa
Mapa base mundial
Versão:
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 105e112e12..1f71f3970e 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -3448,4 +3448,22 @@ Pro praghere iscrie su còdighe intreu
As a bìdere s\'icona petzi durante sa navigatzione o su movimentu.
S\'icona de sa mapa aparit in sa mapa ebbia, e divenit s\'icona de navigatzione durante sa navigatzione.
Inoghe podes pompiare e cumpartzire sos registros de s\'aplicatzione
+ Anàlisi de su geo intent \'%s\' fallida.
+ Pro impreare custa optzione b\'at bisòngiu de unu permissu.
+ Custu est unu filtru pro non registrare puntos in suta de una lestresa isseberada. Faghet in modu chi sas rastas registradas pàrgiant prus regulares cando benint pompiadas in sa mapa.
+ Efetu segundàriu: in sa rasta tua ant a mancare totu sas setziones in ue no as rispetadu su critèriu de sa lestresa mìnima (es. cando ispinghes sa bitzicleta tua cara a artu in unu montigru). Annotamala, non b\'ant a èssere informatziones a pitzu de sos perìodos de pasu, che a sas pàusas. Custu at a influentzare totu sas anàlisis o sos post-protzessamentos, a es. cando ses chirchende de determinare sa longària totale de su biàgiu tuo, su tempus in movimentu, o sa lestresa mèdia tua.
+ Intervallu de arrastamentu
+ Indiritzu web
+ Dislinda s\'indiritzu web cun sa sintassi de paràmetros: lat={0}, lon={1}, marcadesutempus={2}, hdop={3}, artària={4}, lestresa={5}, diretzione={6}.
+ Notìfica
+ Lestresa mìnima
+ Acuradesa mìnima
+ Movimentu mìnimu
+ Menù — Logos meos — Rastas
+ Menù — Logos meos — Notas
+ Menù — Logos meos — Modìficas de OSM
+ Riprìstina sas impostatziones predefinidas de s\'estensione
+ Imprea s\'aplicatzione de sistema
+ Sonu de s\'oturadore de sa fotocàmera
+ S\'autorizatzione est resèssida
\ No newline at end of file
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index edb345a414..73f50679b6 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1380,7 +1380,7 @@
Відхилити
Аудіо
Поділитись нотаткою
- OSM примітки
+ A/V примітки
Мережева мапа
Тільки дороги
Вільно %1$s
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 2685d47466..26e6050c65 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -4179,4 +4179,6 @@
Ghost bike
+ Paintball
+
diff --git a/OsmAnd/src/net/osmand/data/FavouritePoint.java b/OsmAnd/src/net/osmand/data/FavouritePoint.java
index 2af499a8c6..4d70bd663b 100644
--- a/OsmAnd/src/net/osmand/data/FavouritePoint.java
+++ b/OsmAnd/src/net/osmand/data/FavouritePoint.java
@@ -3,7 +3,6 @@ package net.osmand.data;
import java.io.Serializable;
import android.content.Context;
-import android.content.res.Resources;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
@@ -19,7 +18,6 @@ public class FavouritePoint implements Serializable, LocationPoint {
private static final String HIDDEN = "hidden";
private static final String ADDRESS_EXTENSION = "address";
- private static final String DEFAULT_ICON_NAME = "special_star";
protected String name = "";
protected String description;
@@ -139,6 +137,8 @@ public class FavouritePoint implements Serializable, LocationPoint {
public int getOverlayIconId() {
if (isSpecialPoint()) {
return specialPointType.getIconId();
+ } else if (iconId == 0) {
+ return R.drawable.mx_special_star;
}
return iconId;
}
@@ -202,7 +202,6 @@ public class FavouritePoint implements Serializable, LocationPoint {
return "Favourite " + getName(); //$NON-NLS-1$
}
-
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -253,7 +252,6 @@ public class FavouritePoint implements Serializable, LocationPoint {
return result;
}
-
public enum SpecialPointType {
HOME("home", R.string.home_button, R.drawable.mx_special_house),
WORK("work", R.string.work_button, R.drawable.mx_special_building),
@@ -286,7 +284,6 @@ public class FavouritePoint implements Serializable, LocationPoint {
}
}
-
public static FavouritePoint fromWpt(@NonNull WptPt pt, @NonNull Context ctx) {
String name = pt.name;
String categoryName = pt.category != null ? pt.category : "";
diff --git a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
index 2a039f3bbf..acabdba2db 100644
--- a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
+++ b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
@@ -1,5 +1,7 @@
package net.osmand.plus;
+import android.location.GnssNavigationMessage;
+import android.location.GnssStatus;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import java.util.ArrayList;
@@ -17,7 +19,6 @@ import net.osmand.binary.GeocodingUtilities.GeocodingResult;
import net.osmand.binary.RouteDataObject;
import net.osmand.data.LatLon;
import net.osmand.data.QuadPoint;
-import net.osmand.plus.OsmandSettings.OsmandPreference;
import net.osmand.plus.TargetPointsHelper.TargetPoint;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.router.RouteSegmentResult;
@@ -127,7 +128,7 @@ public class OsmAndLocationProvider implements SensorEventListener {
private List locationListeners = new ArrayList();
private List compassListeners = new ArrayList();
- private Listener gpsStatusListener;
+ private Object gpsStatusListener;
private float[] mRotationM = new float[9];
@@ -249,7 +250,7 @@ public class OsmAndLocationProvider implements SensorEventListener {
}
}
if (isLocationPermissionAvailable(app)) {
- service.addGpsStatusListener(getGpsStatusListener(service));
+ registerGpsStatusListener(service);
try {
service.requestLocationUpdates(LocationManager.GPS_PROVIDER, GPS_TIMEOUT_REQUEST, GPS_DIST_REQUEST, gpsListener);
} catch (IllegalArgumentException e) {
@@ -291,17 +292,55 @@ public class OsmAndLocationProvider implements SensorEventListener {
}
}
- private Listener getGpsStatusListener(final LocationManager service) {
- gpsStatusListener = new Listener() {
- private GpsStatus gpsStatus;
- @Override
- public void onGpsStatusChanged(int event) {
- gpsStatus = service.getGpsStatus(gpsStatus);
- updateGPSInfo(gpsStatus);
- updateLocation(location);
- }
- };
- return gpsStatusListener;
+ private void registerGpsStatusListener(final LocationManager service) {
+ if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ gpsStatusListener = new GnssStatus.Callback() {
+
+ @Override
+ public void onStarted() {
+ }
+
+ @Override
+ public void onStopped() {
+ }
+
+ @Override
+ public void onFirstFix(int ttffMillis) {
+ }
+
+ @Override
+ public void onSatelliteStatusChanged(GnssStatus status) {
+ int satCount = 0;
+ boolean fixed = false;
+ int u = 0;
+ if(status != null) {
+ satCount = status.getSatelliteCount();
+ for (int i = 0; i < satCount; i++) {
+ if (status.usedInFix(i)) {
+ u++;
+ fixed = true;
+ }
+ }
+ }
+ gpsInfo.fixed = fixed;
+ gpsInfo.foundSatellites = satCount;
+ gpsInfo.usedSatellites = u;
+ updateLocation(location);
+ }
+ };
+ service.registerGnssStatusCallback((GnssStatus.Callback) gpsStatusListener);
+ } else {
+ gpsStatusListener = new Listener() {
+ private GpsStatus gpsStatus;
+ @Override
+ public void onGpsStatusChanged(int event) {
+ gpsStatus = service.getGpsStatus(gpsStatus);
+ updateGPSInfo(gpsStatus);
+ updateLocation(location);
+ }
+ };
+ service.addGpsStatusListener((Listener) gpsStatusListener);
+ }
}
private void updateGPSInfo(GpsStatus s) {
@@ -642,7 +681,13 @@ public class OsmAndLocationProvider implements SensorEventListener {
private void stopLocationRequests() {
LocationManager service = (LocationManager) app.getSystemService(Context.LOCATION_SERVICE);
- service.removeGpsStatusListener(gpsStatusListener);
+ if(gpsStatusListener != null) {
+ if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ service.unregisterGnssStatusCallback((GnssStatus.Callback) gpsStatusListener);
+ } else {
+ service.removeGpsStatusListener((Listener) gpsStatusListener);
+ }
+ }
service.removeUpdates(gpsListener);
while(!networkListeners.isEmpty()) {
service.removeUpdates(networkListeners.poll());
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 4137fd479d..bde5832a5c 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1349,9 +1349,8 @@ public class OsmandSettings {
return DrivingRegion.JAPAN;
} else if (df.getCountry().equalsIgnoreCase("au")) {
return DrivingRegion.AUSTRALIA;
-// potentially wrong in Europe
-// } else if(df.getCountry().equalsIgnoreCase(Locale.UK.getCountry())) {
-// return DrivingRegion.UK_AND_OTHERS;
+ } else if(df.getCountry().equalsIgnoreCase(Locale.UK.getCountry())) {
+ return DrivingRegion.UK_AND_OTHERS;
}
return DrivingRegion.EUROPE_ASIA;
}
@@ -1373,6 +1372,29 @@ public class OsmandSettings {
public final OsmandPreference ANGULAR_UNITS = new EnumIntPreference(
"angular_measurement", AngularConstants.DEGREES, AngularConstants.values()).makeProfile();
+ public static final String LAST_START_LAT = "last_searched_lat"; //$NON-NLS-1$
+ public static final String LAST_START_LON = "last_searched_lon"; //$NON-NLS-1$
+
+ public LatLon getLastStartPoint() {
+ if (settingsAPI.contains(globalPreferences, LAST_START_LAT) && settingsAPI.contains(globalPreferences, LAST_START_LON)) {
+ return new LatLon(settingsAPI.getFloat(globalPreferences, LAST_START_LAT, 0),
+ settingsAPI.getFloat(globalPreferences, LAST_START_LON, 0));
+ }
+ return null;
+ }
+
+ public boolean setLastStartPoint(LatLon l) {
+ if (l == null) {
+ return settingsAPI.edit(globalPreferences).remove(LAST_START_LAT).remove(LAST_START_LON).commit();
+ } else {
+ return setLastStartPoint(l.getLatitude(), l.getLongitude());
+ }
+ }
+
+ public boolean setLastStartPoint(double lat, double lon) {
+ return settingsAPI.edit(globalPreferences).putFloat(LAST_START_LAT, (float) lat).
+ putFloat(LAST_START_LON, (float) lon).commit();
+ }
public final OsmandPreference SPEED_SYSTEM = new EnumIntPreference(
"default_speed_system", SpeedConstants.KILOMETERS_PER_HOUR, SpeedConstants.values()) {
diff --git a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
index 494b77e176..046456a172 100644
--- a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
@@ -445,6 +445,7 @@ public class TargetPointsHelper {
Location lastKnownLocation = ctx.getLocationProvider().getLastKnownLocation();
LatLon latLon = lastKnownLocation != null ?
new LatLon(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude()) : null;
+ routingHelper.checkAndUpdateStartLocation(latLon);
setMyLocationPoint(latLon, false, null);
}
}
diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index 9b2ac30258..d9985350e9 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -7,7 +7,6 @@ import android.view.WindowManager;
import net.osmand.Location;
import net.osmand.StateChangedListener;
-import net.osmand.binary.BinaryMapDataObject;
import net.osmand.data.LatLon;
import net.osmand.data.RotatedTileBox;
import net.osmand.map.IMapLocationListener;
@@ -28,6 +27,7 @@ import net.osmand.plus.views.AnimateDraggingMapThread;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.util.MapUtils;
+
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -155,7 +155,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
return movingToMyLocation;
}
- private void detectDrivingRegion(final LatLon latLon) {
+ public void detectDrivingRegion(final LatLon latLon) {
new DetectDrivingRegionTask(app).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, latLon);
}
@@ -167,7 +167,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
locationProvider = location.getProvider();
if (settings.DRIVING_REGION_AUTOMATIC.get() && !drivingRegionUpdated && !app.isApplicationInitializing()) {
drivingRegionUpdated = true;
- detectDrivingRegion(new LatLon(location.getLatitude(), location.getLongitude()));
+ app.getRoutingHelper().checkAndUpdateStartLocation(location);
}
}
if (mapView != null) {
@@ -444,7 +444,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
isUserZoomed = true;
}
- private static class DetectDrivingRegionTask extends AsyncTask {
+ private static class DetectDrivingRegionTask extends AsyncTask {
private OsmandApplication app;
@@ -453,10 +453,10 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
}
@Override
- protected BinaryMapDataObject doInBackground(LatLon... latLons) {
+ protected WorldRegion doInBackground(LatLon... latLons) {
try {
if (latLons != null && latLons.length > 0) {
- return app.getRegions().getSmallestBinaryMapDataObjectAt(latLons[0]);
+ return app.getRegions().getSmallestBinaryMapDataObjectAt(latLons[0]).getKey();
}
} catch (IOException e) {
// ignore
@@ -465,13 +465,9 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
}
@Override
- protected void onPostExecute(BinaryMapDataObject o) {
- if (o != null) {
- String fullName = app.getRegions().getFullName(o);
- WorldRegion worldRegion = app.getRegions().getRegionData(fullName);
- if (worldRegion != null) {
- app.setupDrivingRegion(worldRegion);
- }
+ protected void onPostExecute(WorldRegion worldRegion) {
+ if (worldRegion != null) {
+ app.setupDrivingRegion(worldRegion);
}
}
}
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadResources.java b/OsmAnd/src/net/osmand/plus/download/DownloadResources.java
index fdb14163c5..c30c2730d2 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadResources.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadResources.java
@@ -468,7 +468,7 @@ public class DownloadResources extends DownloadResourceGroup {
List res = new ArrayList<>();
OsmandRegions regions = app.getRegions();
DownloadIndexesThread downloadThread = app.getDownloadThread();
- List downloadRegions = regions.getWoldRegionsAt(latLon);
+ List downloadRegions = regions.getWorldRegionsAt(latLon);
for (WorldRegion downloadRegion : downloadRegions) {
if (includeDownloaded || !isIndexItemDownloaded(downloadThread, type, downloadRegion, res)) {
addIndexItem(downloadThread, type, downloadRegion, res);
diff --git a/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java
index 034b2fa8f6..0d9834a351 100644
--- a/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java
@@ -1,7 +1,6 @@
package net.osmand.plus.download.ui;
import android.content.res.TypedArray;
-import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
@@ -32,7 +31,6 @@ import net.osmand.Collator;
import net.osmand.CollatorStringMatcher;
import net.osmand.OsmAndCollator;
import net.osmand.ResultMatcher;
-import net.osmand.binary.BinaryMapDataObject;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
import net.osmand.data.Amenity;
@@ -416,15 +414,13 @@ public class SearchDialogFragment extends DialogFragment implements DownloadEven
@Override
protected IndexItem doInBackground(Void... params) {
Amenity amenity = cityItem.getAmenity();
- BinaryMapDataObject o = null;
+ WorldRegion downloadRegion = null;
try {
- o = osmandRegions.getSmallestBinaryMapDataObjectAt(amenity.getLocation());
+ downloadRegion = osmandRegions.getSmallestBinaryMapDataObjectAt(amenity.getLocation()).getKey();
} catch (IOException e) {
// ignore
}
- if (o != null) {
- String selectedFullName = osmandRegions.getFullName(o);
- WorldRegion downloadRegion = osmandRegions.getRegionData(selectedFullName);
+ if (downloadRegion != null) {
List indexItems = ctx.getDownloadThread().getIndexes().getIndexItems(downloadRegion);
for (IndexItem item : indexItems) {
if (item.getType() == DownloadActivityType.NORMAL_FILE) {
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index 186bd88d11..401d8c7584 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -39,6 +39,7 @@ public class RoutingHelper {
private static final org.apache.commons.logging.Log log = PlatformUtil.getLog(RoutingHelper.class);
private static final float POSITION_TOLERANCE = 60;
+ private static final int CACHE_RADIUS = 100000;
private List> listeners = new LinkedList<>();
private List> updateListeners = new LinkedList<>();
@@ -173,6 +174,7 @@ public class RoutingHelper {
}
public synchronized void setFinalAndCurrentLocation(LatLon finalLocation, List intermediatePoints, Location currentLocation){
+ checkAndUpdateStartLocation(currentLocation);
RouteCalculationResult previousRoute = route;
clearCurrentRoute(finalLocation, intermediatePoints);
// to update route
@@ -259,6 +261,17 @@ public class RoutingHelper {
public LatLon getFinalLocation() {
return finalLocation;
}
+ public void checkAndUpdateStartLocation(Location nextStartLocation) {
+ checkAndUpdateStartLocation(new LatLon(nextStartLocation.getLatitude(), nextStartLocation.getLongitude()));
+ }
+
+ public void checkAndUpdateStartLocation(LatLon newStartLocation) {
+ LatLon lastStartLocation = app.getSettings().getLastStartPoint();
+ if (lastStartLocation == null || MapUtils.getDistance(newStartLocation, lastStartLocation) > CACHE_RADIUS) {
+ app.getMapViewTrackingUtilities().detectDrivingRegion(newStartLocation);
+ app.getSettings().setLastStartPoint(newStartLocation);
+ }
+ }
public List getIntermediatePoints() {
return intermediatePoints;
diff --git a/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java b/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
index 0d5342a7da..b87c36a30e 100644
--- a/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
@@ -45,8 +45,10 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -250,7 +252,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
&& zoom >= ZOOM_MIN_TO_SHOW_DOWNLOAD_DIALOG && zoom <= ZOOM_MAX_TO_SHOW_DOWNLOAD_DIALOG
&& currentObjects != null) {
WorldRegion regionData;
- List selectedObjects = new ArrayList<>();
+ Map selectedObjects = new LinkedHashMap<>();
for (int i = 0; i < currentObjects.size(); i++) {
final BinaryMapDataObject o = currentObjects.get(i);
String fullName = osmandRegions.getFullName(o);
@@ -262,7 +264,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
hideDownloadMapToolbar();
return;
} else {
- selectedObjects.add(o);
+ selectedObjects.put(regionData, o);
}
}
}
@@ -270,11 +272,8 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
IndexItem indexItem = null;
String name = null;
- BinaryMapDataObject smallestRegion = app.getRegions().getSmallestBinaryMapDataObjectAt(selectedObjects);
- if (smallestRegion != null) {
- String fullName = osmandRegions.getFullName(smallestRegion);
- regionData = osmandRegions.getRegionData(fullName);
-
+ regionData = app.getRegions().getSmallestBinaryMapDataObjectAt(selectedObjects).getKey();
+ if (regionData != null) {
DownloadIndexesThread downloadThread = app.getDownloadThread();
List indexItems = downloadThread.getIndexes().getIndexItems(regionData);
if (indexItems.size() == 0) {
diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleHelper.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleHelper.java
index d85decda64..ef96f89671 100644
--- a/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleHelper.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikiArticleHelper.java
@@ -107,7 +107,7 @@ public class WikiArticleHelper {
List regions = null;
if (articleLatLon != null) {
try {
- regions = application.getRegions().getWoldRegionsAt(articleLatLon);
+ regions = application.getRegions().getWorldRegionsAt(articleLatLon);
} catch (IOException e) {
Log.e(TAG, e.getMessage(), e);
}