From c4f1deffdcab1a65d4aa64de840c909db929d4d4 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Sun, 27 May 2018 13:05:31 +0200
Subject: Revert "Bratseth/iterate over indexes not fields 2"

---
 .../com/yahoo/prelude/searcher/PosSearcher.java    | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'container-search/src/main/java/com/yahoo/prelude/searcher/PosSearcher.java')

diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/PosSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/PosSearcher.java
index 43717ecf6cd..33667349397 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/PosSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/PosSearcher.java
@@ -34,7 +34,6 @@ import com.yahoo.prelude.Location;
 @Before(PhaseNames.TRANSFORMED_QUERY)
 @Provides(PosSearcher.POSITION_PARSING)
 public class PosSearcher extends Searcher {
-
     public static final String POSITION_PARSING = "PositionParsing";
 
     private static final CompoundName posBb = new CompoundName("pos.bb");
@@ -53,7 +52,7 @@ public class PosSearcher extends Searcher {
     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);
 
-    @Override
+
     public Result search(Query query, Execution execution) {
         String bb = query.properties().getString(posBb);
         String ll = query.properties().getString(posLl);
@@ -93,8 +92,9 @@ public class PosSearcher extends Searcher {
             }
         }
         catch (IllegalArgumentException e) {
-            return new Result(query, ErrorMessage.createInvalidQueryParameter("Error in pos parameters: " +
-                                                                              Exceptions.toMessageString(e)));
+            // System.err.println("error: "+e);
+            return new Result(query, ErrorMessage.createInvalidQueryParameter(
+                                                                                      "Error in pos parameters: " + Exceptions.toMessageString(e)));
         }
         // and finally:
         query.getRanking().setLocation(loc);
@@ -102,8 +102,8 @@ public class PosSearcher extends Searcher {
     }
 
     private void handleGeoCircle(Query query, String ll, Location target) {
-        double ewCoord;
-        double nsCoord;
+        double ewCoord = 0;
+        double nsCoord = 0;
         try {
             DegreesParser parsed = new DegreesParser(ll);
             ewCoord = parsed.longitude;
@@ -111,9 +111,9 @@ public class PosSearcher extends Searcher {
         } catch (IllegalArgumentException e) {
             throw new IllegalArgumentException("Unable to parse lat/long string '" +ll + "'", e);
         }
-
         String radius = query.properties().getString(posRadius);
-        double radiusdegrees;
+        double radiusdegrees = 0.0;
+
         if (radius == null) {
             radiusdegrees = 50.0 * km2deg;
         } else if (radius.endsWith("km")) {
@@ -133,8 +133,8 @@ public class PosSearcher extends Searcher {
 
 
     private void handleXyCircle(Query query, String xy, Location target) {
-        int xcoord;
-        int ycoord;
+        int xcoord = 0;
+        int ycoord = 0;
         // parse xy
         int semipos = xy.indexOf(';');
         if (semipos > 0 && semipos < xy.length()) {
@@ -143,9 +143,8 @@ public class PosSearcher extends Searcher {
         } else {
             throw new IllegalArgumentException("pos.xy must be in the format 'digits;digits' but was: '"+xy+"'");
         }
-
         String radius = query.properties().getString(posRadius);
-        int radiusUnits;
+        int radiusUnits = 0;
         if (radius == null) {
             radiusUnits = 5000;
         } else if (radius.endsWith("km")) {
@@ -166,6 +165,7 @@ public class PosSearcher extends Searcher {
         target.setXyCircle(xcoord, ycoord, radiusUnits);
     }
 
+
     private static void parseBoundingBox(String bb, Location target) {
         BoundingBoxParser parser = new BoundingBoxParser(bb);
         target.setBoundingBox(parser.n, parser.s, parser.e, parser.w);
-- 
cgit v1.2.3