Add toggle for gdal_spatialite_computed_geom_column entries for #6

brownag · Dec 7, 2023 · 82465eb · 82465eb
1 parent a165fef
commit 82465eb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/R/gpkg-view.R b/R/gpkg-view.R
@@ -5,6 +5,10 @@
 #' @param viewquery _character_. Query for view contents. 
 #' @param geom_column _character_. Column name of view geometry. Default: `"geom"`
 #' @param geometry_type_name _character_. View geometry type. Default: `"GEOMETRY"`
+#' @param spatialite_computed _logical_. Register definition of `geom_column` as
+#'                            the result of a Spatialite spatial function via 
+#'                            `"gdal_spatialite_computed_geom_column"` extension. 
+#'                            Default: `FALSE`
 #' @param data_type _character_. View data type. Default `"features"`
 #' @param srs_id _integer_. Spatial Reference System ID. Default: `4326` (WGS84)
 #' @param z _integer_. Default: `0`
@@ -18,6 +22,7 @@ gpkg_create_spatial_view <- function(g,
                                      viewquery, 
                                      geom_column = "geom",
                                      geometry_type_name = "GEOMETRY",
+                                     spatialite_computed = FALSE,
                                      data_type = "features",
                                      srs_id = 4326,
                                      z = 0,
@@ -29,4 +34,8 @@ gpkg_execute(g, sprintf("INSERT INTO gpkg_contents (table_name, identifier, data
 gpkg_execute(g, sprintf("INSERT INTO gpkg_geometry_columns (table_name, column_name, geometry_type_name, srs_id, z, m) 
                         VALUES ('%s', '%s', '%s', %s, %s, %s)",
                                 viewname, geom_column, geometry_type_name, srs_id, z, m))
+if (spatialite_computed)
+  gpkg_execute(g, sprintf("INSERT INTO gpkg_extensions (table_name, column_name, extension_name, definition, scope) 
+                        VALUES ('%s', '%s', 'gdal_spatialite_computed_geom_column', 'https://gdal.org/drivers/vector/gpkg_spatialite_computed_geom_column.html', 'read-write');",
+                                viewname, geom_column))
 }
diff --git a/man/gpkg_create_spatial_view.Rd b/man/gpkg_create_spatial_view.Rd
diff --git a/misc/gpkg-view-voronoi.R b/misc/gpkg-view-voronoi.R
@@ -17,7 +17,8 @@ gpkg_create_spatial_view(g, "my_vor", "SELECT lux.fid AS OGC_FID,
                                               ST_VoronojDiagram(geom) AS geom2 
                                        FROM lux WHERE ID_2 <= 3", 
                          geom_column = "geom2", 
-                         geometry_type_name = "MULTIPOLYGON") 
+                         geometry_type_name = "MULTIPOLYGON",
+                         spatialite_computed = TRUE) 
                          # NB: terra::vect() sensitive to geom type
 gpkg_contents(g)