GMLAS: take into account gYearMonth XML data type (relates to BRGM/gm…

…l_application_schema_toolbox#46) git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@40959 f0d54148-0727-0410-94bb-9a71ac55c965
aashish24 · Dec 5, 2017 · d9328eb · d9328eb
1 parent a6da4ab
commit d9328eb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 1 deletion.
diff --git a/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h b/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h
@@ -533,6 +533,7 @@ typedef enum
     GMLAS_FT_DECIMAL,
     GMLAS_FT_DATE,
     GMLAS_FT_GYEAR,
+    GMLAS_FT_GYEAR_MONTH,
     GMLAS_FT_TIME,
     GMLAS_FT_DATETIME,
     GMLAS_FT_BASE64BINARY,

diff --git a/ogr/ogrsf_frmts/gmlas/ogr_gmlas_consts.h b/ogr/ogrsf_frmts/gmlas/ogr_gmlas_consts.h
@@ -291,6 +291,7 @@ namespace GMLASConstants
     STRING_CONST(szXS_DECIMAL, "decimal");
     STRING_CONST(szXS_DATE, "date");
     STRING_CONST(szXS_GYEAR, "gYear");
+    STRING_CONST(szXS_GYEAR_MONTH, "gYearMonth");
     STRING_CONST(szXS_TIME, "time");
     STRING_CONST(szXS_DATETIME, "dateTime");
     STRING_CONST(szXS_ANY_URI, "anyURI");

diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp
@@ -101,6 +101,8 @@ GMLASFieldType GMLASField::GetTypeFromString( const CPLString& osType )
         return GMLAS_FT_DATE;
     else if( osType == szXS_GYEAR )
         return GMLAS_FT_GYEAR;
+    else if( osType == szXS_GYEAR_MONTH )
+        return GMLAS_FT_GYEAR_MONTH;
     else if( osType == szXS_TIME )
         return GMLAS_FT_TIME;
     else if( osType == szXS_DATETIME )

diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp
@@ -810,6 +810,9 @@ void OGRGMLASLayer::PostInit( bool bIncludeGeometryXML )
             case GMLAS_FT_GYEAR:
                 eType = OFTInteger;
                 break;
+            case GMLAS_FT_GYEAR_MONTH:
+                eType = OFTDate;
+                break;
             case GMLAS_FT_TIME:
                 eType = OFTTime;
                 break;

diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp
@@ -680,7 +680,7 @@ void GMLASReader::SetField( OGRFeature* poFeature,
             poFeature->SetField( nAttrIdx, "" );
         }
     }
-    else if( eType == OFTDateTime )
+    else if( eType == OFTDate || eType == OFTDateTime )
     {
         OGRField sField;
         if( OGRParseXMLDateTime(

diff --git a/ogr/ogrutils.cpp b/ogr/ogrutils.cpp
@@ -1233,6 +1233,14 @@ int OGRParseXMLDateTime( const char* pszXMLDateTime,
         TZ = 0;
         bRet = true;
     }
+    // Date is expressed as a UTC date with only year:month.
+    else if( sscanf(pszXMLDateTime, "%04d-%02d", &year, &month) ==
+             2 )
+    {
+        TZ = 0;
+        bRet = true;
+        day = 1;
+    }
 
     if( !bRet )
       return FALSE;