KML driver: writer: generate a Placemark id

Fixes OSGeo#10840 (comment)
rouault · Oct 11, 2024 · 330df9d · 330df9d
1 parent b6edb51
commit 330df9d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/autotest/ogr/ogr_kml.py b/autotest/ogr/ogr_kml.py
@@ -577,7 +577,7 @@ def test_ogr_kml_write_schema(tmp_vsimem):
     <SimpleField name="realfield" type="float"></SimpleField>
 </Schema>
 <Folder><name>lyr</name>
-  <Placemark>
+  <Placemark id="lyr.1">
     <ExtendedData><SchemaData schemaUrl="#lyr">
         <SimpleData name="strfield">strfield_val</SimpleData>
         <SimpleData name="intfield">1</SimpleData>
@@ -648,7 +648,7 @@ def test_ogr_kml_two_layers(tmp_vsimem):
 <Folder><name>empty</name>
 </Folder>
 <Folder><name>lyr</name>
-  <Placemark>
+  <Placemark id="lyr.1">
     <ExtendedData><SchemaData schemaUrl="#lyr">
         <SimpleData name="foo">bar</SimpleData>
     </SchemaData></ExtendedData>

diff --git a/autotest/utilities/test_ogr2ogr.py b/autotest/utilities/test_ogr2ogr.py
@@ -1403,7 +1403,7 @@ def test_ogr2ogr_49_bis(ogr2ogr_path, tmp_path):
         """<kml xmlns="http://www.opengis.net/kml/2.2">""",
         """<Document id="root_doc">""",
         """<Folder><name>grid</name>""",
-        """  <Placemark>""",
+        """  <Placemark id="grid.1">""",
         """        <name>440750.000</name>""",
         """  </Placemark>""",
         """</Folder>""",

diff --git a/ogr/ogrsf_frmts/kml/ogr_kml.h b/ogr/ogrsf_frmts/kml/ogr_kml.h
@@ -74,7 +74,7 @@ class OGRKMLLayer final : public OGRLayer
     int iNextKMLId_;
     bool bWriter_;
     int nLayerNumber_;
-    int nWroteFeatureCount_;
+    GIntBig nWroteFeatureCount_;
     bool bSchemaWritten_;
     bool bClosedForWriting;
     char *pszName_;

diff --git a/ogr/ogrsf_frmts/kml/ogrkmllayer.cpp b/ogr/ogrsf_frmts/kml/ogrkmllayer.cpp
@@ -339,7 +339,11 @@ OGRErr OGRKMLLayer::ICreateFeature(OGRFeature *poFeature)
         VSIFPrintfL(fp, "<Folder><name>%s</name>\n", pszName_);
     }
 
-    VSIFPrintfL(fp, "  <Placemark>\n");
+    ++nWroteFeatureCount_;
+    char *pszEscapedLayerName = OGRGetXML_UTF8_EscapedString(GetDescription());
+    VSIFPrintfL(fp, "  <Placemark id=\"%s." CPL_FRMT_GIB "\">\n",
+                pszEscapedLayerName, nWroteFeatureCount_);
+    CPLFree(pszEscapedLayerName);
 
     if (poFeature->GetFID() == OGRNullFID)
         poFeature->SetFID(iNextKMLId_++);
@@ -561,7 +565,6 @@ OGRErr OGRKMLLayer::ICreateFeature(OGRFeature *poFeature)
     }
 
     VSIFPrintfL(fp, "  </Placemark>\n");
-    nWroteFeatureCount_++;
     return OGRERR_NONE;
 }