From 0be576a272b817c50e91fafa47d15b6ce6a1bb3b Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Thu, 10 Aug 2023 03:41:22 +0300 Subject: [PATCH 1/1] Don't construct invalid LatLng objects in home location --- app/assets/javascripts/user.js | 35 ++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js index c306273e5..3a739e83a 100644 --- a/app/assets/javascripts/user.js +++ b/app/assets/javascripts/user.js @@ -70,9 +70,18 @@ $(document).ready(function () { respondToHomeUpdate(); }).on("moveend", function () { var lat = $("#home_lat").val(), - lon = $("#home_lon").val(); + lon = $("#home_lon").val(), + location; + + try { + if (lat && lon) { + location = L.latLng(lat, lon); + } + } catch (error) { + // keep location undefined + } - $("#home_show").prop("disabled", isCloseEnoughToMapCenter(lat, lon)); + $("#home_show").prop("disabled", !location || isCloseEnoughToMapCenter(location)); }); $("#home_lat, #home_lon").on("input", function () { @@ -121,13 +130,19 @@ $(document).ready(function () { function respondToHomeUpdate() { var lat = $("#home_lat").val(), lon = $("#home_lon").val(), - has_home = !!(lat && lon); + location; + + try { + if (lat && lon) { + location = L.latLng(lat, lon); + } + } catch (error) {} - $("#home_message").toggleClass("invisible", has_home); - $("#home_show").prop("hidden", !has_home); - $("#home_delete").prop("hidden", !has_home); - $("#home_undelete").prop("hidden", !(!has_home && deleted_lat && deleted_lon)); - if (has_home) { + $("#home_message").toggleClass("invisible", Boolean(location)); + $("#home_show").prop("hidden", !location); + $("#home_delete").prop("hidden", !location); + $("#home_undelete").prop("hidden", !(!location && deleted_lat && deleted_lon)); + if (location) { marker.setLatLng([lat, lon]); marker.addTo(map); map.panTo([lat, lon]); @@ -136,8 +151,8 @@ $(document).ready(function () { } } - function isCloseEnoughToMapCenter(lat, lon) { - var inputPt = map.latLngToContainerPoint([lat, lon]), + function isCloseEnoughToMapCenter(location) { + var inputPt = map.latLngToContainerPoint(location), centerPt = map.latLngToContainerPoint(map.getCenter()); return centerPt.distanceTo(inputPt) < 10; -- 2.39.5