ILI: Add support for INTERLIS 2.4

Author: pka

autotest/ogr/data/ili/KGKCGC_FPDS2_V1_1.imd

@@ -790,8 +790,7 @@ def test_ogr_interlis2_2():
 # Ili2 Oereb model
 
 
-def test_ogr_interlis2_4():
-
+def test_ogr_interlis2_3():
     ds = ogr.Open(
         "data/ili/ch.bazl.sicherheitszonenplan.oereb_20131118.xtf,data/ili/ch.bazl.sicherheitszonenplan.oereb_20131118.imd"
     )
@@ -872,6 +871,80 @@ def test_ogr_interlis2_4():
             ogrtest.check_feature_geometry(geom, val)
 
 
+###############################################################################
+# Ili 2.4 model
+
+
+def test_ogr_interlis2_4():
+    ds = gdal.OpenEx(
+        "data/ili/fpds2_v1_1.xtf", open_options=["MODEL=data/ili/KGKCGC_FPDS2_V1_1.imd"]
+    )
+    assert ds is not None
+
+    layers = [
+        "UebersichtGeodienst",
+        "UebersichtMassstab",
+        "Zustaendigkeit",
+        "Fixpunkt",
+        "FixpunktAktion",
+        "FixpunkteNachfuehrung",
+        "FixpunktVersion",
+    ]
+
+    assert ds.GetLayerCount() == len(layers), "layer count wrong."
+
+    for i in range(ds.GetLayerCount()):
+        assert ds.GetLayer(i).GetName() in layers, "Did not get right layers"
+
+    lyr = ds.GetLayerByName("FixpunktVersion")
+    assert lyr.GetFeatureCount() == 7, "feature count wrong."
+
+    feat = lyr.GetNextFeature()
+
+    field_values = [
+        "1667a884-a4a8-461f-8db1-4fbb395b0e57",
+        "2006-11-13",
+        0.05,
+        535.36,
+        "ja",
+        "transformiert",
+        0.02,
+        "ja",
+        "Stein",
+        "Nr.reservieren",
+        "",
+        "",
+        "",
+        "72b72689-85cb-411a-9022-7de6fbd3277b",
+        "ba10bace-1efc-4abb-8a59-ebd40a006c9e",
+    ]
+
+    if feat.GetFieldCount() != len(field_values):
+        feat.DumpReadable()
+        pytest.fail("field count wrong.")
+
+    for i in range(feat.GetFieldCount()):
+        if feat.GetFieldAsString(i) != str(field_values[i]):
+            feat.DumpReadable()
+            print(
+                lyr.GetLayerDefn().GetFieldDefn(i).GetName(), feat.GetFieldAsString(i)
+            )
+            pytest.fail("field value wrong.")
+
+    geom_field_values = [
+        "POINT (2761075.728 1198812.021)",
+    ]
+    assert feat.GetGeomFieldCount() == len(geom_field_values), "geom field count wrong."
+
+    for i in range(feat.GetGeomFieldCount()):
+        geom = feat.GetGeomFieldRef(i)
+        val = geom_field_values[i]
+        if val is None:
+            assert geom is None
+        else:
+            ogrtest.check_feature_geometry(geom, val)
+
+
 ###############################################################################
 # Check arc segmentation
 

autotest/ogr/data/ili/fpds2_v1_1.xtf

@@ -24,7 +24,7 @@
 -  the long term data storage
 -  the contract-proof security and the availability of the software
 
-OGR supports INTERLIS 1 and INTERLIS 2 (2.2 and 2.3) with the following
+OGR supports INTERLIS 1 and INTERLIS 2 (2.2 and newer) with the following
 limitations:
 
 -  Curves in Interlis 1 area polygons are converted to line segments
@@ -41,12 +41,22 @@ Driver capabilities
 
 .. supports_virtualio::
 
+Dataset open options
+--------------------
+
+|about-open-options|
+The following open options are available:
+
+-  .. oo:: MODEL
+
+      Path to IlisMeta model file.
+
 Model support
 -------------
 
 Data is read from transfer files which have different
 formats in INTERLIS 1 (.itf) and INTERLIS 2 (.xtf). Models are passed in
-IlisMeta format by using "a_filename.xtf,models.imd" as a connection
+IlisMeta format with the open option ``MODEL`` or by using "a_filename.xtf,models.imd" as a connection
 string.
 
 IlisMeta files can be be generated with the ili2c compiler. Command line
