more readable error if geo coordinates do not parse

1 files changed, 11 insertions, 3 deletions

diff --git a/document/src/main/java/com/yahoo/document/PositionDataType.java b/document/src/main/java/com/yahoo/document/PositionDataType.java
index 816fcd7bdf7..a989422ab92 100644
--- a/document/src/main/java/com/yahoo/document/PositionDataType.java
+++ b/document/src/main/java/com/yahoo/document/PositionDataType.java
@@ -73,10 +73,18 @@ public final class PositionDataType {
             DegreesParser d = new DegreesParser(str);
             return valueOf((int)(d.longitude * 1000000), (int)(d.latitude * 1000000));
         } catch (IllegalArgumentException e) {
-            // empty
+            try {
+                String[] arr = str.split(";");
+                if (arr.length == 2) {
+                    int x = Integer.parseInt(arr[0]);
+                    int y = Integer.parseInt(arr[1]);
+                    return valueOf(x, y);
+                }
+            } catch (NumberFormatException nfe) {
+                // empty
+            }
+            throw new IllegalArgumentException("Could not parse '"+str+"' as geo coordinates: "+e.getMessage());
         }
-        String[] arr = str.split(";", 2);
-        return valueOf(Integer.parseInt(arr[0]), Integer.parseInt(arr[1]));
     }
 
     public static IntegerFieldValue getXValue(FieldValue pos) {