From d9c1947e8dc3aa13186316f1180fb6e5b249a01b Mon Sep 17 00:00:00 2001
From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com>
Date: Sat, 6 Dec 2025 04:48:24 +0100
Subject: [PATCH] Shorten cookie expiry assignment

---
 app/assets/javascripts/index.js            | 14 +++++++-------
 app/assets/javascripts/index/directions.js |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index b2cb527c0..85de00b95 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -162,8 +162,9 @@ $(function () {
 
   $(".leaflet-control .control-button").tooltip({ placement: "left", container: "body" });
 
-  const expiry = new Date();
-  expiry.setYear(expiry.getFullYear() + 10);
+  const expires = new Date();
+  const thisYear = expires.getFullYear();
+  expires.setFullYear(thisYear + 10);
 
   map.on("moveend baselayerchange overlayadd overlayremove", function () {
     updateLinks(
@@ -172,7 +173,7 @@ $(function () {
       map.getLayersCode(),
       map._object);
 
-    OSM.cookies.set("_osm_location", OSM.locationCookie(map), { expires: expiry });
+    OSM.cookies.set("_osm_location", OSM.locationCookie(map), { expires });
   });
 
   if (OSM.cookies.get("_osm_welcome") !== "hide") {
@@ -181,18 +182,17 @@ $(function () {
 
   $(".welcome .btn-close").on("click", function () {
     $(".welcome").hide();
-    OSM.cookies.set("_osm_welcome", "hide", { expires: expiry });
+    OSM.cookies.set("_osm_welcome", "hide", { expires });
   });
 
-  const bannerExpiry = new Date();
-  bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
+  expires.setFullYear(thisYear + 1);
 
   $("#banner .btn-close").on("click", function (e) {
     const cookieId = e.target.id;
     $("#banner").hide();
     e.preventDefault();
     if (cookieId) {
-      OSM.cookies.set(cookieId, "hide", { expires: bannerExpiry });
+      OSM.cookies.set(cookieId, "hide", { expires });
     }
   });
 
diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 7efa0a4ce..f5dc4e050 100644
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -28,8 +28,8 @@ OSM.Directions = function (map) {
     OSM.DirectionsEndpoint(map, $("input[name='route_to']"), { icon: "stop", color: "var(--marker-red)" }, endpointDragCallback, endpointChangeCallback)
   ];
 
-  const expiry = new Date();
-  expiry.setYear(expiry.getFullYear() + 10);
+  const expires = new Date();
+  expires.setFullYear(expires.getFullYear() + 10);
 
   const modeGroup = $(".routing_modes");
   const select = $("select#routing_engines");
@@ -140,13 +140,13 @@ OSM.Directions = function (map) {
 
   modeGroup.on("change", "input[name='modes']", function (e) {
     setEngine(chosenEngine.provider + "_" + e.target.value);
-    OSM.cookies.set("_osm_directions_engine", chosenEngine.id, { expires: expiry });
+    OSM.cookies.set("_osm_directions_engine", chosenEngine.id, { expires });
     getRoute(true, true);
   });
 
   select.on("change", function (e) {
     setEngine(e.target.value + "_" + chosenEngine.mode);
-    OSM.cookies.set("_osm_directions_engine", chosenEngine.id, { expires: expiry });
+    OSM.cookies.set("_osm_directions_engine", chosenEngine.id, { expires });
     getRoute(true, true);
   });
 
-- 
2.39.5