[Git][debian-gis-team/mkgmap][upstream] New upstream version 0.0.0+svn4923

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream 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
- - - - -


2 changed files:

- resources/mkgmap-version.properties
- src/uk/me/parabola/mkgmap/reader/osm/MultiPolygonRelation.java


Changes:

=====================================
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/-/commit/05369f9883a1f2edc118718e494aff57416b5af6

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/commit/05369f9883a1f2edc118718e494aff57416b5af6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250119/5450b8fb/attachment-0001.htm>