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

Fix transport stop compare

Browse source
This commit is contained in:
Victor Shcherb 2019-07-29 10:07:26 +02:00
parent d388eb7500
commit 221dc057e7
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java
View file

@ -161,22 +161,10 @@ public class TransportStop extends MapObject {
return exitsString;
}
private boolean areRoutesEquals(long[] r1, long[] r2) {
boolean res = (r1 == null && r2 == null);
if (!res && r1 != null && r2 != null) {
res = true;
for (long id : r1) {
if (!Algorithms.containsInArrayL(r2, id)) {
res = false;
break;
}
}
}
return res;
}
public boolean compareStop(TransportStop thatObj) {
if (this.compareObject(thatObj) && areRoutesEquals(this.routesIds, thatObj.routesIds) &&
if (this.compareObject(thatObj) &&
// don't compare routes cause stop could be identical
// ((this.routesIds == null && thatObj.routesIds == null) || (this.routesIds != null && this.routesIds.equals(thatObj.routesIds))) &&
((this.exits == null && thatObj.exits == null) || (this.exits != null && thatObj.exits != null && this.exits.size() == thatObj.exits.size()))) {
if (this.exits != null) {
for (TransportStopExit exit1 : this.exits) {