Index: src/uk/me/parabola/mkgmap/reader/osm/Element.java =================================================================== --- src/uk/me/parabola/mkgmap/reader/osm/Element.java (Revision 1080) +++ src/uk/me/parabola/mkgmap/reader/osm/Element.java (Arbeitskopie) @@ -86,6 +86,7 @@ * element. */ public void copyTags(Element other) { + if (other.tags != null) tags = other.tags.copy(); } @@ -97,4 +98,8 @@ if (this.name == null) this.name = name; } + + public Tags getTags() { + return tags; + } } Index: src/uk/me/parabola/mkgmap/reader/osm/MultiPolygonRelation.java =================================================================== --- src/uk/me/parabola/mkgmap/reader/osm/MultiPolygonRelation.java (Revision 1080) +++ src/uk/me/parabola/mkgmap/reader/osm/MultiPolygonRelation.java (Arbeitskopie) @@ -5,7 +5,6 @@ import java.util.List; import java.util.Map; -import uk.me.parabola.imgfmt.Utils; import uk.me.parabola.imgfmt.app.Coord; /** @@ -23,8 +22,9 @@ * this because the type of the relation is not known until after all * its tags are read in. * @param other The relation to base this one on. + * @param wayMap Map of all ways. */ - public MultiPolygonRelation(Relation other) { + public MultiPolygonRelation(Relation other, Map wayMap) { setId(other.getId()); for (Map.Entry pairs: other.getRoles().entrySet()){ addElement(pairs.getValue(), pairs.getKey()); @@ -33,8 +33,16 @@ if (value != null && pairs.getKey() instanceof Way) { Way way = (Way) pairs.getKey(); - if (value.equals("outer")) - outer = way; + if (value.equals("outer")){ + // duplicate outer way and remove tags for cascaded multipolygons + outer = new Way(-way.getId()); + outer.copyTags(way); + for(Coord point: way.getPoints()) + outer.addPoint(point); + wayMap.put(outer.getId(), outer); + if (way.getTags() != null) + way.getTags().removeAll(); + } else if (value.equals("inner")) inners.add(way); } @@ -50,13 +58,23 @@ public void processElements() { if (outer != null) { + for (Way w: inners) { if (w != null) { - List pts = w.getPoints(); - int[] insert = findCpa(outer.getPoints(), pts); + int[] insert = findCpa(outer.getPoints(), w.getPoints()); if (insert[0] > 0) - insertPoints(pts, insert[0], insert[1]); - pts.clear(); + insertPoints(w, insert[0], insert[1]); + + // remove tags from inner way that are available in the outer way + if (outer.getTags() != null){ + for (Map.Entry mapTags: outer.getTags().getKeyValues().entrySet()){ + String key = mapTags.getKey(); + String value = mapTags.getValue(); + if (w.getTag(key) != null) + if (w.getTag(key).equals(value)) + w.deleteTag(key); + } + } } } } @@ -64,22 +82,39 @@ /** * Insert Coordinates into the outer way. - * @param inList List of Coordinates to be inserted + * @param way Way to be inserted * @param out Coordinates will be inserted after this point in the outer way. * @param in Points will be inserted starting at this index, * then from element 0 to (including) this element; */ - private void insertPoints(List inList, int out, int in){ + private void insertPoints(Way way, int out, int in){ List outList = outer.getPoints(); + List inList = way.getPoints(); int index = out+1; for (int i = in; i < inList.size(); i++) outList.add(index++, inList.get(i)); - for (int i = 0; i <= in; i++) + for (int i = 0; i < in; i++) outList.add(index++, inList.get(i)); - - //with this line commented we get triangles, when uncommented some areas disappear - // at least in mapsource, on device itself looks OK. - outList.add(index,outList.get(out)); + + if (outer.getPoints().size() < 32){ + outList.add(index++, inList.get(in)); + outList.add(index, outList.get(out)); + } + else{ + // we shift the nodes to avoid duplicate nodes (large areas only) + int oLat = outList.get(out).getLatitude(); + int oLon = outList.get(out).getLongitude(); + int iLat = inList.get(in).getLatitude(); + int iLon = inList.get(in).getLongitude(); + if ((oLat - iLat) > (oLon - iLon)){ + outList.add(index++, new Coord(iLat-1, iLon)); + outList.add(index, new Coord(oLat-1, oLon)); + } + else{ + outList.add(index++, new Coord(iLat, iLon-1)); + outList.add(index, new Coord(oLat, oLon-1)); + } + } } /** Index: src/uk/me/parabola/mkgmap/reader/osm/Tags.java =================================================================== --- src/uk/me/parabola/mkgmap/reader/osm/Tags.java (Revision 1080) +++ src/uk/me/parabola/mkgmap/reader/osm/Tags.java (Arbeitskopie) @@ -16,7 +16,9 @@ */ package uk.me.parabola.mkgmap.reader.osm; +import java.util.HashMap; import java.util.Iterator; +import java.util.Map; /** * Store the tags that belong to an Element. @@ -110,7 +112,7 @@ } return null; } - + /** * Make a deep copy of this object. * @return A copy of this object. @@ -261,4 +263,22 @@ put(e.key, e.value); } } -} + + public void removeAll() { + for (int i = 0; i < capacity; i++){ + keys[i] = null; + values[i] = null; + } + size = 0; + } + + public Map getKeyValues() { + Map tagMap = new HashMap(); + for (int i = 0; i < capacity; i++) + if (keys[i] != null && values[i] != null) + tagMap.put(keys[i], values[i]); + return tagMap; + } + + +} \ No newline at end of file Index: src/uk/me/parabola/mkgmap/reader/osm/xml/Osm5XmlHandler.java =================================================================== --- src/uk/me/parabola/mkgmap/reader/osm/xml/Osm5XmlHandler.java (Revision 1080) +++ src/uk/me/parabola/mkgmap/reader/osm/xml/Osm5XmlHandler.java (Arbeitskopie) @@ -351,7 +351,7 @@ String type = currentRelation.getTag("type"); if (type != null) { if ("multipolygon".equals(type)) - currentRelation = new MultiPolygonRelation(currentRelation); + currentRelation = new MultiPolygonRelation(currentRelation, wayMap); else if("restriction".equals(type)) { if(ignoreTurnRestrictions)