diff -Nru gdal-2.4.0+9/core/port/cpl_json.cpp gdal-2.4.0+10/core/port/cpl_json.cpp
--- gdal-2.4.0+9/core/port/cpl_json.cpp	2018-12-21 15:49:10.000000000 +0000
+++ gdal-2.4.0+10/core/port/cpl_json.cpp	2019-02-03 20:55:33.000000000 +0000
@@ -336,7 +336,7 @@
 #endif // HAVE_CURL
 {
 #ifdef HAVE_CURL
-    int nDepth = atoi( CSLFetchNameValueDef( papszOptions, "JSON_DEPTH", "10") );
+    int nDepth = atoi( CSLFetchNameValueDef( papszOptions, "JSON_DEPTH", "32") ); // Same as JSON_TOKENER_DEFAULT_DEPTH
     JsonContext ctx = { nullptr, json_tokener_new_ex(nDepth), 0 };
 
     CPLHTTPFetchWriteFunc pWriteFunc = CPLJSONWriteFunction;
@@ -1165,7 +1165,7 @@
 int CPLJSONArray::Size() const
 {
     if( m_poJsonObject )
-        return json_object_array_length( TO_JSONOBJ(m_poJsonObject) );
+        return static_cast<int>(json_object_array_length( TO_JSONOBJ(m_poJsonObject) ));
     return 0;
 }
 
diff -Nru gdal-2.4.0+9/core/port/cpl_minizip_zip.cpp gdal-2.4.0+10/core/port/cpl_minizip_zip.cpp
--- gdal-2.4.0+9/core/port/cpl_minizip_zip.cpp	2019-02-02 16:55:33.000000000 +0000
+++ gdal-2.4.0+10/core/port/cpl_minizip_zip.cpp	2019-02-03 20:55:33.000000000 +0000
@@ -1151,8 +1151,10 @@
     zi->ci.totalUncompressedData = 0;
     zi->ci.pos_zip64extrainfo = 0;
 
-    // For now always generate zip64 extra fields
-    err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local, /* zip64 */ 0);
+    // For now default is to generate zip64 extra fields
+    const bool bZip64 = CPLTestBool(CPLGetConfigOption("CPL_CREATE_ZIP64", "ON"));
+    err = Write_LocalFileHeader(zi, filename, size_extrafield_local,
+        extrafield_local, bZip64 ? 1 : 0);
 
     zi->ci.stream.avail_in = 0;
     zi->ci.stream.avail_out = Z_BUFSIZE;
diff -Nru gdal-2.4.0+9/debian/changelog gdal-2.4.0+10/debian/changelog
--- gdal-2.4.0+9/debian/changelog	2019-02-02 16:56:24.000000000 +0000
+++ gdal-2.4.0+10/debian/changelog	2019-02-03 20:56:42.000000000 +0000
@@ -1,8 +1,14 @@
-gdal (2.4.0+9-0trusty1) trusty; urgency=medium
+gdal (2.4.0+10-0trusty1) trusty; urgency=medium
+
+  * 7b8527d - Dmitry Baryshnikov : Add create zip64 option, increase json depth, fix ngw create layer (unique fields, patch in batch mode, etc.)
+
+ -- Dmitry Baryshnikov <dmitry.baryshnikov@nextgis.com>  Sun, 03 Feb 2019 20:56:42 +0000
+
+gdal (2.4.0+9-0unstable1) unstable; urgency=medium
 
   * 34f2eed - Mikhail Gusev : Temp fix for generating ZIP 2.0, not ZIP 4.5
 
- -- Dmitry Baryshnikov <dmitry.baryshnikov@nextgis.com>  Sat, 02 Feb 2019 16:56:24 +0000
+ -- Dmitry Baryshnikov <dmitry.baryshnikov@nextgis.com>  Sat, 02 Feb 2019 16:58:37 +0000
 
 gdal (2.4.0+8-0unstable1) unstable; urgency=medium
 
