-Blader door de Features of ga direct naar de features in: +Blader door de Features of ga direct naar de features in:
diff --git a/internal/engine/testdata/expected_multiple_ogc_apis_single_collection.json b/internal/engine/testdata/expected_multiple_ogc_apis_single_collection.json index 71cc9c11..3f832c99 100644 --- a/internal/engine/testdata/expected_multiple_ogc_apis_single_collection.json +++ b/internal/engine/testdata/expected_multiple_ogc_apis_single_collection.json @@ -1,6 +1,6 @@ { - "id": "NewYork", - "title": "NewYork", + "id": "newyork", + "title": "newyork", "description": "This is a description about the NewYork collection in Markdown. We offer both 3D Tiles and Features for this collection.", "keywords": [ { @@ -44,52 +44,52 @@ "type": "application/json", "title": "This document as JSON", "updated": "2023-05-10T12:00:00Z", - "href": "http://localhost:8180/collections/NewYork?f=json" + "href": "http://localhost:8180/collections/newyork?f=json" }, { "rel": "alternate", "type": "text/html", "title": "This document as HTML", "updated": "2023-05-10T12:00:00Z", - "href": "http://localhost:8180/collections/NewYork?f=html" + "href": "http://localhost:8180/collections/newyork?f=html" }, { "rel": "preview", "type": "image/png", - "title": "Thumbnail for NewYork", + "title": "Thumbnail for newyork", "href": "http://localhost:8180/resources/3d.png" }, { "rel": "items", "type": "application/json+3dtiles", - "title": "Tileset definition of collection NewYork according to the OGC 3D Tiles specification", - "href": "http://localhost:8180/collections/NewYork/3dtiles?f=json" + "title": "Tileset definition of collection newyork according to the OGC 3D Tiles specification", + "href": "http://localhost:8180/collections/newyork/3dtiles?f=json" }, { "rel": "items", "type": "application/geo+json", - "title": "The JSON representation of the NewYork features served from this endpoint", - "href": "http://localhost:8180/collections/NewYork/items?f=json" + "title": "The JSON representation of the newyork features served from this endpoint", + "href": "http://localhost:8180/collections/newyork/items?f=json" }, { "rel": "items", "type": "application/vnd.ogc.fg+json", - "title": "The JSON-FG representation of the NewYork features served from this endpoint", - "href": "http://localhost:8180/collections/NewYork/items?f=jsonfg" + "title": "The JSON-FG representation of the newyork features served from this endpoint", + "href": "http://localhost:8180/collections/newyork/items?f=jsonfg" }, { "rel": "items", "type": "text/html", - "title": "The HTML representation of the NewYork features served from this endpoint", - "href": "http://localhost:8180/collections/NewYork/items?f=html" + "title": "The HTML representation of the newyork features served from this endpoint", + "href": "http://localhost:8180/collections/newyork/items?f=html" } ], "content": [ { "rel": "original", "type": "application/json+3dtiles", - "title": "Tileset definition of collection NewYork according to the OGC 3D Tiles specification", - "href": "http://localhost:8180/collections/NewYork/3dtiles?f=json", + "title": "Tileset definition of collection newyork according to the OGC 3D Tiles specification", + "href": "http://localhost:8180/collections/newyork/3dtiles?f=json", "collectionType": "3d-container" } ] diff --git a/internal/engine/testdata/expected_multiple_ogc_apis_single_collection_json_ld.html b/internal/engine/testdata/expected_multiple_ogc_apis_single_collection_json_ld.html index 6a8efee1..eb1e4049 100644 --- a/internal/engine/testdata/expected_multiple_ogc_apis_single_collection_json_ld.html +++ b/internal/engine/testdata/expected_multiple_ogc_apis_single_collection_json_ld.html @@ -5,7 +5,7 @@ "isPartOf": "http:\/\/localhost:8180?f=html", "name": "New York - NewYork", "description": "This is a description about the NewYork collection in Markdown. We offer both 3D Tiles and Features for this collection.", - "url": "http:\/\/localhost:8180/collections/NewYork?f=html","keywords": ["Keyword1","Keyword2"],"license": "https:\/\/creativecommons.org\/publicdomain\/zero\/1.0\/deed.nl", + "url": "http:\/\/localhost:8180/collections/newyork?f=html","keywords": ["Keyword1","Keyword2"],"license": "https:\/\/creativecommons.org\/publicdomain\/zero\/1.0\/deed.nl", "isAccessibleForFree": true ,"thumbnailUrl": "http:\/\/localhost:8180/resources/3d.png" ,"version": "2023-05-10" diff --git a/internal/ogc/features/datasources/geopackage/geopackage.go b/internal/ogc/features/datasources/geopackage/geopackage.go index 51f1b97c..00296863 100644 --- a/internal/ogc/features/datasources/geopackage/geopackage.go +++ b/internal/ogc/features/datasources/geopackage/geopackage.go @@ -18,14 +18,13 @@ import ( "github.com/PDOK/gokoala/internal/ogc/features/datasources" "github.com/PDOK/gokoala/internal/ogc/features/domain" "github.com/go-spatial/geom" + "github.com/go-spatial/geom/cmp" "github.com/go-spatial/geom/encoding/gpkg" "github.com/go-spatial/geom/encoding/wkt" "github.com/google/uuid" "github.com/jmoiron/sqlx" "github.com/mattn/go-sqlite3" "github.com/qustavo/sqlhooks/v2" - - _ "github.com/mattn/go-sqlite3" // import for side effect (= sqlite3 driver) only ) const ( @@ -47,6 +46,7 @@ func loadDriver() { }) } +// geoPackageBackend abstraction over different kinds of GeoPackages, e.g. local file or cloud-backed sqlite. type geoPackageBackend interface { getDB() *sqlx.DB close() @@ -447,11 +447,14 @@ func (g *GeoPackage) selectSpecificColumnsInOrder(propConfig *config.FeatureProp } func mapGpkgGeometry(rawGeom []byte) (geom.Geometry, error) { - geometry, err := gpkg.DecodeGeometry(rawGeom) + geomWithMetadata, err := gpkg.DecodeGeometry(rawGeom) if err != nil { return nil, err } - return geometry.Geometry, nil + if geomWithMetadata == nil || cmp.IsEmptyGeo(geomWithMetadata.Geometry) { + return nil, nil + } + return geomWithMetadata.Geometry, nil } func propertyFiltersToSQL(pf map[string]string) (sql string, namedParams map[string]any) { diff --git a/internal/ogc/features/datasources/geopackage/geopackage_test.go b/internal/ogc/features/datasources/geopackage/geopackage_test.go index 897d65e6..30b25ba0 100644 --- a/internal/ogc/features/datasources/geopackage/geopackage_test.go +++ b/internal/ogc/features/datasources/geopackage/geopackage_test.go @@ -22,7 +22,7 @@ func init() { pwd = path.Dir(filename) } -func newAddressesGeoPackage() geoPackageBackend { +func newTestGeoPackage(file string) geoPackageBackend { loadDriver() return newLocalGeoPackage(&config.GeoPackageLocal{ GeoPackageCommon: config.GeoPackageCommon{ @@ -31,20 +31,7 @@ func newAddressesGeoPackage() geoPackageBackend { MaxBBoxSizeToUseWithRTree: 30000, InMemoryCacheSize: -2000, }, - File: pwd + "/testdata/bag.gpkg", - }) -} - -func newTemporalAddressesGeoPackage() geoPackageBackend { - loadDriver() - return newLocalGeoPackage(&config.GeoPackageLocal{ - GeoPackageCommon: config.GeoPackageCommon{ - Fid: "feature_id", - QueryTimeout: config.Duration{Duration: 15 * time.Second}, - MaxBBoxSizeToUseWithRTree: 30000, - InMemoryCacheSize: -2000, - }, - File: pwd + "/testdata/bag-temporal.gpkg", + File: pwd + file, }) } @@ -107,11 +94,12 @@ func TestGeoPackage_GetFeatures(t *testing.T) { wantFC *domain.FeatureCollection wantCursor domain.Cursors wantErr bool + wantGeom bool }{ { name: "get first page of features", fields: fields{ - backend: newAddressesGeoPackage(), + backend: newTestGeoPackage("/testdata/bag.gpkg"), fidColumn: "feature_id", featureTableByID: map[string]*featureTable{"ligplaatsen": {TableName: "ligplaatsen", GeometryColumnName: "geom"}}, queryTimeout: 60 * time.Second, @@ -145,12 +133,13 @@ func TestGeoPackage_GetFeatures(t *testing.T) { Prev: "|", Next: "Dv4|", // 3838 }, - wantErr: false, + wantGeom: true, + wantErr: false, }, { name: "get second page of features", fields: fields{ - backend: newAddressesGeoPackage(), + backend: newTestGeoPackage("/testdata/bag.gpkg"), fidColumn: "feature_id", featureTableByID: map[string]*featureTable{"ligplaatsen": {TableName: "ligplaatsen", GeometryColumnName: "geom"}}, queryTimeout: 5 * time.Second, @@ -194,12 +183,13 @@ func TestGeoPackage_GetFeatures(t *testing.T) { Prev: "|", Next: "DwE|", }, - wantErr: false, + wantGeom: true, + wantErr: false, }, { name: "get first page of features with reference date", fields: fields{ - backend: newTemporalAddressesGeoPackage(), + backend: newTestGeoPackage("/testdata/bag-temporal.gpkg"), fidColumn: "feature_id", featureTableByID: map[string]*featureTable{"ligplaatsen": {TableName: "ligplaatsen", GeometryColumnName: "geom"}}, queryTimeout: 60 * time.Second, @@ -238,12 +228,13 @@ func TestGeoPackage_GetFeatures(t *testing.T) { Prev: "|", Next: "Dv4|", // 3838 }, - wantErr: false, + wantGeom: true, + wantErr: false, }, { name: "fail on non existing collection", fields: fields{ - backend: newAddressesGeoPackage(), + backend: newTestGeoPackage("/testdata/bag.gpkg"), fidColumn: "feature_id", featureTableByID: map[string]*featureTable{"ligplaatsen": {TableName: "ligplaatsen", GeometryColumnName: "geom"}}, queryTimeout: 5 * time.Second, @@ -260,6 +251,74 @@ func TestGeoPackage_GetFeatures(t *testing.T) { wantCursor: domain.Cursors{}, wantErr: true, // should fail }, + { + name: "get features with empty geometry", + fields: fields{ + backend: newTestGeoPackage("/testdata/null-empty-geoms.gpkg"), + fidColumn: "feature_id", + featureTableByID: map[string]*featureTable{"ligplaatsen": {TableName: "ligplaatsen", GeometryColumnName: "geom"}}, + queryTimeout: 60 * time.Second, + }, + args: args{ + ctx: context.Background(), + collection: "ligplaatsen", + queryParams: datasources.FeaturesCriteria{ + Cursor: domain.DecodedCursor{FID: 0, FiltersChecksum: []byte{}}, + Limit: 1, + }, + }, + wantFC: &domain.FeatureCollection{ + NumberReturned: 1, + Features: []*domain.Feature{ + { + Properties: domain.NewFeaturePropertiesWithData(false, map[string]any{ + "straatnaam": "Van Diemenkade", + "nummer_id": "0363200000454013", + }), + }, + }, + }, + wantCursor: domain.Cursors{ + Prev: "|", + Next: "GSQ|", + }, + wantGeom: false, // should be null + wantErr: false, + }, + { + name: "get features with null geometry", + fields: fields{ + backend: newTestGeoPackage("/testdata/null-empty-geoms.gpkg"), + fidColumn: "feature_id", + featureTableByID: map[string]*featureTable{"ligplaatsen": {TableName: "ligplaatsen", GeometryColumnName: "geom"}}, + queryTimeout: 60 * time.Second, + }, + args: args{ + ctx: context.Background(), + collection: "ligplaatsen", + queryParams: datasources.FeaturesCriteria{ + Cursor: domain.DecodedCursor{FID: 6436, FiltersChecksum: []byte{}}, + Limit: 1, + }, + }, + wantFC: &domain.FeatureCollection{ + NumberReturned: 1, + Features: []*domain.Feature{ + { + Properties: domain.NewFeaturePropertiesWithData(false, map[string]any{ + "straatnaam": "Bokkinghangen", + "nummer_id": "0363200012163629", + }), + }, + }, + }, + wantCursor: domain.Cursors{ + Prev: "DdY|", + Next: "|", + }, + wantGeom: false, // should be null + wantErr: false, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { @@ -284,6 +343,9 @@ func TestGeoPackage_GetFeatures(t *testing.T) { for i, wantedFeature := range tt.wantFC.Features { assert.Equal(t, wantedFeature.Properties.Value("straatnaam"), fc.Features[i].Properties.Value("straatnaam")) assert.Equal(t, wantedFeature.Properties.Value("nummer_id"), fc.Features[i].Properties.Value("nummer_id")) + if !tt.wantGeom { + assert.Nil(t, fc.Features[i].Geometry) + } } assert.Equal(t, tt.wantCursor.Prev, cursor.Prev) assert.Equal(t, tt.wantCursor.Next, cursor.Next) @@ -313,7 +375,7 @@ func TestGeoPackage_GetFeature(t *testing.T) { { name: "get feature", fields: fields{ - backend: newAddressesGeoPackage(), + backend: newTestGeoPackage("/testdata/bag.gpkg"), fidColumn: "feature_id", featureTableByID: map[string]*featureTable{"ligplaatsen": {TableName: "ligplaatsen", GeometryColumnName: "geom"}}, queryTimeout: 5 * time.Second, @@ -336,7 +398,7 @@ func TestGeoPackage_GetFeature(t *testing.T) { { name: "get non existing feature", fields: fields{ - backend: newAddressesGeoPackage(), + backend: newTestGeoPackage("/testdata/bag.gpkg"), fidColumn: "feature_id", featureTableByID: map[string]*featureTable{"ligplaatsen": {TableName: "ligplaatsen", GeometryColumnName: "geom"}}, queryTimeout: 5 * time.Second, @@ -352,7 +414,7 @@ func TestGeoPackage_GetFeature(t *testing.T) { { name: "fail on non existing collection", fields: fields{ - backend: newAddressesGeoPackage(), + backend: newTestGeoPackage("/testdata/bag.gpkg"), fidColumn: "feature_id", featureTableByID: map[string]*featureTable{"ligplaatsen": {TableName: "ligplaatsen", GeometryColumnName: "geom"}}, queryTimeout: 5 * time.Second, @@ -394,7 +456,7 @@ func TestGeoPackage_GetFeature(t *testing.T) { func TestGeoPackage_Warmup(t *testing.T) { t.Run("warmup", func(t *testing.T) { g := &GeoPackage{ - backend: newAddressesGeoPackage(), + backend: newTestGeoPackage("/testdata/bag.gpkg"), fidColumn: "feature_id", featureTableByCollectionID: map[string]*featureTable{"ligplaatsen": {TableName: "ligplaatsen", GeometryColumnName: "geom"}}, queryTimeout: 5 * time.Second, diff --git a/internal/ogc/features/datasources/geopackage/testdata/bag-null-empty.gpkg b/internal/ogc/features/datasources/geopackage/testdata/bag-null-empty.gpkg new file mode 100644 index 00000000..e69de29b diff --git a/internal/ogc/features/datasources/geopackage/testdata/null-empty-geoms.gpkg b/internal/ogc/features/datasources/geopackage/testdata/null-empty-geoms.gpkg new file mode 100644 index 00000000..302b4418 Binary files /dev/null and b/internal/ogc/features/datasources/geopackage/testdata/null-empty-geoms.gpkg differ diff --git a/internal/ogc/features/domain/cursor_test.go b/internal/ogc/features/domain/cursor_test.go index a9b5ed88..c0241d47 100644 --- a/internal/ogc/features/domain/cursor_test.go +++ b/internal/ogc/features/domain/cursor_test.go @@ -151,6 +151,14 @@ func TestEncodedCursor_Decode(t *testing.T) { FiltersChecksum: []byte("foobar"), }, }, + { + name: "should decode cursor without checksum", + c: "GSQ|", + want: DecodedCursor{ + FID: 6436, + FiltersChecksum: nil, + }, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/internal/ogc/features/domain/mapper.go b/internal/ogc/features/domain/mapper.go index 167aea32..bfef6c0b 100644 --- a/internal/ogc/features/domain/mapper.go +++ b/internal/ogc/features/domain/mapper.go @@ -7,7 +7,6 @@ import ( "time" "github.com/PDOK/gokoala/config" - "github.com/go-spatial/geom" "github.com/go-spatial/geom/encoding/geojson" "github.com/jmoiron/sqlx" @@ -109,7 +108,9 @@ func mapColumnsToFeature(ctx context.Context, firstRow bool, feature *Feature, c if err != nil { return nil, fmt.Errorf("failed to map/decode geometry from datasource, error: %w", err) } - feature.Geometry = geojson.Geometry{Geometry: mappedGeom} + if mappedGeom != nil { + feature.Geometry = geojson.Geometry{Geometry: mappedGeom} + } case "minx", "miny", "maxx", "maxy", "min_zoom", "max_zoom": // Skip these columns used for bounding box and zoom filtering diff --git a/internal/ogc/features/main_test.go b/internal/ogc/features/main_test.go index 3520f393..f8e14e33 100644 --- a/internal/ogc/features/main_test.go +++ b/internal/ogc/features/main_test.go @@ -1009,6 +1009,62 @@ func TestFeatures_Feature(t *testing.T) { statusCode: http.StatusOK, }, }, + { + name: "Request GeoJSON for feature with null geom", + fields: fields{ + configFile: "internal/ogc/features/testdata/config_features_geom_null_empty.yaml", + url: "http://localhost:8080/collections/:collectionId/items/:featureId", + collectionID: "foo", + featureID: "6436", + format: "json", + }, + want: want{ + body: "internal/ogc/features/testdata/expected_feature_geom_null.json", + statusCode: http.StatusOK, + }, + }, + { + name: "Request JSON-FG for feature with null geom", + fields: fields{ + configFile: "internal/ogc/features/testdata/config_features_geom_null_empty.yaml", + url: "http://localhost:8080/collections/:collectionId/items/:featureId?f=jsonfg", + collectionID: "foo", + featureID: "6436", + format: "json", + }, + want: want{ + body: "internal/ogc/features/testdata/expected_feature_geom_null_jsonfg.json", + statusCode: http.StatusOK, + }, + }, + { + name: "Request GeoJSON for feature with empty point", + fields: fields{ + configFile: "internal/ogc/features/testdata/config_features_geom_null_empty.yaml", + url: "http://localhost:8080/collections/:collectionId/items/:featureId", + collectionID: "foo", + featureID: "3542", + format: "json", + }, + want: want{ + body: "internal/ogc/features/testdata/expected_feature_geom_empty_point.json", + statusCode: http.StatusOK, + }, + }, + { + name: "Request JSON-FG for feature with empty point", + fields: fields{ + configFile: "internal/ogc/features/testdata/config_features_geom_null_empty.yaml", + url: "http://localhost:8080/collections/:collectionId/items/:featureId?f=jsonfg", + collectionID: "foo", + featureID: "3542", + format: "json", + }, + want: want{ + body: "internal/ogc/features/testdata/expected_feature_geom_empty_point_jsonfg.json", + statusCode: http.StatusOK, + }, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { @@ -1031,9 +1087,7 @@ func TestFeatures_Feature(t *testing.T) { assert.Equal(t, tt.want.statusCode, rr.Code) if tt.want.body != "" { expectedBody, err := os.ReadFile(tt.want.body) - if err != nil { - log.Fatal(err) - } + assert.NoError(t, err) printActual(rr) switch { diff --git a/internal/ogc/features/testdata/config_features_geom_null_empty.yaml b/internal/ogc/features/testdata/config_features_geom_null_empty.yaml new file mode 100644 index 00000000..8e1fa729 --- /dev/null +++ b/internal/ogc/features/testdata/config_features_geom_null_empty.yaml @@ -0,0 +1,35 @@ +--- +version: 1.0.2 +title: OGC API Features +abstract: Contains a slimmed-down/example version of the BAG-dataset +baseUrl: http://localhost:8080 +serviceIdentifier: Feats +license: + name: CC0 + url: https://www.tldrlegal.com/license/creative-commons-cc0-1-0-universal +ogcApi: + features: + datasources: + defaultWGS84: + geopackage: + local: + file: ./internal/ogc/features/datasources/geopackage/testdata/null-empty-geoms.gpkg + fid: feature_id + queryTimeout: 15m # pretty high to allow debugging + collections: + - id: foo + tableName: ligplaatsen + filters: + properties: + - name: straatnaam + - name: postcode + metadata: + title: Foooo + description: Foooo + - id: bar + tableName: ligplaatsen + metadata: + title: Barrr + description: Barrr + tableName: ligplaatsen + - id: baz diff --git a/internal/ogc/features/testdata/expected_feature_geom_empty_point.json b/internal/ogc/features/testdata/expected_feature_geom_empty_point.json new file mode 100644 index 00000000..a18937af --- /dev/null +++ b/internal/ogc/features/testdata/expected_feature_geom_empty_point.json @@ -0,0 +1,47 @@ +{ + "type": "Feature", + "properties": { + "datum_doc": "1900-01-01", + "datum_eind": null, + "datum_strt": "1900-01-01", + "document": "GV00000402", + "huisletter": null, + "huisnummer": 14, + "nummer_id": "0363200000454013", + "postcode": "1013CR", + "rdf_seealso": "http://bag.basisregistraties.overheid.nl/bag/id/nummeraanduiding/0363200000454013", + "status": "Naamgeving uitgegeven", + "straatnaam": "Van Diemenkade", + "toevoeging": null, + "type": "Ligplaats", + "woonplaats": "Amsterdam" + }, + "geometry": null, + "id": "3542", + "links": [ + { + "rel": "self", + "title": "This document as GeoJSON", + "type": "application/geo+json", + "href": "http://localhost:8080/collections/foo/items/3542?f=json" + }, + { + "rel": "alternate", + "title": "This document as JSON-FG", + "type": "application/vnd.ogc.fg+json", + "href": "http://localhost:8080/collections/foo/items/3542?f=jsonfg" + }, + { + "rel": "alternate", + "title": "This document as HTML", + "type": "text/html", + "href": "http://localhost:8080/collections/foo/items/3542?f=html" + }, + { + "rel": "collection", + "title": "The collection to which this feature belongs", + "type": "application/json", + "href": "http://localhost:8080/collections/foo?f=json" + } + ] +} diff --git a/internal/ogc/features/testdata/expected_feature_geom_empty_point_jsonfg.json b/internal/ogc/features/testdata/expected_feature_geom_empty_point_jsonfg.json new file mode 100644 index 00000000..258307ca --- /dev/null +++ b/internal/ogc/features/testdata/expected_feature_geom_empty_point_jsonfg.json @@ -0,0 +1,53 @@ +{ + "id": "3542", + "type": "Feature", + "time": null, + "place": null, + "geometry": null, + "properties": { + "datum_doc": "1900-01-01", + "datum_eind": null, + "datum_strt": "1900-01-01", + "document": "GV00000402", + "huisletter": null, + "huisnummer": 14, + "nummer_id": "0363200000454013", + "postcode": "1013CR", + "rdf_seealso": "http://bag.basisregistraties.overheid.nl/bag/id/nummeraanduiding/0363200000454013", + "status": "Naamgeving uitgegeven", + "straatnaam": "Van Diemenkade", + "toevoeging": null, + "type": "Ligplaats", + "woonplaats": "Amsterdam" + }, + "coordRefSys": "http://www.opengis.net/def/crs/OGC/1.3/CRS84", + "links": [ + { + "rel": "self", + "title": "This document as JSON-FG", + "type": "application/vnd.ogc.fg+json", + "href": "http://localhost:8080/collections/foo/items/3542?f=jsonfg" + }, + { + "rel": "alternate", + "title": "This document as GeoJSON", + "type": "application/geo+json", + "href": "http://localhost:8080/collections/foo/items/3542?f=json" + }, + { + "rel": "alternate", + "title": "This document as HTML", + "type": "text/html", + "href": "http://localhost:8080/collections/foo/items/3542?f=html" + }, + { + "rel": "collection", + "title": "The collection to which this feature belongs", + "type": "application/json", + "href": "http://localhost:8080/collections/foo?f=json" + } + ], + "conformsTo": [ + "http://www.opengis.net/spec/json-fg-1/0.2/conf/core" + ] +} diff --git a/internal/ogc/features/testdata/expected_feature_geom_null.json b/internal/ogc/features/testdata/expected_feature_geom_null.json new file mode 100644 index 00000000..b7ac3338 --- /dev/null +++ b/internal/ogc/features/testdata/expected_feature_geom_null.json @@ -0,0 +1,48 @@ +{ + "type": "Feature", + "properties": { + "datum_doc": "2021-02-26", + "datum_eind": null, + "datum_strt": "2021-02-26", + "document": "SE05427877", + "geom": null, + "huisletter": null, + "huisnummer": 6, + "nummer_id": "0363200012163629", + "postcode": "1013NK", + "rdf_seealso": "http://bag.basisregistraties.overheid.nl/bag/id/nummeraanduiding/0363200012163629", + "status": "Naamgeving uitgegeven", + "straatnaam": "Bokkinghangen", + "toevoeging": null, + "type": "Ligplaats", + "woonplaats": "Amsterdam" + }, + "geometry": null, + "id": "6436", + "links": [ + { + "rel": "self", + "title": "This document as GeoJSON", + "type": "application/geo+json", + "href": "http://localhost:8080/collections/foo/items/6436?f=json" + }, + { + "rel": "alternate", + "title": "This document as JSON-FG", + "type": "application/vnd.ogc.fg+json", + "href": "http://localhost:8080/collections/foo/items/6436?f=jsonfg" + }, + { + "rel": "alternate", + "title": "This document as HTML", + "type": "text/html", + "href": "http://localhost:8080/collections/foo/items/6436?f=html" + }, + { + "rel": "collection", + "title": "The collection to which this feature belongs", + "type": "application/json", + "href": "http://localhost:8080/collections/foo?f=json" + } + ] +} diff --git a/internal/ogc/features/testdata/expected_feature_geom_null_jsonfg.json b/internal/ogc/features/testdata/expected_feature_geom_null_jsonfg.json new file mode 100644 index 00000000..019d7635 --- /dev/null +++ b/internal/ogc/features/testdata/expected_feature_geom_null_jsonfg.json @@ -0,0 +1,54 @@ +{ + "id": "6436", + "type": "Feature", + "time": null, + "place": null, + "geometry": null, + "properties": { + "datum_doc": "2021-02-26", + "datum_eind": null, + "datum_strt": "2021-02-26", + "document": "SE05427877", + "geom": null, + "huisletter": null, + "huisnummer": 6, + "nummer_id": "0363200012163629", + "postcode": "1013NK", + "rdf_seealso": "http://bag.basisregistraties.overheid.nl/bag/id/nummeraanduiding/0363200012163629", + "status": "Naamgeving uitgegeven", + "straatnaam": "Bokkinghangen", + "toevoeging": null, + "type": "Ligplaats", + "woonplaats": "Amsterdam" + }, + "coordRefSys": "http://www.opengis.net/def/crs/OGC/1.3/CRS84", + "links": [ + { + "rel": "self", + "title": "This document as JSON-FG", + "type": "application/vnd.ogc.fg+json", + "href": "http://localhost:8080/collections/foo/items/6436?f=jsonfg" + }, + { + "rel": "alternate", + "title": "This document as GeoJSON", + "type": "application/geo+json", + "href": "http://localhost:8080/collections/foo/items/6436?f=json" + }, + { + "rel": "alternate", + "title": "This document as HTML", + "type": "text/html", + "href": "http://localhost:8080/collections/foo/items/6436?f=html" + }, + { + "rel": "collection", + "title": "The collection to which this feature belongs", + "type": "application/json", + "href": "http://localhost:8080/collections/foo?f=json" + } + ], + "conformsTo": [ + "http://www.opengis.net/spec/json-fg-1/0.2/conf/core" + ] +}