Merge pull request #223 from jbo-ads/second-dimension-optimization

Enable retrieval of second level dimension values at map level

Author: jbo-ads

include/mapcache.h

@@ -1175,7 +1175,8 @@ void mapcache_tileset_get_map_tiles(mapcache_context *ctx, mapcache_tileset *til
                                     mapcache_extent *bbox, int width, int height,
                                     int *ntiles,
                                     mapcache_tile ***tiles,
-                                    mapcache_grid_link **effectively_used_grid_link);
+                                    mapcache_grid_link **effectively_used_grid_link,
+                                    apr_array_header_t *dimensions);
 
 mapcache_image* mapcache_tileset_assemble_map_tiles(mapcache_context *ctx, mapcache_tileset *tileset,
     mapcache_grid_link *grid_link,
@@ -1580,6 +1581,7 @@ struct mapcache_requested_dimension {
   mapcache_dimension *dimension;
   char *requested_value;
   char *cached_value;
+  apr_array_header_t *cached_entries_for_value;
 };
 
 void mapcache_tile_set_cached_dimension(mapcache_context *ctx, mapcache_tile *tile, const char *name, const char *value);
@@ -1593,6 +1595,7 @@ MS_DLL_EXPORT apr_array_header_t *mapcache_requested_dimensions_clone(apr_pool_t
 struct mapcache_dimension {
   mapcache_dimension_type type;
   int isTime;
+  int wms_querybymap_minzoom;
   char *name;
   char *unit;
   apr_table_t *metadata;

lib/configuration_xml.c

@@ -63,6 +63,7 @@ void parseMetadata(mapcache_context *ctx, ezxml_t node, apr_table_t *metadata)
 void parseDimensions(mapcache_context *ctx, ezxml_t node, mapcache_tileset *tileset)
 {
   ezxml_t dimension_node;
+  ezxml_t wms_querybymap_node;
   apr_array_header_t *dimensions = apr_array_make(ctx->pool,1,sizeof(mapcache_dimension*));
   for(dimension_node = ezxml_child(node,"dimension"); dimension_node; dimension_node = dimension_node->next) {
     char *name = (char*)ezxml_attr(dimension_node,"name");
@@ -120,6 +121,26 @@ void parseDimensions(mapcache_context *ctx, ezxml_t node, mapcache_tileset *tile
       return;
     }
 
+    dimension->wms_querybymap_minzoom = -1;
+    wms_querybymap_node = ezxml_child(dimension_node,"wms_querybymap");
+    if (wms_querybymap_node && wms_querybymap_node->txt) {
+      if (!strcasecmp(wms_querybymap_node->txt,"true")) {
+        const char * minzoom = ezxml_attr(wms_querybymap_node,"minzoom");
+        dimension->wms_querybymap_minzoom = 0;
+        if (minzoom && *minzoom) {
+          char *endptr;
+          dimension->wms_querybymap_minzoom = strtol(minzoom,&endptr,10);
+          if (*endptr != 0 || dimension->wms_querybymap_minzoom < 0) {
+            ctx->set_error(ctx, 400, "failed to parse minzoom \"%s\" for <wms_querybymap>"
+                "expecting an integer starting from 0",minzoom);
+            return;
+          }
+        }
+      } else if (strcasecmp(wms_querybymap_node->txt,"false")) {
+        ctx->set_error(ctx,400,"failed to parse <wms_querybymap> (%s), expecting \"true\" or \"false\"",wms_querybymap_node->txt);
+        return;
+      }
+    }
 
     dimension->configuration_parse_xml(ctx,dimension,dimension_node);
     GC_CHECK_ERROR(ctx);

lib/core.c

@@ -369,7 +369,8 @@ mapcache_map* mapcache_assemble_maps(mapcache_context *ctx, mapcache_map **maps,
   for(i=0; i<nmaps; i++) {
     mapcache_tileset_get_map_tiles(ctx,maps[i]->tileset,maps[i]->grid_link,
                                    &maps[i]->extent, maps[i]->width, maps[i]->height,
-                                   &(nmaptiles[i]), &(maptiles[i]), &(effectively_used_grid_links[i]));
+                                   &(nmaptiles[i]), &(maptiles[i]), &(effectively_used_grid_links[i]),
+                                   maps[i]->dimensions);
     if(GC_HAS_ERROR(ctx)) return NULL;
     ntiles += nmaptiles[i];
   }

lib/tileset.c

@@ -209,7 +209,8 @@ void mapcache_tileset_get_map_tiles(mapcache_context *ctx, mapcache_tileset *til
                                     mapcache_extent *bbox, int width, int height,
                                     int *ntiles,
                                     mapcache_tile ***tiles,
-                                    mapcache_grid_link **effectively_used_grid_link)
+                                    mapcache_grid_link **effectively_used_grid_link,
+                                    apr_array_header_t *dimensions)
 {
   double resolution;
   int level;
@@ -225,6 +226,22 @@ void mapcache_tileset_get_map_tiles(mapcache_context *ctx, mapcache_tileset *til
     level = (*effectively_used_grid_link)->max_cached_zoom;
   }
 
+  // Get dimensions values for whole map if required by <wms_querybymap> configuration
+  if (dimensions)
+  {
+    int j;
+    for (j=0 ; j<dimensions->nelts ; j++)
+    {
+      mapcache_requested_dimension *rdim = APR_ARRAY_IDX(dimensions,j,mapcache_requested_dimension*);
+      mapcache_dimension *dim = rdim->dimension;
+      if (dim->wms_querybymap_minzoom != -1 && level >= dim->wms_querybymap_minzoom) {
+        rdim->cached_entries_for_value =
+          mapcache_dimension_get_entries_for_value(ctx,rdim->dimension,rdim->requested_value,
+              tileset,bbox,(*effectively_used_grid_link)->grid);
+      }
+    }
+  }
+
   mapcache_grid_get_xy(ctx,(*effectively_used_grid_link)->grid,bbox->minx,bbox->miny,level,&bl_x,&bl_y);
   mapcache_grid_get_xy(ctx,(*effectively_used_grid_link)->grid,bbox->maxx,bbox->maxy,level,&tr_x,&tr_y);
   Mx = MAPCACHE_MAX(MAPCACHE_MIN(MAPCACHE_MAX(tr_x,bl_x),(*effectively_used_grid_link)->grid_limits[level].maxx),(*effectively_used_grid_link)->grid_limits[level].minx);
@@ -567,6 +584,7 @@ mapcache_tile* mapcache_tileset_tile_create(apr_pool_t *pool, mapcache_tileset *
       mapcache_requested_dimension *rdim = apr_pcalloc(pool,sizeof(mapcache_requested_dimension));
       rdim->requested_value = dimension->default_value;
       rdim->cached_value = NULL;
+      rdim->cached_entries_for_value = NULL;
       rdim->dimension = dimension;
       APR_ARRAY_PUSH(tile->dimensions,mapcache_requested_dimension*) = rdim;
     }
@@ -617,6 +635,7 @@ mapcache_map* mapcache_tileset_map_create(apr_pool_t *pool, mapcache_tileset *ti
       mapcache_requested_dimension *rdim = apr_pcalloc(pool,sizeof(mapcache_requested_dimension));
       rdim->requested_value = dimension->default_value;
       rdim->cached_value = NULL;
+      rdim->cached_entries_for_value = NULL;
       rdim->dimension = dimension;
       APR_ARRAY_PUSH(map->dimensions,mapcache_requested_dimension*) = rdim;
     }
@@ -641,6 +660,7 @@ mapcache_feature_info* mapcache_tileset_feature_info_create(apr_pool_t *pool, ma
       mapcache_requested_dimension *rdim = apr_pcalloc(pool,sizeof(mapcache_requested_dimension));
       rdim->requested_value = dimension->default_value;
       rdim->cached_value = NULL;
+      rdim->cached_entries_for_value = NULL;
       rdim->dimension = dimension;
       APR_ARRAY_PUSH(fi->map.dimensions,mapcache_requested_dimension*) = rdim;
     }
@@ -851,8 +871,13 @@ void mapcache_tileset_tile_set_get_with_subdimensions(mapcache_context *ctx, map
 
   for(i=0;i<tile->dimensions->nelts; i++) {
     mapcache_requested_dimension *rdim = APR_ARRAY_IDX(tile->dimensions,i,mapcache_requested_dimension*);
-    apr_array_header_t *single_subdimension = mapcache_dimension_get_entries_for_value(ctx,rdim->dimension,rdim->requested_value,
-                                                                                     tile->tileset, &extent, tile->grid_link->grid);
+    apr_array_header_t *single_subdimension;
+    if (rdim->cached_entries_for_value) {
+      single_subdimension = rdim->cached_entries_for_value;
+    } else {
+      single_subdimension = mapcache_dimension_get_entries_for_value(ctx,rdim->dimension,rdim->requested_value,
+          tile->tileset, &extent, tile->grid_link->grid);
+    }
     if(GC_HAS_ERROR(ctx)) /* invalid dimension given */
       goto cleanup;
 #ifdef DEBUG