summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2020-08-18 08:40:23 +0000
committerArne Juul <arnej@verizonmedia.com>2020-08-18 08:40:23 +0000
commitefee5d64e09abe58170977c98eab2540a68b4258 (patch)
treeebd69fb85edb11b8067db603519d7e8f2e0581dd
parent08e05ea5f672563e73acc607e26037f243455ae1 (diff)
old format no longer used directly
-rw-r--r--searchlib/src/vespa/searchlib/common/geo_location_parser.cpp13
-rw-r--r--searchlib/src/vespa/searchlib/common/geo_location_parser.h4
2 files changed, 1 insertions, 16 deletions
diff --git a/searchlib/src/vespa/searchlib/common/geo_location_parser.cpp b/searchlib/src/vespa/searchlib/common/geo_location_parser.cpp
index 53792e56562..7d793f9eb55 100644
--- a/searchlib/src/vespa/searchlib/common/geo_location_parser.cpp
+++ b/searchlib/src/vespa/searchlib/common/geo_location_parser.cpp
@@ -63,19 +63,6 @@ GeoLocationParser::correctDimensionalitySkip(const char * &p) {
}
bool
-GeoLocationParser::parseOldFormatWithField(const std::string &str)
-{
- auto sep = str.find(':');
- if (sep == std::string::npos) {
- _parseError = "Location string lacks field specification";
- return false;
- }
- _field_name = str.substr(0, sep);
- std::string only_loc = str.substr(sep + 1);
- return parseOldFormat(only_loc);
-}
-
-bool
GeoLocationParser::parseOldFormat(const std::string &locStr)
{
bool foundBoundingBox = false;
diff --git a/searchlib/src/vespa/searchlib/common/geo_location_parser.h b/searchlib/src/vespa/searchlib/common/geo_location_parser.h
index 7d725f4a035..e1a68163fbb 100644
--- a/searchlib/src/vespa/searchlib/common/geo_location_parser.h
+++ b/searchlib/src/vespa/searchlib/common/geo_location_parser.h
@@ -20,9 +20,6 @@ public:
bool parseNoField(const std::string &locStr);
bool parseWithField(const std::string &locStr);
- bool parseOldFormat(const std::string &locStr);
- bool parseOldFormatWithField(const std::string &str);
-
std::string getFieldName() const { return _field_name; }
GeoLocation getGeoLocation() const;
@@ -46,6 +43,7 @@ private:
const char *_parseError;
bool correctDimensionalitySkip(const char * &p);
bool parseJsonFormat(const std::string &locStr);
+ bool parseOldFormat(const std::string &locStr);
};
} // namespace