[mapserver-commits] r12562 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2011-09-20 08:37:48 -0700 (Tue, 20 Sep 2011)
New Revision: 12562

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapfile.c
Log:
Backport in 6-0: Added geomtransform in writeStyle function

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-09-20 15:35:53 UTC (rev 12561)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-09-20 15:37:48 UTC (rev 12562)
@@ -15,6 +15,8 @@
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
 
+- Added GEOMTRANSFORM in writeStyle function
+
 - WCS 1.0: Fix crash with some _rangeset_axes values (#4020)
 
 - Changed msDrawVectorLayer() not to cache shapes if attribute binding is present after the first style (#3976)

Modified: branches/branch-6-0/mapserver/mapfile.c
===================================================================
--- branches/branch-6-0/mapserver/mapfile.c	2011-09-20 15:35:53 UTC (rev 12561)
+++ branches/branch-6-0/mapserver/mapfile.c	2011-09-20 15:37:48 UTC (rev 12562)
@@ -2705,6 +2705,17 @@
   
   writeNumber(stream, indent, "GAP", 0, style->gap);
 
+  if(style->_geomtransform.type != MS_GEOMTRANSFORM_NONE) {
+    writeKeyword(stream, indent, "GEOMTRANSFORM", style->_geomtransform.type, 6,
+                 MS_GEOMTRANSFORM_BBOX, "\"bbox\"",
+                 MS_GEOMTRANSFORM_END, "\"end\"",
+                 MS_GEOMTRANSFORM_LABELPOINT, "\"labelpnt\"",
+                 MS_GEOMTRANSFORM_LABELPOLY, "\"labelpoly\"",
+                 MS_GEOMTRANSFORM_START, "\"start\"",
+                 MS_GEOMTRANSFORM_VERTICES, "\"vertices\""
+    );
+  }
+
   if(style->linecap != MS_CJC_DEFAULT_CAPS) {
      writeKeyword(stream,indent,"LINECAP",(int)style->linecap,5,
            MS_CJC_NONE,"NONE",
@@ -2780,11 +2791,6 @@
     writeDimension(stream, indent, "DATARANGE", style->minvalue, style->maxvalue, NULL, NULL);
   }
 
-  if(style->_geomtransform.type != MS_GEOMTRANSFORM_NONE) {
-    /*
-    ** TODO: fprintf(stream, "        GEOMTRANSFORM \"%s\"\n",style->_geomtransformexpression);
-    */
-  }
   writeBlockEnd(stream, indent, "STYLE");
 }