Merge pull request #213 from jbo-ads/getfeatureinfo-with-dimensions

GetFeatureInfo: Fix dimension values forwarded to WMS source

Author: jbo-ads

lib/source.c

@@ -73,7 +73,7 @@ void mapcache_source_query_info(mapcache_context *ctx, mapcache_source *source,
 #endif
   for(i=0;i<=source->retry_count;i++) {
     if(i) { /* not our first try */
-      ctx->log(ctx, MAPCACHE_INFO, "source (%s) render_map retry %d of %d. previous try returned error: %s",
+      ctx->log(ctx, MAPCACHE_INFO, "source (%s) query_info retry %d of %d. previous try returned error: %s",
                source->name, i, source->retry_count, ctx->get_error_message(ctx));
       ctx->clear_errors(ctx);
       if(source->retry_delay > 0) {

lib/source_wms.c

@@ -71,10 +71,10 @@ void _mapcache_source_wms_render_map(mapcache_context *ctx, mapcache_source *pso
     for(i=0; i<map->dimensions->nelts; i++) {
       mapcache_requested_dimension *rdim = APR_ARRAY_IDX(map->dimensions,i,mapcache_requested_dimension*);
       /* set both DIM_key=val and key=val KVP params */
-      apr_table_setn(params,rdim->dimension->name,rdim->cached_value);
+      apr_table_setn(params,rdim->dimension->name,rdim->requested_value);
       if(strcasecmp(rdim->dimension->name,"TIME") && strcasecmp(rdim->dimension->name,"ELEVATION")) {
         char *dim_name = apr_pstrcat(ctx->pool,"DIM_",rdim->dimension->name,NULL);
-        apr_table_setn(params,dim_name,rdim->cached_value);
+        apr_table_setn(params,dim_name,rdim->requested_value);
       }
     }
   }
@@ -125,10 +125,10 @@ void _mapcache_source_wms_query(mapcache_context *ctx, mapcache_source *source,
     for(i=0; i<map->dimensions->nelts; i++) {
       mapcache_requested_dimension *rdim = APR_ARRAY_IDX(map->dimensions,i,mapcache_requested_dimension*);
       /* set both DIM_key=val and key=val KVP params */
-      apr_table_setn(params,rdim->dimension->name,rdim->cached_value);
+      apr_table_setn(params,rdim->dimension->name,rdim->requested_value);
       if(strcasecmp(rdim->dimension->name,"TIME") && strcasecmp(rdim->dimension->name,"ELEVATION")) {
         char *dim_name = apr_pstrcat(ctx->pool,"DIM_",rdim->dimension->name,NULL);
-        apr_table_setn(params,dim_name,rdim->cached_value);
+        apr_table_setn(params,dim_name,rdim->requested_value);
       }
     }
   }