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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-08-20 00:48:52 +02:00
commit 3e451cc072
1 changed files with 88 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
OsmAnd-java/src/net/osmand/binary/BinaryMapDataObject.java
View file

@ -1,12 +1,15 @@
package net.osmand.binary;
import java.util.LinkedHashMap;
import java.util.Map;
import gnu.trove.list.array.TIntArrayList;
import gnu.trove.map.hash.TIntObjectHashMap;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.TreeSet;
import net.osmand.binary.BinaryMapIndexReader.MapIndex;
import net.osmand.binary.BinaryMapIndexReader.TagValuePair;
import net.osmand.render.RenderingRulesStorage;
public class BinaryMapDataObject {
@ -27,12 +30,17 @@ public class BinaryMapDataObject {
public BinaryMapDataObject(){
}
public BinaryMapDataObject(int[] coordinates, int[] types, int[][] polygonInnerCoordinates, long id){
public BinaryMapDataObject(long id, int[] coordinates, int[][] polygonInnerCoordinates, int objectType, boolean area,
int[] types, int[] additionalTypes){
this.polygonInnerCoordinates = polygonInnerCoordinates;
this.coordinates = coordinates;
this.additionalTypes = new int[0];
this.additionalTypes = additionalTypes;
this.types = types;
this.id = id;
this.objectType = objectType;
this.area = area;
}
protected void setCoordinates(int[] coordinates) {
@ -184,5 +192,79 @@ public class BinaryMapDataObject {
return coordinates[2 * ind];
}
public boolean compareBinary(BinaryMapDataObject thatObj) {
if(this.objectType == thatObj.objectType
&& this.id == thatObj.id
&& this.area == thatObj.area
&& Arrays.equals(this.polygonInnerCoordinates, thatObj.polygonInnerCoordinates)
&& Arrays.equals(this.coordinates, thatObj.coordinates) ) {
boolean equals = true;
if(equals) {
if(types == null || thatObj.types == null) {
equals = types == thatObj.types;
} else if(types.length != thatObj.types.length){
equals = false;
} else {
for(int i = 0; i < types.length && equals; i++) {
TagValuePair o = mapIndex.decodeType(types[i]);
TagValuePair s = thatObj.mapIndex.decodeType(thatObj.types[i]);
equals = o.equals(s);
}
}
}
if(equals) {
if(additionalTypes == null || thatObj.additionalTypes == null) {
equals = additionalTypes == thatObj.additionalTypes;
} else if(additionalTypes.length != thatObj.additionalTypes.length){
equals = false;
} else {
for(int i = 0; i < additionalTypes.length && equals; i++) {
TagValuePair o = mapIndex.decodeType(additionalTypes[i]);
TagValuePair s = thatObj.mapIndex.decodeType(thatObj.additionalTypes[i]);
equals = o.equals(s);
}
}
}
if(equals) {
if(namesOrder == null || thatObj.namesOrder == null) {
equals = namesOrder == thatObj.namesOrder;
} else if(namesOrder.size() != thatObj.namesOrder.size()){
equals = false;
} else {
for(int i = 0; i < namesOrder.size() && equals; i++) {
TagValuePair o = mapIndex.decodeType(namesOrder.get(i));
TagValuePair s = thatObj.mapIndex.decodeType(thatObj.namesOrder.get(i));
equals = o.equals(s);
}
}
}
if(equals) {
// here we now that name indexes are equal & it is enough to check the value sets
if(objectNames == null || thatObj.objectNames == null) {
equals = objectNames == thatObj.objectNames;
} else if(objectNames.size() != thatObj.objectNames.size()){
equals = false;
} else {
TreeSet<String> st = new TreeSet<String>(Arrays.asList(objectNames.values()));
TreeSet<String> ot = new TreeSet<String>(Arrays.asList(thatObj.objectNames.values()));
equals = st.equals(ot);
}
}
return equals;
}
return false;
}
public int[] getCoordinates() {
return coordinates;
}
public int getObjectType() {
return objectType;
}
}