[mapserver-commits] r12358 - trunk/mapserver/mapcache

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:19:27 -0700 (Fri, 26 Aug 2011)
New Revision: 12358

Modified:
   trunk/mapserver/mapcache/geocache.xml
Log:
add all grid SRSs to the root WMS <Layer>
thomas.bonfort | 2011-05-11 14:22:40 +0200 (Wed, 11 May 2011)

Modified: trunk/mapserver/mapcache/geocache.xml
===================================================================
--- trunk/mapserver/mapcache/geocache.xml	2011-08-26 11:19:23 UTC (rev 12357)
+++ trunk/mapserver/mapcache/geocache.xml	2011-08-26 11:19:27 UTC (rev 12358)
@@ -63,8 +63,7 @@
    <!--
          there are three preconfigured grids you can use in <tileset>s without having to
          explicitely define them here:
-         <grid>
-            <name>WGS84</name>
+         <grid name="WGS84">
             <metadata>
                <title>GoogleCRS84Quad</title>
                <WellKnownScaleSet>urn:ogc:def:wkss:OGC:1.0:GoogleCRS84Quad</WellKnownScaleSet>
@@ -72,60 +71,19 @@
             <extent>-180 -90 180 90</extent>
             <srs>epsg:4326</srs>
             <size>256 256</size>
-            <resolutions>
-               1.40625000000000
-               0.703125000000000
-               0.351562500000000
-               0.175781250000000
-               8.78906250000000e-2
-               4.39453125000000e-2
-               2.19726562500000e-2
-               1.09863281250000e-2
-               5.49316406250000e-3
-               2.74658203125000e-3
-               1.37329101562500e-3
-               6.86645507812500e-4
-               3.43322753906250e-4
-               1.71661376953125e-4
-               8.58306884765625e-5
-               4.29153442382812e-5
-               2.14576721191406e-5
-               1.07288360595703e-5
-               5.36441802978516e-6
-            </resolutions>
+            <resolutions>1.40625000000000 0.703125000000000 0.351562500000000 0.175781250000000 8.78906250000000e-2 4.39453125000000e-2 2.19726562500000e-2 1.09863281250000e-2 5.49316406250000e-3 2.74658203125000e-3 1.37329101562500e-3 6.86645507812500e-4 3.43322753906250e-4 1.71661376953125e-4 8.58306884765625e-5 4.29153442382812e-5 2.14576721191406e-5 1.07288360595703e-5 5.36441802978516e-6</resolutions>
          </grid>
 
-         <grid>
-            <name>GoogleMapsCompatible</name>
+         <grid name="GoogleMapsCompatible">
             <metadata>
                <title>GoogleMapsCompatible</title>
                <WellKnownScaleSet>urn:ogc:def:wkss:OGC:1.0:GoogleMapsCompatible</WellKnownScaleSet>
             </metadata>
-            <extent>-20037508.3427892480,-20037508.3427892480,20037508.3427892480,20037508.3427892480</extent>
+            <extent>-20037508.3427892480 -20037508.3427892480 20037508.3427892480 20037508.3427892480</extent>
             <srs>epsg:3857</srs>
             <srsalias>epsg:900913</srsalias>
             <size>256 256</size>
-            <resolutions>
-               156543.0339280410
-               78271.51696402048
-               39135.75848201023
-               19567.87924100512
-               9783.939620502561
-               4891.969810251280
-               2445.984905125640
-               1222.992452562820
-               611.4962262814100
-               305.7481131407048
-               152.8740565703525
-               76.43702828517624
-               38.21851414258813
-               19.10925707129406
-               9.554628535647032
-               4.777314267823516
-               2.388657133911758
-               1.194328566955879
-               0.5971642834779395
-            </resolutions>
+            <resolutions>156543.0339280410 78271.51696402048 39135.75848201023 19567.87924100512 9783.939620502561 4891.969810251280 2445.984905125640 1222.992452562820 611.4962262814100 305.7481131407048 152.8740565703525 76.43702828517624 38.21851414258813 19.10925707129406 9.554628535647032 4.777314267823516 2.388657133911758 1.194328566955879 0.5971642834779395</resolutions>
          </grid>
    -->