diff -Nru gdal-2.4.0+9/drivers/common/cad/vsilfileio.cpp gdal-2.4.0+10/drivers/common/cad/vsilfileio.cpp
--- gdal-2.4.0+9/drivers/common/cad/vsilfileio.cpp	2018-05-13 00:00:30.000000000 +0000
+++ gdal-2.4.0+10/drivers/common/cad/vsilfileio.cpp	2019-02-03 20:55:33.000000000 +0000
@@ -57,7 +57,7 @@
 bool VSILFileIO::Open(int mode)
 {
     // NOTE: now support only read mode
-    if( mode & OpenMode::write )
+    if( mode & OpenMode::out )
         return false;
 
     std::string sOpenMode = "r";
diff -Nru gdal-2.4.0+9/drivers/common/ngw/gdalngwdataset.cpp gdal-2.4.0+10/drivers/common/ngw/gdalngwdataset.cpp
--- gdal-2.4.0+9/drivers/common/ngw/gdalngwdataset.cpp	2019-01-22 07:38:27.000000000 +0000
+++ gdal-2.4.0+10/drivers/common/ngw/gdalngwdataset.cpp	2019-02-03 20:55:33.000000000 +0000
@@ -65,7 +65,8 @@
     poRasterDS(nullptr),
     nRasters(0),
     nCacheExpires(604800),  // 7 days
-    nCacheMaxSize(67108864) // 64 MB
+    nCacheMaxSize(67108864),// 64 MB
+    osJsonDepth("32")
 {}
 
 /*
@@ -198,6 +199,9 @@
     bExtInNativeData = CPLFetchBool( papszOpenOptionsIn, "NATIVE_DATA",
         CPLTestBool( CPLGetConfigOption("NGW_NATIVE_DATA", "NO") ) );
 
+    osJsonDepth = CSLFetchNameValueDef( papszOpenOptionsIn, "JSON_DEPTH",
+        CPLGetConfigOption("NGW_JSON_DEPTH", "32"));
+
     return Init( nOpenFlagsIn );
 }
 
@@ -790,6 +794,7 @@
 {
     char **papszOptions = nullptr;
     papszOptions = CSLAddString(papszOptions, "HEADERS=Accept: */*");
+    papszOptions = CSLAddNameValue(papszOptions, "JSON_DEPTH", osJsonDepth.c_str());
     if( !osUserPwd.empty() )
     {
         papszOptions = CSLAddString(papszOptions, "HTTPAUTH=BASIC");
diff -Nru gdal-2.4.0+9/drivers/common/ngw/ngw_api.cpp gdal-2.4.0+10/drivers/common/ngw/ngw_api.cpp
--- gdal-2.4.0+9/drivers/common/ngw/ngw_api.cpp	2019-01-07 23:28:54.000000000 +0000
+++ gdal-2.4.0+10/drivers/common/ngw/ngw_api.cpp	2019-02-03 20:55:33.000000000 +0000
@@ -621,9 +621,10 @@
     return bResult;
 }
 
-bool PatchFeatures(const std::string &osUrl, const std::string &osResourceId,
+std::vector<GIntBig> PatchFeatures(const std::string &osUrl, const std::string &osResourceId,
     const std::string &osFeaturesJson, char **papszHTTPOptions)
 {
+    std::vector<GIntBig> aoFIDs;
     CPLErrorReset();
     std::string osPayloadInt = "POSTFIELDS=" + osFeaturesJson;
 
@@ -635,21 +636,37 @@
     CPLDebug("NGW", "PatchFeatures request payload: %s", osFeaturesJson.c_str());
 
     std::string osUrlInt = GetFeature(osUrl, osResourceId);
-    CPLHTTPResult *psResult = CPLHTTPFetch( osUrlInt.c_str(), papszHTTPOptions );
+    CPLJSONDocument oPatchFeatureReq;
+    bool bResult = oPatchFeatureReq.LoadUrl( osUrlInt, papszHTTPOptions );
     CSLDestroy( papszHTTPOptions );
-    bool bResult = false;
-    if( psResult )
-    {
-        bResult = psResult->nStatus == 0 && psResult->pszErrBuf == nullptr;
 
-        // Get error message.
-        if( !bResult )
+    CPLJSONObject oRoot = oPatchFeatureReq.GetRoot();
+    if( oRoot.IsValid() )
+        {
+        if( bResult )
         {
-            ReportError(psResult->pabyData, psResult->nDataLen);
+            CPLJSONArray aoJSONIDs = oRoot.ToArray();
+            for( int i = 0; i < aoJSONIDs.Size(); ++i)
+            {
+                GIntBig nOutFID = aoJSONIDs[i].GetLong( "id", OGRNullFID );
+                aoFIDs.push_back(nOutFID);
         }
-        CPLHTTPDestroyResult(psResult);
     }
-    return bResult;
+        else
+        {
+            std::string osErrorMessage = oRoot.GetString("message");
+            if( osErrorMessage.empty() )
+            {
+                osErrorMessage = "Patch features failed";
+            }
+            CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrorMessage.c_str());
+        }
+    }
+    else
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Patch features failed");
+    }
+    return aoFIDs;
 }
 
 bool GetExtent(const std::string &osUrl, const std::string &osResourceId,
diff -Nru gdal-2.4.0+9/drivers/common/ngw/ogrngwdriver.cpp gdal-2.4.0+10/drivers/common/ngw/ogrngwdriver.cpp
--- gdal-2.4.0+9/drivers/common/ngw/ogrngwdriver.cpp	2018-12-21 15:49:10.000000000 +0000
+++ gdal-2.4.0+10/drivers/common/ngw/ogrngwdriver.cpp	2019-02-03 20:55:33.000000000 +0000
@@ -433,6 +433,7 @@
         "   <Option name='NATIVE_DATA' scope='vector' type='boolean' description='Whether to store the native Json representation of extensions key' default='NO'/>"
         "   <Option name='CACHE_EXPIRES' scope='raster' type='integer' description='Time in seconds cached files will stay valid. If cached file expires it is deleted when maximum size of cache is reached. Also expired file can be overwritten by the new one from web' default='604800'/>"
         "   <Option name='CACHE_MAX_SIZE' scope='raster' type='integer' description='The cache maximum size in bytes. If cache reached maximum size, expired cached files will be deleted' default='67108864'/>"
+        "   <Option name='JSON_DEPTH' scope='raster,vector' type='integer' description='The depth of json response that can be parsed. If depth is greater than this value, parse error occurs' default='32'/>"
         "</OpenOptionList>"
     );
 
@@ -447,6 +448,7 @@
         "   <Option name='NATIVE_DATA' scope='vector' type='boolean' description='Whether to store the native Json representation of extensions key' default='NO'/>"
         "   <Option name='CACHE_EXPIRES' scope='raster' type='integer' description='Time in seconds cached files will stay valid. If cached file expires it is deleted when maximum size of cache is reached. Also expired file can be overwritten by the new one from web' default='604800'/>"
         "   <Option name='CACHE_MAX_SIZE' scope='raster' type='integer' description='The cache maximum size in bytes. If cache reached maximum size, expired cached files will be deleted' default='67108864'/>"
+        "   <Option name='JSON_DEPTH' scope='raster,vector' type='integer' description='The depth of json response that can be parsed. If depth is greater than this value, parse error occurs' default='32'/>"
         "</CreationOptionList>"
     );
 
