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>
319 lines
11 KiB
Python
319 lines
11 KiB
Python
# =================================================================
|
|
#
|
|
# Authors: Tom Kralidis <tomkralidis@gmail.com>
|
|
#
|
|
# Copyright (c) 2021 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.
|
|
#
|
|
# =================================================================
|
|
|
|
from datetime import datetime, date, time
|
|
from decimal import Decimal
|
|
from copy import deepcopy
|
|
|
|
import pytest
|
|
from pyproj.exceptions import CRSError
|
|
from shapely.geometry import Point
|
|
|
|
from pygeoapi import util
|
|
from pygeoapi.api import __version__
|
|
from pygeoapi.provider.base import ProviderTypeError
|
|
|
|
from .util import get_test_file_path
|
|
|
|
|
|
@pytest.fixture()
|
|
def config():
|
|
with open(get_test_file_path('pygeoapi-test-config.yml')) as fh:
|
|
return util.yaml_load(fh)
|
|
|
|
|
|
@pytest.fixture()
|
|
def config_with_rules() -> dict:
|
|
""" Returns a pygeoapi configuration with default API rules. """
|
|
with open(get_test_file_path('pygeoapi-test-config-apirules.yml')) as fh:
|
|
return util.yaml_load(fh)
|
|
|
|
|
|
def test_get_typed_value():
|
|
value = util.get_typed_value('2')
|
|
assert isinstance(value, int)
|
|
|
|
value = util.get_typed_value('1.2')
|
|
assert isinstance(value, float)
|
|
|
|
value = util.get_typed_value('1.c2')
|
|
assert isinstance(value, str)
|
|
|
|
|
|
def test_yaml_load(config):
|
|
assert isinstance(config, dict)
|
|
with pytest.raises(FileNotFoundError):
|
|
with open(get_test_file_path('404.yml')) as fh:
|
|
util.yaml_load(fh)
|
|
|
|
|
|
def test_str2bool():
|
|
assert not util.str2bool(False)
|
|
assert not util.str2bool('0')
|
|
assert not util.str2bool('no')
|
|
assert util.str2bool('yes')
|
|
assert util.str2bool('1')
|
|
assert util.str2bool(True)
|
|
assert util.str2bool('true')
|
|
assert util.str2bool('True')
|
|
assert util.str2bool('TRUE')
|
|
assert util.str2bool('tRuE')
|
|
assert util.str2bool('on')
|
|
assert util.str2bool('On')
|
|
assert not util.str2bool('off')
|
|
|
|
|
|
def test_json_serial():
|
|
d = datetime(1972, 10, 30)
|
|
assert util.json_serial(d) == '1972-10-30T00:00:00'
|
|
|
|
d = date(2010, 7, 31)
|
|
assert util.json_serial(d) == '2010-07-31'
|
|
|
|
d = time(11)
|
|
assert util.json_serial(d) == '11:00:00'
|
|
|
|
d = Decimal(1.0)
|
|
assert util.json_serial(d) == 1.0
|
|
|
|
with pytest.raises(TypeError):
|
|
util.json_serial('foo')
|
|
|
|
|
|
def test_mimetype():
|
|
assert util.get_mimetype('file.xml') == 'application/xml'
|
|
assert util.get_mimetype('file.yml') == 'text/plain'
|
|
assert util.get_mimetype('file.yaml') == 'text/plain'
|
|
|
|
|
|
def test_get_breadcrumbs():
|
|
path = '/dataset/model-run/forecast-hour/variable.grib2'
|
|
breadcrumbs = util.get_breadcrumbs(path)
|
|
|
|
assert len(breadcrumbs) == 5
|
|
assert breadcrumbs[3]['href'] == 'dataset/model-run/forecast-hour'
|
|
|
|
|
|
def test_path_basename():
|
|
assert util.get_path_basename('/path/to/file.txt') == 'file.txt'
|
|
assert util.get_path_basename('/path/to/dir') == 'dir'
|
|
|
|
|
|
def test_filter_dict_by_key_value(config):
|
|
collections = util.filter_dict_by_key_value(config['resources'],
|
|
'type', 'collection')
|
|
assert len(collections) == 8
|
|
|
|
notfound = util.filter_dict_by_key_value(config['resources'],
|
|
'type', 'foo')
|
|
|
|
assert len(notfound) == 0
|
|
|
|
|
|
def test_get_provider_by_type(config):
|
|
p = util.get_provider_by_type(config['resources']['obs']['providers'],
|
|
'feature')
|
|
|
|
assert isinstance(p, dict)
|
|
assert p['type'] == 'feature'
|
|
assert p['name'] == 'CSV'
|
|
|
|
with pytest.raises(ProviderTypeError):
|
|
p = util.get_provider_by_type(config['resources']['obs']['providers'],
|
|
'something-else')
|
|
|
|
|
|
def test_get_provider_default(config):
|
|
pd = util.get_provider_default(config['resources']['obs']['providers'])
|
|
|
|
assert pd['type'] == 'feature'
|
|
assert pd['name'] == 'CSV'
|
|
|
|
pd = util.get_provider_default(config['resources']['obs']['providers'])
|
|
|
|
|
|
def test_read_data():
|
|
data = util.read_data(get_test_file_path('pygeoapi-test-config.yml'))
|
|
|
|
assert isinstance(data, bytes)
|
|
|
|
|
|
def test_url_join():
|
|
f = util.url_join
|
|
assert f('http://localhost:5000') == 'http://localhost:5000'
|
|
assert f('http://localhost:5000/') == 'http://localhost:5000'
|
|
assert f('http://localhost:5000', '') == 'http://localhost:5000'
|
|
assert f('http://localhost:5000/', '') == 'http://localhost:5000'
|
|
assert f('http://localhost:5000/', '/') == 'http://localhost:5000'
|
|
assert f('http://localhost:5000/api', '/') == 'http://localhost:5000/api'
|
|
assert f('http://localhost:5000/api', '/v0') == 'http://localhost:5000/api/v0' # noqa
|
|
assert f('http://localhost:5000/api', '/v0/') == 'http://localhost:5000/api/v0' # noqa
|
|
assert f('http://localhost:5000', 'api', 'v0') == 'http://localhost:5000/api/v0' # noqa
|
|
|
|
|
|
def test_get_base_url(config, config_with_rules):
|
|
assert util.get_base_url(config) == 'http://localhost:5000'
|
|
assert util.get_base_url(config_with_rules) == 'http://localhost:5000/api/v0' # noqa
|
|
|
|
|
|
def test_get_api_rules(config, config_with_rules):
|
|
# Test unset/default rules
|
|
rules = util.get_api_rules(config)
|
|
assert not rules.strict_slashes
|
|
assert not rules.url_prefix
|
|
assert rules.api_version == __version__
|
|
assert rules.version_header == ''
|
|
assert rules.get_url_prefix() == ''
|
|
assert rules.response_headers == {}
|
|
|
|
# Test configured rules
|
|
rules = util.get_api_rules(config_with_rules)
|
|
assert rules.strict_slashes
|
|
assert rules.url_prefix
|
|
assert rules.api_version == __version__
|
|
assert rules.version_header == 'X-API-Version'
|
|
assert rules.response_headers == {'X-API-Version': __version__}
|
|
|
|
# Test specific version override
|
|
config_changed = deepcopy(config_with_rules)
|
|
config_changed['server']['api_rules']['api_version'] = '1.2.3'
|
|
rules = util.get_api_rules(config_changed)
|
|
assert rules.api_version == '1.2.3'
|
|
assert rules.get_url_prefix() == 'v1'
|
|
assert rules.get_url_prefix('flask') == '/v1'
|
|
assert rules.get_url_prefix('starlette') == '/v1'
|
|
assert rules.get_url_prefix('django') == r'^v1/'
|
|
|
|
# Test prefix without version
|
|
config_changed = deepcopy(config_with_rules)
|
|
config_changed['server']['api_rules']['url_prefix'] = 'test'
|
|
rules = util.get_api_rules(config_changed)
|
|
assert rules.get_url_prefix() == 'test'
|
|
assert rules.get_url_prefix('flask') == '/test'
|
|
assert rules.get_url_prefix('starlette') == '/test'
|
|
assert rules.get_url_prefix('django') == r'^test/'
|
|
|
|
|
|
def test_get_transform_from_crs():
|
|
crs_in = util.get_crs_from_uri(
|
|
'http://www.opengis.net/def/crs/EPSG/0/4258'
|
|
)
|
|
crs_out = util.get_crs_from_uri(
|
|
'http://www.opengis.net/def/crs/EPSG/0/25833'
|
|
)
|
|
transform_func = util.get_transform_from_crs(crs_in, crs_out)
|
|
p_in = Point((67.278972, 14.394493))
|
|
p_out = Point((473901.6105, 7462606.8762))
|
|
assert p_out.equals_exact(transform_func(p_in), 1e-3)
|
|
|
|
|
|
def test_get_supported_crs_list():
|
|
DEFAULT_CRS_LIST = [
|
|
'http://www.opengis.net/def/crs/OGC/1.3/CRS84',
|
|
'http://www.opengis.net/def/crs/OGC/1.3/CRS84h'
|
|
]
|
|
DUTCH_CRS = 'http://www.opengis.net/def/crs/EPSG/0/28992'
|
|
|
|
# Make various combinations of configs
|
|
CONFIGS = \
|
|
[
|
|
dict(),
|
|
{'crs': ['http://www.opengis.net/def/crs/OGC/1.3/CRS84']},
|
|
{'crs': ['http://www.opengis.net/def/crs/OGC/1.3/CRS84h']},
|
|
{'crs': ['http://www.opengis.net/def/crs/EPSG/0/4326',
|
|
'http://www.opengis.net/def/crs/OGC/1.3/CRS84']},
|
|
{'crs': ['http://www.opengis.net/def/crs/EPSG/0/4326',
|
|
DUTCH_CRS]},
|
|
]
|
|
# Apply all configs to util function
|
|
for config in CONFIGS:
|
|
crs_list = util.get_supported_crs_list(config, DEFAULT_CRS_LIST)
|
|
|
|
# Whatever config: a default should be present
|
|
contains_default = False
|
|
for crs in crs_list:
|
|
if crs in DEFAULT_CRS_LIST:
|
|
contains_default = True
|
|
assert contains_default
|
|
|
|
# Extra CRSs supplied should also be present
|
|
if DUTCH_CRS in config:
|
|
assert DUTCH_CRS in crs_list
|
|
|
|
|
|
def test_get_crs_from_uri():
|
|
with pytest.raises(CRSError):
|
|
util.get_crs_from_uri('http://www.opengis.net/not/a/valid/crs/uri')
|
|
with pytest.raises(CRSError):
|
|
util.get_crs_from_uri('http://www.opengis.net/def/crs/EPSG/0/0')
|
|
CRS_DICT = {
|
|
'http://www.opengis.net/def/crs/OGC/1.3/CRS84': 'OGC:CRS84',
|
|
'http://www.opengis.net/def/crs/EPSG/0/4326': 'EPSG:4326',
|
|
'http://www.opengis.net/def/crs/EPSG/0/28992': 'EPSG:28992'
|
|
}
|
|
for key in CRS_DICT:
|
|
crs_obj = util.get_crs_from_uri(key)
|
|
assert crs_obj.srs == CRS_DICT[key]
|
|
|
|
|
|
def test_transform_bbox():
|
|
# Use rounded values as fractions may differ
|
|
result = [59742, 446645, 129005, 557074]
|
|
|
|
bbox = [4, 52, 5, 53]
|
|
from_crs = 'http://www.opengis.net/def/crs/OGC/1.3/CRS84'
|
|
to_crs = 'http://www.opengis.net/def/crs/EPSG/0/28992'
|
|
bbox_trans = util.transform_bbox(bbox, from_crs, to_crs)
|
|
for n in range(4):
|
|
assert round(bbox_trans[n]) == result[n]
|
|
|
|
bbox = [52, 4, 53, 5]
|
|
from_crs = 'http://www.opengis.net/def/crs/EPSG/0/4326'
|
|
bbox_trans = util.transform_bbox(bbox, from_crs, to_crs)
|
|
for n in range(4):
|
|
assert round(bbox_trans[n]) == result[n]
|
|
|
|
|
|
def test_prefetcher():
|
|
prefetcher = util.UrlPrefetcher()
|
|
assert prefetcher.get_headers('bad_url') == {}
|
|
# URL below will redirect once
|
|
url = 'https://github.com/geopython/pygeoapi/raw/4a18393662583e53b8c7d591130246d9cd2c3f3f/pygeoapi/static/img/pygeoapi.png' # noqa
|
|
headers = prefetcher.get_headers(url)
|
|
length = int(headers.get('content-length', 0))
|
|
assert length > 0
|
|
# Test without redirect
|
|
headers = prefetcher.get_headers(url, allow_redirects=False)
|
|
assert headers.get('content-length') in (0, '0', None)
|
|
assert headers.get('content-type') != 'image/png'
|
|
# Test using redirect location from header
|
|
headers = prefetcher.get_headers(headers['location'])
|
|
assert int(headers.get('content-length', 0)) == length
|
|
assert headers.get('content-type') == 'image/png'
|