Changeset 12388

Timestamp:

10/12/07 21:44:13 (1 year ago)

Author:

warmerdam

Message:

Fix handling of gmljp2 files with srsName only on Envelope (#1906)
Fix handling of urn:x-ogc (use importFromURN() method). Add GMLJP2OVERRIDE
configuration option mechanism to set custom GMLJP2 from a file.

Files:

• trunk/gdal/gcore/gdaljp2metadata.cpp (modified) (3 diffs)

trunk/gdal/gcore/gdaljp2metadata.cpp

@@ -629 +629 @@
-
-/* -------------------------------------------------------------------- */
+/*      If we still don't have an srsName, check for it on the          */
+/*      boundedBy Envelope.  Some products                              */
+/*      (ie. EuropeRasterTile23.jpx) use this as the only srsName       */
+/*      delivery vehicle.                                               */
+/* -------------------------------------------------------------------- */
+    if( pszSRSName == NULL )
+    {
+        pszSRSName = 
+            CPLGetXMLValue( psXML,
+                            "=FeatureCollection.boundedBy.Envelope.srsName",
+                            NULL );
+    }
+
+/* -------------------------------------------------------------------- */
-/*      If we have gotten a geotransform, then try to interprete the    */
-/*      srsName.                                                        */
@@ -635 +649 @@
-        && (pszProjection == NULL || strlen(pszProjection) == 0) )
-    {
+        OGRSpatialReference oSRS;
+
-        if( EQUALN(pszSRSName,"epsg:",5) )
-        {
-            OGRSpatialReference oSRS;
-            if( oSRS.SetFromUserInput( pszSRSName ) == OGRERR_NONE )
-                oSRS.exportToWkt( &pszProjection );
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-        else if( !GMLSRSLookup( pszSRSName ) )
@@ -752 +757 @@
-
-{
+/* -------------------------------------------------------------------- */
+/*      This is a backdoor to let us embed a literal gmljp2 chunk       */
+/*      supplied by the user as an external file.  This is mostly       */
+/*      for preparing test files with exotic contents.                  */
+/* -------------------------------------------------------------------- */
+    if( CPLGetConfigOption( "GMLJP2OVERRIDE", NULL ) != NULL )
+    {
+        FILE *fp = VSIFOpenL( CPLGetConfigOption( "GMLJP2OVERRIDE",""), "r" );
+        char *pszGML = NULL;
+
+        if( fp == NULL )
+        {
+            CPLError( CE_Failure, CPLE_AppDefined, 
+                      "Unable to open GMLJP2OVERRIDE file." );
+            return NULL;
+        }
+        
+        VSIFSeekL( fp, 0, SEEK_END );
+        int nLength = (int) VSIFTellL( fp );
+        pszGML = (char *) CPLCalloc(1,nLength+1);
+        VSIFSeekL( fp, 0, SEEK_SET );
+        VSIFReadL( pszGML, 1, nLength, fp );
+        VSIFCloseL( fp );
+
+        GDALJP2Box *apoGMLBoxes[2];
+
+        apoGMLBoxes[0] = GDALJP2Box::CreateLblBox( "gml.data" );
+        apoGMLBoxes[1] = 
+            GDALJP2Box::CreateLabelledXMLAssoc( "gml.root-instance", 
+                                                pszGML );
+
+        GDALJP2Box *poGMLData = GDALJP2Box::CreateAsocBox( 2, apoGMLBoxes);
+        
+        delete apoGMLBoxes[0];
+        delete apoGMLBoxes[1];
+
+        CPLFree( pszGML );
+        
+        return poGMLData;
+    }
+
-/* -------------------------------------------------------------------- */
-/*      Try do determine a PCS or GCS code we can use.                  */