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

Fixed finishInitializingTags() method

Browse source
This commit is contained in:
PaulStets 2017-08-23 15:55:27 +03:00
parent 9b07601969
commit ef547dc7ec
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,9 @@ public class BinaryMapDataObject {
} }
public Map<Integer, String> getOrderedObjectNames() { public Map<Integer, String> getOrderedObjectNames() {
if (namesOrder == null) {
return null;
}
LinkedHashMap<Integer, String> lm = new LinkedHashMap<Integer, String> (); LinkedHashMap<Integer, String> lm = new LinkedHashMap<Integer, String> ();
for (int i = 0; i < namesOrder.size(); i++) { for (int i = 0; i < namesOrder.size(); i++) {
int nm = namesOrder.get(i); int nm = namesOrder.get(i);
@ -240,14 +243,18 @@ public class BinaryMapDataObject {
} }
} }
if(equals) { if(equals) {
// here we now that name indexes are equal & it is enough to check the value sets // here we know that name indexes are equal & it is enough to check the value sets
if(objectNames == null || thatObj.objectNames == null) { if(objectNames == null || thatObj.objectNames == null) {
equals = objectNames == thatObj.objectNames; equals = objectNames == thatObj.objectNames;
} else if(objectNames.size() != thatObj.objectNames.size()){ } else if(objectNames.size() != thatObj.objectNames.size()){
equals = false; equals = false;
} else { } else {
TreeSet<String> st = new TreeSet<String>(Arrays.asList(objectNames.values())); Object[] thisNames = objectNames.values();
TreeSet<String> ot = new TreeSet<String>(Arrays.asList(thatObj.objectNames.values())); Object[] thatNames = thatObj.objectNames.values();
String[] thisStrings = Arrays.copyOf(thisNames, thisNames.length, String[].class);
String[] thatStrings = Arrays.copyOf(thatNames, thatNames.length, String[].class);
TreeSet<String> st = new TreeSet<String>(Arrays.asList(thisStrings));
TreeSet<String> ot = new TreeSet<String>(Arrays.asList(thatStrings));
equals = st.equals(ot); equals = st.equals(ot);
} }
} }

2
OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java
View file

@ -1762,7 +1762,7 @@ public class BinaryMapIndexReader {
} }
public void finishInitializingTags() { public void finishInitializingTags() {
int free = decodingRules.size() * 2 + 1; int free = decodingRules.size();
coastlineBrokenEncodingType = free++; coastlineBrokenEncodingType = free++;
initMapEncodingRule(0, coastlineBrokenEncodingType, "natural", "coastline_broken"); initMapEncodingRule(0, coastlineBrokenEncodingType, "natural", "coastline_broken");
if (landEncodingType == -1) { if (landEncodingType == -1) {