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

Merge pull request #4325 from schrod/Fix_Import_Color_Handling

Browse source 
Fix favorite import issues
This commit is contained in:
vshcherb 2017-08-23 22:50:50 +02:00 committed by GitHub
commit cc620df157
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
OsmAnd/src/net/osmand/data/FavouritePoint.java
View file

@ -121,4 +121,26 @@ public class FavouritePoint implements Serializable, LocationPoint {
return "Favourite " + getName(); //$NON-NLS-1$
}
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof FavouritePoint)) return false;
FavouritePoint fp = (FavouritePoint)o;
return (this.latitude == fp.latitude)
&& (this.longitude == fp.longitude)
&& (this.name.equals(fp.name));
}
@Override
public int hashCode() {
int hash = (int)latitude*1000 + (int)longitude*1000;
hash += (name != null) ? name.hashCode() : 0;
return hash;
}
}

1
OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
View file

@ -565,6 +565,7 @@ public class GpxImportHelper {
if (p.desc != null) {
fp.setDescription(p.desc);
}
fp.setColor(p.getColor(0));
favourites.add(fp);
}
}