NAS: disable NAS_INDICATOR default to fix #720

OSGeo · Jul 26, 2018 · 9ec6971 · 9ec6971 · rouault · Jul 26, 2018
1 parent e44b035
commit 9ec6971
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/gdal/ogr/ogrsf_frmts/nas/drv_nas.html b/gdal/ogr/ogrsf_frmts/nas/drv_nas.html
@@ -15,9 +15,11 @@ <h1>NAS - ALKIS</h1>
 library.</p>
 
 <p>The driver looks for "opengis.net/gml" and one of the strings semicolon
-separated strings listed in the option <b>NAS_INDICATOR</b> (which defaults to
-"NAS-Operationen;AAA-Fachschema;aaa.xsd;aaa-suite") to
-determine if a input is a NAS file and ignores all files without any matches.</p>
+separated strings listed in the option <b>NAS_INDICATOR</b>  to determine if
+a input is a NAS file and ignores all files without any matches.</p>
+
+<p>The former default of "NAS-Operationen;AAA-Fachschema;aaa.xsd;aaa-suite" was
+removed and has now to be explicitly specified to enable detection.</p>
 
 <p>In GDAL 2.3 a bunch of workarounds were removed, that caused the driver to
 remap or ignore some elements and attributes internally to avoid attribute

diff --git a/gdal/ogr/ogrsf_frmts/nas/ogrnasdriver.cpp b/gdal/ogr/ogrsf_frmts/nas/ogrnasdriver.cpp
@@ -74,11 +74,7 @@ static int OGRNASDriverIdentify( GDALOpenInfo* poOpenInfo )
     if( strstr(szPtr,"opengis.net/gml") == nullptr )
         return FALSE;
 
-    char **papszIndicators = CSLTokenizeStringComplex(
-        CPLGetConfigOption(
-            "NAS_INDICATOR",
-            "NAS-Operationen;AAA-Fachschema;aaa.xsd;aaa-suite" ),
-        ";", 0, 0 );
+    char **papszIndicators = CSLTokenizeStringComplex(CPLGetConfigOption("NAS_INDICATOR", ""), ";", 0, 0 );
 
     bool bFound = false;
     for( int i = 0; papszIndicators[i] && !bFound; i++ )