Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update tests

Browse source
This commit is contained in:
Victor Shcherb 2016-07-29 02:41:57 +02:00
parent ec46b8141d
commit fababf068b
4 changed files with 332 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

375
OsmAnd-java/src/net/osmand/binary/OsmandOdb.java
View file

@ -29394,6 +29394,38 @@ public final class OsmandOdb {
*/ */
net.osmand.binary.OsmandOdb.TransportRouteStopOrBuilder getReverseStopsOrBuilder( net.osmand.binary.OsmandOdb.TransportRouteStopOrBuilder getReverseStopsOrBuilder(
int index); int index);
// optional bytes directGeometry = 17;
/**
* <code>optional bytes directGeometry = 17;</code>
*
* <pre>
* array of delta x,y sint32 (CodedIinputStream) &gt;&gt; 5 (precision 31 &gt;&gt; 5)
* first x,y - 31 coordinates (&gt;&gt;5), next points is delta to previous
* point, line or outer polygon coordinates
* </pre>
*/
boolean hasDirectGeometry();
/**
* <code>optional bytes directGeometry = 17;</code>
*
* <pre>
* array of delta x,y sint32 (CodedIinputStream) &gt;&gt; 5 (precision 31 &gt;&gt; 5)
* first x,y - 31 coordinates (&gt;&gt;5), next points is delta to previous
* point, line or outer polygon coordinates
* </pre>
*/
com.google.protobuf.ByteString getDirectGeometry();
// optional bytes reverseGeometry = 18;
/**
* <code>optional bytes reverseGeometry = 18;</code>
*/
boolean hasReverseGeometry();
/**
* <code>optional bytes reverseGeometry = 18;</code>
*/
com.google.protobuf.ByteString getReverseGeometry();
} }
/** /**
* Protobuf type {@code OsmAnd.OBF.TransportRoute} * Protobuf type {@code OsmAnd.OBF.TransportRoute}
@ -29497,6 +29529,16 @@ public final class OsmandOdb {
reverseStops_.add(input.readMessage(net.osmand.binary.OsmandOdb.TransportRouteStop.PARSER, extensionRegistry)); reverseStops_.add(input.readMessage(net.osmand.binary.OsmandOdb.TransportRouteStop.PARSER, extensionRegistry));
break; break;
} }
case 138: {
bitField0_ |= 0x00000080;
directGeometry_ = input.readBytes();
break;
}
case 146: {
bitField0_ |= 0x00000100;
reverseGeometry_ = input.readBytes();
break;
}
} }
} }
} catch (com.google.protobuf.InvalidProtocolBufferException e) { } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -29794,6 +29836,50 @@ public final class OsmandOdb {
return reverseStops_.get(index); return reverseStops_.get(index);
} }
// optional bytes directGeometry = 17;
public static final int DIRECTGEOMETRY_FIELD_NUMBER = 17;
private com.google.protobuf.ByteString directGeometry_;
/**
* <code>optional bytes directGeometry = 17;</code>
*
* <pre>
* array of delta x,y sint32 (CodedIinputStream) &gt;&gt; 5 (precision 31 &gt;&gt; 5)
* first x,y - 31 coordinates (&gt;&gt;5), next points is delta to previous
* point, line or outer polygon coordinates
* </pre>
*/
public boolean hasDirectGeometry() {
return ((bitField0_ & 0x00000080) == 0x00000080);
}
/**
* <code>optional bytes directGeometry = 17;</code>
*
* <pre>
* array of delta x,y sint32 (CodedIinputStream) &gt;&gt; 5 (precision 31 &gt;&gt; 5)
* first x,y - 31 coordinates (&gt;&gt;5), next points is delta to previous
* point, line or outer polygon coordinates
* </pre>
*/
public com.google.protobuf.ByteString getDirectGeometry() {
return directGeometry_;
}
// optional bytes reverseGeometry = 18;
public static final int REVERSEGEOMETRY_FIELD_NUMBER = 18;
private com.google.protobuf.ByteString reverseGeometry_;
/**
* <code>optional bytes reverseGeometry = 18;</code>
*/
public boolean hasReverseGeometry() {
return ((bitField0_ & 0x00000100) == 0x00000100);
}
/**
* <code>optional bytes reverseGeometry = 18;</code>
*/
public com.google.protobuf.ByteString getReverseGeometry() {
return reverseGeometry_;
}
private void initFields() { private void initFields() {
id_ = 0L; id_ = 0L;
type_ = 0; type_ = 0;
@ -29804,6 +29890,8 @@ public final class OsmandOdb {
distance_ = 0; distance_ = 0;
directStops_ = java.util.Collections.emptyList(); directStops_ = java.util.Collections.emptyList();
reverseStops_ = java.util.Collections.emptyList(); reverseStops_ = java.util.Collections.emptyList();
directGeometry_ = com.google.protobuf.ByteString.EMPTY;
reverseGeometry_ = com.google.protobuf.ByteString.EMPTY;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@ -29860,6 +29948,12 @@ public final class OsmandOdb {
for (int i = 0; i < reverseStops_.size(); i++) { for (int i = 0; i < reverseStops_.size(); i++) {
output.writeMessage(16, reverseStops_.get(i)); output.writeMessage(16, reverseStops_.get(i));
} }
if (((bitField0_ & 0x00000080) == 0x00000080)) {
output.writeBytes(17, directGeometry_);
}
if (((bitField0_ & 0x00000100) == 0x00000100)) {
output.writeBytes(18, reverseGeometry_);
}
getUnknownFields().writeTo(output); getUnknownFields().writeTo(output);
} }
@ -29905,6 +29999,14 @@ public final class OsmandOdb {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeMessageSize(16, reverseStops_.get(i)); .computeMessageSize(16, reverseStops_.get(i));
} }
if (((bitField0_ & 0x00000080) == 0x00000080)) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(17, directGeometry_);
}
if (((bitField0_ & 0x00000100) == 0x00000100)) {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(18, reverseGeometry_);
}
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
return size; return size;
@ -30049,6 +30151,10 @@ public final class OsmandOdb {
} else { } else {
reverseStopsBuilder_.clear(); reverseStopsBuilder_.clear();
} }
directGeometry_ = com.google.protobuf.ByteString.EMPTY;
bitField0_ = (bitField0_ & ~0x00000200);
reverseGeometry_ = com.google.protobuf.ByteString.EMPTY;
bitField0_ = (bitField0_ & ~0x00000400);
return this; return this;
} }
@ -30123,6 +30229,14 @@ public final class OsmandOdb {
} else { } else {
result.reverseStops_ = reverseStopsBuilder_.build(); result.reverseStops_ = reverseStopsBuilder_.build();
} }
if (((from_bitField0_ & 0x00000200) == 0x00000200)) {
to_bitField0_ |= 0x00000080;
}
result.directGeometry_ = directGeometry_;
if (((from_bitField0_ & 0x00000400) == 0x00000400)) {
to_bitField0_ |= 0x00000100;
}
result.reverseGeometry_ = reverseGeometry_;
result.bitField0_ = to_bitField0_; result.bitField0_ = to_bitField0_;
onBuilt(); onBuilt();
return result; return result;
@ -30214,6 +30328,12 @@ public final class OsmandOdb {
} }
} }
} }
if (other.hasDirectGeometry()) {
setDirectGeometry(other.getDirectGeometry());
}
if (other.hasReverseGeometry()) {
setReverseGeometry(other.getReverseGeometry());
}
this.mergeUnknownFields(other.getUnknownFields()); this.mergeUnknownFields(other.getUnknownFields());
return this; return this;
} }
@ -31089,6 +31209,102 @@ public final class OsmandOdb {
return reverseStopsBuilder_; return reverseStopsBuilder_;
} }
// optional bytes directGeometry = 17;
private com.google.protobuf.ByteString directGeometry_ = com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes directGeometry = 17;</code>
*
* <pre>
* array of delta x,y sint32 (CodedIinputStream) &gt;&gt; 5 (precision 31 &gt;&gt; 5)
* first x,y - 31 coordinates (&gt;&gt;5), next points is delta to previous
* point, line or outer polygon coordinates
* </pre>
*/
public boolean hasDirectGeometry() {
return ((bitField0_ & 0x00000200) == 0x00000200);
}
/**
* <code>optional bytes directGeometry = 17;</code>
*
* <pre>
* array of delta x,y sint32 (CodedIinputStream) &gt;&gt; 5 (precision 31 &gt;&gt; 5)
* first x,y - 31 coordinates (&gt;&gt;5), next points is delta to previous
* point, line or outer polygon coordinates
* </pre>
*/
public com.google.protobuf.ByteString getDirectGeometry() {
return directGeometry_;
}
/**
* <code>optional bytes directGeometry = 17;</code>
*
* <pre>
* array of delta x,y sint32 (CodedIinputStream) &gt;&gt; 5 (precision 31 &gt;&gt; 5)
* first x,y - 31 coordinates (&gt;&gt;5), next points is delta to previous
* point, line or outer polygon coordinates
* </pre>
*/
public Builder setDirectGeometry(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000200;
directGeometry_ = value;
onChanged();
return this;
}
/**
* <code>optional bytes directGeometry = 17;</code>
*
* <pre>
* array of delta x,y sint32 (CodedIinputStream) &gt;&gt; 5 (precision 31 &gt;&gt; 5)
* first x,y - 31 coordinates (&gt;&gt;5), next points is delta to previous
* point, line or outer polygon coordinates
* </pre>
*/
public Builder clearDirectGeometry() {
bitField0_ = (bitField0_ & ~0x00000200);
directGeometry_ = getDefaultInstance().getDirectGeometry();
onChanged();
return this;
}
// optional bytes reverseGeometry = 18;
private com.google.protobuf.ByteString reverseGeometry_ = com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes reverseGeometry = 18;</code>
*/
public boolean hasReverseGeometry() {
return ((bitField0_ & 0x00000400) == 0x00000400);
}
/**
* <code>optional bytes reverseGeometry = 18;</code>
*/
public com.google.protobuf.ByteString getReverseGeometry() {
return reverseGeometry_;
}
/**
* <code>optional bytes reverseGeometry = 18;</code>
*/
public Builder setReverseGeometry(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
bitField0_ |= 0x00000400;
reverseGeometry_ = value;
onChanged();
return this;
}
/**
* <code>optional bytes reverseGeometry = 18;</code>
*/
public Builder clearReverseGeometry() {
bitField0_ = (bitField0_ & ~0x00000400);
reverseGeometry_ = getDefaultInstance().getReverseGeometry();
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:OsmAnd.OBF.TransportRoute) // @@protoc_insertion_point(builder_scope:OsmAnd.OBF.TransportRoute)
} }
@ -57688,88 +57904,89 @@ public final class OsmandOdb {
" \003(\t\022\030\n\020attributeTagIds2\030\021 \003(\r\022\030\n\020attrib" + " \003(\t\022\030\n\020attributeTagIds2\030\021 \003(\r\022\030\n\020attrib" +
"uteValues2\030\022 \003(\t\"=\n\017TransportRoutes\022*\n\006r" + "uteValues2\030\022 \003(\t\"=\n\017TransportRoutes\022*\n\006r" +
"outes\030\006 \003(\0132\032.OsmAnd.OBF.TransportRoute\"" + "outes\030\006 \003(\0132\032.OsmAnd.OBF.TransportRoute\"" +
"\345\001\n\016TransportRoute\022\n\n\002id\030\001 \002(\004\022\014\n\004type\030\003" + "\226\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" + " \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" + "ame\030\006 \001(\r\022\017\n\007name_en\030\007 \001(\r\022\020\n\010distance\030\010" +
" \001(\r\0223\n\013directStops\030\017 \003(\0132\036.OsmAnd.OBF.T" + " \001(\r\0223\n\013directStops\030\017 \003(\0132\036.OsmAnd.OBF.T" +
"ransportRouteStop\0224\n\014reverseStops\030\020 \003(\0132", "ransportRouteStop\0224\n\014reverseStops\030\020 \003(\0132",
"\036.OsmAnd.OBF.TransportRouteStop\"W\n\022Trans" + "\036.OsmAnd.OBF.TransportRouteStop\022\026\n\016direc" +
"portRouteStop\022\n\n\002id\030\001 \002(\022\022\n\n\002dx\030\002 \002(\021\022\n\n" + "tGeometry\030\021 \001(\014\022\027\n\017reverseGeometry\030\022 \001(\014" +
"\002dy\030\003 \002(\021\022\014\n\004name\030\006 \002(\r\022\017\n\007name_en\030\007 \001(\r" + "\"W\n\022TransportRouteStop\022\n\n\002id\030\001 \002(\022\022\n\n\002dx" +
"\"b\n\rTransportStop\022\n\n\002dx\030\001 \002(\021\022\n\n\002dy\030\002 \002(" + "\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\014\n\004name\030\006 \002(\r\022\017\n\007name" +
"\021\022\n\n\002id\030\005 \002(\022\022\014\n\004name\030\006 \002(\r\022\017\n\007name_en\030\007" + "_en\030\007 \001(\r\"b\n\rTransportStop\022\n\n\002dx\030\001 \002(\021\022\n" +
" \001(\r\022\016\n\006routes\030\020 \003(\r\"\272\001\n\022TransportStopsT" + "\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\007" +
"ree\022\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top\030" + "name_en\030\007 \001(\r\022\016\n\006routes\030\020 \003(\r\"\272\001\n\022Transp" +
"\003 \002(\021\022\016\n\006bottom\030\004 \002(\021\0220\n\010subtrees\030\007 \003(\0132" + "ortStopsTree\022\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(" +
"\036.OsmAnd.OBF.TransportStopsTree\022(\n\005leafs" + "\021\022\013\n\003top\030\003 \002(\021\022\016\n\006bottom\030\004 \002(\021\0220\n\010subtre" +
"\030\010 \003(\0132\031.OsmAnd.OBF.TransportStop\022\016\n\006bas", "es\030\007 \003(\0132\036.OsmAnd.OBF.TransportStopsTree",
"eId\030\020 \001(\004\"\256\001\n\024OsmAndTransportIndex\022\014\n\004na" + "\022(\n\005leafs\030\010 \003(\0132\031.OsmAnd.OBF.TransportSt" +
"me\030\001 \001(\t\022+\n\006routes\030\003 \001(\0132\033.OsmAnd.OBF.Tr" + "op\022\016\n\006baseId\030\020 \001(\004\"\256\001\n\024OsmAndTransportIn" +
"ansportRoutes\022-\n\005stops\030\006 \001(\0132\036.OsmAnd.OB" + "dex\022\014\n\004name\030\001 \001(\t\022+\n\006routes\030\003 \001(\0132\033.OsmA" +
"F.TransportStopsTree\022,\n\013stringTable\030\t \002(" + "nd.OBF.TransportRoutes\022-\n\005stops\030\006 \001(\0132\036." +
"\0132\027.OsmAnd.OBF.StringTable\"\312\002\n\016OsmAndPoi" + "OsmAnd.OBF.TransportStopsTree\022,\n\013stringT" +
"Index\022\014\n\004name\030\001 \002(\t\022-\n\nboundaries\030\002 \002(\0132" + "able\030\t \002(\0132\027.OsmAnd.OBF.StringTable\"\312\002\n\016" +
"\031.OsmAnd.OBF.OsmAndTileBox\0228\n\017categories" + "OsmAndPoiIndex\022\014\n\004name\030\001 \002(\t\022-\n\nboundari" +
"Table\030\003 \003(\0132\037.OsmAnd.OBF.OsmAndCategoryT" + "es\030\002 \002(\0132\031.OsmAnd.OBF.OsmAndTileBox\0228\n\017c" +
"able\0221\n\tnameIndex\030\004 \001(\0132\036.OsmAnd.OBF.Osm" + "ategoriesTable\030\003 \003(\0132\037.OsmAnd.OBF.OsmAnd" +
"AndPoiNameIndex\0226\n\rsubtypesTable\030\005 \001(\0132\037", "CategoryTable\0221\n\tnameIndex\030\004 \001(\0132\036.OsmAn",
".OsmAnd.OBF.OsmAndSubtypesTable\022\'\n\005boxes" + "d.OBF.OsmAndPoiNameIndex\0226\n\rsubtypesTabl" +
"\030\006 \003(\0132\030.OsmAnd.OBF.OsmAndPoiBox\022-\n\007poiD" + "e\030\005 \001(\0132\037.OsmAnd.OBF.OsmAndSubtypesTable" +
"ata\030\t \003(\0132\034.OsmAnd.OBF.OsmAndPoiBoxData\"" + "\022\'\n\005boxes\030\006 \003(\0132\030.OsmAnd.OBF.OsmAndPoiBo" +
"\331\001\n\022OsmAndPoiNameIndex\022-\n\005table\030\003 \002(\0132\036." + "x\022-\n\007poiData\030\t \003(\0132\034.OsmAnd.OBF.OsmAndPo" +
"OsmAnd.OBF.IndexedStringTable\022C\n\004data\030\005 " + "iBoxData\"\331\001\n\022OsmAndPoiNameIndex\022-\n\005table" +
"\003(\01325.OsmAnd.OBF.OsmAndPoiNameIndex.OsmA" + "\030\003 \002(\0132\036.OsmAnd.OBF.IndexedStringTable\022C" +
"ndPoiNameIndexData\032O\n\026OsmAndPoiNameIndex" + "\n\004data\030\005 \003(\01325.OsmAnd.OBF.OsmAndPoiNameI" +
"Data\0225\n\005atoms\030\003 \003(\0132&.OsmAnd.OBF.OsmAndP" + "ndex.OsmAndPoiNameIndexData\032O\n\026OsmAndPoi" +
"oiNameIndexDataAtom\"Q\n\032OsmAndPoiNameInde" + "NameIndexData\0225\n\005atoms\030\003 \003(\0132&.OsmAnd.OB" +
"xDataAtom\022\014\n\004zoom\030\002 \001(\r\022\t\n\001x\030\003 \001(\r\022\t\n\001y\030", "F.OsmAndPoiNameIndexDataAtom\"Q\n\032OsmAndPo",
"\004 \001(\r\022\017\n\007shiftTo\030\016 \001(\007\">\n\023OsmAndCategory" + "iNameIndexDataAtom\022\014\n\004zoom\030\002 \001(\r\022\t\n\001x\030\003 " +
"Table\022\020\n\010category\030\001 \002(\t\022\025\n\rsubcategories" + "\001(\r\022\t\n\001y\030\004 \001(\r\022\017\n\007shiftTo\030\016 \001(\007\">\n\023OsmAn" +
"\030\003 \003(\t\"E\n\023OsmAndSubtypesTable\022.\n\010subtype" + "dCategoryTable\022\020\n\010category\030\001 \002(\t\022\025\n\rsubc" +
"s\030\004 \003(\0132\034.OsmAnd.OBF.OsmAndPoiSubtype\"\205\001" + "ategories\030\003 \003(\t\"E\n\023OsmAndSubtypesTable\022." +
"\n\020OsmAndPoiSubtype\022\014\n\004name\030\001 \002(\t\022\017\n\007tagn" + "\n\010subtypes\030\004 \003(\0132\034.OsmAnd.OBF.OsmAndPoiS" +
"ame\030\002 \001(\t\022\016\n\006isText\030\003 \002(\010\022\021\n\tfrequency\030\005" + "ubtype\"\205\001\n\020OsmAndPoiSubtype\022\014\n\004name\030\001 \002(" +
" \001(\r\022\031\n\021subtypeValuesSize\030\006 \001(\r\022\024\n\014subty" + "\t\022\017\n\007tagname\030\002 \001(\t\022\016\n\006isText\030\003 \002(\010\022\021\n\tfr" +
"peValue\030\010 \003(\t\"\255\001\n\014OsmAndPoiBox\022\014\n\004zoom\030\001" + "equency\030\005 \001(\r\022\031\n\021subtypeValuesSize\030\006 \001(\r" +
" \002(\r\022\014\n\004left\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\0223\n\ncateg" + "\022\024\n\014subtypeValue\030\010 \003(\t\"\255\001\n\014OsmAndPoiBox\022" +
"ories\030\004 \001(\0132\037.OsmAnd.OBF.OsmAndPoiCatego", "\014\n\004zoom\030\001 \002(\r\022\014\n\004left\030\002 \002(\021\022\013\n\003top\030\003 \002(\021",
"ries\022*\n\010subBoxes\030\n \003(\0132\030.OsmAnd.OBF.OsmA" + "\0223\n\ncategories\030\004 \001(\0132\037.OsmAnd.OBF.OsmAnd" +
"ndPoiBox\022\023\n\013shiftToData\030\016 \001(\007\"@\n\023OsmAndP" + "PoiCategories\022*\n\010subBoxes\030\n \003(\0132\030.OsmAnd" +
"oiCategories\022\022\n\ncategories\030\003 \003(\r\022\025\n\rsubc" + ".OBF.OsmAndPoiBox\022\023\n\013shiftToData\030\016 \001(\007\"@" +
"ategories\030\005 \003(\r\"i\n\020OsmAndPoiBoxData\022\014\n\004z" + "\n\023OsmAndPoiCategories\022\022\n\ncategories\030\003 \003(" +
"oom\030\001 \001(\r\022\t\n\001x\030\002 \001(\r\022\t\n\001y\030\003 \001(\r\0221\n\007poiDa" + "\r\022\025\n\rsubcategories\030\005 \003(\r\"i\n\020OsmAndPoiBox" +
"ta\030\005 \003(\0132 .OsmAnd.OBF.OsmAndPoiBoxDataAt" + "Data\022\014\n\004zoom\030\001 \001(\r\022\t\n\001x\030\002 \001(\r\022\t\n\001y\030\003 \001(\r" +
"om\"\360\001\n\024OsmAndPoiBoxDataAtom\022\n\n\002dx\030\002 \002(\021\022" + "\0221\n\007poiData\030\005 \003(\0132 .OsmAnd.OBF.OsmAndPoi" +
"\n\n\002dy\030\003 \002(\021\022\022\n\ncategories\030\004 \003(\r\022\025\n\rsubca" + "BoxDataAtom\"\360\001\n\024OsmAndPoiBoxDataAtom\022\n\n\002" +
"tegories\030\005 \003(\r\022\014\n\004name\030\006 \001(\t\022\016\n\006nameEn\030\007" + "dx\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\022\n\ncategories\030\004 \003(\r" +
" \001(\t\022\n\n\002id\030\010 \001(\004\022\024\n\014openingHours\030\n \001(\t\022\014", "\022\025\n\rsubcategories\030\005 \003(\r\022\014\n\004name\030\006 \001(\t\022\016\n",
"\n\004site\030\013 \001(\t\022\r\n\005phone\030\014 \001(\t\022\014\n\004note\030\r \001(" + "\006nameEn\030\007 \001(\t\022\n\n\002id\030\010 \001(\004\022\024\n\014openingHour" +
"\t\022\026\n\016textCategories\030\016 \003(\r\022\022\n\ntextValues\030" + "s\030\n \001(\t\022\014\n\004site\030\013 \001(\t\022\r\n\005phone\030\014 \001(\t\022\014\n\004" +
"\017 \003(\t\"\032\n\007IdTable\022\017\n\007routeId\030\001 \003(\022\"F\n\017Res" + "note\030\r \001(\t\022\026\n\016textCategories\030\016 \003(\r\022\022\n\nte" +
"trictionData\022\014\n\004type\030\001 \002(\005\022\014\n\004from\030\002 \002(\005" + "xtValues\030\017 \003(\t\"\032\n\007IdTable\022\017\n\007routeId\030\001 \003" +
"\022\n\n\002to\030\003 \002(\005\022\013\n\003via\030\004 \001(\005\"x\n\tRouteData\022\016" + "(\022\"F\n\017RestrictionData\022\014\n\004type\030\001 \002(\005\022\014\n\004f" +
"\n\006points\030\001 \002(\014\022\022\n\npointTypes\030\004 \001(\014\022\022\n\npo" + "rom\030\002 \002(\005\022\n\n\002to\030\003 \002(\005\022\013\n\003via\030\004 \001(\005\"x\n\tRo" +
"intNames\030\005 \001(\014\022\r\n\005types\030\007 \002(\014\022\017\n\007routeId" + "uteData\022\016\n\006points\030\001 \002(\014\022\022\n\npointTypes\030\004 " +
"\030\014 \002(\005\022\023\n\013stringNames\030\016 \001(\014\"\304\005\n\022OsmAndRo" + "\001(\014\022\022\n\npointNames\030\005 \001(\014\022\r\n\005types\030\007 \002(\014\022\017" +
"utingIndex\022\014\n\004name\030\001 \002(\t\022?\n\005rules\030\002 \003(\0132" + "\n\007routeId\030\014 \002(\005\022\023\n\013stringNames\030\016 \001(\014\"\304\005\n" +
"0.OsmAnd.OBF.OsmAndRoutingIndex.RouteEnc", "\022OsmAndRoutingIndex\022\014\n\004name\030\001 \002(\t\022?\n\005rul",
"odingRule\022>\n\trootBoxes\030\003 \003(\0132+.OsmAnd.OB" + "es\030\002 \003(\01320.OsmAnd.OBF.OsmAndRoutingIndex" +
"F.OsmAndRoutingIndex.RouteDataBox\022A\n\014bas" + ".RouteEncodingRule\022>\n\trootBoxes\030\003 \003(\0132+." +
"emapBoxes\030\004 \003(\0132+.OsmAnd.OBF.OsmAndRouti" + "OsmAnd.OBF.OsmAndRoutingIndex.RouteDataB" +
"ngIndex.RouteDataBox\022=\n\006blocks\030\005 \003(\0132-.O" + "ox\022A\n\014basemapBoxes\030\004 \003(\0132+.OsmAnd.OBF.Os" +
"smAnd.OBF.OsmAndRoutingIndex.RouteDataBl" + "mAndRoutingIndex.RouteDataBox\022=\n\006blocks\030" +
"ock\032;\n\021RouteEncodingRule\022\013\n\003tag\030\003 \002(\t\022\r\n" + "\005 \003(\0132-.OsmAnd.OBF.OsmAndRoutingIndex.Ro" +
"\005value\030\005 \002(\t\022\n\n\002id\030\007 \001(\r\032\231\001\n\014RouteDataBo" + "uteDataBlock\032;\n\021RouteEncodingRule\022\013\n\003tag" +
"x\022\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top\030\003 " + "\030\003 \002(\t\022\r\n\005value\030\005 \002(\t\022\n\n\002id\030\007 \001(\r\032\231\001\n\014Ro" +
"\002(\021\022\016\n\006bottom\030\004 \002(\021\022\023\n\013shiftToData\030\005 \001(\007" + "uteDataBox\022\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022" +
"\022:\n\005boxes\030\007 \003(\0132+.OsmAnd.OBF.OsmAndRouti", "\013\n\003top\030\003 \002(\021\022\016\n\006bottom\030\004 \002(\021\022\023\n\013shiftToD",
"ngIndex.RouteDataBox\032\303\001\n\016RouteDataBlock\022" + "ata\030\005 \001(\007\022:\n\005boxes\030\007 \003(\0132+.OsmAnd.OBF.Os" +
"$\n\007idTable\030\005 \001(\0132\023.OsmAnd.OBF.IdTable\022*\n" + "mAndRoutingIndex.RouteDataBox\032\303\001\n\016RouteD" +
"\013dataObjects\030\006 \003(\0132\025.OsmAnd.OBF.RouteDat" + "ataBlock\022$\n\007idTable\030\005 \001(\0132\023.OsmAnd.OBF.I" +
"a\0221\n\014restrictions\030\007 \003(\0132\033.OsmAnd.OBF.Res" + "dTable\022*\n\013dataObjects\030\006 \003(\0132\025.OsmAnd.OBF" +
"trictionData\022,\n\013stringTable\030\010 \001(\0132\027.OsmA" + ".RouteData\0221\n\014restrictions\030\007 \003(\0132\033.OsmAn" +
"nd.OBF.StringTableB\036\n\021net.osmand.binaryB" + "d.OBF.RestrictionData\022,\n\013stringTable\030\010 \001" +
"\tOsmandOdb" "(\0132\027.OsmAnd.OBF.StringTableB\036\n\021net.osman" +
"d.binaryB\tOsmandOdb"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -57907,7 +58124,7 @@ public final class OsmandOdb {
internal_static_OsmAnd_OBF_TransportRoute_fieldAccessorTable = new internal_static_OsmAnd_OBF_TransportRoute_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_TransportRoute_descriptor, internal_static_OsmAnd_OBF_TransportRoute_descriptor,
new java.lang.String[] { "Id", "Type", "Operator", "Ref", "Name", "NameEn", "Distance", "DirectStops", "ReverseStops", }); new java.lang.String[] { "Id", "Type", "Operator", "Ref", "Name", "NameEn", "Distance", "DirectStops", "ReverseStops", "DirectGeometry", "ReverseGeometry", });
internal_static_OsmAnd_OBF_TransportRouteStop_descriptor = internal_static_OsmAnd_OBF_TransportRouteStop_descriptor =
getDescriptor().getMessageTypes().get(17); getDescriptor().getMessageTypes().get(17);
internal_static_OsmAnd_OBF_TransportRouteStop_fieldAccessorTable = new internal_static_OsmAnd_OBF_TransportRouteStop_fieldAccessorTable = new