diff -Nru gdal-2.4.0+9/drivers/common/ngw/ogr_ngw.h gdal-2.4.0+10/drivers/common/ngw/ogr_ngw.h
--- gdal-2.4.0+9/drivers/common/ngw/ogr_ngw.h	2019-01-07 23:28:54.000000000 +0000
+++ gdal-2.4.0+10/drivers/common/ngw/ogr_ngw.h	2019-02-03 20:55:33.000000000 +0000
@@ -102,7 +102,7 @@
     bool UpdateFeature(const std::string &osUrl, const std::string &osResourceId,
         const std::string &osFeatureId, const std::string &osFeatureJson,
         char **papszHTTPOptions);
-    bool PatchFeatures(const std::string &osUrl, const std::string &osResourceId,
+    std::vector<GIntBig> PatchFeatures(const std::string &osUrl, const std::string &osResourceId,
         const std::string &osFeaturesJson, char **papszHTTPOptions);
     bool GetExtent(const std::string &osUrl, const std::string &osResourceId,
         char **papszHTTPOptions, int nEPSG, OGREnvelope &stExtent);
@@ -196,7 +196,6 @@
     void FetchPermissions();
     void FreeFeaturesCache( bool bForce = false );
     std::string CreateNGWResourceJson();
-    std::string FeaturesToJson();
     OGRErr SyncFeatures();
     GIntBig GetMaxFeatureCount( bool bForce );
     bool FillFeatures(const std::string &osUrl);
@@ -229,6 +228,9 @@
     int nRasters;
     int nCacheExpires, nCacheMaxSize;
 
+    // json
+    std::string osJsonDepth;
+
 public:
     OGRNGWDataset();
     virtual ~OGRNGWDataset();
diff -Nru gdal-2.4.0+9/drivers/common/ngw/ogrngwlayer.cpp gdal-2.4.0+10/drivers/common/ngw/ogrngwlayer.cpp
--- gdal-2.4.0+9/drivers/common/ngw/ogrngwlayer.cpp	2019-01-09 20:48:32.000000000 +0000
+++ gdal-2.4.0+10/drivers/common/ngw/ogrngwlayer.cpp	2019-02-03 20:55:33.000000000 +0000
@@ -290,6 +290,9 @@
     return FeatureToJson(poFeature).Format(CPLJSONObject::Plain);
 }
 
