more descriptive enum name for geo location term

10 files changed, 11 insertions, 11 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 2a7bcb1a873..5faa5ec322d 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -722,7 +722,7 @@
       "public static final enum com.yahoo.prelude.query.Item$ItemType REGEXP",
       "public static final enum com.yahoo.prelude.query.Item$ItemType WORD_ALTERNATIVES",
       "public static final enum com.yahoo.prelude.query.Item$ItemType NEAREST_NEIGHBOR",
-      "public static final enum com.yahoo.prelude.query.Item$ItemType LOCATION_TERM",
+      "public static final enum com.yahoo.prelude.query.Item$ItemType GEO_LOCATION_TERM",
       "public final int code"
     ]
   },
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/GeoLocationItem.java b/container-search/src/main/java/com/yahoo/prelude/query/GeoLocationItem.java
index 1bf9cb041be..0ac408a1313 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/GeoLocationItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/GeoLocationItem.java
@@ -53,7 +53,7 @@ public class GeoLocationItem extends TermItem {
 
     @Override
     public ItemType getItemType() {
-        return ItemType.LOCATION_TERM;
+        return ItemType.GEO_LOCATION_TERM;
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/Item.java b/container-search/src/main/java/com/yahoo/prelude/query/Item.java
index bd368864e9a..c4978b2a378 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/Item.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/Item.java
@@ -61,7 +61,7 @@ public abstract class Item implements Cloneable {
         REGEXP(24),
         WORD_ALTERNATIVES(25),
         NEAREST_NEIGHBOR(26),
-        LOCATION_TERM(27);
+        GEO_LOCATION_TERM(27);
 
         public final int code;
 
diff --git a/searchlib/src/vespa/searchlib/parsequery/parse.h b/searchlib/src/vespa/searchlib/parsequery/parse.h
index b4dd9826b84..68e259b92e8 100644
--- a/searchlib/src/vespa/searchlib/parsequery/parse.h
+++ b/searchlib/src/vespa/searchlib/parsequery/parse.h
@@ -53,7 +53,7 @@ public:
         ITEM_REGEXP                =   24,
         ITEM_WORD_ALTERNATIVES     =   25,
         ITEM_NEAREST_NEIGHBOR      =   26,
-        ITEM_LOCATION_TERM         =   27,
+        ITEM_GEO_LOCATION_TERM         =   27,
         ITEM_MAX                   =   28,  // Indicates how long tables must be.
         ITEM_UNDEF                 =   31,
     };
diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
index 17cbd6dce1b..1820fb0e969 100644
--- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
+++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
@@ -207,7 +207,7 @@ SimpleQueryStackDumpIterator::next()
         }
         break;
     case ParseItem::ITEM_NUMTERM:
-    case ParseItem::ITEM_LOCATION_TERM:
+    case ParseItem::ITEM_GEO_LOCATION_TERM:
     case ParseItem::ITEM_TERM:
     case ParseItem::ITEM_PREFIXTERM:
     case ParseItem::ITEM_SUBSTRINGTERM:
diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
index f1599e820ef..f86aa341d99 100644
--- a/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
+++ b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
@@ -64,7 +64,7 @@ QueryNode::Build(const QueryNode * parent, const QueryNodeResultFactory & factor
     }
     break;
     case ParseItem::ITEM_NUMTERM:
-    case ParseItem::ITEM_LOCATION_TERM:
+    case ParseItem::ITEM_GEO_LOCATION_TERM:
     case ParseItem::ITEM_TERM:
     case ParseItem::ITEM_PREFIXTERM:
     case ParseItem::ITEM_REGEXP:
diff --git a/searchlib/src/vespa/searchlib/query/tree/stackdumpcreator.cpp b/searchlib/src/vespa/searchlib/query/tree/stackdumpcreator.cpp
index f33520d8b0e..82302e4ab48 100644
--- a/searchlib/src/vespa/searchlib/query/tree/stackdumpcreator.cpp
+++ b/searchlib/src/vespa/searchlib/query/tree/stackdumpcreator.cpp
@@ -228,7 +228,7 @@ class QueryNodeConverter : public QueryVisitor {
     }
 
     void visit(LocationTerm &node) override {
-        createTerm(node, ParseItem::ITEM_LOCATION_TERM);
+        createTerm(node, ParseItem::ITEM_GEO_LOCATION_TERM);
     }
 
     void visit(PrefixTerm &node) override {
diff --git a/searchlib/src/vespa/searchlib/query/tree/stackdumpquerycreator.h b/searchlib/src/vespa/searchlib/query/tree/stackdumpquerycreator.h
index 898db9785f6..410b3475553 100644
--- a/searchlib/src/vespa/searchlib/query/tree/stackdumpquerycreator.h
+++ b/searchlib/src/vespa/searchlib/query/tree/stackdumpquerycreator.h
@@ -141,7 +141,7 @@ private:
                 t = &builder.addStringTerm(term, view, id, weight);
             } else if (type == ParseItem::ITEM_SUFFIXTERM) {
                 t = &builder.addSuffixTerm(term, view, id, weight);
-            } else if (type == ParseItem::ITEM_LOCATION_TERM) {
+            } else if (type == ParseItem::ITEM_GEO_LOCATION_TERM) {
                 Location loc(term);
                 t = &builder.addLocationTerm(loc, view, id, weight);
             } else if (type == ParseItem::ITEM_NUMTERM) {
diff --git a/searchsummary/src/tests/extractkeywords/simplequerystackitem.cpp b/searchsummary/src/tests/extractkeywords/simplequerystackitem.cpp
index 5a4b6d76b8f..f12822949f9 100644
--- a/searchsummary/src/tests/extractkeywords/simplequerystackitem.cpp
+++ b/searchsummary/src/tests/extractkeywords/simplequerystackitem.cpp
@@ -24,7 +24,7 @@ void assert_term_type(ParseItem::ItemType type) {
     assert(type == ParseItem::ITEM_TERM ||
            type == ParseItem::ITEM_NUMTERM ||
            type == ParseItem::ITEM_NEAREST_NEIGHBOR ||
-           type == ParseItem::ITEM_LOCATION_TERM ||
+           type == ParseItem::ITEM_GEO_LOCATION_TERM ||
            type == ParseItem::ITEM_PREFIXTERM ||
            type == ParseItem::ITEM_SUBSTRINGTERM ||
            type == ParseItem::ITEM_SUFFIXTERM ||
@@ -152,7 +152,7 @@ SimpleQueryStackItem::AppendBuffer(RawBuf *buf) const
         break;
     case ITEM_TERM:
     case ITEM_NUMTERM:
-    case ITEM_LOCATION_TERM:
+    case ITEM_GEO_LOCATION_TERM:
     case ITEM_PREFIXTERM:
     case ITEM_SUBSTRINGTERM:
     case ITEM_EXACTSTRINGTERM:
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
index 37239fe9da6..8cc577355cf 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
@@ -270,7 +270,7 @@ JuniperQueryAdapter::Traverse(juniper::IQueryVisitor *v) const
         case search::ParseItem::ITEM_PREDICATE_QUERY:
         case search::ParseItem::ITEM_SAME_ELEMENT:
         case search::ParseItem::ITEM_NEAREST_NEIGHBOR:
-        case search::ParseItem::ITEM_LOCATION_TERM:
+        case search::ParseItem::ITEM_GEO_LOCATION_TERM:
             if (!v->VisitOther(&item, iterator.getArity())) {
                 rc = SkipItem(&iterator);
             }