Merge branch 'geopython:master' into slow-postgresql-performance-with-large-datasets

Author: mdearos

docs/source/publishing/ogcapi-tiles.rst

@@ -196,6 +196,7 @@ This code block shows how to configure pygeoapi to read map tiles from a WMTS.
          options:
              wmts_layer: camb:hex350_grid_mental_1920 # the layer name of the wmts
              wmts_tile_matrix_set: WebMercatorQuad  # the name of the tile matrix set of the wmts.
+             wmts_style: camb:hex350_grid_mental_1920  # the style identifier of the wmts. If empty or this key is missing, it falls back to the default style.
              scheme: WebMercatorQuad  # the aligning scheme in pygeoapi.
              zoom:
                  min: 0

pygeoapi/api/itemtypes.py

@@ -37,7 +37,7 @@
 
 from collections import ChainMap
 from copy import deepcopy
-from datetime import datetime
+from datetime import datetime, UTC
 from http import HTTPStatus
 import logging
 from typing import Any, Tuple, Union
@@ -625,7 +625,7 @@ def get_collection_items(
             'href': '/'.join(uri.split('/')[:-1])
         })
 
-    content['timeStamp'] = datetime.utcnow().strftime(
+    content['timeStamp'] = datetime.now(UTC).strftime(
         '%Y-%m-%dT%H:%M:%S.%fZ')
 
     # Set response language to requested provider locale

pygeoapi/provider/wmts_facade.py

@@ -161,7 +161,7 @@ def get_tiles(self, layer=None, tileset=None,
                 'tileMatrix': z,
                 'tileRow': y,
                 'tileCol': x,
-                'style': ''
+                'style': self.options.get('wmts_style', '')
             }
 
             if '?' in self.data:

pygeoapi/templates/collections/items/index.html

@@ -18,7 +18,7 @@
     <script src="https://unpkg.com/leaflet.markercluster/dist/leaflet.markercluster-src.js"></script>
 
     {% if data['itemtype'] == 'record' %}
-    <link rel="stylesheet" href="https://unpkg.com/leaflet-draw@1.0.4/dist/leaflet.draw.css"></script>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet-draw@1.0.4/dist/leaflet.draw.css"/>
     <script src="https://unpkg.com/leaflet-draw@1.0.4/dist/leaflet.draw.js"></script>
     {% endif %}
 {% endblock %}

tests/load_tinydb_records.py

@@ -1,8 +1,10 @@
 # =================================================================
 #
 # Authors: Tom Kralidis <tomkralidis@gmail.com>
+#          Francesco Bartoli <xbartolone@gmail.com>
 #
 # Copyright (c) 2025 Tom Kralidis
+# Copyright (c) 2025 Francesco Bartoli
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -27,7 +29,7 @@
 #
 # =================================================================
 
-from datetime import datetime
+from datetime import datetime, UTC
 from pathlib import Path
 import sys
 from typing import Union
@@ -226,7 +228,7 @@ def get_anytext(bag: Union[list, str]) -> str:
         'geometry': geometry,
         'properties': {
             'created': issued,
-            'updated': datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ'),
+            'updated': datetime.now(UTC).strftime('%Y-%m-%dT%H:%M:%SZ'),
             'type': type_,
             'title': title,
             'description': description,