[mapserver-commits] r12212 - trunk/mapserver/mapcache/src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:07:41 -0700 (Fri, 26 Aug 2011)
New Revision: 12212

Modified:
   trunk/mapserver/mapcache/src/configuration.c
Log:
add missing headers
thomas.bonfort | 2011-01-07 14:35:19 +0100 (Fri, 07 Jan 2011)

Modified: trunk/mapserver/mapcache/src/configuration.c
===================================================================
--- trunk/mapserver/mapcache/src/configuration.c	2011-08-26 11:07:36 UTC (rev 12211)
+++ trunk/mapserver/mapcache/src/configuration.c	2011-08-26 11:07:41 UTC (rev 12212)
@@ -27,44 +27,52 @@
 geocache_cfg* geocache_configuration_create(apr_pool_t *pool) {
    geocache_grid *grid;
    int i;
-   double wgs84_resolutions[16]={
-         1.40625,
-         0.703125,
-         0.3515625,
-         0.17578125,
-         0.087890625,
-         0.0439453125,
-         0.02197265625,
-         0.010986328125,
-         0.0054931640625,
-         0.00274658203125,
-         0.001373291015625,
-         0.0006866455078125,
-         0.00034332275390625,
-         0.000171661376953125,
-         0.0000858306884765625,
-         0.00004291534423828125};
+   double wgs84_resolutions[19]={
+         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};
+   
    double google_resolutions[19] = {
-         156543.0339,
-         78271.51695,
-         39135.758475,
-         19567.8792375,
-         9783.93961875,
-         4891.96980938,
-         2445.98490469,
-         1222.99245234,
-         611.496226172,
-         305.748113086,
-         152.874056543,
-         76.4370282715,
-         38.2185141357,
-         19.1092570679,
-         9.55462853394,
-         4.77731426697,
-         2.38865713348,
-         1.19432856674,
-         0.597164283371
+         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
    };
+   
+   
+   
+   
    double wgs84_extent[4]={-180,-90,180,90};
    double google_extent[4]={-20037508.34,-20037508.34,20037508.34,20037508.34};
 
@@ -112,7 +120,7 @@
 
    grid = geocache_grid_create(pool);
    grid->name = "google";
-   grid->srs = "epsg:900913";
+   grid->srs = "epsg:3857";
    apr_table_add(grid->metadata,"title","GoogleMapsCompatible");
    apr_table_add(grid->metadata,"wellKnownScaleSet","urn:ogc:def:wkss:OGC:1.0:GoogleMapsCompatible");
    grid->tile_sx = grid->tile_sy = 256;