chore: trying to improve isLocationOnPath

Author: farfromrefug

packages/ui-carto/platforms/android/java/com/akylas/carto/additions/Utils.java

@@ -289,6 +289,7 @@ static public long isLocationOnPath(MapPos point, MapPosVector poly, boolean clo
                     // Also explore wrapping of x3Base around the world in both directions.
                     xTry[1] = x3Base + 2 * Math.PI;
                     xTry[2] = x3Base - 2 * Math.PI;
+                    boolean found = false;
                     for (int index2 = 0; index2 < xTry.length; index2++) {
                         double x3 = xTry[index2];
                         double dy = y2 - y1;
@@ -299,20 +300,24 @@ static public long isLocationOnPath(MapPos point, MapPosVector poly, boolean clo
                         double latClosest = inverseMercator(yClosest);
                         double havDist = havDistance(lat3, latClosest, x3 - xClosest);
                         if (havDist < havTolerance) {
-                            if (lastHavDist == -1) {
+                            if (lastHavDist == -1 || havDist < lastHavDist) {
                                 lastHavDist = havDist;
-                            } else if (havDist < lastHavDist){
-                                lastHavDist = havDist;
-                            } else {
-                                return index;
+                                found = true;
+                                break;
                             }
                         }
                     }
+                    if (!found && lastHavDist != -1) {
+                        return index - 1;
+                    }
                 }
                 lat1 = lat2;
                 lng1 = lng2;
                 y1 = y2;
             }
+            if (lastHavDist != -1) {
+                return size - 1;
+            }
         }
         return -1;
     }