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

Fix slight deviation for transport stops

Browse source
This commit is contained in:
Victor Shcherb 2019-07-28 19:11:07 +02:00 committed by max-klaus
parent b0b612b46a
commit 1e3a6493f8
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapTransportReaderAdapter.java
View file

@ -1,8 +1,16 @@
package net.osmand.binary; package net.osmand.binary;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import com.google.protobuf.CodedInputStream; import com.google.protobuf.CodedInputStream;
import com.google.protobuf.WireFormat; import com.google.protobuf.WireFormat;
import gnu.trove.list.array.TIntArrayList;
import gnu.trove.map.hash.TIntObjectHashMap;
import net.osmand.binary.BinaryMapIndexReader.SearchRequest; import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
import net.osmand.data.TransportSchedule; import net.osmand.data.TransportSchedule;
import net.osmand.data.TransportStop; import net.osmand.data.TransportStop;
@ -12,16 +20,6 @@ import net.osmand.osm.edit.Way;
import net.osmand.util.MapUtils; import net.osmand.util.MapUtils;
import net.osmand.util.TransliterationHelper; import net.osmand.util.TransliterationHelper;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import gnu.trove.list.array.TIntArrayList;
import gnu.trove.map.hash.TIntObjectHashMap;
public class BinaryMapTransportReaderAdapter { public class BinaryMapTransportReaderAdapter {
private CodedInputStream codedIS; private CodedInputStream codedIS;
private final BinaryMapIndexReader map; private final BinaryMapIndexReader map;
@ -256,8 +254,8 @@ public class BinaryMapTransportReaderAdapter {
dataObject.setFileOffset(filePointer); dataObject.setFileOffset(filePointer);
boolean end = false; boolean end = false;
long rid = 0; long rid = 0;
int rx = 0; int[] rx = new int[] {0};
int ry = 0; int[] ry = new int[] {0};
while(!end){ while(!end){
int t = codedIS.readTag(); int t = codedIS.readTag();
int tag = WireFormat.getTagFieldNumber(t); int tag = WireFormat.getTagFieldNumber(t);
@ -336,8 +334,6 @@ public class BinaryMapTransportReaderAdapter {
TransportStop stop = readTransportRouteStop(rx, ry, rid, stringTable, filePointer); TransportStop stop = readTransportRouteStop(rx, ry, rid, stringTable, filePointer);
dataObject.getForwardStops().add(stop); dataObject.getForwardStops().add(stop);
rid = stop.getId(); rid = stop.getId();
rx = (int) MapUtils.getTileNumberX(BinaryMapIndexReader.TRANSPORT_STOP_ZOOM, stop.getLocation().getLongitude());
ry = (int) MapUtils.getTileNumberY(BinaryMapIndexReader.TRANSPORT_STOP_ZOOM, stop.getLocation().getLatitude());
codedIS.popLimit(olds); codedIS.popLimit(olds);
break; break;
default: default:
@ -479,7 +475,7 @@ public class BinaryMapTransportReaderAdapter {
private TransportStop readTransportRouteStop(int dx, int dy, long did, TIntObjectHashMap<String> stringTable, private TransportStop readTransportRouteStop(int[] dx, int[] dy, long did, TIntObjectHashMap<String> stringTable,
int filePointer) throws IOException { int filePointer) throws IOException {
TransportStop dataObject = new TransportStop(); TransportStop dataObject = new TransportStop();
dataObject.setFileOffset(codedIS.getTotalBytesRead()); dataObject.setFileOffset(codedIS.getTotalBytesRead());
@ -502,10 +498,10 @@ public class BinaryMapTransportReaderAdapter {
did += codedIS.readSInt64(); did += codedIS.readSInt64();
break; break;
case OsmandOdb.TransportRouteStop.DX_FIELD_NUMBER : case OsmandOdb.TransportRouteStop.DX_FIELD_NUMBER :
dx += codedIS.readSInt32(); dx[0] += codedIS.readSInt32();
break; break;
case OsmandOdb.TransportRouteStop.DY_FIELD_NUMBER : case OsmandOdb.TransportRouteStop.DY_FIELD_NUMBER :
dy += codedIS.readSInt32(); dy[0] += codedIS.readSInt32();
break; break;
default: default:
skipUnknownField(t); skipUnknownField(t);
@ -513,7 +509,7 @@ public class BinaryMapTransportReaderAdapter {
} }
} }
dataObject.setId(did); dataObject.setId(did);
dataObject.setLocation(BinaryMapIndexReader.TRANSPORT_STOP_ZOOM, dx, dy); dataObject.setLocation(BinaryMapIndexReader.TRANSPORT_STOP_ZOOM, dx[0], dy[0]);
return dataObject; return dataObject;
} }
@ -542,7 +538,6 @@ public class BinaryMapTransportReaderAdapter {
TransportStop dataObject = new TransportStop(); TransportStop dataObject = new TransportStop();
dataObject.setLocation(BinaryMapIndexReader.TRANSPORT_STOP_ZOOM, x, y); dataObject.setLocation(BinaryMapIndexReader.TRANSPORT_STOP_ZOOM, x, y);
dataObject.setFileOffset(shift); dataObject.setFileOffset(shift);
List<String> names = null;
while(true){ while(true){
int t = codedIS.readTag(); int t = codedIS.readTag();
tag = WireFormat.getTagFieldNumber(t); tag = WireFormat.getTagFieldNumber(t);