#1017 fixed filled lakes caused by geos ignoring inverted rings unlike boost geometry

Author: MaartenHilferink

all22.sln

@@ -128,6 +128,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "geometry", "geometry", "{DA
 		library\geometry\Grid2Poly.dms = library\geometry\Grid2Poly.dms
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "basedata_nl", "basedata_nl", "{4BA5370E-B346-4808-8EB1-FFEA14F95C08}"
+	ProjectSection(SolutionItems) = preProject
+		library\basedata_nl\grids.dms = library\basedata_nl\grids.dms
+		library\basedata_nl\rdc.dms = library\basedata_nl\rdc.dms
+		library\basedata_nl\RegioIndelingen.dms = library\basedata_nl\RegioIndelingen.dms
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rdc", "rdc", "{DF48FB24-2017-41E7-AE22-3E7A013014E1}"
+	ProjectSection(SolutionItems) = preProject
+		library\basedata_nl\rdc\ngr_layer.dms = library\basedata_nl\rdc\ngr_layer.dms
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -459,6 +471,8 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{F6034506-5822-49C4-B88A-ECF5818E44C3} = {43041446-F114-4F3C-8750-B147FD69766E}
 		{DAEA2268-E8F4-4B5A-BA92-78B6706573F0} = {5EB69BFA-4450-4654-9D5D-3BD8A6252EFA}
+		{4BA5370E-B346-4808-8EB1-FFEA14F95C08} = {5EB69BFA-4450-4654-9D5D-3BD8A6252EFA}
+		{DF48FB24-2017-41E7-AE22-3E7A013014E1} = {4BA5370E-B346-4808-8EB1-FFEA14F95C08}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C5FA5874-0ACE-4DE3-8FFD-61207AF7E57B}

library/geometry/Grid2Poly.dms

@@ -341,6 +341,7 @@ template grid2poly
 
 		attribute<coordinate_system> geometry(poly) := points2polygon(ClosedZoneRingPoint/geometry, ClosedZoneRingPoint/ZoneRing_rel, ClosedZoneRingPoint/Ring_ordinal);
 		attribute<meter2>       area           := area(geometry, meter2);
+		attribute<coordinate_system> geometry_reversed(poly) := points2polygon(ClosedZoneRingPoint/geometry, ClosedZoneRingPoint/ZoneRing_rel, ClosedZoneRingPoint/Ring_ordinal_reversed);
 	}
 
 	unit<uint32> ZoneRingJunction := range(uint32, 0, sum(ZoneRing/nrJunctions)) 
@@ -376,29 +377,35 @@ template grid2poly
 		attribute<JunctionLink>       JunctionLink_rel     := ZoneRingJunction_rel->JunctionLink_rel;
 		attribute<JFLS2>              JFLS2_rel            := JunctionLink_rel->outJFLS2;
 		attribute<JFLS2_Point>        JFLS2_Point_rel      := JFLS2_rel->JFLS2_Point_Base + RingJunction_ordinal;
-		attribute<coordinate_system> geometry             := JFLS2_Point_rel->geometry;
+		attribute<coordinate_system>  geometry             := JFLS2_Point_rel->geometry;
 	}
 	// add a closing point to each ring equal to the first point of that ring.
 	unit<uint32> ClosedZoneRingPoint := range(uint32, 0, sum(ZoneRingJunction/nrPoints)+#ZoneRing)
 	{
 		 attribute<coordinate_system> geometry     := union_data(., ZoneRingPoint/geometry, ZoneRing/ZoneRingPointBase->geometry);
-		 attribute<ZoneRing>           ZoneRing_rel := union_data(., ZoneRingPoint/ZoneRing_rel, id(ZoneRing));
-		 attribute<uint32>             Ring_ordinal := union_data(., ZoneRingPoint/Ring_ordinal, sum(ZoneRingJunction/nrPoints, ZoneRingJunction/ZoneRing_rel));
-		 attribute<Zone>               Zone_rel     := ZoneRing_rel->FirstZone_rel;
+		 attribute<ZoneRing>          ZoneRing_rel := union_data(., ZoneRingPoint/ZoneRing_rel, id(ZoneRing));
+		 attribute<uint32>            Ring_ordinal := union_data(., ZoneRingPoint/Ring_ordinal, sum(ZoneRingJunction/nrPoints, ZoneRingJunction/ZoneRing_rel));
+		 attribute<Zone>              Zone_rel     := ZoneRing_rel->FirstZone_rel;
 	}
 
 	unit<uint32> RingResults := union_unit(ZoneRing, NonEmptyJFRing, NonEmptyJFRing)
 	{
 		attribute<coordinate_system> geometry(poly) := union_data(., ZoneRing/geometry, NonEmptyJFRing/SimplifiedRing, NonEmptyJFRing/SimplifiedReversedRing);
+		unit<uint32> all_points := sequence2points(geometry);
+		
+		attribute<coordinate_system> geometry_reversed(poly) := points2sequence(all_points/point, all_points/sequence_rel, max(all_points/ordinal, all_points/sequence_rel)[all_points/sequence_rel] - all_points/ordinal);
+		
 		attribute<meter2>            area           := area(geometry, meter2);
 		attribute<Zone>              Zone_rel       := union_data(., ZoneRing/FirstZone_rel, NonEmptyJFRing/RightZone_rel, NonEmptyJFRing/Left_Zone_rel), IntegrityCheck = "ZoneRing/CheckUniqueZonePerRing";
 	}
 
 	unit<uint32> Results := Zone
 	{
 		// Polygonen van dezelfde regio samenvoegen tot multi-polygons, in een afzonderlijke template
-		// TODO: met afzonderlijke punten doen o.b.v. de te checked aanname dat ze niet overlappen.
-		attribute<coordinate_system> geometry(poly) := geos_union_polygon(RingResults/geometry, RingResults/Zone_rel);
+		// TODO: met afzonderlijke ringen samenstellen o.b.v. de te checked aanname dat ze niet overlappen.
+		attribute<coordinate_system> islands (poly) := geos_union_polygon(RingResults/geometry         , RingResults/area > 0.0 ? RingResults/Zone_rel : null_u);
+		attribute<coordinate_system> lakes   (poly) := geos_union_polygon(RingResults/geometry_reversed, RingResults/area < 0.0 ? RingResults/Zone_rel : null_u);
+		attribute<coordinate_system> geometry(poly) := geos_difference   (islands, lakes);
 
 		// check dat result geen overlappende polygonen bevat
 		unit<uint32> overlap_check := geos_polygon_connectivity(geometry)

stx/dll/src/StxInterface.cpp

@@ -218,7 +218,7 @@ TreeItem* AppendTreeFromConfiguration(CharPtr sourceFileName, TreeItem* context
 	SharedStr sourcePathNameStrFromCurrent = DelimitedConcat(ConfigurationFilenameContainer::GetConfigLoadDirFromCurrentDir().c_str(), sourcePathName);
 	if (!IsFileOrDirAccessible(sourcePathNameStrFromCurrent))
 		throwErrorF("File Open", "Cannot open configuration file %s.%s"
-			context ? "\nNote that #include statements are relative to the subdir that accompanies the referent" : ""
+			, context ? "\nNote that #include statements are relative to the subdir that accompanies the referent" : ""
 			, sourcePathName);
 
 	// read last changed time in the context of an open file to prevent getting the wrong info.