@@ -56,38 +66,44 @@ example:
 
    java -jar ili2c.jar --ilidirs '%ILI_DIR;http://models.interlis.ch/;%JAR_DIR' -oIMD --out models.imd model1.ili [model2.ili ...]
 
+or for newer models:
+
+::
+
+   java -jar ili2c.jar --ilidirs '%ILI_DIR;http://models.interlis.ch/;%JAR_DIR' -oIMD16 --out models.imd model1.ili [model2.ili ...]
+
 Some possible transformations using :ref:`ogr2ogr`.
 
 -  Interlis 1 -> Shape:
 
    ::
 
-      ogr2ogr -f "ESRI Shapefile" shpdir ili-bsp.itf,Beispiel.imd
+      gdal vector convert --oo MODEL=Beispiel.imd -f "ESRI Shapefile" ili-bsp.itf shpdir
 
--  Interlis 2 -> Shape:
+-  Interlis 2 -> GeoPackage:
 
    ::
 
-      ogr2ogr -f "ESRI Shapefile" shpdir RoadsExdm2ien.xml,RoadsExdm2ien.imd
+      gdal vector convert --oo MODEL=KGKCGC_FPDS2_V1_1.imd fpds2_v1_1.xtf fpds2_v1_1.gpkg
 
    or without model:
 
    ::
 
-      ogr2ogr -f "ESRI Shapefile" shpdir RoadsExdm2ien.xml
+      gdal vector convert -f "ESRI Shapefile" RoadsExdm2ien.xml shpdir
 
    Example with curves and multiple geometries:
 
    ::
 
-      ogr2ogr --config OGR_STROKE_CURVE TRUE -SQL 'SELECT Rechtsstatus,publiziertAb,MetadatenGeobasisdaten,Eigentumsbeschraenkung,ZustaendigeStelle,Flaeche FROM "OeREBKRM09trsfr.Transferstruktur.Geometrie"' shpdir ch.bazl.sicherheitszonenplan.oereb_20131118.xtf,OeREBKRM09vs.imd OeREBKRM09trsfr.Transferstruktur.Geometrie
+      gdal vector sql --oo MODEL=OeREBKRM09vs.imd --config OGR_STROKE_CURVE=TRUE --sql 'SELECT Rechtsstatus,publiziertAb,MetadatenGeobasisdaten,Eigentumsbeschraenkung,ZustaendigeStelle,Flaeche FROM "OeREBKRM09trsfr.Transferstruktur.Geometrie"' -f "ESRI Shapefile" ch.bazl.sicherheitszonenplan.oereb_20131118.xtf shpdir
 
 -  Importing multiple Interlis 1 files into PostGIS:
 
    ::
 
-      ogr2ogr -f PostgreSQL PG:dbname=warmerda av_fixpunkte_ohne_LFPNachfuehrung.itf,av.imd -lco OVERWRITE=yes
-      ogr2ogr -f PostgreSQL PG:dbname=warmerda av_fixpunkte_mit_LFPNachfuehrung.itf,av.imd -append
+      gdal vector convert --oo MODEL=av.imd --overwrite-layer av_fixpunkte_ohne_LFPNachfuehrung.itf PG:dbname=warmerda
+      gdal vector convert --oo MODEL=av.imd --append av_fixpunkte_mit_LFPNachfuehrung.itf PG:dbname=warmerda
 
 Arc interpolation
 ~~~~~~~~~~~~~~~~~
@@ -102,8 +118,6 @@ Arc interpolation
 Other Notes
 -----------
 