33
OsmAnd-java/src/net/osmand/data/TransportRoute.java
View file

@ -1,8 +1,10 @@
package net.osmand.data; package net.osmand.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import net.osmand.osm.edit.Way;
import net.osmand.util.MapUtils; import net.osmand.util.MapUtils;
public class TransportRoute extends MapObject { public class TransportRoute extends MapObject {
@ -12,6 +14,8 @@ public class TransportRoute extends MapObject {
private String operator; private String operator;
private String type; private String type;
private Integer dist = null; private Integer dist = null;
private List<Way> forwardWays;
private List<Way> backwardWays;
public TransportRoute(){ public TransportRoute(){
} }
@ -24,6 +28,35 @@ public class TransportRoute extends MapObject {
return backwardStops; return backwardStops;
} }
public List<Way> getForwardWays() {
if(forwardWays == null){
return Collections.emptyList();
}
return forwardWays;
}
public List<Way> getBackwardWays() {
if(backwardWays == null){
return Collections.emptyList();
}
return backwardWays;
}
public void addWay(Way w, int direction){
if(direction >= 0) {
if(forwardWays == null) {
forwardWays = new ArrayList<>();
}
forwardWays.add(w);
}
if(direction <= 0) {
if(backwardWays == null) {
backwardWays = new ArrayList<>();
}
backwardWays.add(w);
}
}
public String getRef() { public String getRef() {
return ref; return ref;
} }

5
OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java
View file

@ -11,6 +11,7 @@ import net.osmand.data.City;
import net.osmand.data.City.CityType; import net.osmand.data.City.CityType;
import net.osmand.data.LatLon; import net.osmand.data.LatLon;
import net.osmand.data.MapObject; import net.osmand.data.MapObject;
import net.osmand.data.TransportRoute;
import net.osmand.data.TransportStop; import net.osmand.data.TransportStop;
import net.osmand.osm.MapPoiTypes; import net.osmand.osm.MapPoiTypes;
import net.osmand.osm.MapRenderingTypes; import net.osmand.osm.MapRenderingTypes;
@ -220,8 +221,8 @@ public class EntityParser {
} }
public static OsmTransportRoute parserRoute(Relation r, String ref){ public static TransportRoute parserRoute(Relation r, String ref){
OsmTransportRoute rt = new OsmTransportRoute(); TransportRoute rt = new TransportRoute();
parseMapObject(rt, r, r.getTags()); parseMapObject(rt, r, r.getTags());
rt.setRef(ref); rt.setRef(ref);
return rt; return rt;

25
OsmAnd-java/src/net/osmand/osm/edit/OsmTransportRoute.java
View file

@ -1,25 +0,0 @@
package net.osmand.osm.edit;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.osmand.data.TransportRoute;
public class OsmTransportRoute extends TransportRoute {
private List<Way> ways;
public List<Way> getWays() {
if(ways == null){
return Collections.emptyList();
}
return ways;
}
public void addWay(Way w){
if(ways == null){
ways = new ArrayList<Way>();
}
ways.add(w);
}
}