+/*
+ * FreeMap()
+ */
 static void FreeMap( std::map<GIntBig, OGRFeature*> &moFeatures )
 {
     for( auto &oPair: moFeatures )
@@ -300,6 +303,77 @@
     moFeatures.clear();
 }
 
+static bool CheckFieldNameUnique( OGRFeatureDefn *poFeatureDefn, int iField,
+    const char *pszFieldName )
+{
+    for( int i = 0; i < poFeatureDefn->GetFieldCount(); ++i)
+    {
+        if( i == iField)
+        {
+            continue;
+        }
+
+        OGRFieldDefn *poFieldDefn = poFeatureDefn->GetFieldDefn( i );
+        if( poFieldDefn && EQUAL(poFieldDefn->GetNameRef(), pszFieldName) )
+        {
+            CPLError( CE_Failure, CPLE_NotSupported,
+                  "Field name %s already present in field %d.",
+                  pszFieldName, i );
+            return false;
+        }
+    }
+    return true;
+}
+
+static std::string GetUniqueFieldName( OGRFeatureDefn *poFeatureDefn, int iField,
+    const char *pszBaseName, int nAdd, int nMax = 100 )
+{
+    const char *pszNewName = CPLSPrintf("%s%d", pszBaseName, nAdd);
+    for( int i = 0; i < poFeatureDefn->GetFieldCount(); ++i)
+    {
+        if( i == iField)
+        {
+            continue;
+        }
+
+        OGRFieldDefn *poFieldDefn = poFeatureDefn->GetFieldDefn( i );
+        if( poFieldDefn && EQUAL(poFieldDefn->GetNameRef(), pszNewName) )
+        {
+            if( nAdd + 1 == nMax)
+            {
+                CPLError( CE_Failure, CPLE_NotSupported,
+                  "Too many field names like '%s' + number.",
+                  pszBaseName);
+
+                return pszBaseName; // Let's solve this on server side.
+            }
+            return GetUniqueFieldName( poFeatureDefn, iField, pszBaseName, nAdd + 1 );
+        }
+    }
+
+    return pszNewName;
+}
+
+static void NormalizeFieldName( OGRFeatureDefn *poFeatureDefn, int iField,
+    OGRFieldDefn *poFieldDefn )
+{
+    if( EQUAL(poFieldDefn->GetNameRef(), "id"))
+    {
+        std::string osNewFieldName = GetUniqueFieldName(poFeatureDefn, iField,
+            poFieldDefn->GetNameRef(), 0);
+        if( !EQUAL(osNewFieldName.c_str(), "id") )
+        {
+            CPLError( CE_Warning, CPLE_NotSupported,
+                      "Normalized/laundered field name: '%s' to '%s'",
+                      poFieldDefn->GetNameRef(),
+                      osNewFieldName.c_str() );
+
+            // Set field name with normalized value.
+            poFieldDefn->SetName( osNewFieldName.c_str() );
+        }
+    }
+}
+
 /*
  * TranslateSQLToFilter()
  */