--  `ogrtools <https://github.com/sourcepole/ogrtools>`__ library
-   includes extensions for the OGR Interlis driver
 -  Development of the OGR INTERLIS driver was supported by `Swiss
    Federal Administration <http://www.kogis.ch/>`__, `Canton
    Solothurn <http://www.sogis.ch/>`__ and `Canton

autotest/ogr/ogr_ili.py

@@ -74,24 +74,24 @@ void ILI2Handler::endDocument()
 }
 
 void ILI2Handler::startElement(const XMLCh *const /* uri */,
-                               const XMLCh *const /* localname */,
-                               const XMLCh *const qname,
+                               const XMLCh *const localname,
+                               const XMLCh *const /* qname */,
                                const Attributes &attrs)
 {
     // start to add the layers, features with the DATASECTION
     char *tmpC = nullptr;
     m_nEntityCounter = 0;
     if ((level >= 0) ||
-        (cmpStr(ILI2_DATASECTION, tmpC = XMLString::transcode(qname)) == 0))
+        (cmpStr(ILI2_DATASECTION, tmpC = XMLString::transcode(localname)) == 0))
     {
         level++;
 
         if (level >= 2)
         {
 
             // create the dom tree
-            DOMElement *elem =
-                reinterpret_cast<DOMElement *>(dom_doc->createElement(qname));
+            DOMElement *elem = reinterpret_cast<DOMElement *>(
+                dom_doc->createElement(localname));
 
             // add all attributes
             unsigned int len = static_cast<unsigned int>(attrs.getLength());

doc/source/drivers/vector/ili.rst

@@ -25,7 +25,10 @@ using namespace std;
 //
 static const char *const ILI2_TID = "TID";
 static const XMLCh xmlch_ILI2_TID[] = {'T', 'I', 'D', '\0'};
+static const XMLCh xmlch_ILI2_TID_NS[] = {'i', 'l', 'i', ':',
+                                          't', 'i', 'd', '\0'};
 static const XMLCh ILI2_REF[] = {'R', 'E', 'F', '\0'};
+static const XMLCh ILI2_REF_NS[] = {'i', 'l', 'i', ':', 'r', 'e', 'f', '\0'};
 
 constexpr int ILI2_STRING_TYPE = 0;
 constexpr int ILI2_COORD_TYPE = 1;
@@ -151,7 +154,10 @@ static char *getObjValue(DOMElement *elem)
 
 static char *getREFValue(DOMElement *elem)
 {
-    CPLString osREFValue(transcode(elem->getAttribute(ILI2_REF)));
+    const XMLCh *val = elem->hasAttribute(ILI2_REF)
+                           ? elem->getAttribute(ILI2_REF)
+                           : elem->getAttribute(ILI2_REF_NS);
+    CPLString osREFValue(transcode(val));
     return CPLStrdup(osREFValue);
 }
 
@@ -672,29 +678,9 @@ int ILI2Reader::SetupParser()
     m_poSAXReader->setFeature(XMLUni::fgXercesDisableDefaultEntityResolution,
                               true);
 
-    /* No Validation
-    #if (OGR_ILI2_VALIDATION)
-        m_poSAXReader->setFeature(
-            XMLString::transcode("http://xml.org/sax/features/validation"),
-    true); m_poSAXReader->setFeature(
-            XMLString::transcode("http://xml.org/sax/features/namespaces"),
-    true);
-
-        m_poSAXReader->setFeature( XMLUni::fgSAX2CoreNameSpaces, true );
-        m_poSAXReader->setFeature( XMLUni::fgXercesSchema, true );
-
-    //    m_poSAXReader->setDoSchema(true);
-    //    m_poSAXReader->setValidationSchemaFullChecking(true);
-    #else
-    */
-    XMLCh *tmpCh =
-        XMLString::transcode("http://xml.org/sax/features/validation");
-    m_poSAXReader->setFeature(tmpCh, false);
-    XMLString::release(&tmpCh);
-    tmpCh = XMLString::transcode("http://xml.org/sax/features/namespaces");
-    m_poSAXReader->setFeature(tmpCh, false);
-    XMLString::release(&tmpCh);
-    // #endif
+    // No Validation
+    m_poSAXReader->setFeature(XMLUni::fgSAX2CoreValidation, false);
+    m_poSAXReader->setFeature(XMLUni::fgXercesSchema, false);
 
     m_bReadStarted = FALSE;
 
@@ -835,8 +821,10 @@ int ILI2Reader::AddFeature(DOMElement *elem)
     int fIndex = feature->GetFieldIndex(ILI2_TID);
     if (fIndex != -1)
     {
-        feature->SetField(
-            fIndex, transcode(elem->getAttribute(xmlch_ILI2_TID)).c_str());
+        const XMLCh *val = elem->hasAttribute(xmlch_ILI2_TID)
+                               ? elem->getAttribute(xmlch_ILI2_TID)
+                               : elem->getAttribute(xmlch_ILI2_TID_NS);
+        feature->SetField(fIndex, transcode(val).c_str());
     }
     else
     {