[mapserver-commits] r13008 - sandbox/sdlime/rfc-77

[svn at osgeo.org]

Author: sdlime
Date: 2012-01-21 20:11:56 -0800 (Sat, 21 Jan 2012)
New Revision: 13008

Modified:
   sandbox/sdlime/rfc-77/mapfile.c
Log:
Updated writeLabel() for RFC 77...

Modified: sandbox/sdlime/rfc-77/mapfile.c
===================================================================
--- sandbox/sdlime/rfc-77/mapfile.c	2012-01-22 00:51:26 UTC (rev 13007)
+++ sandbox/sdlime/rfc-77/mapfile.c	2012-01-22 04:11:56 UTC (rev 13008)
@@ -68,6 +68,7 @@
 static int loadStyle(styleObj *style);
 static void writeStyle(FILE* stream, int indent, styleObj *style);
 static int resolveSymbolNames(mapObj *map);
+static void writeExpression(FILE *stream, int indent, const char *name, expressionObj *exp);
 
 /************************************************************************/
 /*                           int isAxisInverted                         */
@@ -1959,6 +1960,8 @@
 
     writeKeyword(stream, indent, "ANTIALIAS", label->antialias, 1, MS_TRUE, "TRUE");
 
+    writeExpression(stream, indent, "EXPRESSION", &(label->expression));
+
     if(label->numbindings > 0 && label->bindings[MS_LABEL_BINDING_FONT].item)
       writeAttributeBinding(stream, indent, "FONT", &(label->bindings[MS_LABEL_BINDING_FONT]));
     else writeString(stream, indent, "FONT", NULL, label->font);
@@ -2013,6 +2016,9 @@
   writeNumber(stream, indent, "MAXOVERLAPANGLE", 22.5, label->maxoverlapangle);
   for(i=0; i<label->numstyles; i++)
     writeStyle(stream, indent, label->styles[i]);
+
+  writeExpression(stream, indent, "TEXT", &(label->text));
+
   writeKeyword(stream, indent, "TYPE", label->type, 2, MS_BITMAP, "BITMAP", MS_TRUETYPE, "TRUETYPE");
   writeCharacter(stream, indent, "WRAP", '\0', label->wrap);
   writeBlockEnd(stream, indent, "LABEL");