@@ -429,7 +503,6 @@
 /*
  * OGRNGWLayer()
  */
-
 OGRNGWLayer::OGRNGWLayer( const std::string &osResourceIdIn, OGRNGWDataset *poDSIn,
     const NGWAPI::Permissions &stPermissionsIn, OGRFeatureDefn *poFeatureDefnIn,
     GIntBig nFeatureCountIn, const OGREnvelope &stExtentIn ) :
@@ -919,6 +992,9 @@
     }
 }
 
+/*
+ * GetMaxFeatureCount()
+ */
 GIntBig OGRNGWLayer::GetMaxFeatureCount( bool bForce )
 {
     if( nFeatureCount < 0 || bForce )
@@ -977,6 +1053,9 @@
     return OGRERR_NONE;
 }
 
+/*
+ * GetExtent()
+ */
 OGRErr OGRNGWLayer::GetExtent(int iGeomField, OGREnvelope *psExtent, int bForce)
 {
     return OGRLayer::GetExtent(iGeomField, psExtent, bForce);
@@ -1009,16 +1088,31 @@
     bFetchedPermissions = true;
 }
 
+/*
+ * CreateField()
+ */
 OGRErr OGRNGWLayer::CreateField( OGRFieldDefn *poField, CPL_UNUSED int bApproxOK )
 {
+    CPLAssert( nullptr != poField );
+
     if( osResourceId == "-1" ) // Can create field only on new layers (not synced with server).
     {
-        poFeatureDefn->AddFieldDefn( poField );
+        if( !CheckFieldNameUnique(poFeatureDefn, -1, poField->GetNameRef()) )
+        {
+            return OGRERR_FAILURE;
+        }
+        // Field name 'id' is forbidden.
+        OGRFieldDefn oModFieldDefn(poField);
+        NormalizeFieldName(poFeatureDefn, -1, &oModFieldDefn);
+        poFeatureDefn->AddFieldDefn( &oModFieldDefn );
         return OGRERR_NONE;
     }
     return OGRLayer::CreateField( poField, bApproxOK );
 }
 
+/*
+ * DeleteField()
+ */
 OGRErr OGRNGWLayer::DeleteField( int iField )
 {
     if( osResourceId == "-1" ) // Can delete field only on new layers (not synced with server).
@@ -1028,6 +1122,9 @@
     return OGRLayer::DeleteField( iField );
 }
 
+/*
+ * ReorderFields()
+ */
 OGRErr OGRNGWLayer::ReorderFields( int *panMap )
 {
     if( osResourceId == "-1" ) // Can reorder fields only on new layers (not synced with server).
@@ -1037,35 +1134,59 @@
     return OGRLayer::ReorderFields( panMap );
 }
 
