[mapserver-commits] r11301 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-03-22 08:55:28 -0700 (Tue, 22 Mar 2011)
New Revision: 11301

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapkml.cpp
   trunk/mapserver/mapkmlrenderer.cpp
Log:
KML: update code to reflect output changes. Fix true type symbols. (#3766)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-22 14:34:15 UTC (rev 11300)
+++ trunk/mapserver/HISTORY.TXT	2011-03-22 15:55:28 UTC (rev 11301)
@@ -15,6 +15,10 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- KML: update code to reflect output changes. Fix true type symbols. (#3766)
+
+- SLD: Text Symbolizer now uses the new expression syntax (#3757)
+
 - WFS: correct bbox values for GetFeature with featureid request (#3761) 
 
 - Mapscript Seg Fault on mapObj->getMetaData (#3738)

Modified: trunk/mapserver/mapkml.cpp
===================================================================
--- trunk/mapserver/mapkml.cpp	2011-03-22 14:34:15 UTC (rev 11300)
+++ trunk/mapserver/mapkml.cpp	2011-03-22 15:55:28 UTC (rev 11301)
@@ -118,10 +118,12 @@
     return MS_SUCCESS;
 }
 
-int msRenderTruetypeSymbolKml(imageObj *img, double x, double y,
+int msRenderTruetypeSymbolKml(imageObj *image, double x, double y,
         symbolObj *symbol, symbolStyleObj *style)
 {
-   return MS_SUCCESS;
+    KmlRenderer* renderer = getKmlRenderer(image);
+    renderer->renderTruetypeSymbol(image, x, y, symbol, style);
+    return MS_SUCCESS;
 }
 
 

Modified: trunk/mapserver/mapkmlrenderer.cpp
===================================================================
--- trunk/mapserver/mapkmlrenderer.cpp	2011-03-22 14:34:15 UTC (rev 11300)
+++ trunk/mapserver/mapkmlrenderer.cpp	2011-03-22 15:55:28 UTC (rev 11301)
@@ -330,16 +330,9 @@
         BgColor = layer->map->imagecolor;
 
          xmlNewChild(DocNode, NULL, BAD_CAST "name", BAD_CAST layer->map->name);
+         aggFormat = msSelectOutputFormat( layer->map, "png24");
+         aggFormat->transparent = MS_TRUE;
          
-         for (int i=0; i<map->numoutputformats; i++)
-         {
-             outputFormatObj *iFormat = layer->map->outputformatlist[i];
-             if(!strcasecmp(iFormat->name,"png24"))
-             {
-                 aggFormat = iFormat;
-                 break;
-             }
-         } 
     }
 
     currentLayer = layer;