Fiona <-> OGR field mappings take 2 (refactor)

fiona/__init__.py

@@ -46,6 +46,7 @@
     get_gdal_version_tuple,
 )
 from fiona._env import driver_count
+from fiona._path import _ParsedPath, _UnparsedPath, _parse_path, _vsi_path
 from fiona._show_versions import show_versions
 from fiona._vsiopener import _opener_registration
 from fiona.collection import BytesCollection, Collection
@@ -54,15 +55,8 @@
 from fiona.errors import FionaDeprecationWarning
 from fiona.io import MemoryFile
 from fiona.model import Feature, Geometry, Properties
-from fiona.ogrext import (
-    FIELD_TYPES_MAP,
-    _bounds,
-    _listdir,
-    _listlayers,
-    _remove,
-    _remove_layer,
-)
-from fiona._path import _ParsedPath, _UnparsedPath, _parse_path, _vsi_path
+from fiona.ogrext import FIELD_TYPES_MAP, _bounds, _listdir, _listlayers, _remove, _remove_layer
+from fiona.schema import NAMED_FIELD_TYPES
 from fiona.vfs import parse_paths as vfs_parse_paths
 
 # These modules are imported by fiona.ogrext, but are also import here to
@@ -534,7 +528,7 @@ def prop_type(text):
 
     """
     key = text.split(':')[0]
-    return FIELD_TYPES_MAP[key]
+    return NAMED_FIELD_TYPES[key].type
 
 
 def drivers(*args, **kwargs):

fiona/fio/load.py

@@ -8,7 +8,6 @@
 import fiona
 from fiona.fio import options, with_context_env
 from fiona.model import Feature, Geometry
-from fiona.schema import FIELD_TYPES_MAP_REV
 from fiona.transform import transform_geom
 
 
@@ -87,11 +86,14 @@ def feature_gen():
     except TypeError:
         raise click.ClickException("Invalid input.")
 
-    # print(first, first.geometry)
+    # TODO: this inference of a property's type from its value needs some
+    # work. It works reliably only for the basic JSON serializable types.
+    # The fio-load command does require JSON input but that may change
+    # someday.
     schema = {"geometry": first.geometry.type}
     schema["properties"] = {
-            k: FIELD_TYPES_MAP_REV.get(type(v)) or "str"
-            for k, v in first.properties.items()
+        k: type(v if v is not None else "").__name__
+        for k, v in first.properties.items()
     }
 
     if append:

fiona/gdal.pxi

@@ -236,7 +236,9 @@ cdef extern from "ogr_core.h" nogil:
     cdef int OFSTBoolean = 1
     cdef int OFSTInt16 = 2
     cdef int OFSTFloat32 = 3
-    cdef int OFSTMaxSubType = 3
+    cdef int OFSTJSON = 4
+    cdef int OFSTUUID = 5
+    cdef int OFSTMaxSubType = 5
 
     ctypedef struct OGREnvelope:
         double MinX