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

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:11:03 -0700 (Fri, 26 Aug 2011)
New Revision: 12250

Modified:
   trunk/mapserver/mapcache/src/service_wms.c
   trunk/mapserver/mapcache/src/service_wmts.c
Log:
put matrixsets at the end of the doc
thomas.bonfort | 2011-01-15 10:44:51 +0100 (Sat, 15 Jan 2011)

Modified: trunk/mapserver/mapcache/src/service_wms.c
===================================================================
--- trunk/mapserver/mapcache/src/service_wms.c	2011-08-26 11:10:58 UTC (rev 12249)
+++ trunk/mapserver/mapcache/src/service_wms.c	2011-08-26 11:11:03 UTC (rev 12250)
@@ -214,8 +214,6 @@
    double *bbox;
    
    str = apr_table_get(params,"SERVICE");
-   if(!str)
-      str = apr_table_get(params,"service");
    if(!str) {
       ctx->set_error(ctx,GEOCACHE_REQUEST_ERROR,"received wms request with no service param");
       return;
@@ -226,8 +224,6 @@
    }
       
    str = apr_table_get(params,"REQUEST");
-   if(!str)
-      str = apr_table_get(params,"request");
    if(!str) {
       ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wms with no request");
       return;
@@ -244,8 +240,6 @@
 
 
    str = apr_table_get(params,"BBOX");
-   if(!str)
-      str = apr_table_get(params,"bbox");
    if(!str) {
       ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wms request with no bbox");
       return;
@@ -259,8 +253,6 @@
    }
 
    str = apr_table_get(params,"WIDTH");
-   if(!str)
-      str = apr_table_get(params,"width");
    if(!str) {
       ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wms request with no width");
       return;
@@ -274,8 +266,6 @@
    }
 
    str = apr_table_get(params,"HEIGHT");
-   if(!str)
-      str = apr_table_get(params,"height");
    if(!str) {
       ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wms request with no height");
       return;
@@ -289,16 +279,12 @@
    }
 
    srs = apr_table_get(params,"SRS");
-   if(!srs)
-      srs = apr_table_get(params,"srs");
    if(!srs) {
       ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wms request with no srs");
       return;
    }
 
    str = apr_table_get(params,"LAYERS");
-   if(!str)
-      str = apr_table_get(params,"layers");
    if(!str) {
       ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wms request with no layers");
       return;

Modified: trunk/mapserver/mapcache/src/service_wmts.c
===================================================================
--- trunk/mapserver/mapcache/src/service_wmts.c	2011-08-26 11:10:58 UTC (rev 12249)
+++ trunk/mapserver/mapcache/src/service_wmts.c	2011-08-26 11:11:03 UTC (rev 12250)
@@ -249,8 +249,6 @@
    geocache_tileset *tileset;
    int row,col,level;
    str = apr_table_get(params,"SERVICE");
-   if(!str)
-      str = apr_table_get(params,"service");
    if(!str) {
       ctx->set_error(ctx,GEOCACHE_REQUEST_ERROR,"received wmts request with no service param");
       return;
@@ -261,8 +259,6 @@
    }
       
    str = apr_table_get(params,"REQUEST");
-   if(!str)
-      str = apr_table_get(params,"request");
    if(!str) {
       ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wmts request with no request");
       return;
@@ -280,8 +276,6 @@
       geocache_grid *grid = NULL;
       
       str = apr_table_get(params,"TILEROW");
-      if(!str)
-         str = apr_table_get(params,"tilerow");
       if(!str) {
          ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wmts request with no TILEROW");
          return;
@@ -295,8 +289,6 @@
       }
       
       str = apr_table_get(params,"TILECOL");
-      if(!str)
-         str = apr_table_get(params,"tilecol");
       if(!str) {
          ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wmts request with no TILECOL");
          return;
@@ -312,8 +304,6 @@
       
       
       layer = apr_table_get(params,"LAYER");
-      if(!layer)
-         layer = apr_table_get(params,"layer");
       if(!layer) {
          ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wmts request with no layer");
          return;
@@ -326,8 +316,6 @@
       }
       
       matrixset = apr_table_get(params,"TILEMATRIXSET");
-      if(!matrixset)
-         matrixset = apr_table_get(params,"tilematrixset");
       if(!matrixset) {
          ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wmts request with no TILEMATRIXSET");
          return;
@@ -346,8 +334,6 @@
       }
 
       matrix = apr_table_get(params,"TILEMATRIX");
-      if(!matrix)
-         matrix = apr_table_get(params,"tilematrix");
       if(!matrix) {
          ctx->set_error(ctx, GEOCACHE_REQUEST_ERROR, "received wmts request with no TILEMATRIX");
          return;