Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 52 additions & 1 deletion pygeoapi/provider/ogr.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from copy import deepcopy
import functools
import importlib
import json
import logging
import os
from typing import Any
Expand Down Expand Up @@ -498,7 +499,7 @@ def _ogr_feature_to_json(
# EPSG:4258 in ExportToJson where it shouldn't. See #1174.
# Suppress swapping by unassigning SpatialReference
geom.AssignSpatialReference(None)
json_feature = ogr_feature.ExportToJson(as_object=True)
json_feature = _feature_to_dict(ogr_feature)

if skip_geometry:
json_feature['geometry'] = None
Expand Down Expand Up @@ -876,6 +877,56 @@ def handler(self, err_level, err_num, err_msg):
raise ProviderGenericError(last_error)


# AI generated code: Junie claude-opus-5-5
def _feature_to_dict(ogr_feature) -> dict:
"""
Convert an OGR feature to a GeoJSON-like dict.

Replaces ``ogr.Feature.ExportToJson``, which looks up every field by
name and scales quadratically with the number of fields. Reading the
fields by index is an order of magnitude faster for wide layers.

The output is identical to ``ExportToJson(as_object=True)``: the
geometry is taken from the default geometry field, ``id`` is omitted
for features without a FID, boolean subtype fields are converted with
``bool()`` (so NULL becomes ``False``) and for duplicate field names
the first field wins.

:param ogr_feature: OGR feature

:returns: dict with type, geometry, properties and optionally id
"""

geom = ogr_feature.GetGeometryRef()
geometry = None
if geom is not None:
geometry = json.loads(geom.ExportToJson(options=[]))

output = {
'type': 'Feature',
'geometry': geometry,
'properties': {}
}

fid = ogr_feature.GetFID()
if fid != osgeo_ogr.NullFID:
output['id'] = fid

properties = output['properties']
for i in range(ogr_feature.GetFieldCount()):
fld_defn = ogr_feature.GetFieldDefnRef(i)
name = fld_defn.GetName()
if name in properties:
continue
value = ogr_feature.GetField(i)
if (fld_defn.GetType() == osgeo_ogr.OFTInteger and
fld_defn.GetSubType() == osgeo_ogr.OFSTBoolean):
value = bool(value)
properties[name] = value

return output


def _silent_gdal_error(f):
"""
Decorator function for gdal
Expand Down
80 changes: 80 additions & 0 deletions tests/provider/test_ogr_feature_to_dict.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# AI generated code: Junie claude-opus-5-5
"""Tests that the fast OGR feature serializer equals ExportToJson."""

import pytest
from osgeo import ogr

from pygeoapi.provider.ogr import _feature_to_dict


def make_layer(duplicate=False):
"""Create an in-memory OGR layer with various field types."""
ds = ogr.GetDriverByName('Memory').CreateDataSource('mem')
layer = ds.CreateLayer('test', geom_type=ogr.wkbPoint)
layer.CreateField(ogr.FieldDefn('name', ogr.OFTString))
layer.CreateField(ogr.FieldDefn('count', ogr.OFTInteger))
layer.CreateField(ogr.FieldDefn('value', ogr.OFTReal))
layer.CreateField(ogr.FieldDefn('date', ogr.OFTDate))
flag = ogr.FieldDefn('flag', ogr.OFTInteger)
flag.SetSubType(ogr.OFSTBoolean)
layer.CreateField(flag)
if duplicate:
layer.GetLayerDefn().AddFieldDefn(
ogr.FieldDefn('name', ogr.OFTString))
return ds, layer


def assert_parity(feature):
expected = feature.ExportToJson(as_object=True)
result = _feature_to_dict(feature)
assert result == expected
assert list(result) == list(expected)
assert list(result['properties']) == list(expected['properties'])
for key, val in expected['properties'].items():
assert type(result['properties'][key]) is type(val)
return result


def test_full_feature():
ds, layer = make_layer()
feature = ogr.Feature(layer.GetLayerDefn())
feature.SetField('name', 'a')
feature.SetField('count', 3)
feature.SetField('value', 1.5)
feature.SetField('date', '2024/01/02')
feature.SetField('flag', 1)
feature.SetGeometry(ogr.CreateGeometryFromWkt('POINT (1 2)'))
layer.CreateFeature(feature)
result = assert_parity(layer.GetFeature(feature.GetFID()))
assert result['properties']['flag'] is True


@pytest.mark.parametrize('flag', [0, None])
def test_boolean_false_and_null(flag):
ds, layer = make_layer()
feature = ogr.Feature(layer.GetLayerDefn())
if flag is None:
feature.SetFieldNull('flag')
else:
feature.SetField('flag', flag)
layer.CreateFeature(feature)
result = assert_parity(layer.GetFeature(feature.GetFID()))
assert result['properties']['flag'] is False


def test_no_geometry_and_no_fid():
ds, layer = make_layer()
feature = ogr.Feature(layer.GetLayerDefn())
feature.SetField('count', 3)
result = assert_parity(feature)
assert result['geometry'] is None
assert 'id' not in result


def test_duplicate_field_names():
ds, layer = make_layer(duplicate=True)
feature = ogr.Feature(layer.GetLayerDefn())
feature.SetField(0, 'first')
feature.SetField(feature.GetFieldCount() - 1, 'second')
result = assert_parity(feature)
assert result['properties']['name'] == 'first'
Loading