[mapserver-commits] r13141 - in trunk/mapserver: . mapcache

[svn at osgeo.org]

Author: tbonfort
Date: 2012-02-13 05:07:23 -0800 (Mon, 13 Feb 2012)
New Revision: 13141

Modified:
   trunk/mapserver/mapcache/mapcache.xml
   trunk/mapserver/mapcopy.c
Log:
fix missing element in msCopyLabel


Modified: trunk/mapserver/mapcache/mapcache.xml
===================================================================
--- trunk/mapserver/mapcache/mapcache.xml	2012-02-13 11:49:51 UTC (rev 13140)
+++ trunk/mapserver/mapcache/mapcache.xml	2012-02-13 13:07:23 UTC (rev 13141)
@@ -12,14 +12,17 @@
       <getmap>
          <params>
             <FORMAT>image/png</FORMAT>
-            <LAYERS>basic</LAYERS>
+            <LAYERS>default</LAYERS>
          </params>
       </getmap>
       
       <http>
-         <url>http://vmap0.tiles.osgeo.org/wms/vmap0</url>
+         <url>http://localhost/cgi-bin/mapserv?map=/gro1/mapserver-utils/osm-google.map</url>
       </http>
    </source>
+   <source name="ms" type="mapserver">
+      <mapfile>/gro1/mapserver-utils/osm-google.map</mapfile>
+   </source>
    
    <tileset name="test">
       <source>vmap0</source>
@@ -31,6 +34,16 @@
       <metabuffer>10</metabuffer>
       <expires>3600</expires>
    </tileset>
+   <tileset name="ms">
+      <source>ms</source>
+      <cache>disk</cache>
+      <grid>WGS84</grid>
+      <grid>g</grid>
+      <format>PNG</format>
+      <metatile>5 5</metatile>
+      <metabuffer>10</metabuffer>
+      <expires>3600</expires>
+   </tileset>
 
 
    <default_format>JPEG</default_format>

Modified: trunk/mapserver/mapcopy.c
===================================================================
--- trunk/mapserver/mapcopy.c	2012-02-13 11:49:51 UTC (rev 13140)
+++ trunk/mapserver/mapcopy.c	2012-02-13 13:07:23 UTC (rev 13141)
@@ -298,6 +298,7 @@
   MS_COPYSTRING(dst->encoding, src->encoding);
 
   MS_COPYSTELEM(outlinewidth);
+  MS_COPYSTELEM(space_size_10);
 
   /* 
   ** now the styles 
@@ -491,6 +492,7 @@
             return MS_FAILURE;
         }
     }
+    MS_COPYSTELEM(numlabels);
 
     MS_COPYSTRING(dst->keyimage, src->keyimage);
     MS_COPYSTRING(dst->name, src->name);