Merge pull request OSGeo#13102 from rouault/fix_13093

ESRIJSON: recognize esriFieldTypeDateOnly, esriFieldTypeTimeOnly, esriFieldTypeBigInteger, esriFieldTypeGUID and esriFieldTypeGlobalID data types

Author: rouault

autotest/ogr/data/esrijson/esripoint.json

@@ -44,6 +44,31 @@
       "alias": "fooDate",
       "type": "esriFieldTypeDate",
       "length": 8
+    },
+    {
+      "name": "fooDateOnly",
+      "alias": "fooDateOnly",
+      "type": "esriFieldTypeDateOnly",
+    },
+    {
+      "name": "fooTimeOnly",
+      "alias": "fooTimeOnly",
+      "type": "esriFieldTypeTimeOnly",
+    },
+    {
+      "name": "fooBigInteger",
+      "alias": "fooBigInteger",
+      "type": "esriFieldTypeBigInteger",
+    },
+    {
+      "name": "fooGUID",
+      "alias": "fooGUID",
+      "type": "esriFieldTypeGUID",
+    },
+    {
+      "name": "fooGlobalID",
+      "alias": "fooGlobalID",
+      "type": "esriFieldTypeGlobalID",
     }
   ],
   "features" : [
@@ -59,7 +84,12 @@
         "fooSingle" : 1.5,
         "fooDouble" : 3.4,
         "fooString" : "56",
-        "fooDate": 1640908800000
+        "fooDate": 1640908800000,
+        "fooDateOnly": "2025-09-20",
+        "fooTimeOnly": "12:34:56",
+        "fooBigInteger": 1234567890123456,
+        "fooGlobalID": "{FD04C39C-69C6-4DCC-88D6-7E3E673DD0CB}",
+        "fooGUID": "{3BFE6840-A9E6-432A-AD34-B2067C8A276F}"
       }
     }
   ]

autotest/ogr/ogr_esrijson.py

@@ -81,7 +81,7 @@ def test_ogr_esrijson_read_point():
 
     extent = (2, 2, 49, 49)
 
-    rc = validate_layer(lyr, "esripoint", 1, ogr.wkbPoint, 7, extent)
+    rc = validate_layer(lyr, "esripoint", 1, ogr.wkbPoint, 12, extent)
     assert rc
 
     layer_defn = lyr.GetLayerDefn()
@@ -102,12 +102,47 @@ def test_ogr_esrijson_read_point():
     ogrtest.check_feature_geometry(feature, "POINT(2 49)")
 
     assert feature.GetFID() == 1
+    assert (
+        lyr.GetLayerDefn()
+        .GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex("fooSmallInt"))
+        .GetSubType()
+        == ogr.OFSTInt16
+    )
     assert feature["fooSmallInt"] == 2
     assert feature["fooInt"] == 1234567890
+    assert (
+        lyr.GetLayerDefn()
+        .GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex("fooSingle"))
+        .GetSubType()
+        == ogr.OFSTFloat32
+    )
     assert feature["fooSingle"] == 1.5
     assert feature["fooDouble"] == 3.4
     assert feature["fooString"] == "56"
     assert feature["fooDate"] == "2021/12/31 00:00:00+00"
+    assert feature["fooDateOnly"] == "2025/09/20"
+    assert (
+        lyr.GetLayerDefn()
+        .GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex("fooTimeOnly"))
+        .GetType()
+        == ogr.OFTTime
+    )
+    assert feature["fooTimeOnly"] == "12:34:56"
+    assert feature["fooBigInteger"] == 1234567890123456
+    assert (
+        lyr.GetLayerDefn()
+        .GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex("fooGlobalID"))
+        .GetSubType()
+        == ogr.OFSTUUID
+    )
+    assert feature["fooGlobalID"] == "{FD04C39C-69C6-4DCC-88D6-7E3E673DD0CB}"
+    assert (
+        lyr.GetLayerDefn()
+        .GetFieldDefn(lyr.GetLayerDefn().GetFieldIndex("fooGUID"))
+        .GetSubType()
+        == ogr.OFSTUUID
+    )
+    assert feature["fooGUID"] == "{3BFE6840-A9E6-432A-AD34-B2067C8A276F}"
 
     lyr = None
     ds = None

ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp

@@ -35,6 +35,9 @@
 #include "ogrgeojsonutils.h"
 #include "ogresrijsongeometry.h"
 
+#include <map>
+#include <utility>
+
 // #include "symbol_renames.h"
 
 /************************************************************************/
@@ -295,6 +298,21 @@ bool OGRESRIJSONReader::GenerateLayerDefn()
 /*                             ParseField()                             */
 /************************************************************************/
 
