fix: improved isLocationOnPath

Author: farfromrefug

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

@@ -275,6 +275,7 @@ static public long isLocationOnPath(MapPos point, MapPosVector poly, boolean clo
             double y1 = mercator(lat1);
             double y3 = mercator(lat3);
             double[] xTry = new double[3];
+            double lastHavDist = -1;
             for (int index = 0; index < size; index++) {
                 MapPos point2 = poly.get(index);
                 double lat2 = toRadians(point2.getY());
@@ -298,7 +299,13 @@ static public long isLocationOnPath(MapPos point, MapPosVector poly, boolean clo
                         double latClosest = inverseMercator(yClosest);
                         double havDist = havDistance(lat3, latClosest, x3 - xClosest);
                         if (havDist < havTolerance) {
-                            return index;
+                            if (lastHavDist = -1) {
+                                lastHavDist = havDist;
+                            } else if (havDist < lastHavDist){
+                                lastHavDist = havDist;
+                            } else {
+                                return index;
+                            }
                         }
                     }
                 }

packages/ui-carto/platforms/ios/src/Utils.m

@@ -198,6 +198,7 @@ + (long)isLocationOn:(NTMapPos *)point
     double y1 = mercator(lat1);
     double y3 = mercator(lat3);
     NSMutableArray *xTry = [NSMutableArray array];
+    double lastHavDist = -1;
     for (int index = 0; index < size; index++) {
       NTMapPos *point2 = ([poly get:index]);
       double lat2 = toRadians([point2 getY]);
@@ -219,7 +220,13 @@ + (long)isLocationOn:(NTMapPos *)point
           double latClosest = inverseMercator(yClosest);
           double havDist = havDistance(lat3, latClosest, x3 - xClosest);
           if (havDist < havTolerance) {
-            return index;
+            if (lastHavDist = -1) {
+                lastHavDist = havDist;
+            } else if (havDist < lastHavDist){
+                lastHavDist = havDist;
+            } else {
+                return index;
+            }
           }
         }
       }