[mapserver-commits] r10733 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-11-17 11:04:37 -0800 (Wed, 17 Nov 2010)
New Revision: 10733

Modified:
   trunk/mapserver/maptemplate.c
Log:
Enable inner/outer ring header/footer/separator variables. They aren't used yet, just enabled in a shpxy tag. (#3606)

Modified: trunk/mapserver/maptemplate.c
===================================================================
--- trunk/mapserver/maptemplate.c	2010-11-17 11:04:23 UTC (rev 10732)
+++ trunk/mapserver/maptemplate.c	2010-11-17 19:04:37 UTC (rev 10733)
@@ -1856,15 +1856,15 @@
 
   /*
   ** Pointers to static strings, naming convention is:
-  **   char 1 - x=x, y=y, c=coordinate, p=part, s=shape
-  **   char 2 - h=header, f=footer, s=seperator
+  **   char 1/2 - x=x, y=y, c=coordinate, p=part, s=shape, ir=inner ring, or=outer ring
+  **   last char - h=header, f=footer, s=seperator
   */
   char *xh, *xf, *yh, *yf;
   char *cs;
   char *ph, *pf, *ps;
   char *sh, *sf;
-  /* char *irh="", *irf="", *irs=""; // inner ring: necessary for complex polygons */
-  /* char *orh="", *orf="", *ors=""; // outer ring */
+  char *irh, *irf, *irs; /* inner ring: necessary for complex polygons */
+  char *orh, *orf, *ors; /* outer ring */
 
   int centroid;
   int precision;
@@ -1901,7 +1901,8 @@
   while (tagStart) {
     xh = yh = yf = ph = pf = sh = sf = ""; /* initialize the tag arguments */
     xf= ",";
-    ps = cs = " ";
+    irh = irf = orh = orf = "";    
+    ps = cs = irs = ors = " ";
 
     centroid = MS_FALSE;
     precision = 0;
@@ -1930,6 +1931,21 @@
       argValue = msLookupHashTable(tagArgs, "cs");
       if(argValue) cs = argValue;
 
+      argValue = msLookupHashTable(tagArgs, "irh");
+      if(argValue) irh = argValue;
+      argValue = msLookupHashTable(tagArgs, "irf");
+      if(argValue) irf = argValue;
+
+      argValue = msLookupHashTable(tagArgs, "orh");
+      if(argValue) orh = argValue;
+      argValue = msLookupHashTable(tagArgs, "orf");
+      if(argValue) orf = argValue;
+
+      argValue = msLookupHashTable(tagArgs, "irs");
+      if(argValue) irs = argValue;
+      argValue = msLookupHashTable(tagArgs, "ors");
+      if(argValue) ors = argValue;
+
       argValue = msLookupHashTable(tagArgs, "ph");
       if(argValue) ph = argValue;
       argValue = msLookupHashTable(tagArgs, "pf");