2 files changed, 7 insertions, 7 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
index 719f16edc0a..0d9acea7643 100644
--- a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
+++ b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
@@ -437,21 +437,21 @@ public class SelectParser implements Parser {
         if (arg3.type() != Type.STRING) {
            throw new IllegalArgumentException("Invalid geoLocation radius type "+arg3.type()+" for "+arg3);
         }
-        var radius = new DistanceParser(arg3.asString(), false);
+        double radius = DistanceParser.parse(arg3.asString());
         if (arg1.type() == Type.STRING && arg2.type() == Type.STRING) {
             var c1input = children.get(1).asString();
             var c2input = children.get(2).asString();
             var coord_1 = ParsedDegree.fromString(c1input, true, false);
             var coord_2 = ParsedDegree.fromString(c2input, false, true);
             if (coord_1.isLatitude && coord_2.isLongitude) {
-                loc.setGeoCircle(coord_1.degrees, coord_2.degrees, radius.degrees);
+                loc.setGeoCircle(coord_1.degrees, coord_2.degrees, radius);
             } else if (coord_2.isLatitude && coord_1.isLongitude) {
-                loc.setGeoCircle(coord_2.degrees, coord_1.degrees, radius.degrees);
+                loc.setGeoCircle(coord_2.degrees, coord_1.degrees, radius);
             } else {
                 throw new IllegalArgumentException("Invalid geoLocation coordinates '"+c1input+"' and '"+c2input+"'");
             }
         } else if (arg1.type() == Type.DOUBLE && arg2.type() == Type.DOUBLE) {
-            loc.setGeoCircle(arg1.asDouble(), arg2.asDouble(), radius.degrees);
+            loc.setGeoCircle(arg1.asDouble(), arg2.asDouble(), radius);
         } else {
             throw new IllegalArgumentException("Invalid geoLocation coordinate types "+arg1.type()+" and "+arg2.type());
         }
diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
index 7248c3a1831..6a464a1503b 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
@@ -426,12 +426,12 @@ public class YqlParser implements Parser {
         String field = fetchFieldRead(args.get(0));
         var coord_1 = ParsedDegree.fromString(fetchFieldRead(args.get(1)), true, false);
         var coord_2 = ParsedDegree.fromString(fetchFieldRead(args.get(2)), false, true);
-        var radius = new DistanceParser(fetchFieldRead(args.get(3)), false);
+        double radius = DistanceParser.parse(fetchFieldRead(args.get(3)));
         var loc = new Location();
         if (coord_1.isLatitude && coord_2.isLongitude) {
-            loc.setGeoCircle(coord_1.degrees, coord_2.degrees, radius.degrees);
+            loc.setGeoCircle(coord_1.degrees, coord_2.degrees, radius);
         } else if (coord_2.isLatitude && coord_1.isLongitude) {
-            loc.setGeoCircle(coord_2.degrees, coord_1.degrees, radius.degrees);
+            loc.setGeoCircle(coord_2.degrees, coord_1.degrees, radius);
         } else {
             throw new IllegalArgumentException("Invalid geoLocation coordinates '"+coord_1+"' and '"+coord_2+"'");
         }