From 3775ee1305965e6c274d02242bcd15297229273e Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 22 Sep 2017 22:19:38 +0200 Subject: [PATCH 1/2] Remove unused variable --- src/overpass_api/statements/id_query.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/overpass_api/statements/id_query.h b/src/overpass_api/statements/id_query.h index f9732e834..38e563aae 100644 --- a/src/overpass_api/statements/id_query.h +++ b/src/overpass_api/statements/id_query.h @@ -58,8 +58,6 @@ class Id_Query_Statement : public Output_Statement virtual std::string dump_xml(const std::string& indent) const { - std::vector< uint64 >::const_iterator it = refs.begin(); - std::string result = indent + " Date: Sat, 23 Sep 2017 11:51:57 +0200 Subject: [PATCH 2/2] Readd mandatory prefix to avoid bbox filter collision --- src/overpass_api/statements/id_query.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/overpass_api/statements/id_query.h b/src/overpass_api/statements/id_query.h index 38e563aae..8605458d3 100644 --- a/src/overpass_api/statements/id_query.h +++ b/src/overpass_api/statements/id_query.h @@ -38,7 +38,7 @@ class Id_Query_Statement : public Output_Statement static Generic_Statement_Maker< Id_Query_Statement > statement_maker; virtual Query_Constraint* get_query_constraint(); - + const std::vector< uint64 >& get_refs() { return refs; } int get_type() const { return type; } @@ -63,7 +63,7 @@ class Id_Query_Statement : public Output_Statement result += " ref=\"" + ::to_string(refs[0]) + "\""; for (uint i = 1; i < refs.size(); ++i) result += " ref_" + ::to_string(i) + "=\"" + ::to_string(refs[i]) + "\""; - + return result + dump_xml_result_name() + "/>\n"; } @@ -75,14 +75,14 @@ class Id_Query_Statement : public Output_Statement virtual std::string dump_ql_in_query(const std::string& indent) const { std::vector< uint64 >::const_iterator it = refs.begin(); - - std::string result = "("; + + std::string result = (refs.size() > 1) ? "(id:" : "("; if (it != refs.end()) result += ::to_string(*it++); while (it != refs.end()) result += "," + ::to_string(*it++); result += ")"; - + return result; }