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>
231 lines
8.3 KiB
Python
231 lines
8.3 KiB
Python
# =================================================================
|
|
#
|
|
# Authors: Tom Kralidis <tomkralidis@gmail.com>
|
|
#
|
|
# 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.
|
|
#
|
|
# =================================================================
|
|
|
|
from collections import OrderedDict
|
|
import csv
|
|
import itertools
|
|
import logging
|
|
|
|
from pygeoapi.provider.base import (BaseProvider, ProviderQueryError,
|
|
ProviderItemNotFoundError)
|
|
from pygeoapi.util import get_typed_value, crs_transform
|
|
|
|
LOGGER = logging.getLogger(__name__)
|
|
|
|
|
|
class CSVProvider(BaseProvider):
|
|
"""CSV provider"""
|
|
|
|
def __init__(self, provider_def):
|
|
"""
|
|
Initialize object
|
|
|
|
:param provider_def: provider definition
|
|
|
|
:returns: pygeoapi.provider.csv_.CSVProvider
|
|
"""
|
|
|
|
super().__init__(provider_def)
|
|
self.geometry_x = provider_def['geometry']['x_field']
|
|
self.geometry_y = provider_def['geometry']['y_field']
|
|
self.fields = self.get_fields()
|
|
|
|
def get_fields(self):
|
|
"""
|
|
Get provider field information (names, types)
|
|
|
|
:returns: dict of fields
|
|
"""
|
|
|
|
LOGGER.debug('Treating all columns as string types')
|
|
with open(self.data) as ff:
|
|
LOGGER.debug('Serializing DictReader')
|
|
data_ = csv.DictReader(ff)
|
|
fields = {}
|
|
|
|
row = next(data_)
|
|
|
|
for key, value in row.items():
|
|
LOGGER.debug(f'key: {key}, value: {value}')
|
|
value2 = get_typed_value(value)
|
|
if key in [self.geometry_x, self.geometry_y]:
|
|
continue
|
|
if key == self.id_field:
|
|
type_ = 'string'
|
|
elif isinstance(value2, float):
|
|
type_ = 'number'
|
|
elif isinstance(value2, int):
|
|
type_ = 'integer'
|
|
else:
|
|
type_ = 'string'
|
|
|
|
fields[key] = {'type': type_}
|
|
|
|
return fields
|
|
|
|
def _load(self, offset=0, limit=10, resulttype='results',
|
|
identifier=None, bbox=[], datetime_=None, properties=[],
|
|
select_properties=[], skip_geometry=False, q=None):
|
|
"""
|
|
Load CSV data
|
|
|
|
:param offset: starting record to return (default 0)
|
|
:param limit: number of records to return (default 10)
|
|
:param datetime_: temporal (datestamp or extent)
|
|
:param resulttype: return results or hit limit (default results)
|
|
:param properties: list of tuples (name, value)
|
|
:param select_properties: list of property names
|
|
:param skip_geometry: bool of whether to skip geometry (default False)
|
|
:param q: full-text search term(s)
|
|
|
|
:returns: dict of GeoJSON FeatureCollection
|
|
"""
|
|
|
|
found = False
|
|
result = None
|
|
feature_collection = {
|
|
'type': 'FeatureCollection',
|
|
'features': []
|
|
}
|
|
if identifier is not None:
|
|
# Loop through all rows when searching for a single feature
|
|
limit = self._load(resulttype='hits').get('numberMatched')
|
|
|
|
with open(self.data) as ff:
|
|
LOGGER.debug('Serializing DictReader')
|
|
data_ = csv.DictReader(ff)
|
|
if properties:
|
|
data_ = filter(
|
|
lambda p: all(
|
|
[p[prop[0]] == prop[1] for prop in properties]), data_)
|
|
|
|
if resulttype == 'hits':
|
|
LOGGER.debug('Returning hits only')
|
|
feature_collection['numberMatched'] = len(list(data_))
|
|
return feature_collection
|
|
LOGGER.debug('Slicing CSV rows')
|
|
for row in itertools.islice(data_, offset, offset+limit):
|
|
try:
|
|
coordinates = [
|
|
float(row.pop(self.geometry_x)),
|
|
float(row.pop(self.geometry_y)),
|
|
]
|
|
except ValueError:
|
|
msg = f'Skipping row with invalid geometry: {row.get(self.id_field)}' # noqa
|
|
LOGGER.error(msg)
|
|
continue
|
|
feature = {'type': 'Feature'}
|
|
feature['id'] = row.pop(self.id_field)
|
|
if not skip_geometry:
|
|
feature['geometry'] = {
|
|
'type': 'Point',
|
|
'coordinates': coordinates
|
|
}
|
|
else:
|
|
feature['geometry'] = None
|
|
|
|
feature['properties'] = OrderedDict()
|
|
|
|
if self.properties or select_properties:
|
|
for p in set(self.properties) | set(select_properties):
|
|
try:
|
|
feature['properties'][p] = get_typed_value(row[p])
|
|
except KeyError as err:
|
|
LOGGER.error(err)
|
|
raise ProviderQueryError()
|
|
else:
|
|
for key, value in row.items():
|
|
LOGGER.debug(f'key: {key}, value: {value}')
|
|
feature['properties'][key] = get_typed_value(value)
|
|
|
|
if identifier is not None and feature['id'] == identifier:
|
|
found = True
|
|
result = feature
|
|
|
|
feature_collection['features'].append(feature)
|
|
|
|
feature_collection['numberMatched'] = \
|
|
len(feature_collection['features'])
|
|
|
|
if identifier is not None and not found:
|
|
return None
|
|
elif identifier is not None and found:
|
|
return result
|
|
|
|
feature_collection['numberReturned'] = len(
|
|
feature_collection['features'])
|
|
|
|
return feature_collection
|
|
|
|
@crs_transform
|
|
def query(self, offset=0, limit=10, resulttype='results',
|
|
bbox=[], datetime_=None, properties=[], sortby=[],
|
|
select_properties=[], skip_geometry=False, q=None, **kwargs):
|
|
"""
|
|
CSV query
|
|
|
|
:param offset: starting record to return (default 0)
|
|
:param limit: number of records to return (default 10)
|
|
:param resulttype: return results or hit limit (default results)
|
|
:param bbox: bounding box [minx,miny,maxx,maxy]
|
|
:param datetime_: temporal (datestamp or extent)
|
|
:param properties: list of tuples (name, value)
|
|
:param sortby: list of dicts (property, order)
|
|
:param select_properties: list of property names
|
|
:param skip_geometry: bool of whether to skip geometry (default False)
|
|
:param q: full-text search term(s)
|
|
|
|
:returns: dict of GeoJSON FeatureCollection
|
|
"""
|
|
|
|
return self._load(offset, limit, resulttype,
|
|
properties=properties,
|
|
select_properties=select_properties,
|
|
skip_geometry=skip_geometry)
|
|
|
|
@crs_transform
|
|
def get(self, identifier, **kwargs):
|
|
"""
|
|
query CSV id
|
|
|
|
:param identifier: feature id
|
|
|
|
:returns: dict of single GeoJSON feature
|
|
"""
|
|
item = self._load(identifier=identifier)
|
|
if item:
|
|
return item
|
|
else:
|
|
err = f'item {identifier} not found'
|
|
LOGGER.error(err)
|
|
raise ProviderItemNotFoundError(err)
|
|
|
|
def __repr__(self):
|
|
return f'<CSVProvider> {self.data}'
|