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

Fix amenity compare

Browse source
This commit is contained in:
Victor Shcherb 2017-09-03 23:58:06 +02:00
parent b28c1a6e0a
commit 5fb60db786
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,8 @@ public class BinaryInspector {
// "-lang=ru",
// "-bbox=30.4981,50.4424,30.5195,50.4351",
// "-osm="+System.getProperty("maps.dir")+"/map_full_1.obf.osm",
System.getProperty("maps.dir")+"/diff/Brazil_southamerica_01_00.obf"
// System.getProperty("maps.dir")+"/diff/Brazil_southamerica_01_00.obf"
System.getProperty("maps.dir")+"/diff/Diff.obf"
// System.getProperty("maps.dir")+"/Ukraine_kiev-city_europe_2.obf"
});
} else {

2
OsmAnd-java/src/net/osmand/data/Amenity.java
View file

@ -257,7 +257,7 @@ public class Amenity extends MapObject {
public boolean comparePoi(Amenity thatObj) {
if (this.id == thatObj.id &&
if (this.id.longValue() == thatObj.id.longValue() &&
Algorithms.objectEquals(this.type.getKeyName(), thatObj.type.getKeyName()) &&
Algorithms.objectEquals(getLocation(), thatObj.getLocation()) &&
Algorithms.objectEquals(this.subType, thatObj.subType) &&