Merge pull request #260 from geographika/zoom-levels

Add additional zoom levels to GoogleMapsCompatible grids

Author: jbo-ads

lib/configuration.c

@@ -41,7 +41,7 @@ void mapcache_configuration_parse(mapcache_context *ctx, const char *filename, m
 
   GC_CHECK_ERROR(ctx);
 
-  /* if we were suppplied with an onlineresource, make sure it ends with a / */
+  /* if we were supplied with an onlineresource, make sure it ends with a / */
   if(NULL != (url = (char*)apr_table_get(config->metadata,"url"))) {
     char *urlend = url + strlen(url)-1;
     if(*urlend != '/') {
@@ -91,7 +91,7 @@ mapcache_cfg* mapcache_configuration_create(apr_pool_t *pool)
     5.36441802978516e-6
   };
 
-  double google_resolutions[19] = {
+  double google_resolutions[22] = {
     156543.0339280410,
     78271.51696402048,
     39135.75848201023,
@@ -110,7 +110,10 @@ mapcache_cfg* mapcache_configuration_create(apr_pool_t *pool)
     4.777314267823516,
     2.388657133911758,
     1.194328566955879,
-    0.5971642834779395
+    0.5971642834779395,
+    0.2985821417389697,
+    0.1492910708694849,
+    0.0746455354347424
   };
 
 
@@ -178,7 +181,7 @@ mapcache_cfg* mapcache_configuration_create(apr_pool_t *pool)
   apr_table_add(grid->metadata,"profile","global-mercator");
   apr_table_add(grid->metadata,"wellKnownScaleSet","urn:ogc:def:wkss:OGC:1.0:GoogleMapsCompatible");
   grid->tile_sx = grid->tile_sy = 256;
-  grid->nlevels = 19;
+  grid->nlevels = 22;
   grid->unit = MAPCACHE_UNIT_METERS;
   grid->extent = google_extent;
   grid->levels = (mapcache_grid_level**)apr_pcalloc(pool,
@@ -203,7 +206,7 @@ mapcache_cfg* mapcache_configuration_create(apr_pool_t *pool)
   apr_table_add(grid->metadata,"profile","global-mercator");
   apr_table_add(grid->metadata,"wellKnownScaleSet","urn:ogc:def:wkss:OGC:1.0:GoogleMapsCompatible");
   grid->tile_sx = grid->tile_sy = 256;
-  grid->nlevels = 19;
+  grid->nlevels = 22;
   grid->unit = MAPCACHE_UNIT_METERS;
   grid->extent = google_extent;
   grid->levels = (mapcache_grid_level**)apr_pcalloc(pool,

mapcache.xml.sample

@@ -107,7 +107,7 @@
             <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>
+            <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 0.2985821417389697 0.1492910708694849 0.0746455354347424</resolutions>
          </grid>
    --> 
 
@@ -142,6 +142,9 @@
                2.388657133911758
                1.194328566955879
                0.5971642834779395
+               0.2985821417389697
+               0.1492910708694849
+               0.0746455354347424
             </resolutions>
          </grid>
    --> 

tests/expected/wmts_capabilities.xml

@@ -242,6 +242,33 @@
         <MatrixWidth>262144</MatrixWidth>
         <MatrixHeight>262144</MatrixHeight>
       </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>19</ows:Identifier>
+        <ScaleDenominator>1066.36479192489173328795</ScaleDenominator>
+        <TopLeftCorner>-20037508.342789 20037508.342789</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>524288</MatrixWidth>
+        <MatrixHeight>524288</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>20</ows:Identifier>
+        <ScaleDenominator>533.18239596244609401765</ScaleDenominator>
+        <TopLeftCorner>-20037508.342789 20037508.342789</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>1048576</MatrixWidth>
+        <MatrixHeight>1048576</MatrixHeight>
+      </TileMatrix>
+      <TileMatrix>
+        <ows:Identifier>21</ows:Identifier>
+        <ScaleDenominator>266.59119798122287647857</ScaleDenominator>
+        <TopLeftCorner>-20037508.342789 20037508.342789</TopLeftCorner>
+        <TileWidth>256</TileWidth>
+        <TileHeight>256</TileHeight>
+        <MatrixWidth>2097152</MatrixWidth>
+        <MatrixHeight>2097152</MatrixHeight>
+      </TileMatrix>
     </TileMatrixSet>
   </Contents>
 </Capabilities>