7c6993719d
* OGC API - Features Part 2 (groundwork+CRS-BBOX) from PR #1155 - contributes to issue #1128 * #1128 provide conformance class for OAPIF Part 2 in /conformance page * #1128 bitten by flake8... * #1128 configurability CRS Feature Providers with syntax, defaults and tests * #1128 configurability CRS Feature Providers refine for default values * #1128 display supported CRSs in HTML Collection template * #1128 config, mmetadata and tests for storageCRS and storageCrsCoordinateEpoch * #1128 WIP for bbox-crs parameter support * #1128 utility function and tests for default/mandatory supprted CRS list * #1128 default supported CRS adaptation to OAPIF Part 2 standard * #1128 grr flake8 whitespace * #1128 start adding full API tests OGR for bbox-crs and crs parms * #1128 fix flake8 * #1128 fix flake8 - install GDAL in workflow main for OGR tests * #1128 fix flake8 - install GDAL in workflow main for OGR tests - need pip package? * #1128 fix flake8 - install GDAL in workflow main for OGR tests - using libgdal-dev gdal-bin * #1128 fix SensorThings test for main.yml Workflow * #1128 fix SensorThings test for main.yml Workflow nr 2 * #1128 make all OGR tests working again * #1128 make all OGR tests working again - flake8 * #1128 make all OGR tests working again - GeoSolutions WFS bbox * #1128 #1155 add documentation for OGC OAPIF Part 2 CRS CRS BBOX support * #1128 #1155 refine documentation for OGC OAPIF Part 2 CRS CRS BBOX support * #1128 #1155 refine documentation to align with #1149 * #1128 #1155 rework from review OAS and pygeoapi config schema * #1128 #1155 minor: compile Re for CRS URI only once as global var * #1128 merge in changes from PR #1173 - fix missing import * WIP Ogcapi features part 2 - Support for crs query parameter (#1149) * feat(ogcapi_features_crs): start implementing crs support from ogcapi features part2 * Pass input and output CRSs WKT instead of crs transformation object * fix longs lines and blank lines * fix typo * fix import for type annotation not supported by python version * fix variable visibility in local scope * fix tabs/spaces indentations * Add support for the crs parameter to OGRProvider * make flake8 happy * Make crs transformation mechanism more consistent between PostgreSQL and OGR providers * test(util): add two test functions in util.py New functions: test_get_crs_from_uri and test_get_transform_from_crs * fix too long lines... * Update get_crs_from_uri and corresponding test function * fix(get_crs_from_uri): make the error more explicit in if wrong crs uri format * flake8 again... * Keep support for source_srs/target_srs in config for OGRProvider * revert changes made to pygeoapi-config-0.x.yml, overlap with PR 1155 * test: add test data and update test config file * Extract 'crs' and 'storage_crs' and provider level instead of collection level * feat(crs): new decorator to support coordinates transformation of feature collections * feat(crs): 'crs' query parameter for CSVProvider * test(crs): add tests for 'crs' query parameter * test: update number of collections in test_describe_collections * test: update number of collections in test_filter_dict_by_key_value * fix(crs_transform): change the crs transformation decorator Change the logic of the decorator so that it works for both functions that return FeatureCollections and for functions tha return single Features. * test: add tests for get_collection_item end-point with 'crs' parameter * fix(test_get_collection_item_crs): id as path parameter, not query parameter * test: unpack coordinates to create point geometry * feat(crs): add suuport for crs query parameter for all providers of type 'feature' * docs(crs): add documentation to illustrate use of 'crs' query parameters * docs(crs): more data access examples * fix typo and add new line * refactor: specify None as default value for crs_transform_out parameter in _sqlalchemy_to_feature method * changes for PR 1149, test_api and style formatting * CRS84 as default crs also for test_get_collection_items_crs * test(crs): test coordinates transformation implementation of PostgreSQLProvider * test(crs): move tests to test_postgresql_provider * fix test function calls * change test to ensure returned features are the same * add json format to request object * test(crs): test coordinates transformation implementation of OGRProvider * refactor(crs): make more compact get_collection_item and get_collection_items Define two new static methods in API class, to create crs_transform_wkt and setting content-crs header. These methods can be re-used in both get_collection_item and get_collection_items methods and removes code duplication. --------- Co-authored-by: Just van den Broecke <just@justobjects.nl> * #1178 fix flake8 error * #1178 use EPSG:28992 i.s.o. 32631 - fix unit test OGR Shapefile * #1174 use CRS-compliant Axis ordering for crs support * #1174 fix and honour CRS 4258disable native CRS Transform in OGR Provider - Axis ordering not honoured... * #1174 remove ADR tests rom test_util.py * #1174 enable native CRS transform again in OGR Provider * #1174 enable native CRS transform again in OGR Provider - fix config * #1174 remove support for source/target_srs in OGRProvider - enforce transforms always based on storageCRS * #1174 fix tests Postgresql Provider for Transforms * #1174 fix tests Postgresql Provider for Transforms * #1174 add tests for OGR Transformation and Axis Order * #1174 Suppress potential axis-swapping in OGR ExportToJSON * #1174 minor fix test - unassign spatialref before setgeom infeat * #1174 minor fix test - unassign spatialref before setgeom infeat - flake8 * #1174 solve CI WFS test failures with GDAL HTTP config options * #1174 bbox and bbox-crs defs local in openapi.py for CITE validators * #1174 merge master - #1152 #1203 etc * #1174 small doc changes * #1174 move GeomObject typedef to beginning of util.py * #1174 added debug logging in transform Decorator func --------- Co-authored-by: Mathieu Tachon <92298764+MTachon@users.noreply.github.com>
406 lines
14 KiB
Python
406 lines
14 KiB
Python
# =================================================================
|
|
#
|
|
# Authors: Just van den Broecke <justb4@gmail.com>
|
|
# Authors: Tom Kralidis <tomkralidis@gmail.com>
|
|
#
|
|
# Copyright (c) 2019 Just van den Broecke
|
|
# Copyright (c) 2022 Tom Kralidis
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person
|
|
# obtaining a copy of this software and associated documentation
|
|
# files (the "Software"), to deal in the Software without
|
|
# restriction, including without limitation the rights to use,
|
|
# copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
# copies of the Software, and to permit persons to whom the
|
|
# Software is furnished to do so, subject to the following
|
|
# conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be
|
|
# included in all copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
# OTHER DEALINGS IN THE SOFTWARE.
|
|
#
|
|
# =================================================================
|
|
|
|
# Needs to be run like: python3 -m pytest
|
|
|
|
import logging
|
|
|
|
import pytest
|
|
|
|
from pygeoapi.provider.base import ProviderItemNotFoundError
|
|
from pygeoapi.provider.ogr import OGRProvider
|
|
|
|
|
|
LOGGER = logging.getLogger(__name__)
|
|
|
|
|
|
@pytest.fixture()
|
|
def config_poi_portugal():
|
|
return {
|
|
'name': 'OGR',
|
|
'type': 'feature',
|
|
'data': {
|
|
'source_type': 'GPKG',
|
|
'source': './tests/data/poi_portugal.gpkg',
|
|
# 'source_srs': 'EPSG:4326',
|
|
# 'target_srs': 'EPSG:4326',
|
|
'source_capabilities': {
|
|
'paging': True
|
|
},
|
|
},
|
|
'id_field': 'osm_id',
|
|
'layer': 'poi_portugal'
|
|
}
|
|
|
|
|
|
def test_query(config_poi_portugal):
|
|
"""Testing query for a valid JSON object with geometry"""
|
|
|
|
p = OGRProvider(config_poi_portugal)
|
|
feature_collection = p.query()
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert features is not None
|
|
feature = features[0]
|
|
properties = feature.get('properties')
|
|
assert properties is not None
|
|
geometry = feature.get('geometry')
|
|
assert geometry is not None
|
|
|
|
|
|
def test_get(config_poi_portugal):
|
|
p = OGRProvider(config_poi_portugal)
|
|
result = p.get(536678593)
|
|
assert result['id'] == 536678593
|
|
assert 'cafe' in result['properties']['fclass']
|
|
|
|
|
|
def test_get_not_existing_feature_raise_exception(
|
|
config_poi_portugal
|
|
):
|
|
"""Testing query for a not existing object"""
|
|
p = OGRProvider(config_poi_portugal)
|
|
with pytest.raises(ProviderItemNotFoundError):
|
|
p.get(-1)
|
|
|
|
|
|
# Testing with GeoPackage files with identical features
|
|
# (all 2481 addresses in Otterlo Netherlands)
|
|
# in different projections.
|
|
|
|
@pytest.fixture()
|
|
def config_gpkg_4326():
|
|
return {
|
|
'name': 'OGR',
|
|
'type': 'feature',
|
|
'data': {
|
|
'source_type': 'GPKG',
|
|
'source':
|
|
'./tests/data/dutch_addresses_4326.gpkg',
|
|
# 'source_srs': 'EPSG:4326',
|
|
# 'target_srs': 'EPSG:4326',
|
|
'source_capabilities': {
|
|
'paging': True
|
|
},
|
|
},
|
|
'id_field': 'id',
|
|
'layer': 'OGRGeoJSON'
|
|
}
|
|
|
|
|
|
# Note that this Shapefile is zipped, as OGR supports /vsizip/!
|
|
@pytest.fixture()
|
|
def config_gpkg_28992():
|
|
return {
|
|
'name': 'OGR',
|
|
'type': 'feature',
|
|
'data': {
|
|
'source_type': 'GPKG',
|
|
'source':
|
|
'./tests/data/dutch_addresses_28992.gpkg',
|
|
# 'source_srs': 'EPSG:28992',
|
|
# 'target_srs': 'EPSG:4326',
|
|
'source_capabilities': {
|
|
'paging': True
|
|
},
|
|
},
|
|
'crs': [
|
|
'http://www.opengis.net/def/crs/OGC/1.3/CRS84',
|
|
'http://www.opengis.net/def/crs/EPSG/0/28992'
|
|
],
|
|
'storageCRS': 'http://www.opengis.net/def/crs/EPSG/0/28992',
|
|
'id_field': 'id',
|
|
'layer': 'OGRGeoJSON'
|
|
}
|
|
|
|
|
|
def test_get_fields_4326(config_gpkg_4326):
|
|
"""Testing field types"""
|
|
p = OGRProvider(config_gpkg_4326)
|
|
results = p.get_fields()
|
|
assert results['straatnaam']['type'] == 'string'
|
|
assert results['huisnummer']['type'] == 'string'
|
|
|
|
|
|
def test_get_28992(config_gpkg_28992):
|
|
"""Testing query for a specific object"""
|
|
p = OGRProvider(config_gpkg_28992)
|
|
result = p.get('inspireadressen.1747652')
|
|
assert result['id'] == 'inspireadressen.1747652'
|
|
assert 'Mosselsepad' in result['properties']['straatnaam']
|
|
|
|
|
|
def test_get_4326(config_gpkg_4326):
|
|
"""Testing query for a specific object"""
|
|
p = OGRProvider(config_gpkg_4326)
|
|
result = p.get('inspireadressen.1747652')
|
|
assert result['id'] == 'inspireadressen.1747652'
|
|
assert 'Mosselsepad' in result['properties']['straatnaam']
|
|
|
|
|
|
def test_query_hits_28992(config_gpkg_28992):
|
|
"""Testing query on entire collection for hits"""
|
|
|
|
p = OGRProvider(config_gpkg_28992)
|
|
feature_collection = p.query(resulttype='hits')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 0
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is not None
|
|
assert hits == 2481
|
|
|
|
|
|
def test_query_hits_4326(config_gpkg_4326):
|
|
"""Testing query on entire collection for hits"""
|
|
|
|
p = OGRProvider(config_gpkg_4326)
|
|
feature_collection = p.query(resulttype='hits')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 0
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is not None
|
|
assert hits == 2481
|
|
|
|
|
|
def test_query_bbox_hits_4326(config_gpkg_4326):
|
|
"""Testing query for a valid JSON object with geometry"""
|
|
|
|
p = OGRProvider(config_gpkg_4326)
|
|
# feature_collection = p.query(
|
|
# bbox=[120000, 480000, 124000, 487000], resulttype='hits')
|
|
feature_collection = p.query(
|
|
bbox=[5.763409, 52.060197, 5.769256, 52.061976], resulttype='hits')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 0
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is not None
|
|
assert hits == 1
|
|
|
|
|
|
def test_query_bbox_hits_28992(config_gpkg_28992):
|
|
"""Testing query for a valid JSON object with geometry, single address"""
|
|
|
|
p = OGRProvider(config_gpkg_28992)
|
|
# feature_collection = p.query(
|
|
# bbox=(180800, 452500, 181200, 452700), resulttype='hits')
|
|
feature_collection = p.query(
|
|
bbox=[180800, 452500, 181200, 452700], resulttype='hits')
|
|
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 0
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is not None
|
|
assert hits == 1
|
|
|
|
|
|
def test_query_bbox_28992(config_gpkg_28992):
|
|
"""Testing query for a valid JSON object with geometry"""
|
|
|
|
p = OGRProvider(config_gpkg_28992)
|
|
# feature_collection = p.query(
|
|
# bbox=[180800, 452500, 181200, 452700], resulttype='results')
|
|
feature_collection = p.query(
|
|
bbox=(180800, 452500, 181200, 452700), resulttype='results')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 1
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is None
|
|
feature = features[0]
|
|
properties = feature.get('properties')
|
|
assert properties is not None
|
|
geometry = feature.get('geometry')
|
|
assert geometry is not None
|
|
assert properties['straatnaam'] == 'Planken Wambuisweg'
|
|
|
|
|
|
def test_query_bbox_4326(config_gpkg_4326):
|
|
"""Testing query for a valid JSON object with geometry"""
|
|
|
|
p = OGRProvider(config_gpkg_4326)
|
|
# feature_collection = p.query(
|
|
# bbox=[180800, 452500, 181200, 452700], resulttype='results')
|
|
feature_collection = p.query(
|
|
bbox=(5.763409, 52.060197, 5.769256, 52.061976), resulttype='results')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 1
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is None
|
|
feature = features[0]
|
|
properties = feature.get('properties')
|
|
assert properties is not None
|
|
geometry = feature.get('geometry')
|
|
assert geometry is not None
|
|
assert properties['straatnaam'] == 'Planken Wambuisweg'
|
|
|
|
|
|
def test_query_with_limit_28992(config_gpkg_28992):
|
|
"""Testing query for a valid JSON object with geometry"""
|
|
|
|
p = OGRProvider(config_gpkg_28992)
|
|
feature_collection = p.query(limit=2, resulttype='results')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 2
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is None
|
|
feature = features[0]
|
|
properties = feature.get('properties')
|
|
assert properties is not None
|
|
geometry = feature.get('geometry')
|
|
assert geometry is not None
|
|
|
|
|
|
def test_query_with_limit_4326(config_gpkg_4326):
|
|
"""Testing query for a valid JSON object with geometry"""
|
|
|
|
p = OGRProvider(config_gpkg_4326)
|
|
feature_collection = p.query(limit=5, resulttype='results')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 5
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is None
|
|
feature = features[0]
|
|
properties = feature.get('properties')
|
|
assert properties is not None
|
|
geometry = feature.get('geometry')
|
|
assert geometry is not None
|
|
|
|
|
|
def test_query_with_offset_28992(config_gpkg_28992):
|
|
"""Testing query for a valid JSON object with geometry"""
|
|
|
|
p = OGRProvider(config_gpkg_28992)
|
|
feature_collection = p.query(offset=20, limit=5, resulttype='results')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 5
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is None
|
|
feature = features[0]
|
|
properties = feature.get('properties')
|
|
assert properties is not None
|
|
assert feature['id'] == 'inspireadressen.1744969'
|
|
assert 'Egypte' in properties['straatnaam']
|
|
geometry = feature.get('geometry')
|
|
assert geometry is not None
|
|
|
|
|
|
def test_query_with_offset_4326(config_gpkg_4326):
|
|
"""Testing query for a valid JSON object with geometry"""
|
|
|
|
p = OGRProvider(config_gpkg_4326)
|
|
feature_collection = p.query(offset=20, limit=5, resulttype='results')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 5
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is None
|
|
feature = features[0]
|
|
properties = feature.get('properties')
|
|
assert properties is not None
|
|
assert feature['id'] == 'inspireadressen.1744969'
|
|
assert 'Egypte' in properties['straatnaam']
|
|
geometry = feature.get('geometry')
|
|
assert geometry is not None
|
|
|
|
|
|
def test_query_bbox_with_offset_28992(config_gpkg_28992):
|
|
"""Testing query for a valid JSON object with geometry"""
|
|
|
|
p = OGRProvider(config_gpkg_28992)
|
|
feature_collection = p.query(
|
|
offset=10, limit=5,
|
|
bbox=(181000, 456000, 182000, 457000),
|
|
resulttype='results')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 5
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is None
|
|
feature = features[0]
|
|
properties = feature.get('properties')
|
|
assert properties is not None
|
|
geometry = feature.get('geometry')
|
|
assert geometry is not None
|
|
assert properties['straatnaam'] == 'Arnhemseweg'
|
|
assert properties['huisnummer'] == '99'
|
|
|
|
|
|
def test_query_bbox_with_offset_4326(config_gpkg_4326):
|
|
"""Testing query for a valid JSON object with geometry"""
|
|
|
|
p = OGRProvider(config_gpkg_4326)
|
|
feature_collection = p.query(
|
|
offset=1, limit=5,
|
|
bbox=(5.742, 52.053, 5.773, 52.098),
|
|
resulttype='results')
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) == 5
|
|
hits = feature_collection.get('numberMatched')
|
|
assert hits is None
|
|
feature = features[0]
|
|
properties = feature.get('properties')
|
|
assert properties is not None
|
|
geometry = feature.get('geometry')
|
|
assert geometry is not None
|
|
assert properties['straatnaam'] == 'Egypte'
|
|
assert properties['huisnummer'] == '6'
|
|
|
|
|
|
def test_query_with_property_filtering(config_gpkg_4326):
|
|
"""Testing query with property filtering"""
|
|
|
|
p = OGRProvider(config_gpkg_4326)
|
|
|
|
feature_collection = p.query(
|
|
properties=[
|
|
('straatnaam', 'Arnhemseweg')
|
|
]
|
|
)
|
|
|
|
assert feature_collection.get('type') == 'FeatureCollection'
|
|
features = feature_collection.get('features')
|
|
assert len(features) > 1
|
|
|
|
for feature in features:
|
|
assert 'properties' in feature
|
|
assert 'straatnaam' in feature['properties']
|
|
|
|
assert feature['properties']['straatnaam'] == 'Arnhemseweg'
|