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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-10-26 03:14:52 -0700 (Wed, 26 Oct 2011)
New Revision: 12698

Modified:
   trunk/mapserver/mapcache/src/service_wmts.c
Log:
fix some tilematrix limits bugs


Modified: trunk/mapserver/mapcache/src/service_wmts.c
===================================================================
--- trunk/mapserver/mapcache/src/service_wmts.c	2011-10-25 15:28:33 UTC (rev 12697)
+++ trunk/mapserver/mapcache/src/service_wmts.c	2011-10-26 10:14:52 UTC (rev 12698)
@@ -225,6 +225,9 @@
          }
 
 
+         /* gaia gis chokes if this is added to the capabilities doc,
+          * so disable it for now
+          *
          double *gbbox = grid_link->restricted_extent?grid_link->restricted_extent:grid_link->grid->extent;
          ezxml_t bbox = ezxml_add_child(layer,"ows:BoundingBox",0);
          ezxml_set_txt(ezxml_add_child(bbox,"ows:LowerCorner",0),
@@ -232,6 +235,7 @@
          ezxml_set_txt(ezxml_add_child(bbox,"ows:UpperCorner",0),
                apr_psprintf(ctx->pool,"%f %f",gbbox[2], gbbox[3]));
          ezxml_set_attr(bbox,"crs",mapcache_grid_get_crs(ctx,grid_link->grid));
+         */
       }
       layer_index = apr_hash_next(layer_index);
    }
@@ -279,8 +283,8 @@
                   grid->extent[1] + glevel->maxy * glevel->resolution * grid->tile_sy));
          ezxml_set_txt(ezxml_add_child(tm,"TileWidth",0),apr_psprintf(ctx->pool,"%d",grid->tile_sx));
          ezxml_set_txt(ezxml_add_child(tm,"TileHeight",0),apr_psprintf(ctx->pool,"%d",grid->tile_sy));
-         ezxml_set_txt(ezxml_add_child(tm,"MatrixWidth",0),apr_psprintf(ctx->pool,"%d",glevel->maxx+1));
-         ezxml_set_txt(ezxml_add_child(tm,"MatrixHeight",0),apr_psprintf(ctx->pool,"%d",glevel->maxy+1));
+         ezxml_set_txt(ezxml_add_child(tm,"MatrixWidth",0),apr_psprintf(ctx->pool,"%d",glevel->maxx));
+         ezxml_set_txt(ezxml_add_child(tm,"MatrixHeight",0),apr_psprintf(ctx->pool,"%d",glevel->maxy));
       }
       grid_index = apr_hash_next(grid_index);
    }