Merge pull request #15 from Amsterdam/fix/infinite-simplification-due…

…-to-spikes Clipping now happens before simplification
Amsterdam · Sep 12, 2023 · 4696146 · 4696146
2 parents 12e6fc3 + 8d179dc
commit 4696146
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/TileBakeLibrary/CityJSONToTileConverter.cs b/TileBakeLibrary/CityJSONToTileConverter.cs
@@ -466,7 +466,12 @@ private List<SubObject> CityJSONParseProcess(CityJSON cityJson)
 				}
 				WriteParsingStatusToConsole(skipped, done, parsing, simplifying, tiling);
 
-				if (subObject.maxVerticesPerSquareMeter > 0)
+                if (clipSpikes)
+                {
+                    subObject.ClipSpikes(spikeCeiling, spikeFloor);
+                }
+
+                if (subObject.maxVerticesPerSquareMeter > 0)
 				{
 					Interlocked.Increment(ref simplifying);
 					WriteParsingStatusToConsole(skipped, done, parsing, simplifying, tiling);
@@ -479,10 +484,6 @@ private List<SubObject> CityJSONParseProcess(CityJSON cityJson)
 					//Always merge based on VertexNormalCombination.normalAngleComparisonThreshold
 					subObject.MergeSimilarVertices();
 				}
-				if (clipSpikes)
-				{
-					subObject.ClipSpikes(spikeCeiling, spikeFloor);
-				}
 
 				if (TilingMethod == "TILED")
 				{