be more lenient with "DIM_" prefix for WMS dimensions

Author: tbonfort

lib/service_wms.c

@@ -667,7 +667,14 @@ void _mapcache_service_wms_parse_request(mapcache_context *ctx, mapcache_service
               } else {
                 dim_name = apr_pstrcat(ctx->pool, "dim_", dimension->name, NULL);
               }
-              if((value = (char*)apr_table_get(params,dim_name)) != NULL) {
+              if((value = (char*)apr_table_get(params,dim_name)) == NULL) {
+                if(strcasecmp(dimension->name,"TIME") && strcasecmp(dimension->name,"ELEVATION")) {
+                  /* also test for the dimension without the DIM_ prefix if the latter was not found in hte KVP params */
+                  value = (char*)apr_table_get(params,dimension->name);
+                }
+              }
+
+              if(value) {
                 char *tmpval = apr_pstrdup(ctx->pool,value);
                 int ok;
                 if(dimension->skip_validation) {

lib/source_wms.c

@@ -55,7 +55,12 @@ void _mapcache_source_wms_render_map(mapcache_context *ctx, mapcache_map *map)
     int i;
     for(i=0; i<elts->nelts; i++) {
       apr_table_entry_t entry = APR_ARRAY_IDX(elts,i,apr_table_entry_t);
+      /* set both DIM_key=val and key=val KVP params */
       apr_table_setn(params,entry.key,entry.val);
+      if(strcasecmp(entry.key,"TIME") && strcasecmp(entry.key,"ELEVATION")) {
+        char *dim_name = apr_pstrcat(ctx->pool,"DIM_",entry.key,NULL);
+        apr_table_setn(params,dim_name,entry.val);
+      }
     }
 
   }