From 00c0a62329b0c7a24bd21233f3fa9d54f8b486f5 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 2 Sep 2017 22:08:38 +0200 Subject: [PATCH] Fix compare route data object --- OsmAnd-java/src/net/osmand/binary/BinaryInspector.java | 6 +++--- OsmAnd-java/src/net/osmand/binary/RouteDataObject.java | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java index 4fb72e4f4d..e06f98c626 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java @@ -74,15 +74,15 @@ public class BinaryInspector { in.inspector(new String[] { // "-vpoi", - "-vmap", "-vmapobjects", // "-vmapcoordinates", -// "-vrouting", +// "-vmap", "-vmapobjects", // "-vmapcoordinates", + "-vrouting", // "-vtransport", // "-vaddress", "-vcities","-vstreetgroups", // "-vstreets", "-vbuildings", "-vintersections", // "-lang=ru", // "-bbox=30.4981,50.4424,30.5195,50.4351", // "-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")+"Ukraine_kiev-city_europe_2.obf", }); diff --git a/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java b/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java index 1481ac0404..0c8ec712e6 100644 --- a/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java +++ b/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java @@ -77,11 +77,7 @@ public class RouteDataObject { boolean equals = true; 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 (this.types == null || thatObj.types == null) { equals = this.types == thatObj.types; @@ -158,7 +154,7 @@ public class RouteDataObject { } } } - + return equals; } return false; }