[mapserver-commits] r13137 - trunk/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2012-02-12 01:49:40 -0800 (Sun, 12 Feb 2012)
New Revision: 13137

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/shp2img.c
Log:
shp2img: make it possible to specify layers (with -l option) that match GROUP names

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2012-02-12 09:45:59 UTC (rev 13136)
+++ trunk/mapserver/HISTORY.TXT	2012-02-12 09:49:40 UTC (rev 13137)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 -------------------------------------------------
 
+- shp2img: make it possible to specify layers (with -l option) that match GROUP names.
+
 - reuse a pre-parsed mapfile across fastcgi loops in case the mapfile is
   specified with the MS_MAPFILE env variable. (#4018)
 

Modified: trunk/mapserver/shp2img.c
===================================================================
--- trunk/mapserver/shp2img.c	2012-02-12 09:45:59 UTC (rev 13136)
+++ trunk/mapserver/shp2img.c	2012-02-12 09:49:40 UTC (rev 13137)
@@ -277,17 +277,18 @@
       }
 
       for(j=0; j<map->numlayers; j++) {
-	if(GET_LAYER(map, j)->status == MS_DEFAULT)
-          continue;
-	else {
-	  GET_LAYER(map, j)->status = MS_OFF;
-	  for(k=0; k<num_layers; k++) {
-	    if(GET_LAYER(map, j)->name && strcasecmp(GET_LAYER(map, j)->name, layers[k]) == 0) {
-	      GET_LAYER(map, j)->status = MS_ON;
-	      break;
-	    }
-	  }
-	}
+          if(GET_LAYER(map, j)->status == MS_DEFAULT)
+              continue;
+          else {
+              GET_LAYER(map, j)->status = MS_OFF;
+              for(k=0; k<num_layers; k++) {
+                  if((GET_LAYER(map, j)->name && strcasecmp(GET_LAYER(map, j)->name, layers[k]) == 0) ||
+                     (GET_LAYER(map, j)->group && strcasecmp(GET_LAYER(map, j)->group, layers[k]) == 0)) {
+                      GET_LAYER(map, j)->status = MS_ON;
+                      break;
+                  }
+              }
+          }
       }
 
       msFreeCharArray(layers, num_layers);