update octreetiler

Author: bertt

src/b3dm.tileset/GeometryRepository.cs

@@ -85,7 +85,7 @@ public static double[] GetGeometriesBoundingBox(NpgsqlConnection conn, string ge
         }
     }
 
-    public static List<GeometryRecord> GetGeometrySubset(NpgsqlConnection conn, string geometry_table, string geometry_column, double[] bbox, int source_epsg, int target_srs, string shaderColumn = "", string attributesColumns = "", string query = "", string radiusColumn = "", bool keepProjection = false, HashSet<string> excludeHashes = null, int? maxFeatures = null)
+    public static List<GeometryRecord> GetGeometrySubset(NpgsqlConnection conn, string geometry_table, string geometry_column, double[] bbox, int source_epsg, int target_srs, string shaderColumn = "", string attributesColumns = "", string query = "", string radiusColumn = "", bool keepProjection = false, HashSet<string> excludeHashes = null, int? maxFeatures = null, SubdivisionScheme scheme = SubdivisionScheme.QUADTREE)
     {
         var sqlselect = GetSqlSelect(geometry_column, shaderColumn, attributesColumns, radiusColumn, target_srs);
         var sqlFrom = "FROM " + geometry_table;
@@ -100,7 +100,7 @@ public static List<GeometryRecord> GetGeometrySubset(NpgsqlConnection conn, stri
             sqlWhere += $" AND MD5(ST_AsBinary({geometry_column})::text) != ALL(@excludeHashes)";
         }
 
-        var sqlOrderBy = GetOrderBy(geometry_column);
+        var sqlOrderBy = GetOrderBy(geometry_column, scheme);
         var sqlLimit = maxFeatures.HasValue ? $" LIMIT {maxFeatures.Value}" : "";
         var sql = sqlselect + sqlFrom + " where " + sqlWhere + sqlOrderBy + sqlLimit;
 
@@ -175,8 +175,11 @@ public static string GetGeometryColumn(string geometry_column, int target_srs)
         return $"st_transform({geometry_column}, {target_srs})";
     }
 
-    public static string GetOrderBy(string geometry_column)
+    public static string GetOrderBy(string geometry_column, SubdivisionScheme scheme)
     {
+        if (scheme == SubdivisionScheme.OCTREE) {
+            return $" ORDER BY (ST_XMax({geometry_column}) - ST_XMin({geometry_column})) *(ST_YMax({geometry_column}) - ST_YMin({geometry_column})) DESC";
+        }
         return $" ORDER BY ST_Area(ST_Envelope({geometry_column})) DESC";
     }
 

src/b3dm.tileset/OctreeTiler.cs

@@ -103,7 +103,7 @@ private HashSet<string> CreateTileForLargestGeometries3D(BoundingBox3D bbox, int
         int target_srs = tilingSettings.KeepProjection ? inputTable.EPSGCode : 4978;
 
         var bbox1 = new double[] { bbox.XMin, bbox.YMin, bbox.XMax, bbox.YMax, bbox.ZMin, bbox.ZMax };
-        var geometriesToProcess = GeometryRepository.GetGeometrySubset(conn, inputTable.TableName, inputTable.GeometryColumn, bbox1, inputTable.EPSGCode, target_srs, inputTable.ShadersColumn, inputTable.AttributeColumns, where, inputTable.RadiusColumn, tilingSettings.KeepProjection, processedGeometries, tilingSettings.MaxFeaturesPerTile);
+        var geometriesToProcess = GeometryRepository.GetGeometrySubset(conn, inputTable.TableName, inputTable.GeometryColumn, bbox1, inputTable.EPSGCode, target_srs, inputTable.ShadersColumn, inputTable.AttributeColumns, where, inputTable.RadiusColumn, tilingSettings.KeepProjection, processedGeometries, tilingSettings.MaxFeaturesPerTile, SubdivisionScheme.OCTREE);
 
         if (geometriesToProcess.Count > 0) {
             foreach (var geom in geometriesToProcess.Where(geom => !string.IsNullOrEmpty(geom.Hash))) {
@@ -129,7 +129,7 @@ private void CreateTile3D(BoundingBox3D bbox, int level, Tile3D tile, List<Tile3
         int target_srs = tilingSettings.KeepProjection ? inputTable.EPSGCode : 4978;
 
         var bbox1 = new double[] { bbox.XMin, bbox.YMin, bbox.XMax, bbox.YMax, bbox.ZMin, bbox.ZMax };
-        var geometries = GeometryRepository.GetGeometrySubset(conn, inputTable.TableName, inputTable.GeometryColumn, bbox1, inputTable.EPSGCode, target_srs, inputTable.ShadersColumn, inputTable.AttributeColumns, where, inputTable.RadiusColumn, tilingSettings.KeepProjection, processedGeometries);
+        var geometries = GeometryRepository.GetGeometrySubset(conn, inputTable.TableName, inputTable.GeometryColumn, bbox1, inputTable.EPSGCode, target_srs, inputTable.ShadersColumn, inputTable.AttributeColumns, where, inputTable.RadiusColumn, tilingSettings.KeepProjection, processedGeometries, tilingSettings.MaxFeaturesPerTile, SubdivisionScheme.OCTREE);
 
         if (geometries.Count > 0) {
             // Collect hashes of processed geometries