+static const std::map<std::string, std::pair<OGRFieldType, OGRFieldSubType>>
+    goMapEsriTypeToOGR = {
+        {"esriFieldTypeString", {OFTString, OFSTNone}},
+        {"esriFieldTypeSingle", {OFTReal, OFSTFloat32}},
+        {"esriFieldTypeDouble", {OFTReal, OFSTNone}},
+        {"esriFieldTypeSmallInteger", {OFTInteger, OFSTInt16}},
+        {"esriFieldTypeInteger", {OFTInteger, OFSTNone}},
+        {"esriFieldTypeDate", {OFTDateTime, OFSTNone}},
+        {"esriFieldTypeDateOnly", {OFTDate, OFSTNone}},
+        {"esriFieldTypeTimeOnly", {OFTTime, OFSTNone}},
+        {"esriFieldTypeBigInteger", {OFTInteger64, OFSTNone}},
+        {"esriFieldTypeGUID", {OFTString, OFSTUUID}},
+        {"esriFieldTypeGlobalID", {OFTString, OFSTUUID}},
+};
+
 bool OGRESRIJSONReader::ParseField(json_object *poObj)
 {
     OGRFeatureDefn *poDefn = poLayer_->GetLayerDefn();
@@ -313,43 +331,26 @@ bool OGRESRIJSONReader::ParseField(json_object *poObj)
         OGRFieldSubType eFieldSubType = OFSTNone;
         const char *pszObjName = json_object_get_string(poObjName);
         const char *pszObjType = json_object_get_string(poObjType);
-        if (EQUAL(pszObjType, "esriFieldTypeString"))
-        {
-            // do nothing
-        }
-        else if (EQUAL(pszObjType, "esriFieldTypeOID"))
+        if (strcmp(pszObjType, "esriFieldTypeOID") == 0)
         {
             eFieldType = OFTInteger;
             poLayer_->SetFIDColumn(pszObjName);
         }
-        else if (EQUAL(pszObjType, "esriFieldTypeSingle"))
-        {
-            eFieldType = OFTReal;
-            eFieldSubType = OFSTFloat32;
-        }
-        else if (EQUAL(pszObjType, "esriFieldTypeDouble"))
-        {
-            eFieldType = OFTReal;
-        }
-        else if (EQUAL(pszObjType, "esriFieldTypeSmallInteger"))
-        {
-            eFieldType = OFTInteger;
-            eFieldSubType = OFSTInt16;
-        }
-        else if (EQUAL(pszObjType, "esriFieldTypeInteger"))
-        {
-            eFieldType = OFTInteger;
-        }
-        else if (EQUAL(pszObjType, "esriFieldTypeDate"))
-        {
-            eFieldType = OFTDateTime;
-        }
         else
         {
-            CPLDebug("ESRIJSON",
-                     "Unhandled fields[\"%s\"].type = %s. "
-                     "Processing it as a String",
-                     pszObjName, pszObjType);
+            const auto it = goMapEsriTypeToOGR.find(pszObjType);
+            if (it != goMapEsriTypeToOGR.end())
+            {
+                eFieldType = it->second.first;
+                eFieldSubType = it->second.second;
+            }
+            else
+            {
+                CPLDebug("ESRIJSON",
+                         "Unhandled fields[\"%s\"].type = %s. "
+                         "Processing it as a String",
+                         pszObjName, pszObjType);
+            }
         }
         OGRFieldDefn fldDefn(pszObjName, eFieldType);
         fldDefn.SetSubType(eFieldSubType);

ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp

@@ -22,11 +22,12 @@
 #include <algorithm>
 #include <memory>
 
-const char szESRIJSonFeaturesGeometryRings[] =
-    "{\"features\":[{\"geometry\":{\"rings\":[";
+constexpr const char szESRIJSonFeaturesGeometryRings[] =
+    "\"features\":[{\"geometry\":{\"rings\":[";
 
 // Cf https://github.com/OSGeo/gdal/issues/9996#issuecomment-2129845692
-const char szESRIJSonFeaturesAttributes[] = "{\"features\":[{\"attributes\":{";
+constexpr const char szESRIJSonFeaturesAttributes[] =
+    "\"features\":[{\"attributes\":{";
 
 /************************************************************************/
 /*                           SkipUTF8BOM()                              */
@@ -227,8 +228,9 @@ static bool IsGeoJSONLikeObject(const char *pszText, bool &bMightBeSequence,
 
     const std::string osWithoutSpace = GetCompactJSon(pszText, strlen(pszText));
     if (osWithoutSpace.find("{\"features\":[") == 0 &&
-        osWithoutSpace.find(szESRIJSonFeaturesGeometryRings) != 0 &&
-        osWithoutSpace.find(szESRIJSonFeaturesAttributes) != 0)
+        osWithoutSpace.find(szESRIJSonFeaturesGeometryRings) ==
+            std::string::npos &&
+        osWithoutSpace.find(szESRIJSonFeaturesAttributes) == std::string::npos)
     {
         return true;
     }
@@ -329,8 +331,10 @@ bool ESRIJSONIsObject(const char *pszText, GDALOpenInfo *poOpenInfo)
     }
 
     const std::string osWithoutSpace = GetCompactJSon(pszText, strlen(pszText));
-    if (osWithoutSpace.find(szESRIJSonFeaturesGeometryRings) == 0 ||
-        osWithoutSpace.find(szESRIJSonFeaturesAttributes) == 0 ||
+    if (osWithoutSpace.find(szESRIJSonFeaturesGeometryRings) !=
+            std::string::npos ||
+        osWithoutSpace.find(szESRIJSonFeaturesAttributes) !=
+            std::string::npos ||
         osWithoutSpace.find("\"spatialReference\":{\"wkid\":") !=
             std::string::npos)
     {