[mapserver-commits] r12374 - in trunk/mapserver/mapcache: . src
svn at osgeo.org
svn at osgeo.org
Fri Aug 26 07:20:34 EDT 2011
Author: tbonfort
Date: 2011-08-26 04:20:34 -0700 (Fri, 26 Aug 2011)
New Revision: 12374
Modified:
trunk/mapserver/mapcache/geocache.xml
trunk/mapserver/mapcache/src/configuration.c
Log:
fix thread-unsafe usage of http request urls
thomas.bonfort | 2011-05-25 12:12:17 +0200 (Wed, 25 May 2011)
Modified: trunk/mapserver/mapcache/geocache.xml
===================================================================
--- trunk/mapserver/mapcache/geocache.xml 2011-08-26 11:20:29 UTC (rev 12373)
+++ trunk/mapserver/mapcache/geocache.xml 2011-08-26 11:20:34 UTC (rev 12374)
@@ -32,15 +32,15 @@
getMap requests. This is the srs that will be sent to the WMS source during
a request, make sure that this srs is supported by the wms.
-->
- <srs>epsg:4326</srs>
+ <srs>EPSG:4326</srs>
<!--
equivalent values for the SRS that can be requested by a client.
this value is essentially here to be able to support:
- - epsg:900913 and epsg:3857 for the googleMapsCompatible gridset
- - epsg:2154 and IGNF:LAMB93
+ - EPSG:900913 and EPSG:3857 for the googleMapsCompatible gridset
+ - EPSG:2154 and IGNF:LAMB93
-->
- <srsalias>epsg:foobar</srsalias>
+ <srsalias>EPSG:foobar</srsalias>
<!--
width and height of tiles. 256x256 is the usual size
@@ -69,7 +69,7 @@
<WellKnownScaleSet>urn:ogc:def:wkss:OGC:1.0:GoogleCRS84Quad</WellKnownScaleSet>
</metadata>
<extent>-180 -90 180 90</extent>
- <srs>epsg:4326</srs>
+ <srs>EPSG:4326</srs>
<units>dd</units>
<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>
@@ -81,15 +81,15 @@
<WellKnownScaleSet>urn:ogc:def:wkss:OGC:1.0:GoogleMapsCompatible</WellKnownScaleSet>
</metadata>
<extent>-20037508.3427892480 -20037508.3427892480 20037508.3427892480 20037508.3427892480</extent>
- <srs>epsg:3857</srs>
- <srsalias>epsg:900913</srsalias>
+ <srs>EPSG:3857</srs>
+ <srsalias>EPSG:900913</srsalias>
<units>m</units>
<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>
</grid>
-->
- <!-- this grid is identical to the previous one, except that it uses epsg:900913 as the default srs as it is more supported -->
+ <!-- this grid is identical to the previous one, except that it uses EPSG:900913 as the default srs as it is more supported -->
<!--
<grid>
<name>g</name>
@@ -98,8 +98,8 @@
<WellKnownScaleSet>urn:ogc:def:wkss:OGC:1.0:GoogleMapsCompatible</WellKnownScaleSet>
</metadata>
<extent>-20037508.3427892480,-20037508.3427892480,20037508.3427892480,20037508.3427892480</extent>
- <srs>epsg:900913</srs>
- <srsalias>epsg:3857</srsalias>
+ <srs>EPSG:900913</srs>
+ <srsalias>EPSG:3857</srsalias>
<size>256 256</size>
<resolutions>
156543.0339280410
Modified: trunk/mapserver/mapcache/src/configuration.c
===================================================================
--- trunk/mapserver/mapcache/src/configuration.c 2011-08-26 11:20:29 UTC (rev 12373)
+++ trunk/mapserver/mapcache/src/configuration.c 2011-08-26 11:20:34 UTC (rev 12374)
@@ -101,7 +101,7 @@
apr_table_add(grid->metadata,"title","GoogleCRS84Quad");
apr_table_add(grid->metadata,"wellKnownScaleSet","urn:ogc:def:wkss:OGC:1.0:GoogleCRS84Quad");
apr_table_add(grid->metadata,"profile","global-geodetic");
- grid->srs = apr_pstrdup(pool,"epsg:4326");
+ grid->srs = apr_pstrdup(pool,"EPSG:4326");
grid->unit = GEOCACHE_UNIT_DEGREES;
grid->tile_sx = grid->tile_sy = 256;
grid->nlevels = 19;
@@ -120,8 +120,8 @@
grid = geocache_grid_create(pool);
grid->name = apr_pstrdup(pool,"GoogleMapsCompatible");
- grid->srs = apr_pstrdup(pool,"epsg:3857");
- APR_ARRAY_PUSH(grid->srs_aliases,char*) = apr_pstrdup(pool,"epsg:900913");
+ grid->srs = apr_pstrdup(pool,"EPSG:3857");
+ APR_ARRAY_PUSH(grid->srs_aliases,char*) = apr_pstrdup(pool,"EPSG:900913");
apr_table_add(grid->metadata,"title","GoogleMapsCompatible");
apr_table_add(grid->metadata,"profile","global-mercator");
apr_table_add(grid->metadata,"wellKnownScaleSet","urn:ogc:def:wkss:OGC:1.0:GoogleMapsCompatible");
@@ -143,8 +143,8 @@
grid = geocache_grid_create(pool);
grid->name = apr_pstrdup(pool,"g");
- grid->srs = apr_pstrdup(pool,"epsg:900913");
- APR_ARRAY_PUSH(grid->srs_aliases,char*) = apr_pstrdup(pool,"epsg:3857");
+ grid->srs = apr_pstrdup(pool,"EPSG:900913");
+ APR_ARRAY_PUSH(grid->srs_aliases,char*) = apr_pstrdup(pool,"EPSG:3857");
apr_table_add(grid->metadata,"title","GoogleMapsCompatible");
apr_table_add(grid->metadata,"profile","global-mercator");
apr_table_add(grid->metadata,"wellKnownScaleSet","urn:ogc:def:wkss:OGC:1.0:GoogleMapsCompatible");
@@ -688,7 +688,7 @@
geocache_grid_compute_limits(grid,extent,gridlink->grid_limits);
/* compute wgs84 bbox if it wasn't supplied already */
- if(!havewgs84bbox && !strcasecmp(grid->srs,"epsg:4326")) {
+ if(!havewgs84bbox && !strcasecmp(grid->srs,"EPSG:4326")) {
tileset->wgs84bbox[0] = extent[0];
tileset->wgs84bbox[1] = extent[1];
tileset->wgs84bbox[2] = extent[2];
More information about the mapserver-commits
mailing list