MapServer#3443 reports a huge performance issue because of falling back to world bounds when reprojection of a map request rectangle into layer projection fails. This patch will abort drawing such a layer.

Author: Martin Kofahl

mapproject.c

@@ -641,20 +641,12 @@ int msProjectRectGrid(projectionObj *in, projectionObj *out, rectObj *rect)
   }
 
   if( !rect_initialized ) {
-    if( out == NULL || out->proj == NULL
-        || pj_is_latlong(in->proj) ) {
-      prj_rect.minx = -180;
-      prj_rect.maxx = 180;
-      prj_rect.miny = -90;
-      prj_rect.maxy = 90;
-    } else {
-      prj_rect.minx = -22000000;
-      prj_rect.maxx = 22000000;
-      prj_rect.miny = -11000000;
-      prj_rect.maxy = 11000000;
-    }
+    prj_rect.minx = 0;
+    prj_rect.maxx = 0;
+    prj_rect.miny = 0;
+    prj_rect.maxy = 0;
 
-    msDebug( "msProjectRect(): all points failed to reproject, trying to fall back to using world bounds ... hope this helps.\n" );
+    msSetError(MS_PROJERR, "All points failed to reproject.", "msProjectRect()");
   } else {
     msDebug( "msProjectRect(): some points failed to reproject, doing internal sampling.\n" );
   }

mapraster.c

@@ -474,7 +474,14 @@ int msDrawRasterLayerLow(mapObj *map, layerObj *layer, imageObj *image,
     searchrect = map->extent;
 #ifdef USE_PROJ
     /* if necessary, project the searchrect to source coords */
-    if((map->projection.numargs > 0) && (layer->projection.numargs > 0)) msProjectRect(&map->projection, &layer->projection, &searchrect);
+    if((map->projection.numargs > 0) && (layer->projection.numargs > 0)) {
+      if( msProjectRect(&map->projection, &layer->projection, &searchrect)
+          != MS_SUCCESS ) {
+        msDebug( "msDrawRasterLayerLow(%s): unable to reproject map request rectangle into layer projection, canceling.\n", layer->name );
+        final_status = MS_FAILURE;
+        goto cleanup;
+      }
+    }
 #endif
     status = msLayerWhichShapes(tlp, searchrect, MS_FALSE);
     if (status != MS_SUCCESS) {