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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:08:02 -0700 (Fri, 26 Aug 2011)
New Revision: 12216

Modified:
   trunk/mapserver/mapcache/src/configuration.c
Log:
fix a bug that prevented aquiring a global lock when using virtualhosts
thomas.bonfort | 2011-01-07 19:10:02 +0100 (Fri, 07 Jan 2011)

Modified: trunk/mapserver/mapcache/src/configuration.c
===================================================================
--- trunk/mapserver/mapcache/src/configuration.c	2011-08-26 11:07:57 UTC (rev 12215)
+++ trunk/mapserver/mapcache/src/configuration.c	2011-08-26 11:08:02 UTC (rev 12216)
@@ -119,7 +119,7 @@
    geocache_configuration_add_grid(cfg,grid,"WGS84");
 
    grid = geocache_grid_create(pool);
-   grid->name = "google";
+   grid->name = "GoogleMapsCompatible";
    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");
@@ -137,9 +137,29 @@
       grid->extents[i][3] = google_extent[3];
       grid->resolutions[i] = google_resolutions[i];
    }
+   geocache_configuration_add_grid(cfg,grid,"GoogleMapsCompatible");
+
+   grid = geocache_grid_create(pool);
+   grid->name = "google";
+   grid->srs = "epsg:900913";
+   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;
+   grid->resolutions = google_resolutions;
+   grid->levels = 19;
+   grid->unit = GEOCACHE_UNIT_METERS;
+   grid->extents = (double**)apr_pcalloc(pool,grid->levels*sizeof(double*));
+   grid->resolutions = (double*)apr_pcalloc(pool,grid->levels*sizeof(double));
+   for(i=0; i<grid->levels; i++) {
+      grid->extents[i] = (double*)apr_pcalloc(pool,4*sizeof(double));
+      grid->extents[i][0] = google_extent[0];
+      grid->extents[i][1] = google_extent[1];
+      grid->extents[i][2] = google_extent[2];
+      grid->extents[i][3] = google_extent[3];
+      grid->resolutions[i] = google_resolutions[i];
+   }
    geocache_configuration_add_grid(cfg,grid,"google");
 
-
    return cfg;
 }