From 200debd2dd02d513f5c31a8d5a826d9922f62008 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 2 Mar 2017 16:01:59 +0100 Subject: [PATCH 1/3] implement area size heuristic for area:id queries fixes #359 --- src/overpass_api/statements/area_query.cc | 16 ++++++++++++++-- src/overpass_api/statements/area_query.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/overpass_api/statements/area_query.cc b/src/overpass_api/statements/area_query.cc index d48ea2b89..2ae042a16 100644 --- a/src/overpass_api/statements/area_query.cc +++ b/src/overpass_api/statements/area_query.cc @@ -287,8 +287,20 @@ void Area_Query_Statement::get_ranges bool Area_Constraint::delivers_data(Resource_Manager& rman) { + int counter = 0; + if (!area->areas_from_input()) - return false; + { + Block_Backend< Uint31_Index, Area_Skeleton > area_locations_db + (rman.get_area_transaction()->data_index(area_settings().AREAS)); + for (Block_Backend< Uint31_Index, Area_Skeleton >::Flat_Iterator + it(area_locations_db.flat_begin()); + !(it == area_locations_db.flat_end()); ++it) + { + if (area->get_submitted_id() == it.object().id.val()) + counter += it.object().used_indices.size(); + } + } else { map< string, Set >::const_iterator mit = rman.sets().find(area->get_input()); @@ -305,8 +317,8 @@ bool Area_Constraint::delivers_data(Resource_Manager& rman) counter += it2->used_indices.size(); } - return (counter <= 12); } + return (counter <= 12); } diff --git a/src/overpass_api/statements/area_query.h b/src/overpass_api/statements/area_query.h index 5cd444b4f..91fd751b8 100644 --- a/src/overpass_api/statements/area_query.h +++ b/src/overpass_api/statements/area_query.h @@ -71,6 +71,7 @@ class Area_Query_Statement : public Output_Statement const Statement& query, Resource_Manager& rman); bool areas_from_input() const { return (submitted_id == 0); } + long long get_submitted_id() const { return submitted_id; } string get_input() const { return input; } static bool is_used() { return is_used_; } From 1790d14a7f203a942f35db287cf136e0796c7582 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 2 Mar 2017 16:51:34 +0100 Subject: [PATCH 2/3] don't initialize variable twice --- src/overpass_api/statements/area_query.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/overpass_api/statements/area_query.cc b/src/overpass_api/statements/area_query.cc index 2ae042a16..19d0f87d5 100644 --- a/src/overpass_api/statements/area_query.cc +++ b/src/overpass_api/statements/area_query.cc @@ -289,6 +289,7 @@ bool Area_Constraint::delivers_data(Resource_Manager& rman) { int counter = 0; + // Count the indicies of the input areas if (!area->areas_from_input()) { Block_Backend< Uint31_Index, Area_Skeleton > area_locations_db @@ -307,9 +308,6 @@ bool Area_Constraint::delivers_data(Resource_Manager& rman) if (mit == rman.sets().end()) return true; - // Count the indicies of the input areas - int counter = 0; - for (map< Uint31_Index, vector< Area_Skeleton > >::const_iterator it = mit->second.areas.begin(); it != mit->second.areas.end(); ++it) { From 4d9992d588043723ee674e7f00dd70ca4e1bcce3 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 2 Mar 2017 17:11:36 +0100 Subject: [PATCH 3/3] use iterator.handle() to fetch area ids see https://github.com/drolbr/Overpass-API/pull/364#discussion_r103956255 --- src/overpass_api/statements/area_query.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/overpass_api/statements/area_query.cc b/src/overpass_api/statements/area_query.cc index 19d0f87d5..b6d253fe2 100644 --- a/src/overpass_api/statements/area_query.cc +++ b/src/overpass_api/statements/area_query.cc @@ -298,7 +298,7 @@ bool Area_Constraint::delivers_data(Resource_Manager& rman) it(area_locations_db.flat_begin()); !(it == area_locations_db.flat_end()); ++it) { - if (area->get_submitted_id() == it.object().id.val()) + if (area->get_submitted_id() == it.handle().id().val()) counter += it.object().used_indices.size(); } } @@ -314,8 +314,8 @@ bool Area_Constraint::delivers_data(Resource_Manager& rman) for (vector< Area_Skeleton >::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) counter += it2->used_indices.size(); } - } + return (counter <= 12); }