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

Fix compare route data object

Browse source
This commit is contained in:
Victor Shcherb 2017-09-02 22:08:38 +02:00
parent f2309e05c0
commit 00c0a62329
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
View file

@ -74,15 +74,15 @@ public class BinaryInspector {
in.inspector(new String[] { in.inspector(new String[] {
// "-vpoi", // "-vpoi",
"-vmap", "-vmapobjects", // "-vmapcoordinates", // "-vmap", "-vmapobjects", // "-vmapcoordinates",
// "-vrouting", "-vrouting",
// "-vtransport", // "-vtransport",
// "-vaddress", "-vcities","-vstreetgroups", // "-vaddress", "-vcities","-vstreetgroups",
// "-vstreets", "-vbuildings", "-vintersections", // "-vstreets", "-vbuildings", "-vintersections",
// "-lang=ru", // "-lang=ru",
// "-bbox=30.4981,50.4424,30.5195,50.4351", // "-bbox=30.4981,50.4424,30.5195,50.4351",
// "-osm="+System.getProperty("maps.dir")+"/map_full.obf.osm", // "-osm="+System.getProperty("maps.dir")+"/map_full.obf.osm",
System.getProperty("maps.dir")+"/diff/2017_08_28_01_00.obf" System.getProperty("maps.dir")+"/diff/Diff.obf"
// System.getProperty("maps.dir")+"../temp/kiev/Ukraine_kiev-city_europe_17_06_05.obf", // System.getProperty("maps.dir")+"../temp/kiev/Ukraine_kiev-city_europe_17_06_05.obf",
// System.getProperty("maps.dir")+"Ukraine_kiev-city_europe_2.obf", // System.getProperty("maps.dir")+"Ukraine_kiev-city_europe_2.obf",
}); });

8
OsmAnd-java/src/net/osmand/binary/RouteDataObject.java
View file

@ -77,11 +77,7 @@ public class RouteDataObject {
boolean equals = true; boolean equals = true;
equals = equals && Arrays.equals(this.restrictions, thatObj.restrictions); equals = equals && Arrays.equals(this.restrictions, thatObj.restrictions);
if (equals) {
if (this.names != null && thatObj.names != null) {
equals = Arrays.equals(this.names.values(), thatObj.names.values());
}
}
if (equals) { if (equals) {
if (this.types == null || thatObj.types == null) { if (this.types == null || thatObj.types == null) {
equals = this.types == thatObj.types; equals = this.types == thatObj.types;
@ -158,7 +154,7 @@ public class RouteDataObject {
} }
} }
} }
return equals;
} }
return false; return false;
} }