+/*
+ * AlterFieldDefn()
+ */
 OGRErr OGRNGWLayer::AlterFieldDefn( int iField, OGRFieldDefn *poNewFieldDefn,
     int nFlagsIn )
 {
+    CPLAssert( nullptr != poNewFieldDefn );
+
     OGRFieldDefn *poFieldDefn = poFeatureDefn->GetFieldDefn( iField );
     if( poFieldDefn )
     {
+        // Check new field name is not equal for another fields.
+        if( !CheckFieldNameUnique(poFeatureDefn, iField, poNewFieldDefn->GetNameRef()) )
+        {
+            return OGRERR_FAILURE;
+        }
         if( osResourceId == "-1" ) // Can alter field only on new layers (not synced with server).
         {
-            poFieldDefn->SetName( poNewFieldDefn->GetNameRef() );
-            poFieldDefn->SetType( poNewFieldDefn->GetType() );
-            poFieldDefn->SetSubType( poNewFieldDefn->GetSubType() );
-            poFieldDefn->SetWidth( poNewFieldDefn->GetWidth() );
-            poFieldDefn->SetPrecision( poNewFieldDefn->GetPrecision() );
+            // Field name 'id' forbidden.
+            OGRFieldDefn oModFieldDefn(poNewFieldDefn);
+            NormalizeFieldName(poFeatureDefn, iField, &oModFieldDefn);
+
+            poFieldDefn->SetName( oModFieldDefn.GetNameRef() );
+            poFieldDefn->SetType( oModFieldDefn.GetType() );
+            poFieldDefn->SetSubType( oModFieldDefn.GetSubType() );
+            poFieldDefn->SetWidth( oModFieldDefn.GetWidth() );
+            poFieldDefn->SetPrecision( oModFieldDefn.GetPrecision() );
         }
         else if( nFlagsIn & ALTER_NAME_FLAG ) // Can only rename field, not change it type.
         {
+            // Field name 'id' forbidden.
+            OGRFieldDefn oModFieldDefn(poNewFieldDefn);
+            NormalizeFieldName(poFeatureDefn, iField, &oModFieldDefn);
+
             bNeedSyncStructure = true;
-            poFieldDefn->SetName(poNewFieldDefn->GetNameRef());
+            poFieldDefn->SetName( oModFieldDefn.GetNameRef() );
         }
     }
     return OGRLayer::AlterFieldDefn( iField, poNewFieldDefn, nFlagsIn );
 }
 
+/*
+ * SetMetadata()
+ */
 CPLErr OGRNGWLayer::SetMetadata(char **papszMetadata, const char *pszDomain)
 {
     bNeedSyncStructure = true;
     return OGRLayer::SetMetadata(papszMetadata, pszDomain);
 }
 
+/*
+ * SetMetadataItem()
+ */
 CPLErr OGRNGWLayer::SetMetadataItem(const char *pszName, const char *pszValue,
     const char *pszDomain)
 {
@@ -1073,6 +1194,9 @@
     return OGRLayer::SetMetadataItem(pszName, pszValue, pszDomain);
 }
 
+/*
+ * CreateNGWResourceJson()
+ */
 std::string OGRNGWLayer::CreateNGWResourceJson()
 {
     CPLJSONObject oResourceJson;
@@ -1139,29 +1263,69 @@
     return oResourceJson.Format(CPLJSONObject::Plain);
 }
 
