[mapserver-commits] r10734 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-11-17 11:11:00 -0800 (Wed, 17 Nov 2010)
New Revision: 10734

Modified:
   trunk/mapserver/maptemplate.c
Log:
Removed inner/outer ring separator attributes from shpxy tag. Can just use the part separator in both cases.

Modified: trunk/mapserver/maptemplate.c
===================================================================
--- trunk/mapserver/maptemplate.c	2010-11-17 19:04:37 UTC (rev 10733)
+++ trunk/mapserver/maptemplate.c	2010-11-17 19:11:00 UTC (rev 10734)
@@ -1863,8 +1863,8 @@
   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; /* inner ring: necessary for complex polygons */
+  char *orh, *orf; /* outer ring */
 
   int centroid;
   int precision;
@@ -1902,7 +1902,7 @@
     xh = yh = yf = ph = pf = sh = sf = ""; /* initialize the tag arguments */
     xf= ",";
     irh = irf = orh = orf = "";    
-    ps = cs = irs = ors = " ";
+    ps = cs = " ";
 
     centroid = MS_FALSE;
     precision = 0;
@@ -1941,11 +1941,6 @@
       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");