diff options
Diffstat (limited to 'export_mvt.py')
| -rw-r--r-- | export_mvt.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/export_mvt.py b/export_mvt.py index b893d79..b56fba1 100644 --- a/export_mvt.py +++ b/export_mvt.py @@ -35,7 +35,13 @@ import brotli from osgeo import gdal, ogr, osr from common import BadConfiguration, escape_identifier, format_bytes, format_time -from common_gdal import getExtent, getSRS, getSpatialFilterFromGeometry, getEscapedTableName +from common_gdal import ( + getExtent, + getSRS, + getSpatialFilterFromGeometry, + getEscapedTableName, + executeSQL, +) from rename_exchange import rename_exchange def parseTilingScheme(scheme : list[Any]) -> tuple[osr.SpatialReference, ogr.Geometry|None]: @@ -184,9 +190,7 @@ def exportSourceLayer(lyr_src : ogr.Layer, query += ' WHERE ' + cond.strip() ds_src = lyr_src.GetDataset() - logging.debug('ExecuteSQL(%s%s)', query, - '' if spatialFilter is None else ', spatialFilter=' + spatialFilter.ExportToWkt()) - with ds_src.ExecuteSQL(query, spatialFilter=spatialFilter) as lyr_src2: + with executeSQL(ds_src, query, spatialFilter=spatialFilter) as lyr_src2: count1 = -1 if lyr_src2.TestCapability(ogr.OLCFastFeatureCount): count1 = lyr_src2.GetFeatureCount(force=0) |