aboutsummaryrefslogtreecommitdiffstats
path: root/searchsummary
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2020-07-16 12:12:31 +0000
committerArne Juul <arnej@verizonmedia.com>2020-07-16 12:23:08 +0000
commit1a7c5ee8f054b8838c4d15661b42600a12895bd1 (patch)
tree20d074532ed49aa3bc50e54902656b2d22909d3c /searchsummary
parent8252b6237053b344c07f082eed9422371ae0d0f2 (diff)
remove fef::Location, use common::GeoLocationSpec instead
Diffstat (limited to 'searchsummary')
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp
index 42afadb386a..1f9b553b56a 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp
@@ -15,6 +15,9 @@
#include <vespa/log/log.h>
LOG_SETUP(".searchsummary.docsummary.docsumstate");
+using search::common::GeoLocationParser;
+using search::common::GeoLocationSpec;
+
namespace search::docsummary {
GetDocsumsState::GetDocsumsState(GetDocsumsStateCallback &callback)
@@ -72,11 +75,11 @@ GetDocsumsState::parse_locations()
using document::PositionDataType;
assert(_parsedLocations.empty()); // only allowed to call this once
if (! _args.getLocation().empty()) {
- search::common::GeoLocationParser parser;
+ GeoLocationParser parser;
if (parser.parseOldFormatWithField(_args.getLocation())) {
auto view = parser.getFieldName();
auto attr_name = PositionDataType::getZCurveFieldName(view);
- search::common::GeoLocationSpec spec{attr_name, parser.getGeoLocation()};
+ GeoLocationSpec spec{attr_name, parser.getGeoLocation()};
_parsedLocations.push_back(spec);
} else {
LOG(warning, "could not parse location string '%s' from request",
@@ -90,10 +93,10 @@ GetDocsumsState::parse_locations()
if (iterator.getType() == search::ParseItem::ITEM_GEO_LOCATION_TERM) {
vespalib::string view = iterator.getIndexName();
vespalib::string term = iterator.getTerm();
- search::common::GeoLocationParser parser;
+ GeoLocationParser parser;
if (parser.parseOldFormat(term)) {
auto attr_name = PositionDataType::getZCurveFieldName(view);
- search::common::GeoLocationSpec spec{attr_name, parser.getGeoLocation()};
+ GeoLocationSpec spec{attr_name, parser.getGeoLocation()};
_parsedLocations.push_back(spec);
} else {
LOG(warning, "could not parse location string '%s' from stack dump",