Merge remote-tracking branch 'origin/master'

OsmAnd/res/values-da/strings.xml

@@ -2834,8 +2834,8 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
     <string name="save_route_point">Gem rutepunkt</string>
     <string name="waypoint_one">Rutepunkt 1</string>
     <string name="route_point_one">Rutepunkt 1</string>
-<string name="measurement_tool_altitude">Højde: %1$s</string>
-    <string name="measurement_tool_speed">Hastighed: %1$ s</string>
+    <string name="measurement_tool_altitude">Højde: %1$s</string>
+    <string name="measurement_tool_speed">Hastighed: %1$s</string>
     <string name="line">Linje</string>
     <string name="save_as_route_point">Gem som rutepunkt</string>
     <string name="save_as_line">Gem som linje</string>

OsmAnd/src/net/osmand/data/FavouritePoint.java

@@ -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;
+	}
+
+}
+

OsmAnd/src/net/osmand/plus/api/SQLiteAPI.java

@@ -45,7 +45,7 @@ public interface SQLiteAPI {
 		
 		long getLong(int ind);
 		
-		long getInt(int ind);
+		int getInt(int ind);
 		
 		byte[] getBlob(int ind);
 		

OsmAnd/src/net/osmand/plus/api/SQLiteAPIImpl.java

@@ -87,7 +87,7 @@ public class SQLiteAPIImpl implements SQLiteAPI {
 				}
 
 				@Override
-				public long getInt(int ind) {
+				public int getInt(int ind) {
 					return c.getInt(ind);
 				}
 

OsmAnd/src/net/osmand/plus/helpers/DatabaseHelper.java

@@ -23,10 +23,10 @@ public class DatabaseHelper {
     private OsmandApplication app;
 
     public static class HistoryDownloadEntry {
-        long count;
+    	int count;
         String name;
 
-        public HistoryDownloadEntry(String name, long count){
+        public HistoryDownloadEntry(String name, int count){
             this.count = count;
             this.name = name;
 
@@ -36,7 +36,7 @@ public class DatabaseHelper {
             return name;
         }
 
-        public long getCount() {
+        public int getCount() {
             return count;
         }
     }

OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java

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