Bas Couwenberg pushed to branch master at Debian GIS Project / mkgmap
Commits: 05369f98 by Bas Couwenberg at 2025-01-19T11:17:36+01:00 New upstream version 0.0.0+svn4923 - - - - - efbb63af by Bas Couwenberg at 2025-01-19T11:17:48+01:00 Update upstream source from tag 'upstream/0.0.0+svn4923' Update to upstream version '0.0.0+svn4923' with Debian dir c6ffa16b64886c57fe32ed46ef5e707c4e0427aa - - - - - 7fdd661d by Bas Couwenberg at 2025-01-19T11:17:59+01:00 New upstream SVN snapshot. - - - - - 4e041258 by Bas Couwenberg at 2025-01-19T11:19:06+01:00 Set distribution to unstable. - - - - - 3 changed files: - debian/changelog - resources/mkgmap-version.properties - src/uk/me/parabola/mkgmap/reader/osm/MultiPolygonRelation.java Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +mkgmap (0.0.0+svn4923-1) unstable; urgency=medium + + * New upstream SVN snapshot. + + -- Bas Couwenberg <[email protected]> Sun, 19 Jan 2025 11:18:56 +0100 + mkgmap (0.0.0+svn4922-1) unstable; urgency=medium * New upstream SVN snapshot. ===================================== resources/mkgmap-version.properties ===================================== @@ -1,2 +1,2 @@ -svn.version: 4922 -build.timestamp: 2024-08-31T05:45:39+0100 +svn.version: 4923 +build.timestamp: 2025-01-08T14:43:50+0000 ===================================== src/uk/me/parabola/mkgmap/reader/osm/MultiPolygonRelation.java ===================================== @@ -96,8 +96,6 @@ public class MultiPolygonRelation extends Relation { private boolean noRecalc; - private boolean renderingFailed; - /** * Create an instance based on an existing relation. We need to do this * because the type of the relation is not known until after all its tags @@ -626,8 +624,6 @@ public class MultiPolygonRelation extends Relation { } for (List<JoinedWay> some : partitions) { processPartition(new Partition(some)); - if (renderingFailed) - break; } tagOuterWays(); @@ -720,8 +716,8 @@ public class MultiPolygonRelation extends Relation { if (partition.innerEqualsOuter) return; if (partition.outerPolygons.isEmpty()) { - renderingFailed = true; - log.error("Internal error: Failed to render " + this); + uk.me.parabola.imgfmt.app.Area fullArea = calcBounds(partition.polygons); + log.warn("Part of divided multipolygon has no outer area and is ignored", this, "in bbox", fullArea); return; } @@ -941,16 +937,14 @@ public class MultiPolygonRelation extends Relation { addTag(TKM_CACHE_AREA_SIZEKEY, mpAreaSizeStr); } - if (!renderingFailed) { - for (Way w : mpPolygons.values()) { - String role = w.deleteTag(TKM_MP_ROLE); - if (mpAreaSizeStr != null && ROLE_OUTER.equals(role)) { - w.addTag(TKM_CACHE_AREA_SIZEKEY, mpAreaSizeStr); - } + for (Way w : mpPolygons.values()) { + String role = w.deleteTag(TKM_MP_ROLE); + if (mpAreaSizeStr != null && ROLE_OUTER.equals(role)) { + w.addTag(TKM_CACHE_AREA_SIZEKEY, mpAreaSizeStr); } - // copy all polygons created by the multipolygon algorithm to the global way map - tileWayMap.putAll(mpPolygons); } + // copy all polygons created by the multipolygon algorithm to the global way map + tileWayMap.putAll(mpPolygons); if (cOfG == null && largestOuterPolygon != null) { // use the center of the largest polygon as reference point cOfG = largestOuterPolygon.getCofG(); @@ -1981,7 +1975,7 @@ public class MultiPolygonRelation extends Relation { if (mostComplex.getPoints().size() > 2000) { uk.me.parabola.imgfmt.app.Area fullArea = calcBounds(partition); uk.me.parabola.imgfmt.app.Area[] areas; - final int niceSplitShift = 11; + final int niceSplitShift = 0; if (fullArea.getHeight() > fullArea.getWidth()) areas = fullArea.split(1, 2, niceSplitShift); else View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/d6ee10db1a9bfd941762193d1abccf79b79f149d...4e041258930cfed9ea34cd7ca6bd9638215ea77f -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/d6ee10db1a9bfd941762193d1abccf79b79f149d...4e041258930cfed9ea34cd7ca6bd9638215ea77f You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
