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>
370 lines
13 KiB
Python
370 lines
13 KiB
Python
# =================================================================
|
|
#
|
|
# Authors: Jorge Samuel Mendes de Jesus <jorge.dejesus@protonmail.net>
|
|
# Tom Kralidis <tomkralidis@gmail.com>
|
|
# Francesco Bartoli <xbartolone@gmail.com>
|
|
#
|
|
# Copyright (c) 2018 Jorge Samuel Mendes de Jesus
|
|
# Copyright (c) 2023 Tom Kralidis
|
|
# Copyright (c) 2020 Francesco Bartoli
|
|
#
|
|
# 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.
|
|
#
|
|
# =================================================================
|
|
|
|
import sqlite3
|
|
import logging
|
|
import os
|
|
import json
|
|
from pygeoapi.plugin import InvalidPluginError
|
|
from pygeoapi.provider.base import (BaseProvider, ProviderConnectionError,
|
|
ProviderItemNotFoundError)
|
|
from pygeoapi.util import crs_transform
|
|
|
|
LOGGER = logging.getLogger(__name__)
|
|
|
|
|
|
SPATIALITE_EXTENSION = os.getenv('SPATIALITE_LIBRARY_PATH',
|
|
'mod_spatialite.so')
|
|
|
|
|
|
class SQLiteGPKGProvider(BaseProvider):
|
|
"""Generic provider for SQLITE and GPKG using sqlite3 module.
|
|
This module requires install of libsqlite3-mod-spatialite
|
|
TODO: DELETE, UPDATE, CREATE
|
|
"""
|
|
|
|
def __init__(self, provider_def):
|
|
"""
|
|
SQLiteGPKGProvider Class constructor
|
|
|
|
:param provider_def: provider definitions from yml pygeoapi-config.
|
|
data,id_field, name set in parent class
|
|
|
|
:returns: pygeoapi.provider.base.SQLiteProvider
|
|
"""
|
|
super().__init__(provider_def)
|
|
|
|
self.table = provider_def['table']
|
|
self.application_id = None
|
|
self.geom_col = None
|
|
|
|
LOGGER.debug('Setting SQLite properties:')
|
|
LOGGER.debug(f'Data source: {self.data}')
|
|
LOGGER.debug(f'Name: {self.name}')
|
|
LOGGER.debug(f'ID_field: {self.id_field}')
|
|
LOGGER.debug(f'Table: {self.table}')
|
|
|
|
self.cursor = self.__load()
|
|
|
|
LOGGER.debug('Got cursor from DB')
|
|
LOGGER.debug('Get available fields/properties')
|
|
|
|
self.get_fields()
|
|
|
|
def get_fields(self):
|
|
"""
|
|
Get fields from sqlite table (columns are field)
|
|
|
|
:returns: dict of fields
|
|
"""
|
|
|
|
if not self.fields:
|
|
results = self.cursor.execute(
|
|
f'PRAGMA table_info({self.table})').fetchall()
|
|
for item in results:
|
|
json_type = None
|
|
|
|
if item['type'] in ['INTEGER', 'REAL']:
|
|
json_type = 'number'
|
|
elif item['type'].startswith('TEXT') or item['type'] == 'BLOB':
|
|
json_type = 'string'
|
|
|
|
if json_type is not None:
|
|
self.fields[item['name']] = {'type': json_type}
|
|
|
|
return self.fields
|
|
|
|
def __get_where_clauses(self, properties=[], bbox=[]):
|
|
"""
|
|
Generarates WHERE conditions to be implemented in query.
|
|
Private method mainly associated with query method.
|
|
|
|
Method returns part of the SQL query, plus tupple to be used
|
|
in the sqlite query method
|
|
|
|
:param properties: list of tuples (name, value)
|
|
:param bbox: bounding box [minx,miny,maxx,maxy]
|
|
|
|
:returns: str, tuple
|
|
"""
|
|
|
|
where_values = tuple()
|
|
where_clause = " WHERE " if (properties or bbox) else ""
|
|
if not where_clause:
|
|
return where_clause, where_values
|
|
|
|
if properties:
|
|
where_clause += " AND ".join(
|
|
[f"{k}=?" for k, v in properties])
|
|
where_values += where_values + tuple((v for k, v in properties))
|
|
|
|
if bbox:
|
|
if properties:
|
|
where_clause += " AND "
|
|
where_clause += f" Intersects({self.geom_col}, BuildMbr(?,?,?,?)) "
|
|
where_values += tuple(bbox)
|
|
# WHERE continent=? <class 'tuple'>: ('Europe',)
|
|
return where_clause, where_values
|
|
|
|
def __response_feature(self, row_data, skip_geometry=False):
|
|
"""
|
|
Assembles GeoJSON output from DB query
|
|
|
|
:param row_data: DB row result
|
|
:param skip_geometry: whether to skip geometry (default False)
|
|
|
|
:returns: `dict` of GeoJSON Feature
|
|
"""
|
|
|
|
if row_data:
|
|
rd = dict(row_data) # sqlite3.Row is doesnt support pop
|
|
feature = {
|
|
'type': 'Feature',
|
|
'geometry': None
|
|
}
|
|
|
|
try:
|
|
if not skip_geometry:
|
|
feature['geometry'] = json.loads(
|
|
rd.pop(f'AsGeoJSON({self.geom_col})')
|
|
)
|
|
except TypeError:
|
|
LOGGER.warning('Missing geometry')
|
|
|
|
feature['properties'] = rd
|
|
feature['id'] = feature['properties'].pop(self.id_field)
|
|
|
|
return feature
|
|
else:
|
|
return None
|
|
|
|
def __response_feature_hits(self, hits):
|
|
"""Assembles GeoJSON/Feature number
|
|
|
|
:returns: GeoJSON FeaturesCollection
|
|
"""
|
|
|
|
feature_collection = {"features": [],
|
|
"type": "FeatureCollection"}
|
|
feature_collection['numberMatched'] = hits
|
|
|
|
return feature_collection
|
|
|
|
def __load(self):
|
|
"""
|
|
Private method for loading spatiallite,
|
|
get the table structure and dump geometry
|
|
|
|
:returns: sqlite3.Cursor
|
|
"""
|
|
|
|
if (os.path.exists(self.data)):
|
|
conn = sqlite3.connect(self.data)
|
|
else:
|
|
LOGGER.error('Path to sqlite does not exist')
|
|
raise InvalidPluginError()
|
|
|
|
try:
|
|
conn.enable_load_extension(True)
|
|
except AttributeError as err:
|
|
LOGGER.error(f'Extension loading not enabled: {err}')
|
|
raise ProviderConnectionError()
|
|
|
|
conn.row_factory = sqlite3.Row
|
|
conn.enable_load_extension(True)
|
|
# conn.set_trace_callback(LOGGER.debug)
|
|
cursor = conn.cursor()
|
|
try:
|
|
cursor.execute(f"SELECT load_extension('{SPATIALITE_EXTENSION}')")
|
|
except sqlite3.OperationalError as err:
|
|
LOGGER.error(f'Extension loading error: {err}')
|
|
raise ProviderConnectionError()
|
|
result = cursor.fetchall()
|
|
|
|
# Checking for geopackage
|
|
cursor.execute("PRAGMA application_id")
|
|
result = cursor.fetchone()
|
|
|
|
self.application_id = result["application_id"]
|
|
if self.application_id == 1196444487:
|
|
LOGGER.info("Detected GPKG 1.2 and greater")
|
|
elif self.application_id == 1196437808:
|
|
LOGGER.info("Detected GPKG 1.0 or 1.1")
|
|
else:
|
|
LOGGER.info("No GPKG detected assuming spatial sqlite3")
|
|
self.application_id = 0
|
|
|
|
if self.application_id:
|
|
geometry_columns_table = 'gpkg_geometry_columns'
|
|
geometry_columns_table_name = 'table_name'
|
|
geometry_columns_column_name = 'column_name'
|
|
cursor.execute("SELECT AutoGPKGStart()")
|
|
result = cursor.fetchall()
|
|
if result[0][0] >= 1:
|
|
LOGGER.info("Loaded Geopackage support")
|
|
else:
|
|
LOGGER.info("SELECT AutoGPKGStart() returned 0." +
|
|
"Detected GPKG but couldn't load support")
|
|
raise InvalidPluginError()
|
|
else:
|
|
geometry_columns_table = 'geometry_columns'
|
|
geometry_columns_column_name = 'f_geometry_column'
|
|
geometry_columns_table_name = 'f_table_name'
|
|
|
|
try:
|
|
cursor.execute(f'PRAGMA table_info({self.table})')
|
|
result = cursor.fetchall()
|
|
except sqlite3.OperationalError:
|
|
LOGGER.error(f'Could not find table: {self.table}')
|
|
raise ProviderConnectionError()
|
|
|
|
LOGGER.debug('Determining name of geometry column')
|
|
cursor.execute(f"SELECT {geometry_columns_column_name} FROM {geometry_columns_table} WHERE {geometry_columns_table_name} = '{self.table}'") # noqa
|
|
geometry_column = cursor.fetchall()
|
|
|
|
if geometry_column:
|
|
LOGGER.debug("Found geometry column")
|
|
self.geom_col = geometry_column[0][0]
|
|
else:
|
|
msg = 'No geometry column found'
|
|
LOGGER.error(msg)
|
|
raise ProviderConnectionError(msg)
|
|
|
|
try:
|
|
assert len(result), 'Table not found'
|
|
assert len([item for item in result
|
|
if self.id_field in item]), 'id_field not present'
|
|
except AssertionError:
|
|
raise InvalidPluginError()
|
|
|
|
self.columns = [item[1] for item in result if item[1]
|
|
not in [self.geom_col, self.geom_col.upper()]]
|
|
self.columns = ','.join(self.columns)+f',AsGeoJSON({self.geom_col})'
|
|
|
|
if self.application_id:
|
|
self.table = f"vgpkg_{self.table}"
|
|
|
|
return cursor
|
|
|
|
@crs_transform
|
|
def query(self, offset=0, limit=10, resulttype='results',
|
|
bbox=[], datetime_=None, properties=[], sortby=[],
|
|
select_properties=[], skip_geometry=False, q=None, **kwargs):
|
|
"""
|
|
Query SQLite/GPKG for all the content.
|
|
e,g: http://localhost:5000/collections/countries/items?
|
|
limit=5&offset=2&resulttype=results&continent=Europe&admin=Albania&bbox=29.3373,-3.4099,29.3761,-3.3924
|
|
http://localhost:5000/collections/countries/items?continent=Africa&bbox=29.3373,-3.4099,29.3761,-3.3924
|
|
|
|
: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: GeoJSON FeaturesCollection
|
|
"""
|
|
LOGGER.debug('Querying SQLite/GPKG')
|
|
|
|
where_clause, where_values = self.__get_where_clauses(
|
|
properties=properties, bbox=bbox)
|
|
|
|
if resulttype == 'hits':
|
|
|
|
sql_query = f"SELECT COUNT(*) as hits FROM {self.table} {where_clause} " # noqa
|
|
|
|
res = self.cursor.execute(sql_query, where_values)
|
|
|
|
hits = res.fetchone()["hits"]
|
|
return self.__response_feature_hits(hits)
|
|
|
|
sql_query = f"SELECT DISTINCT {self.columns} from \
|
|
{self.table} {where_clause} limit ? offset ?"
|
|
|
|
end_index = offset + limit
|
|
|
|
LOGGER.debug(f'SQL Query: {sql_query}')
|
|
LOGGER.debug(f'Start Index: {offset}')
|
|
LOGGER.debug(f'End Index: {end_index}')
|
|
|
|
row_data = self.cursor.execute(
|
|
sql_query, where_values + (limit, offset))
|
|
|
|
feature_collection = {
|
|
'type': 'FeatureCollection',
|
|
'features': []
|
|
}
|
|
|
|
for rd in row_data:
|
|
feature_collection['features'].append(
|
|
self.__response_feature(rd, skip_geometry=skip_geometry))
|
|
|
|
return feature_collection
|
|
|
|
@crs_transform
|
|
def get(self, identifier, **kwargs):
|
|
"""
|
|
Query the provider for a specific
|
|
feature id e.g: /collections/countries/items/1
|
|
|
|
:param identifier: feature id
|
|
|
|
:returns: dict of single GeoJSON feature
|
|
"""
|
|
|
|
LOGGER.debug('Get item from SQLite/GPKG')
|
|
|
|
sql_query = f'SELECT {self.columns} FROM \
|
|
{self.table} WHERE {self.id_field}==?;'
|
|
|
|
LOGGER.debug(f'SQL Query: {sql_query}')
|
|
LOGGER.debug(f'Identifier: {identifier}')
|
|
|
|
row_data = self.cursor.execute(sql_query, (identifier, )).fetchone()
|
|
|
|
feature = self.__response_feature(row_data)
|
|
if feature:
|
|
return feature
|
|
else:
|
|
err = f'item {identifier} not found'
|
|
LOGGER.error(err)
|
|
raise ProviderItemNotFoundError(err)
|
|
|
|
def __repr__(self):
|
|
return f'<SQLiteGPKGProvider> {self.data}, {self.table}'
|