GeoJSON: do not advertize ODsCMeasuredGeometries, OLCMeasuredGeometries and ODsCMeasuredGeometries

Author: rouault

ogr/ogrsf_frmts/geojson/ogr_geojson.h

@@ -127,6 +127,11 @@ class OGRGeoJSONLayer final : public OGRMemLayer
         oWriteOptions_ = options;
     }
 
+    void SetSupportsMGeometries(bool bSupportsMGeometries)
+    {
+        m_bSupportsMGeometries = bSupportsMGeometries;
+    }
+
   private:
     OGRGeoJSONDataSource *poDS_;
     OGRGeoJSONReader *poReader_;
@@ -135,6 +140,7 @@ class OGRGeoJSONLayer final : public OGRMemLayer
     bool bOriginalIdModified_;
     GIntBig nTotalFeatureCount_;
     GIntBig nFeatureReadSinceReset_ = 0;
+    bool m_bSupportsMGeometries = false;
 
     //! Write options used by ICreateFeature() in append scenarios
     OGRGeoJSONWriteOptions oWriteOptions_;
@@ -292,6 +298,11 @@ class OGRGeoJSONDataSource final : public GDALDataset
         return osJSonFlavor_;
     }
 
+    void SetSupportsMGeometries(bool bSupportsMGeometries)
+    {
+        m_bSupportsMGeometries = bSupportsMGeometries;
+    }
+
     virtual CPLErr FlushCache(bool bAtClosing) override;
 
     CPLErr Close() override;
@@ -327,6 +338,7 @@ class OGRGeoJSONDataSource final : public GDALDataset
 
     CPLString osJSonFlavor_;
 
+    bool m_bSupportsMGeometries = false;
     //
     // Private utility functions
     //

ogr/ogrsf_frmts/geojson/ogresrijsondriver.cpp

@@ -77,6 +77,7 @@ void RegisterOGRESRIJSON()
     poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC,
                               "drivers/vector/esrijson.html");
     poDriver->SetMetadataItem(GDAL_DCAP_Z_GEOMETRIES, "YES");
+    poDriver->SetMetadataItem(GDAL_DCAP_MEASURED_GEOMETRIES, "YES");
 
     poDriver->SetMetadataItem(
         GDAL_DMD_OPENOPTIONLIST,

ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp

@@ -87,6 +87,8 @@ void OGRESRIJSONReader::ReadLayers(OGRGeoJSONDataSource *poDS,
 {
     CPLAssert(nullptr == poLayer_);
 
+    poDS->SetSupportsMGeometries(true);
+
     if (nullptr == poGJObject_)
     {
         CPLDebug("ESRIJSON",
@@ -143,6 +145,7 @@ void OGRESRIJSONReader::ReadLayers(OGRGeoJSONDataSource *poDS,
 
     poLayer_ =
         new OGRGeoJSONLayer(osName.c_str(), poSRS, eGeomType, poDS, nullptr);
+    poLayer_->SetSupportsMGeometries(true);
     if (poSRS != nullptr)
         poSRS->Release();
 

ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp

@@ -752,8 +752,9 @@ int OGRGeoJSONDataSource::TestCapability(const char *pszCap)
 {
     if (EQUAL(pszCap, ODsCCreateLayer))
         return fpOut_ != nullptr && nLayers_ == 0;
-    else if (EQUAL(pszCap, ODsCZGeometries) ||
-             EQUAL(pszCap, ODsCMeasuredGeometries))
+    else if (EQUAL(pszCap, ODsCMeasuredGeometries))
+        return m_bSupportsMGeometries;
+    else if (EQUAL(pszCap, ODsCZGeometries))
         return TRUE;
 
     return FALSE;

ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp

@@ -782,7 +782,7 @@ void RegisterOGRGeoJSON()
         "Integer64List RealList StringList Date DateTime");
     poDriver->SetMetadataItem(GDAL_DMD_CREATIONFIELDDATASUBTYPES, "Boolean");
     poDriver->SetMetadataItem(GDAL_DMD_SUPPORTED_SQL_DIALECTS, "OGRSQL SQLITE");
-    poDriver->SetMetadataItem(GDAL_DCAP_MEASURED_GEOMETRIES, "YES");
+
     poDriver->SetMetadataItem(GDAL_DCAP_FLUSHCACHE_CONSISTENT_STATE, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_HONOR_GEOM_COORDINATE_PRECISION, "YES");
 

ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp

@@ -504,6 +504,8 @@ int OGRGeoJSONLayer::TestCapability(const char *pszCap)
 {
     if (EQUAL(pszCap, OLCCurveGeometries))
         return FALSE;
+    else if (EQUAL(pszCap, OLCMeasuredGeometries))
+        return m_bSupportsMGeometries;
     else if (EQUAL(pszCap, OLCZGeometries))
         return TRUE;
     else if (EQUAL(pszCap, OLCStringsAsUTF8))