[mapserver-commits] r11186 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2011-03-17 06:57:29 -0700 (Thu, 17 Mar 2011)
New Revision: 11186

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/shp2img.c
Log:
support GROUP layers in shp2img (#3746)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-17 13:27:56 UTC (rev 11185)
+++ trunk/mapserver/HISTORY.TXT	2011-03-17 13:57:29 UTC (rev 11186)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- support GROUP layers in shp2img (#3746)
+
 - Honour MAXSIZE for WCS 2.0 responses (#3204).
 
 - fallback to ows_title for WCS ows:Title of CoverageDescription (#3528)

Modified: trunk/mapserver/shp2img.c
===================================================================
--- trunk/mapserver/shp2img.c	2011-03-17 13:27:56 UTC (rev 11185)
+++ trunk/mapserver/shp2img.c	2011-03-17 13:57:29 UTC (rev 11186)
@@ -97,7 +97,7 @@
     fprintf(stdout,"  -o image: output filename (stdout if not provided)\n");
     fprintf(stdout,"  -e minx miny maxx maxy: extents to render\n");
     fprintf(stdout,"  -s sizex sizey: output image size\n");
-    fprintf(stdout,"  -l layers: layers to enable - make sure they are quoted and space seperated if more than one listed\n" );
+    fprintf(stdout,"  -l layers: layers / groups to enable - make sure they are quoted and space seperated if more than one listed\n" );
     fprintf(stdout,"  -all_debug n: Set debug level for map and all layers\n" );
     fprintf(stdout,"  -map_debug n: Set map debug level\n" );
     fprintf(stdout,"  -layer_debug layer_name n: Set layer debug level\n" );
@@ -263,7 +263,7 @@
       for(j=0; j<num_layers; j++) { /* loop over -l */
           layer_found=0;
           for(k=0; k<map->numlayers; k++) {
-              if(GET_LAYER(map, k)->name && strcmp(GET_LAYER(map, k)->name, layers[j]) == 0) {
+              if((GET_LAYER(map, k)->name && strcasecmp(GET_LAYER(map, k)->name, layers[j]) == 0) || (GET_LAYER(map, k)->group && strcasecmp(GET_LAYER(map, k)->group, layers[j]) == 0)) {
                   layer_found = 1;
                   break;
               }
@@ -281,7 +281,7 @@
 	else {
 	  GET_LAYER(map, j)->status = MS_OFF;
 	  for(k=0; k<num_layers; k++) {
-	    if(GET_LAYER(map, j)->name && strcmp(GET_LAYER(map, j)->name, layers[k]) == 0) {
+	    if(GET_LAYER(map, j)->name && strcasecmp(GET_LAYER(map, j)->name, layers[k]) == 0) {
 	      GET_LAYER(map, j)->status = MS_ON;
 	      break;
 	    }