change DistanceParser API, mark as Beta

3 files changed, 31 insertions, 10 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+"'");
         }
diff --git a/vespajlib/src/main/java/com/yahoo/geo/DistanceParser.java b/vespajlib/src/main/java/com/yahoo/geo/DistanceParser.java
index e184e4c36ba..1ae68afa4ac 100644
--- a/vespajlib/src/main/java/com/yahoo/geo/DistanceParser.java
+++ b/vespajlib/src/main/java/com/yahoo/geo/DistanceParser.java
@@ -2,6 +2,12 @@
 
 package com.yahoo.geo;
 
+import com.google.common.annotations.Beta;
+
+/**
+ * Utility for parsing a geographical distance with unit.
+ **/
+@Beta
 public class DistanceParser {
     // according to wikipedia:
     // Earth's equatorial radius = 6378137 meter - not used
@@ -13,9 +19,24 @@ public class DistanceParser {
     public final static double km2deg = 1000.000 * 180.0 / (Math.PI * 6356752.0);
     public final static double mi2deg = 1609.344 * 180.0 / (Math.PI * 6356752.0);
 
-    public final double degrees;
+    private final double degrees;
+
+    public double getDegrees() { return degrees; }
+
+    /**
+     * Parse a distance in some kind of units, converting to geographical degrees.
+     * Note that the number and the unit should be separated by a single space only,
+     * or not separated at all.
+     * Supported units are "m", "km", "miles", and "deg",
+     * the last one meaning degrees with no conversion.
+     * For brevity "mi" = "miles" and "d" = "deg".
+     **/
+    static public double parse(String distance) {
+        var parser = new DistanceParser(distance, false);
+        return parser.degrees;
+    }
 
-    public DistanceParser(String distance, boolean assume_micro_degrees) {
+    DistanceParser(String distance, boolean assumeMicroDegrees) {
         if (distance.endsWith(" km")) {
             double km = Double.valueOf(distance.substring(0, distance.length()-3));
             degrees = km * km2deg;
@@ -48,7 +69,7 @@ public class DistanceParser {
             degrees = Double.valueOf(distance.substring(0, distance.length()-3));
         } else if (distance.endsWith("d")) {
             degrees = Double.valueOf(distance.substring(0, distance.length()-1));
-        } else if (assume_micro_degrees) {
+        } else if (assumeMicroDegrees) {
             degrees = Integer.parseInt(distance) * 0.000001;
         } else {
             throw new IllegalArgumentException("missing unit for distance: "+distance);