+/*
+ * SyncFeatures()
+ */
 OGRErr OGRNGWLayer::SyncFeatures()
 {
     if( !bNeedSyncData )
     {
         return OGRERR_NONE;
     }
-    bool bResult = NGWAPI::PatchFeatures( poDS->GetUrl(), osResourceId,
-        FeaturesToJson(), poDS->GetHeaders() );
-    if( bResult )
+
+    CPLJSONArray oFeatureJsonArray;
+    std::vector<GIntBig> aoPatchedFIDs;
+    for(GIntBig nFID : soChangedIds)
+    {
+        if( moFeatures[nFID] != nullptr )
+        {
+            oFeatureJsonArray.Add( FeatureToJson( moFeatures[nFID] ) );
+            aoPatchedFIDs.push_back(nFID);
+        }
+    }
+
+    if( !aoPatchedFIDs.empty() )
+    {
+        auto osIDs = NGWAPI::PatchFeatures( poDS->GetUrl(), osResourceId,
+            oFeatureJsonArray.Format(CPLJSONObject::Plain), poDS->GetHeaders() );
+        if( !osIDs.empty() )
     {
         bNeedSyncData = false;
         nFeatureCount += GetNewFeaturesCount();
         soChangedIds.clear();
-        FreeMap(moFeatures); // While patching we cannot receive new features FIDs.
+            if( osIDs.size() != aoPatchedFIDs.size() ) // Expected equal identifier count.
+            {
+                CPLDebug("ngw", "Patched feature count is not equal. Reload features from server.");
+                FreeMap(moFeatures);
+            }
+            else // Just update identifiers.
+            {
+                int nCounter = 0;
+                for(GIntBig nFID : aoPatchedFIDs)
+                {
+                    GIntBig nNewFID = osIDs[nCounter++];
+                    OGRFeature *poFeature = moFeatures[nFID];
+                    poFeature->SetFID(nNewFID);
+                    moFeatures.erase(nFID);
+                    moFeatures[nNewFID] = poFeature;
+                }
+            }
     }
     else
     {
         // Error message should set in NGWAPI::PatchFeatures function.
+            if( CPLGetLastErrorNo() != 0 )
+            {
         return OGRERR_FAILURE;
     }
+        }
+    }
     return OGRERR_NONE;
 }
 
+/*
+ * SyncToDisk()
+ */
 OGRErr OGRNGWLayer::SyncToDisk()
 {
     if( osResourceId == "-1" ) // Create vector layer at NextGIS Web.
@@ -1276,22 +1440,6 @@
 }
 
 /*
- * FeaturesToJson()
- */
-std::string OGRNGWLayer::FeaturesToJson()
-{
-    CPLJSONArray oFeatureJsonArray;
-    for(GIntBig nFID : soChangedIds)
-    {
-        if( moFeatures[nFID] != nullptr )
-        {
-            oFeatureJsonArray.Add( FeatureToJson( moFeatures[nFID] ) );
-        }
-    }
-    return oFeatureJsonArray.Format(CPLJSONObject::Plain);
-}
-
-/*
  * ISetFeature()
  */
 OGRErr OGRNGWLayer::ISetFeature(OGRFeature *poFeature)
@@ -1462,6 +1610,9 @@
     return OGRERR_NONE;
 }
 
+/*
+ * SetSpatialFilter()
+ */
 void OGRNGWLayer::SetSpatialFilter( OGRGeometry *poGeom )
 {
     OGRLayer::SetSpatialFilter( poGeom );
@@ -1570,6 +1721,9 @@
     return eResult;
 }
 
+/*
+ * SetSelectedFields()
+ */
 OGRErr OGRNGWLayer::SetSelectedFields(const std::set<std::string> &aosFields)
 {
     CPLStringList aosIgnoreFields;
@@ -1585,12 +1739,18 @@
     return SetIgnoredFields( const_cast<const char**>(aosIgnoreFields.List()) );
 }
 
+/*
+ * Clone()
+ */
 OGRNGWLayer *OGRNGWLayer::Clone() const
 {
     return new OGRNGWLayer( osResourceId, poDS, stPermissions,
         poFeatureDefn->Clone(), nFeatureCount, stExtent );
 }
 
+/*
+ * GetNewFeaturesCount()
+ */
 GIntBig OGRNGWLayer::GetNewFeaturesCount() const
 {
     if( soChangedIds.empty() )