Added EXTENT_PRIORITY layer processing option.

git-svn-id: http://svn.osgeo.org/mapserver/trunk@7364 7532c77e-422f-0410-93f4-f0b67bdd69e2
MapServer · Feb 7, 2008 · fbf4fb2 · fbf4fb2
1 parent f4de4fe
commit fbf4fb2
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/mapdrawgdal.c b/mapdrawgdal.c
@@ -1594,6 +1594,7 @@ int msGetGDALGeoTransform( GDALDatasetH hDS, mapObj *map, layerObj *layer,
                            double *padfGeoTransform )
 
 {
+    const char *extent_priority = NULL;
 #if defined(USE_WMS_SVR) || defined (USE_WFS_SVR)
     rectObj  rect;
 #endif
@@ -1608,6 +1609,23 @@ int msGetGDALGeoTransform( GDALDatasetH hDS, mapObj *map, layerObj *layer,
     padfGeoTransform[4] = 0.0;
     padfGeoTransform[5] = -1.0;
 
+/* -------------------------------------------------------------------- */
+/*      Do we want to override GDAL with a worldfile if one is present? */
+/* -------------------------------------------------------------------- */
+    extent_priority = CSLFetchNameValue( layer->processing, 
+                                         "EXTENT_PRIORITY" );
+
+    if( extent_priority != NULL
+        && EQUALN(extent_priority,"WORLD",5) )
+    {
+	        if( GDALGetDescription(hDS) != NULL 
+            && GDALReadWorldFile(GDALGetDescription(hDS), "wld", 
+                                 padfGeoTransform) )
+        {
+            return MS_SUCCESS;
+        }
+    }
+
 /* -------------------------------------------------------------------- */
 /*      Try GDAL.                                                       */
 /*                                                                      */