diff --git a/Dockerfile b/Dockerfile index 04f1a20db..eb72fa3f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ # # Copyright (c) 2020 Tom Kralidis # Copyright (c) 2019 Just van den Broecke -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2024 Angelos Tzotsos # Copyright (c) 2023 Bernhard Mallinger # @@ -134,12 +134,11 @@ RUN python3 -m pip install --no-cache-dir -r requirements-docker.txt \ ADD . /pygeoapi # Install pygeoapi -RUN python3 -m pip install --no-cache-dir -e . +RUN python3 -m pip install --no-cache-dir -e . -RUN \ +RUN \ # Set default config and entrypoint for Docker Image cp /pygeoapi/docker/default.config.yml /pygeoapi/local.config.yml \ - && cp /pygeoapi/docker/entrypoint.sh /entrypoint.sh + && cp /pygeoapi/docker/entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] - diff --git a/docker/default.config.yml b/docker/default.config.yml index d75298f9f..5d962c608 100644 --- a/docker/default.config.yml +++ b/docker/default.config.yml @@ -6,7 +6,7 @@ # # Copyright (c) 2019 Just van den Broecke # Copyright (c) 2020 Tom Kralidis -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation @@ -218,18 +218,18 @@ resources: # target_srs: EPSG:4326 source_capabilities: paging: True - + source_options: # OGR_WFS_VERSION: 1.1.0 OGR_WFS_LOAD_MULTIPLE_LAYER_DEFN: NO - + gdal_ogr_options: EMPTY_AS_NULL: NO GDAL_CACHEMAX: 64 # GDAL_HTTP_PROXY: (optional proxy) # GDAL_PROXY_AUTH: (optional auth for remote WFS) CPL_DEBUG: NO - + crs: - http://www.opengis.net/def/crs/EPSG/0/4258 - http://www.opengis.net/def/crs/EPSG/0/28992 @@ -269,18 +269,18 @@ resources: # target_srs: EPSG:4326 source_capabilities: paging: True - + source_options: # OGR_WFS_VERSION: 2.0.0 OGR_WFS_LOAD_MULTIPLE_LAYER_DEFN: NO - + gdal_ogr_options: EMPTY_AS_NULL: NO GDAL_CACHEMAX: 64 # GDAL_HTTP_PROXY: (optional proxy) # GDAL_PROXY_AUTH: (optional auth for remote WFS) CPL_DEBUG: NO - + crs: - http://www.opengis.net/def/crs/EPSG/0/4258 - http://www.opengis.net/def/crs/EPSG/0/26912 @@ -319,18 +319,18 @@ resources: # target_srs: EPSG:4326 source_capabilities: paging: True - + source_options: # OGR_WFS_VERSION: 1.1.0 OGR_WFS_LOAD_MULTIPLE_LAYER_DEFN: NO - + gdal_ogr_options: EMPTY_AS_NULL: NO GDAL_CACHEMAX: 64 # GDAL_HTTP_PROXY: (optional proxy) # GDAL_PROXY_AUTH: (optional auth for remote WFS) CPL_DEBUG: NO - + crs: - http://www.opengis.net/def/crs/EPSG/0/4258 - http://www.opengis.net/def/crs/EPSG/0/32632 @@ -374,14 +374,14 @@ resources: # target_srs: EPSG:4326 source_capabilities: paging: True - + gdal_ogr_options: EMPTY_AS_NULL: NO GDAL_CACHEMAX: 64 # GDAL_HTTP_PROXY: (optional proxy) # GDAL_PROXY_AUTH: (optional auth for remote WFS) CPL_DEBUG: NO - + id_field: osm_id layer: poi_portugal @@ -414,14 +414,14 @@ resources: # target_srs: EPSG:4326 source_capabilities: paging: True - + gdal_ogr_options: EMPTY_AS_NULL: NO GDAL_CACHEMAX: 64 # GDAL_HTTP_PROXY: (optional proxy) # GDAL_PROXY_AUTH: (optional auth for remote WFS) CPL_DEBUG: NO - + id_field: id layer: ne_110m_lakes @@ -457,14 +457,14 @@ resources: # target_srs: EPSG:4326 source_capabilities: paging: True - + gdal_ogr_options: EMPTY_AS_NULL: NO GDAL_CACHEMAX: 64 # GDAL_HTTP_PROXY: (optional proxy) # GDAL_PROXY_AUTH: (optional auth for remote WFS) CPL_DEBUG: NO - + id_field: id layer: ogrgeojson @@ -499,14 +499,14 @@ resources: # target_srs: EPSG:4326 source_capabilities: paging: True - + gdal_ogr_options: EMPTY_AS_NULL: NO GDAL_CACHEMAX: 64 # GDAL_HTTP_PROXY: (optional proxy) # GDAL_PROXY_AUTH: (optional auth for remote WFS) CPL_DEBUG: NO - + id_field: id layer: OGRGeoJSON diff --git a/pygeoapi/api/__init__.py b/pygeoapi/api/__init__.py index aaf2584ab..f96220080 100644 --- a/pygeoapi/api/__init__.py +++ b/pygeoapi/api/__init__.py @@ -8,7 +8,7 @@ # Ricardo Garcia Silva # # Copyright (c) 2025 Tom Kralidis -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 John A Stevenson and Colin Blackburn # Copyright (c) 2023 Ricardo Garcia Silva # @@ -212,6 +212,7 @@ def example_method(api: API, request: APIRequest, custom_arg): :param request: The web platform specific Request instance. :param supported_locales: List or set of supported Locale instances. """ + def __init__(self, request, supported_locales): # Set default request data self._data = b'' @@ -336,7 +337,7 @@ def _get_format(self, headers) -> Union[str, None]: # Format not specified: get from Accept headers (MIME types) # e.g. format_ = 'text/html' - h = headers.get('accept', headers.get('Accept', '')).strip() # noqa + h = headers.get('accept', headers.get('Accept', '')).strip() # noqa (fmts, mimes) = zip(*FORMAT_TYPES.items()) # basic support for complex types (i.e. with "q=0.x") for type_ in (t.split(';')[0].strip() for t in h.split(',') if t): @@ -1134,10 +1135,10 @@ def describe_collections(api: API, request: APIRequest, # OAPIF Part 2 - list supported CRSs and StorageCRS if collection_data_type in ['edr', 'feature']: - collection['crs'] = get_supported_crs_list(collection_data, DEFAULT_CRS_LIST) # noqa - collection['storageCRS'] = collection_data.get('storage_crs', DEFAULT_STORAGE_CRS) # noqa + collection['crs'] = get_supported_crs_list(collection_data, DEFAULT_CRS_LIST) # noqa + collection['storageCRS'] = collection_data.get('storage_crs', DEFAULT_STORAGE_CRS) # noqa if 'storage_crs_coordinate_epoch' in collection_data: - collection['storageCrsCoordinateEpoch'] = collection_data.get('storage_crs_coordinate_epoch') # noqa + collection['storageCrsCoordinateEpoch'] = collection_data.get('storage_crs_coordinate_epoch') # noqa elif collection_data_type == 'coverage': # TODO: translate @@ -1176,7 +1177,7 @@ def describe_collections(api: API, request: APIRequest, collection['extent']['spatial']['grid'] = [{ 'cellsCount': p._coverage_properties['width'], 'resolution': p._coverage_properties['resx'] - }, { + }, { 'cellsCount': p._coverage_properties['height'], 'resolution': p._coverage_properties['resy'] }] diff --git a/pygeoapi/api/coverages.py b/pygeoapi/api/coverages.py index c6687042c..65f57f450 100644 --- a/pygeoapi/api/coverages.py +++ b/pygeoapi/api/coverages.py @@ -9,7 +9,7 @@ # Bernhard Mallinger # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 John A Stevenson and Colin Blackburn # Copyright (c) 2023 Ricardo Garcia Silva # Copyright (c) 2024 Bernhard Mallinger @@ -161,8 +161,8 @@ def get_collection_coverage( except (AttributeError, ValueError) as err: msg = f'Invalid subset: {err}' return api.get_exception( - HTTPStatus.BAD_REQUEST, headers, format_, - 'InvalidParameterValue', msg) + HTTPStatus.BAD_REQUEST, headers, format_, + 'InvalidParameterValue', msg) if not set(subsets.keys()).issubset(p.axes): msg = 'Invalid axis name' diff --git a/pygeoapi/api/environmental_data_retrieval.py b/pygeoapi/api/environmental_data_retrieval.py index e78170368..b1642d02c 100644 --- a/pygeoapi/api/environmental_data_retrieval.py +++ b/pygeoapi/api/environmental_data_retrieval.py @@ -9,7 +9,7 @@ # Bernhard Mallinger # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 John A Stevenson and Colin Blackburn # Copyright (c) 2023 Ricardo Garcia Silva # Copyright (c) 2024 Bernhard Mallinger @@ -148,7 +148,7 @@ def get_collection_edr_instances(api: API, request: APIRequest, dataset, 'href': f'{uri}/instances/{instance}/{qt}', 'rel': 'data', 'title': f'{qt} query' - } + } } instance_dict['data_queries'][qt] = data_query @@ -166,7 +166,7 @@ def get_collection_edr_instances(api: API, request: APIRequest, dataset, 'href': f'{links_uri}?f={F_JSON}', 'rel': request.get_linkrel(F_JSON), 'type': 'application/json' - }, { + }, { 'href': f'{links_uri}?f={F_HTML}', 'rel': request.get_linkrel(F_HTML), 'type': 'text/html' diff --git a/pygeoapi/api/itemtypes.py b/pygeoapi/api/itemtypes.py index 1dba3df92..1aa373888 100644 --- a/pygeoapi/api/itemtypes.py +++ b/pygeoapi/api/itemtypes.py @@ -8,7 +8,7 @@ # Ricardo Garcia Silva # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 John A Stevenson and Colin Blackburn # Copyright (c) 2023 Ricardo Garcia Silva # @@ -352,7 +352,7 @@ def get_collection_items( HTTPStatus.BAD_REQUEST, headers, request.format, 'NoApplicableCode', msg) - supported_crs_list = get_supported_crs_list(provider_def, DEFAULT_CRS_LIST) # noqa + supported_crs_list = get_supported_crs_list(provider_def, DEFAULT_CRS_LIST) # noqa if bbox_crs not in supported_crs_list: msg = f'bbox-crs {bbox_crs} not supported for this collection' return api.get_exception( @@ -367,7 +367,7 @@ def get_collection_items( if len(bbox) > 0: try: # Get a pyproj CRS instance for the Collection's Storage CRS - storage_crs = provider_def.get('storage_crs', DEFAULT_STORAGE_CRS) # noqa + storage_crs = provider_def.get('storage_crs', DEFAULT_STORAGE_CRS) # noqa # Do the (optional) Transform to the Storage CRS bbox = transform_bbox(bbox, bbox_crs, storage_crs) @@ -621,8 +621,8 @@ def get_collection_items( data=content, options={ 'provider_def': get_provider_by_type( - collections[dataset]['providers'], - 'feature') + collections[dataset]['providers'], + 'feature') } ) except FormatterSerializationError: diff --git a/pygeoapi/api/maps.py b/pygeoapi/api/maps.py index 036892fe2..728177f52 100644 --- a/pygeoapi/api/maps.py +++ b/pygeoapi/api/maps.py @@ -9,7 +9,7 @@ # Bernhard Mallinger # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 John A Stevenson and Colin Blackburn # Copyright (c) 2023 Ricardo Garcia Silva # Copyright (c) 2024 Bernhard Mallinger diff --git a/pygeoapi/api/processes.py b/pygeoapi/api/processes.py index dcf99d541..f6a1d177f 100644 --- a/pygeoapi/api/processes.py +++ b/pygeoapi/api/processes.py @@ -10,7 +10,7 @@ # Francesco Martinelli # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 John A Stevenson and Colin Blackburn # Copyright (c) 2023 Ricardo Garcia Silva # Copyright (c) 2024 Bernhard Mallinger @@ -65,7 +65,7 @@ LOGGER = logging.getLogger(__name__) CONFORMANCE_CLASSES = [ - 'http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/ogc-process-description', # noqa + 'http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/ogc-process-description', # noqa 'http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/core', 'http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/json', 'http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/oas30', diff --git a/pygeoapi/api/stac.py b/pygeoapi/api/stac.py index 716862fc8..a60541055 100644 --- a/pygeoapi/api/stac.py +++ b/pygeoapi/api/stac.py @@ -9,7 +9,7 @@ # Bernhard Mallinger # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 John A Stevenson and Colin Blackburn # Copyright (c) 2023 Ricardo Garcia Silva # Copyright (c) 2024 Bernhard Mallinger diff --git a/pygeoapi/api/tiles.py b/pygeoapi/api/tiles.py index 3a02db3d4..6c456fe0e 100644 --- a/pygeoapi/api/tiles.py +++ b/pygeoapi/api/tiles.py @@ -9,7 +9,7 @@ # Bernhard Mallinger # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 John A Stevenson and Colin Blackburn # Copyright (c) 2023 Ricardo Garcia Silva # Copyright (c) 2024 Bernhard Mallinger @@ -96,7 +96,7 @@ def get_collection_tiles(api: API, request: APIRequest, LOGGER.debug('Loading provider') try: t = get_provider_by_type( - api.config['resources'][dataset]['providers'], 'tile') + api.config['resources'][dataset]['providers'], 'tile') p = load_plugin('provider', t) except (KeyError, ProviderTypeError): msg = 'Invalid collection tiles' @@ -363,14 +363,14 @@ def tilematrixsets(api: API, { "rel": "self", "type": "text/html", - "title": f"The HTML representation of the {e.tileMatrixSet} tile matrix set", # noqa - "href": f"{api.base_url}/TileMatrixSets/{e.tileMatrixSet}?f=html" # noqa + "title": f"The HTML representation of the {e.tileMatrixSet} tile matrix set", # noqa + "href": f"{api.base_url}/TileMatrixSets/{e.tileMatrixSet}?f=html" # noqa }, { "rel": "self", "type": "application/json", - "title": f"The JSON representation of the {e.tileMatrixSet} tile matrix set", # noqa - "href": f"{api.base_url}/TileMatrixSets/{e.tileMatrixSet}?f=json" # noqa + "title": f"The JSON representation of the {e.tileMatrixSet} tile matrix set", # noqa + "href": f"{api.base_url}/TileMatrixSets/{e.tileMatrixSet}?f=json" # noqa } ] }) @@ -505,7 +505,7 @@ def get_oas_30(cfg: dict, locale: str) -> tuple[list[dict[str, str]], dict[str, 'tags': [k], 'operationId': f'get{k.capitalize()}.collection.{datatype}.getTile', # noqa 'parameters': [ - {'$ref': f"{OPENAPI_YAML['oapit']}#/components/parameters/tileMatrixSetId"}, # noqa + {'$ref': f"{OPENAPI_YAML['oapit']}#/components/parameters/tileMatrixSetId"}, # noqa {'$ref': f"{OPENAPI_YAML['oapit']}#/components/parameters/tileMatrix"}, # noqa {'$ref': f"{OPENAPI_YAML['oapit']}#/components/parameters/tileRow"}, # noqa {'$ref': f"{OPENAPI_YAML['oapit']}#/components/parameters/tileCol"}, # noqa diff --git a/pygeoapi/config.py b/pygeoapi/config.py index d1bf5c390..7b4ee9203 100644 --- a/pygeoapi/config.py +++ b/pygeoapi/config.py @@ -4,7 +4,7 @@ # Francesco Bartoli # # Copyright (c) 2022 Tom Kralidis -# Copyright (c) 2024 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation diff --git a/pygeoapi/django_/settings.py b/pygeoapi/django_/settings.py index fb0807236..9a74fef90 100644 --- a/pygeoapi/django_/settings.py +++ b/pygeoapi/django_/settings.py @@ -5,7 +5,7 @@ # Krishna Lodha # Tom Kralidis # -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Luca Delucchi # Copyright (c) 2022 Krishna Lodha # Copyright (c) 2022 Tom Kralidis diff --git a/pygeoapi/django_/urls.py b/pygeoapi/django_/urls.py index 5736b2dea..414925084 100644 --- a/pygeoapi/django_/urls.py +++ b/pygeoapi/django_/urls.py @@ -5,7 +5,7 @@ # Krishna Lodha # Tom Kralidis # -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Luca Delucchi # Copyright (c) 2022 Krishna Lodha # Copyright (c) 2024 Tom Kralidis diff --git a/pygeoapi/django_/views.py b/pygeoapi/django_/views.py index 682ef51ce..ac532ce33 100644 --- a/pygeoapi/django_/views.py +++ b/pygeoapi/django_/views.py @@ -5,7 +5,7 @@ # Krishna Lodha # Tom Kralidis # -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Luca Delucchi # Copyright (c) 2022 Krishna Lodha # Copyright (c) 2025 Tom Kralidis diff --git a/pygeoapi/django_/wsgi.py b/pygeoapi/django_/wsgi.py index 0e69bdf88..6ef279155 100644 --- a/pygeoapi/django_/wsgi.py +++ b/pygeoapi/django_/wsgi.py @@ -5,7 +5,7 @@ # Krishna Lodha # Tom Kralidis # -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Luca Delucchi # Copyright (c) 2022 Krishna Lodha # Copyright (c) 2022 Tom Kralidis diff --git a/pygeoapi/django_app.py b/pygeoapi/django_app.py index 57d601b26..59a1cf3f8 100644 --- a/pygeoapi/django_app.py +++ b/pygeoapi/django_app.py @@ -5,7 +5,7 @@ # Krishna Lodha # Tom Kralidis # -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Luca Delucchi # Copyright (c) 2022 Krishna Lodha # Copyright (c) 2022 Tom Kralidis diff --git a/pygeoapi/models/__init__.py b/pygeoapi/models/__init__.py index ac25c7c7d..db49532fc 100644 --- a/pygeoapi/models/__init__.py +++ b/pygeoapi/models/__init__.py @@ -2,7 +2,7 @@ # # Authors: Francesco Bartoli # -# Copyright (c) 2021 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation diff --git a/pygeoapi/models/config.py b/pygeoapi/models/config.py index 2aa6717b7..162185298 100644 --- a/pygeoapi/models/config.py +++ b/pygeoapi/models/config.py @@ -6,7 +6,7 @@ # Francesco Bartoli # # Copyright (c) 2023 Sander Schaminee -# Copyright (c) 2024 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation @@ -36,7 +36,7 @@ class APIRules(BaseModel): """ Pydantic model for API design rules that must be adhered to. """ - api_version: str = Field(regex=r'^\d+\.\d+\..+$', + api_version: str = Field(pattern=r'^\d+\.\d+\..+$', description="Semantic API version number.") url_prefix: str = Field( "", @@ -62,11 +62,11 @@ def create(**rules_config) -> 'APIRules': """ Returns a new APIRules instance for the current API version and configured rules. """ obj = { - k: v for k, v in rules_config.items() if k in APIRules.__fields__ + k: v for k, v in rules_config.items() if k in APIRules.model_fields } # Validation will fail if required `api_version` is missing # or if `api_version` is not a semantic version number - return APIRules.parse_obj(obj) + return APIRules.model_validate(obj) @property def response_headers(self) -> dict: diff --git a/pygeoapi/models/openapi.py b/pygeoapi/models/openapi.py index d07923612..35549493b 100644 --- a/pygeoapi/models/openapi.py +++ b/pygeoapi/models/openapi.py @@ -4,7 +4,7 @@ # # Authors: Francesco Bartoli # -# Copyright (c) 2024 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation @@ -40,4 +40,4 @@ class SupportedFormats(Enum): class OAPIFormat(BaseModel): - __root__: SupportedFormats = SupportedFormats.YAML + root: SupportedFormats = SupportedFormats.YAML diff --git a/pygeoapi/models/provider/base.py b/pygeoapi/models/provider/base.py index 844590ee4..bc0fc066a 100644 --- a/pygeoapi/models/provider/base.py +++ b/pygeoapi/models/provider/base.py @@ -6,7 +6,7 @@ # Francesco Bartoli # # Copyright (c) 2022 Antonio Cerciello -# Copyright (c) 2023 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation @@ -79,15 +79,16 @@ class TileMatrixSetEnumType(BaseModel): wellKnownScaleSet: str tileMatrices: List[dict] + class TileMatrixSetEnum(Enum): WORLDCRS84QUAD = TileMatrixSetEnumType( tileMatrixSet="WorldCRS84Quad", tileMatrixSetURI="http://www.opengis.net/def/tilematrixset/OGC/1.0/WorldCRS84Quad", # noqa crs="http://www.opengis.net/def/crs/OGC/1.3/CRS84", title="World Mercator WGS84 (ellipsoid)", - orderedAxes = ["Lon", "Lat"], - wellKnownScaleSet = "http://www.opengis.net/def/wkss/OGC/1.0/GoogleCRS84Quad", - tileMatrices = [ + orderedAxes=["Lon", "Lat"], + wellKnownScaleSet="http://www.opengis.net/def/wkss/OGC/1.0/GoogleCRS84Quad", + tileMatrices=[ { "id": "0", "scaleDenominator": 279541132.0143588781357, @@ -429,334 +430,334 @@ class TileMatrixSetEnum(Enum): wellKnownScaleSet="http://www.opengis.net/def/wkss/OGC/1.0/GoogleMapsCompatible", tileMatrices=[ { - "id" : "0", - "scaleDenominator" : 559082264.0287177562714, - "cellSize" : 156543.033928040968, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 1, - "matrixHeight" : 1, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "0", + "scaleDenominator": 559082264.0287177562714, + "cellSize": 156543.033928040968, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 1, + "matrixHeight": 1, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "1", - "scaleDenominator" : 279541132.0143588781357, - "cellSize" : 78271.516964020484, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 2, - "matrixHeight" : 2, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "1", + "scaleDenominator": 279541132.0143588781357, + "cellSize": 78271.516964020484, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 2, + "matrixHeight": 2, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "2", - "scaleDenominator" : 139770566.0071794390678, - "cellSize" : 39135.758482010242, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 4, - "matrixHeight" : 4, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "2", + "scaleDenominator": 139770566.0071794390678, + "cellSize": 39135.758482010242, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 4, + "matrixHeight": 4, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "3", - "scaleDenominator" : 69885283.0035897195339, - "cellSize" : 19567.879241005121, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 8, - "matrixHeight" : 8, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "3", + "scaleDenominator": 69885283.0035897195339, + "cellSize": 19567.879241005121, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 8, + "matrixHeight": 8, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "4", - "scaleDenominator" : 34942641.501794859767, - "cellSize" : 9783.9396205025605, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 16, - "matrixHeight" : 16, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "4", + "scaleDenominator": 34942641.501794859767, + "cellSize": 9783.9396205025605, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 16, + "matrixHeight": 16, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "5", - "scaleDenominator" : 17471320.7508974298835, - "cellSize" : 4891.9698102512803, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 32, - "matrixHeight" : 32, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "5", + "scaleDenominator": 17471320.7508974298835, + "cellSize": 4891.9698102512803, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 32, + "matrixHeight": 32, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "6", - "scaleDenominator" : 8735660.3754487149417, - "cellSize" : 2445.9849051256401, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 64, - "matrixHeight" : 64, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "6", + "scaleDenominator": 8735660.3754487149417, + "cellSize": 2445.9849051256401, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 64, + "matrixHeight": 64, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "7", - "scaleDenominator" : 4367830.1877243574709, - "cellSize" : 1222.9924525628201, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 128, - "matrixHeight" : 128, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "7", + "scaleDenominator": 4367830.1877243574709, + "cellSize": 1222.9924525628201, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 128, + "matrixHeight": 128, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "8", - "scaleDenominator" : 2183915.0938621787354, - "cellSize" : 611.49622628141, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 256, - "matrixHeight" : 256, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "8", + "scaleDenominator": 2183915.0938621787354, + "cellSize": 611.49622628141, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 256, + "matrixHeight": 256, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "9", - "scaleDenominator" : 1091957.5469310893677, - "cellSize" : 305.748113140705, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 512, - "matrixHeight" : 512, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "9", + "scaleDenominator": 1091957.5469310893677, + "cellSize": 305.748113140705, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 512, + "matrixHeight": 512, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "10", - "scaleDenominator" : 545978.7734655446839, - "cellSize" : 152.8740565703525, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 1024, - "matrixHeight" : 1024, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "10", + "scaleDenominator": 545978.7734655446839, + "cellSize": 152.8740565703525, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 1024, + "matrixHeight": 1024, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "11", - "scaleDenominator" : 272989.3867327723419, - "cellSize" : 76.4370282851763, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 2048, - "matrixHeight" : 2048, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "11", + "scaleDenominator": 272989.3867327723419, + "cellSize": 76.4370282851763, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 2048, + "matrixHeight": 2048, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "12", - "scaleDenominator" : 136494.693366386171, - "cellSize" : 38.2185141425881, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 4096, - "matrixHeight" : 4096, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "12", + "scaleDenominator": 136494.693366386171, + "cellSize": 38.2185141425881, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 4096, + "matrixHeight": 4096, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "13", - "scaleDenominator" : 68247.3466831930855, - "cellSize" : 19.1092570712941, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 8192, - "matrixHeight" : 8192, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "13", + "scaleDenominator": 68247.3466831930855, + "cellSize": 19.1092570712941, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 8192, + "matrixHeight": 8192, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "14", - "scaleDenominator" : 34123.6733415965427, - "cellSize" : 9.554628535647, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 16384, - "matrixHeight" : 16384, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "14", + "scaleDenominator": 34123.6733415965427, + "cellSize": 9.554628535647, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 16384, + "matrixHeight": 16384, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "15", - "scaleDenominator" : 17061.8366707982714, - "cellSize" : 4.7773142678235, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 32768, - "matrixHeight" : 32768, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "15", + "scaleDenominator": 17061.8366707982714, + "cellSize": 4.7773142678235, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 32768, + "matrixHeight": 32768, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "16", - "scaleDenominator" : 8530.9183353991357, - "cellSize" : 2.3886571339118, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 65536, - "matrixHeight" : 65536, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "16", + "scaleDenominator": 8530.9183353991357, + "cellSize": 2.3886571339118, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 65536, + "matrixHeight": 65536, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "17", - "scaleDenominator" : 4265.4591676995678, - "cellSize" : 1.1943285669559, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 131072, - "matrixHeight" : 131072, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "17", + "scaleDenominator": 4265.4591676995678, + "cellSize": 1.1943285669559, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 131072, + "matrixHeight": 131072, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "18", - "scaleDenominator" : 2132.7295838497839, - "cellSize" : 0.5971642834779, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 262144, - "matrixHeight" : 262144, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "18", + "scaleDenominator": 2132.7295838497839, + "cellSize": 0.5971642834779, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 262144, + "matrixHeight": 262144, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "19", - "scaleDenominator" : 1066.364791924892, - "cellSize" : 0.298582141739, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 524288, - "matrixHeight" : 524288, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "19", + "scaleDenominator": 1066.364791924892, + "cellSize": 0.298582141739, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 524288, + "matrixHeight": 524288, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "20", - "scaleDenominator" : 533.182395962446, - "cellSize" : 0.1492910708695, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 1048576, - "matrixHeight" : 1048576, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "20", + "scaleDenominator": 533.182395962446, + "cellSize": 0.1492910708695, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 1048576, + "matrixHeight": 1048576, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "21", - "scaleDenominator" : 266.591197981223, - "cellSize" : 0.0746455354347, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 2097152, - "matrixHeight" : 2097152, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "21", + "scaleDenominator": 266.591197981223, + "cellSize": 0.0746455354347, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 2097152, + "matrixHeight": 2097152, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "22", - "scaleDenominator" : 133.2955989906115, - "cellSize" : 0.0373227677174, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 4194304, - "matrixHeight" : 4194304, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "22", + "scaleDenominator": 133.2955989906115, + "cellSize": 0.0373227677174, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 4194304, + "matrixHeight": 4194304, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "23", - "scaleDenominator" : 66.6477994953057, - "cellSize" : 0.0186613838587, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 8388608, - "matrixHeight" : 8388608, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "23", + "scaleDenominator": 66.6477994953057, + "cellSize": 0.0186613838587, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 8388608, + "matrixHeight": 8388608, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "24", - "scaleDenominator" : 33.3238997476529, - "cellSize" : 0.0093306919293, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 16777216, - "matrixHeight" : 16777216, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "24", + "scaleDenominator": 33.3238997476529, + "cellSize": 0.0093306919293, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 16777216, + "matrixHeight": 16777216, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "25", - "scaleDenominator" : 16.6619498738264, - "cellSize" : 0.0046653459647, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 33554432, - "matrixHeight" : 33554432, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "25", + "scaleDenominator": 16.6619498738264, + "cellSize": 0.0046653459647, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 33554432, + "matrixHeight": 33554432, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "26", - "scaleDenominator" : 8.3309749369132, - "cellSize" : 0.0023326729823, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 67108864, - "matrixHeight" : 67108864, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "26", + "scaleDenominator": 8.3309749369132, + "cellSize": 0.0023326729823, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 67108864, + "matrixHeight": 67108864, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "27", - "scaleDenominator" : 4.1654874684566, - "cellSize" : 0.0011663364912, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 134217728, - "matrixHeight" : 134217728, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "27", + "scaleDenominator": 4.1654874684566, + "cellSize": 0.0011663364912, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 134217728, + "matrixHeight": 134217728, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "28", - "scaleDenominator" : 2.0827437342283, - "cellSize" : 0.0005831682456, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 268435456, - "matrixHeight" : 268435456, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "28", + "scaleDenominator": 2.0827437342283, + "cellSize": 0.0005831682456, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 268435456, + "matrixHeight": 268435456, + "tileWidth": 256, + "tileHeight": 256 }, { - "id" : "29", - "scaleDenominator" : 1.0413718671142, - "cellSize" : 0.0002915841228, - "cornerOfOrigin" : "topLeft", - "pointOfOrigin" : [ -20037508.3427892439067, 20037508.3427892439067 ], - "matrixWidth" : 536870912, - "matrixHeight" : 536870912, - "tileWidth" : 256, - "tileHeight" : 256 + "id": "29", + "scaleDenominator": 1.0413718671142, + "cellSize": 0.0002915841228, + "cornerOfOrigin": "topLeft", + "pointOfOrigin": [-20037508.3427892439067, 20037508.3427892439067], + "matrixWidth": 536870912, + "matrixHeight": 536870912, + "tileWidth": 256, + "tileHeight": 256 } ] ) diff --git a/pygeoapi/openapi.py b/pygeoapi/openapi.py index bd4fe1775..6492e3b8c 100644 --- a/pygeoapi/openapi.py +++ b/pygeoapi/openapi.py @@ -5,7 +5,7 @@ # Authors: Ricardo Garcia Silva # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2022 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2023 Ricardo Garcia Silva # # Permission is hereby granted, free of charge, to any person diff --git a/pygeoapi/provider/base_mvt.py b/pygeoapi/provider/base_mvt.py index 0618909bb..12e10155f 100644 --- a/pygeoapi/provider/base_mvt.py +++ b/pygeoapi/provider/base_mvt.py @@ -3,7 +3,7 @@ # Authors: Francesco Bartoli # Authors: Tom Kralidis # -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2023 Tom Kralidis # # Permission is hereby granted, free of charge, to any person @@ -73,9 +73,9 @@ def get_layer(self): def get_tiling_schemes(self): tile_matrix_set_links_list = [ - TileMatrixSetEnum.WORLDCRS84QUAD.value, - TileMatrixSetEnum.WEBMERCATORQUAD.value - ] + TileMatrixSetEnum.WORLDCRS84QUAD.value, + TileMatrixSetEnum.WEBMERCATORQUAD.value + ] tile_matrix_set_links = [ item for item in tile_matrix_set_links_list if item.tileMatrixSet in self.options['schemes']] @@ -214,7 +214,7 @@ def get_metadata(self, dataset, server_url, layer=None, tileset, title, description, keywords, **kwargs) else: - raise NotImplementedError(f"_{metadata_format.upper()}_ is not supported") # noqa + raise NotImplementedError(f"_{metadata_format.upper()}_ is not supported") # noqa def get_tms_links(self): """ diff --git a/pygeoapi/provider/elasticsearch_.py b/pygeoapi/provider/elasticsearch_.py index 4c0ae20c1..739715332 100644 --- a/pygeoapi/provider/elasticsearch_.py +++ b/pygeoapi/provider/elasticsearch_.py @@ -4,7 +4,7 @@ # Francesco Bartoli # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2024 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation diff --git a/pygeoapi/provider/mvt_tippecanoe.py b/pygeoapi/provider/mvt_tippecanoe.py index 2cf855903..d987bd88c 100644 --- a/pygeoapi/provider/mvt_tippecanoe.py +++ b/pygeoapi/provider/mvt_tippecanoe.py @@ -1,8 +1,10 @@ # ================================================================= # # Authors: Joana Simoes +# Francesco Bartoli # # Copyright (c) 2023 Joana Simoes +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation @@ -137,11 +139,8 @@ def get_layer(self): return Path(self.data).name def get_tiling_schemes(self): - "Only WebMercatorQuad tiling scheme is supported in elastic" - return [ - TileMatrixSetEnum.WEBMERCATORQUAD.value - ] + return [TileMatrixSetEnum.WEBMERCATORQUAD.value] def get_tiles_service(self, baseurl=None, servicepath=None, dirpath=None, tile_type=None): @@ -297,13 +296,13 @@ def get_html_metadata(self, dataset, server_url, layer, tileset, metadata['json_url'] = f'{metadata_url}?f=json' try: - metadata_json_content = self.get_metadata_from_URL(self.service_metadata_url) # noqa + metadata_json_content = self.get_metadata_from_URL(self.service_metadata_url) # noqa content = MVTTilesJson(**metadata_json_content) content.tiles = service_url content.vector_layers = json.loads( - metadata_json_content["json"])["vector_layers"] - metadata['metadata'] = content.dict() + metadata_json_content["json"])["vector_layers"] + metadata['metadata'] = content.model_dump() # Some providers may not implement tilejson metadata metadata['tilejson_url'] = f'{metadata_url}?f=tilejson' except ProviderConnectionError: @@ -336,15 +335,15 @@ def get_default_metadata(self, dataset, server_url, layer, tileset, tiling_scheme_url = url_join( server_url, f'/TileMatrixSets/{schema.tileMatrixSet}') tiling_scheme_url_type = "application/json" - tiling_scheme_url_title = f'{schema.tileMatrixSet} tile matrix set definition' # noqa + tiling_scheme_url_title = f'{schema.tileMatrixSet} tile matrix set definition' # noqa tiling_scheme = LinkType(href=tiling_scheme_url, - rel="http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme", # noqa + rel="http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme", # noqa type_=tiling_scheme_url_type, title=tiling_scheme_url_title) if tiling_scheme is None: - msg = f'Could not identify a valid tiling schema' # noqa + msg = "Could not identify a valid tiling schema" LOGGER.error(msg) raise ProviderConnectionError(msg) @@ -365,7 +364,7 @@ def get_default_metadata(self, dataset, server_url, layer, tileset, content.links = links - return content.dict(exclude_none=True) + return content.model_dump(exclude_none=True) def get_vendor_metadata(self, dataset, server_url, layer, tileset, title, description, keywords, **kwargs): @@ -374,7 +373,7 @@ def get_vendor_metadata(self, dataset, server_url, layer, tileset, """ try: - metadata_json_content = self.get_metadata_from_URL(self.service_metadata_url) # noqa + metadata_json_content = self.get_metadata_from_URL(self.service_metadata_url) # noqa service_url = url_join( server_url, @@ -383,8 +382,8 @@ def get_vendor_metadata(self, dataset, server_url, layer, tileset, content = MVTTilesJson(**metadata_json_content) content.tiles = service_url content.vector_layers = json.loads( - metadata_json_content["json"])["vector_layers"] - return content.dict() + metadata_json_content["json"])["vector_layers"] + return content.model_dump() except ProviderConnectionError: msg = f'No tiles metadata json available: {self.service_metadata_url}' # noqa LOGGER.error(msg) diff --git a/pygeoapi/provider/ogr.py b/pygeoapi/provider/ogr.py index 3132c2cb8..9e089edd5 100644 --- a/pygeoapi/provider/ogr.py +++ b/pygeoapi/provider/ogr.py @@ -4,7 +4,7 @@ # Francesco Bartoli # # Copyright (c) 2019 Just van den Broecke -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Tom Kralidis # # Permission is hereby granted, free of charge, to any person diff --git a/pygeoapi/provider/opensearch_.py b/pygeoapi/provider/opensearch_.py index 3e84de0e8..d10cba5af 100644 --- a/pygeoapi/provider/opensearch_.py +++ b/pygeoapi/provider/opensearch_.py @@ -4,7 +4,7 @@ # Francesco Bartoli # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2024 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation diff --git a/pygeoapi/provider/postgresql.py b/pygeoapi/provider/postgresql.py index 6a52881ad..afc29a584 100644 --- a/pygeoapi/provider/postgresql.py +++ b/pygeoapi/provider/postgresql.py @@ -11,7 +11,7 @@ # Copyright (c) 2018 Jorge Samuel Mendes de Jesus # Copyright (c) 2025 Tom Kralidis # Copyright (c) 2022 John A Stevenson and Colin Blackburn -# Copyright (c) 2023 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2024 Bernhard Mallinger # # Permission is hereby granted, free of charge, to any person @@ -85,6 +85,7 @@ class PostgreSQLProvider(BaseProvider): using sync approach and server side cursor (using support class DatabaseCursor) """ + def __init__(self, provider_def): """ PostgreSQLProvider Class constructor diff --git a/pygeoapi/provider/sqlite.py b/pygeoapi/provider/sqlite.py index 9ba796bb9..e1d6ac72c 100644 --- a/pygeoapi/provider/sqlite.py +++ b/pygeoapi/provider/sqlite.py @@ -6,7 +6,7 @@ # # Copyright (c) 2018 Jorge Samuel Mendes de Jesus # Copyright (c) 2023 Tom Kralidis -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation diff --git a/pygeoapi/provider/tile.py b/pygeoapi/provider/tile.py index 2a4e4555e..7e6352ae3 100644 --- a/pygeoapi/provider/tile.py +++ b/pygeoapi/provider/tile.py @@ -3,7 +3,7 @@ # Authors: Francesco Bartoli # Authors: Tom Kralidis # -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Tom Kralidis # # Permission is hereby granted, free of charge, to any person diff --git a/pygeoapi/provider/wmts_facade.py b/pygeoapi/provider/wmts_facade.py index 51d1421e6..0d5cdf44d 100644 --- a/pygeoapi/provider/wmts_facade.py +++ b/pygeoapi/provider/wmts_facade.py @@ -4,7 +4,7 @@ # Authors: Tom Kralidis # Authors: Simon Seyock # -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2023 Tom Kralidis # # Permission is hereby granted, free of charge, to any person @@ -209,7 +209,7 @@ def get_metadata(self, dataset, server_url, layer=None, tileset, title, description, keywords, **kwargs) else: - raise NotImplementedError(f"_{metadata_format.upper()}_ is not supported") # noqa + raise NotImplementedError(f"_{metadata_format.upper()}_ is not supported") # noqa def get_html_metadata(self, dataset, server_url, layer, tileset, title, description, keywords, **kwargs): @@ -251,10 +251,10 @@ def get_default_metadata(self, dataset, server_url, layer, tileset, tiling_scheme_url = url_join( server_url, f'/TileMatrixSets/{schema.tileMatrixSet}') tiling_scheme_url_type = "application/json" - tiling_scheme_url_title = f'{schema.tileMatrixSet} tile matrix set definition' # noqa + tiling_scheme_url_title = f'{schema.tileMatrixSet} tile matrix set definition' # noqa tiling_scheme = LinkType(href=tiling_scheme_url, - rel="http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme", # noqa + rel="http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme", # noqa type_=tiling_scheme_url_type, title=tiling_scheme_url_title) diff --git a/pygeoapi/starlette_app.py b/pygeoapi/starlette_app.py index 91496b452..9fb30c69a 100644 --- a/pygeoapi/starlette_app.py +++ b/pygeoapi/starlette_app.py @@ -4,7 +4,7 @@ # Tom Kralidis # Abdulazeez Abdulazeez Adeshina # -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2025 Tom Kralidis # Copyright (c) 2022 Abdulazeez Abdulazeez Adeshina # @@ -616,6 +616,7 @@ class ApiRulesMiddleware: """ Custom middleware to properly deal with trailing slashes. See https://github.com/encode/starlette/issues/869. """ + def __init__( self, app: ASGIApp diff --git a/requirements-django.txt b/requirements-django.txt index c67c59657..6365372d2 100644 --- a/requirements-django.txt +++ b/requirements-django.txt @@ -1,2 +1,2 @@ Django -pydantic<2.0 +pydantic>2.0 diff --git a/requirements.txt b/requirements.txt index 8ea9bd299..ff00e2528 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ filelock Flask jinja2 jsonschema -pydantic<2.0 +pydantic>2.0 pygeofilter pygeoif pyproj diff --git a/tests/pygeoapi-test-config-postgresql.yml b/tests/pygeoapi-test-config-postgresql.yml index a3d0cf43a..31d5b05c2 100644 --- a/tests/pygeoapi-test-config-postgresql.yml +++ b/tests/pygeoapi-test-config-postgresql.yml @@ -4,7 +4,7 @@ # Francesco Bartoli # # Copyright (c) 2020 Tom Kralidis -# Copyright (c) 2023 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation diff --git a/tests/test_elasticsearch__provider.py b/tests/test_elasticsearch__provider.py index ba1cbb4aa..e6e74da9a 100644 --- a/tests/test_elasticsearch__provider.py +++ b/tests/test_elasticsearch__provider.py @@ -3,7 +3,7 @@ # Authors: Tom Kralidis # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2024 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation @@ -129,13 +129,13 @@ def _and(eq, between): {'property': 'properties.pop_max'}, [100000, 1000000] ] - }, { + }, { 'op': '=', - 'args': [ - {'property': 'properties.featurecla'}, - 'Admin-0 capital' - ] - }] + 'args': [ + {'property': 'properties.featurecla'}, + 'Admin-0 capital' + ] + }] } return parse_cql2_json(json.dumps(and_)) @@ -146,14 +146,14 @@ def intersects(): 'op': 's_intersects', 'args': [ {'property': 'geometry'}, { - 'type': 'Polygon', - 'coordinates': [[ - [10.497565, 41.520355], - [10.497565, 43.308645], - [15.111823, 43.308645], - [15.111823, 41.520355], - [10.497565, 41.520355] - ]] + 'type': 'Polygon', + 'coordinates': [[ + [10.497565, 41.520355], + [10.497565, 43.308645], + [15.111823, 43.308645], + [15.111823, 41.520355], + [10.497565, 41.520355] + ]] } ]} return parse_cql2_json(json.dumps(intersects)) diff --git a/tests/test_models.py b/tests/test_models.py index 7e0070258..f2419e455 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -3,7 +3,7 @@ # Authors: Francesco Bartoli # Tom Kralidis: # -# Copyright (c) 2024 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2024 Tom Kralidis # # Permission is hereby granted, free of charge, to any person @@ -43,5 +43,5 @@ class GeospatialDataTypeFactory(ModelFactory[GeospatialDataType]): def test_provider_base_geospatial_data_type( geospatial_data_type_factory: GeospatialDataTypeFactory) -> None: gdt_instance = geospatial_data_type_factory.build() - assert gdt_instance.dict() + assert gdt_instance.model_dump() assert isinstance(gdt_instance, GeospatialDataType) diff --git a/tests/test_ogr_csv_provider.py b/tests/test_ogr_csv_provider.py index 3bd371d3b..ce53a5d79 100644 --- a/tests/test_ogr_csv_provider.py +++ b/tests/test_ogr_csv_provider.py @@ -3,7 +3,7 @@ # Authors: Francesco Bartoli # Authors: Tom Kralidis # -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Tom Kralidis # # Permission is hereby granted, free of charge, to any person diff --git a/tests/test_ogr_esrijson_provider.py b/tests/test_ogr_esrijson_provider.py index d16652ff8..eb9ae1d34 100644 --- a/tests/test_ogr_esrijson_provider.py +++ b/tests/test_ogr_esrijson_provider.py @@ -3,7 +3,7 @@ # Authors: Francesco Bartoli # Authors: Tom Kralidis # -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Tom Kralidis # # Permission is hereby granted, free of charge, to any person diff --git a/tests/test_ogr_wfs_provider.py b/tests/test_ogr_wfs_provider.py index ddba5468c..6535913ab 100644 --- a/tests/test_ogr_wfs_provider.py +++ b/tests/test_ogr_wfs_provider.py @@ -5,7 +5,7 @@ # Authors: Tom Kralidis # # Copyright (c) 2019 Just van den Broecke -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Tom Kralidis # # Permission is hereby granted, free of charge, to any person diff --git a/tests/test_ogr_wfs_provider_live.py b/tests/test_ogr_wfs_provider_live.py index 5d50d5683..5e212268f 100644 --- a/tests/test_ogr_wfs_provider_live.py +++ b/tests/test_ogr_wfs_provider_live.py @@ -5,7 +5,7 @@ # Authors: Tom Kralidis # # Copyright (c) 2019 Just van den Broecke -# Copyright (c) 2020 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2022 Tom Kralidis # # Permission is hereby granted, free of charge, to any person diff --git a/tests/test_opensearch__provider.py b/tests/test_opensearch__provider.py index 40117e74b..198a60cbb 100644 --- a/tests/test_opensearch__provider.py +++ b/tests/test_opensearch__provider.py @@ -3,7 +3,7 @@ # Authors: Tom Kralidis # # Copyright (c) 2024 Tom Kralidis -# Copyright (c) 2024 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation diff --git a/tests/test_postgresql_provider.py b/tests/test_postgresql_provider.py index a011f3e64..054d3978f 100644 --- a/tests/test_postgresql_provider.py +++ b/tests/test_postgresql_provider.py @@ -10,7 +10,7 @@ # Copyright (c) 2019 Just van den Broecke # Copyright (c) 2025 Tom Kralidis # Copyright (c) 2022 John A Stevenson and Colin Blackburn -# Copyright (c) 2023 Francesco Bartoli +# Copyright (c) 2025 Francesco Bartoli # Copyright (c) 2024 Bernhard Mallinger # # Permission is hereby granted, free of charge, to any person @@ -81,8 +81,8 @@ def config(): 'search_path': ['osm', 'public'] }, 'options': { - 'connect_timeout': 10 - }, + 'connect_timeout': 10 + }, 'id_field': 'osm_id', 'table': 'hotosm_bdi_waterways', 'geom_field': 'foo_geom' @@ -101,8 +101,8 @@ def config_types(): 'search_path': ['public'] }, 'options': { - 'connect_timeout': 10 - }, + 'connect_timeout': 10 + }, 'id_field': 'id', 'table': 'foo', 'geom_field': 'the_geom' @@ -436,7 +436,7 @@ def test_instantiation(config): ({'table': 'bad_table'}, ProviderQueryError, 'Table.*not found in schema.*'), ({'data': {'bad': 'data'}}, ProviderConnectionError, - r'Could not connect to postgresql\+psycopg2:\/\/:5432 \(password hidden\).'), # noqa + r'Could not connect to postgresql\+psycopg2:\/\/:5432 \(password hidden\).'), # noqa ({'id_field': 'bad_id'}, ProviderQueryError, r'No such id_field column \(bad_id\) on osm.hotosm_bdi_waterways.'), ]) @@ -594,7 +594,7 @@ def test_get_collection_items_postgresql_cql_json(pg_api_): {'property': 'osm_id'}, [80800000, 80900000] ] - }, { + }, { # FIXME: the below query is in CQL style, not CQL2 # needs a fix in pygeofilter # 'op': 'isNull', @@ -603,7 +603,7 @@ def test_get_collection_items_postgresql_cql_json(pg_api_): # ] 'op': 'isNull', 'args': {'property': 'name'} - }] + }] } # werkzeug requests use a value of CONTENT_TYPE 'application/json' # to create Content-Type in the Request object. So here we need to