Merge pull request #118 from PDOK/PDOK/reference_date_patch

Assert temporal columns are included in the spatial index if configured
PDOK · Feb 23, 2024 · 5cc62fb · 5cc62fb
2 parents 84c8534 + 5798bd7
commit 5cc62fb
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 7 deletions.
diff --git a/engine/testdata/config_multiple_ogc_apis_single_collection.yaml b/engine/testdata/config_multiple_ogc_apis_single_collection.yaml
@@ -8,9 +8,13 @@ collectionMetadata: &collectionMetadata
     - Keyword2
   thumbnail: 3d.png
   lastUpdated: "2023-05-10T12:00:00Z"
+  temporalProperties:
+    startDate: validfrom
+    endDate: validto
   extent:
     srs: EPSG:3857
     bbox: ["-74.391538", "40.435655", "-73.430235", "41.030882"]
+    interval: [ "\"1970-01-01T00:00:00Z\"", "null" ]
 
 version: 1.0.0
 title: New York

diff --git a/engine/testdata/expected_multiple_ogc_apis_single_collection.json b/engine/testdata/expected_multiple_ogc_apis_single_collection.json
@@ -14,6 +14,15 @@
         ]
       ],
       "crs": "http://www.opengis.net/def/crs/EPSG/0/3857"
+    },
+    "temporal": {
+      "interval": [
+        [
+          "1970-01-01T00:00:00Z",
+          null
+        ]
+      ],
+      "trs": "http://www.opengis.net/def/uom/ISO-8601/0/Gregorian"
     }
   },
   "crs": [

diff --git a/examples/resources/addresses-crs84.gpkg b/examples/resources/addresses-crs84.gpkg
diff --git a/examples/resources/addresses-etrs89.gpkg b/examples/resources/addresses-etrs89.gpkg
diff --git a/examples/resources/addresses-rd.gpkg b/examples/resources/addresses-rd.gpkg
diff --git a/ogc/features/datasources/geopackage/asserts.go b/ogc/features/datasources/geopackage/asserts.go
@@ -24,19 +24,21 @@ func assertIndexesExist(
 		}
 		for _, coll := range configuredCollections {
 			if coll.ID == collID && coll.Features != nil {
-				// assert spatial b-tree index exists, this index substitutes the r-tree when querying large bounding boxes
-				if err := assertIndexExists(table.TableName, db, spatialBtreeColumns); err != nil {
-					return err
-				}
-
 				// assert temporal columns are indexed if configured
 				if coll.Metadata != nil && coll.Metadata.TemporalProperties != nil {
 					temporalBtreeColumns := strings.Join([]string{coll.Metadata.TemporalProperties.StartDate, coll.Metadata.TemporalProperties.EndDate}, ",")
+					spatialBtreeColumns = strings.Join([]string{spatialBtreeColumns, coll.Metadata.TemporalProperties.StartDate, coll.Metadata.TemporalProperties.EndDate}, ",")
 					if err := assertIndexExists(table.TableName, db, temporalBtreeColumns); err != nil {
 						return err
 					}
 				}
 
+				// assert spatial b-tree index exists, this index substitutes the r-tree when querying large bounding boxes
+				// if temporal columns are configured, they must be included in this index as well
+				if err := assertIndexExists(table.TableName, db, spatialBtreeColumns); err != nil {
+					return err
+				}
+
 				// assert the column for each property filter is indexed.
 				for _, propertyFilter := range coll.Features.Filters.Properties {
 					if err := assertIndexExists(table.TableName, db, propertyFilter.Name); err != nil {

diff --git a/ogc/features/testdata/config_benchmark.yaml b/ogc/features/testdata/config_benchmark.yaml
@@ -26,4 +26,12 @@ ogcApi:
               file: ./examples/resources/addresses-etrs89.gpkg
     collections:
       - id: dutch-addresses
-        tableName: addresses  # name of the feature table (optional), when omitted collection ID is used.
+        tableName: addresses  # name of the feature table (optional), when omitted collection ID is used.
+        metadata:
+          description: addresses
+          temporalProperties:
+            startDate: validfrom
+            endDate: validto
+          extent:
+            srs: EPSG:4326
+            interval: [ "\"1970-01-01T00:00:00Z\"", "null" ]
diff --git a/ogc/features/testdata/config_features_multiple_gpkgs.yaml b/ogc/features/testdata/config_features_multiple_gpkgs.yaml
@@ -25,4 +25,12 @@ ogcApi:
               file: ./examples/resources/addresses-etrs89.gpkg
     collections:
       - id: dutch-addresses
-        tableName: addresses  # name of the feature table (optional), when omitted collection ID is used.
+        tableName: addresses  # name of the feature table (optional), when omitted collection ID is used.
+        metadata:
+          description: addresses
+          temporalProperties:
+            startDate: validfrom
+            endDate: validto
+          extent:
+            srs: EPSG:4326
+            interval: [ "\"1970-01-01T00:00:00Z\"", "null" ]