From cb64b1aa884ab47aedfed302c419035893aa9884 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Sat, 6 Dec 2025 19:20:51 +0100
Subject: [PATCH] Use maps/v2 as main path for MapLibre maps

---
 app/controllers/maps_controller.rb                |  2 +-
 app/helpers/application_helper.rb                 |  2 +-
 app/views/shared/map/_date_navigation_v2.html.erb | 12 ++++++------
 config/routes.rb                                  |  7 ++++---
 e2e/v2/helpers/setup.js                           |  2 +-
 e2e/v2/map/area-selection.spec.js                 |  2 +-
 e2e/v2/map/core.spec.js                           |  8 ++++----
 e2e/v2/map/interactions.spec.js                   |  2 +-
 e2e/v2/map/layers/advanced.spec.js                |  4 ++--
 e2e/v2/map/layers/heatmap.spec.js                 |  2 +-
 e2e/v2/map/layers/points.spec.js                  |  2 +-
 e2e/v2/map/layers/routes.spec.js                  |  2 +-
 e2e/v2/map/performance.spec.js                    |  4 ++--
 e2e/v2/map/search.spec.js                         |  2 +-
 e2e/v2/map/settings.spec.js                       |  2 +-
 15 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index e1f31898..efbb024f 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -1,5 +1,5 @@
 class MapsController < ApplicationController
   def index
-    redirect_to maps_maplibre_path
+    redirect_to maps_v2_path
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 530dc2a7..16f117bb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -147,6 +147,6 @@ module ApplicationHelper
     return map_path unless user_signed_in?
 
     preferred_version = current_user.safe_settings.maps&.dig('preferred_version')
-    preferred_version == 'v2' ? maps_maplibre_path : map_path
+    preferred_version == 'v2' ? maps_v2_path : map_path
   end
 end
diff --git a/app/views/shared/map/_date_navigation_v2.html.erb b/app/views/shared/map/_date_navigation_v2.html.erb
index 799fdcce..b3262c50 100644
--- a/app/views/shared/map/_date_navigation_v2.html.erb
+++ b/app/views/shared/map/_date_navigation_v2.html.erb
@@ -17,12 +17,12 @@
   <div
     data-map-controls-target="panel"
     class="hidden lg:!block bg-base-100 rounded-lg shadow-lg p-4 mt-2 lg:mt-0">
-    <%= form_with url: maps_maplibre_path(import_id: params[:import_id]), method: :get do |f| %>
+    <%= form_with url: maps_v2_path(import_id: params[:import_id]), method: :get do |f| %>
       <div class="flex flex-col space-y-4 lg:flex-row lg:space-y-0 lg:space-x-4 lg:items-end">
         <div class="w-full lg:w-1/12">
           <div class="flex flex-col space-y-2">
             <span class="tooltip" data-tip="<%= human_date(start_at - 1.day) %>">
-              <%= link_to maps_maplibre_path(start_at: start_at - 1.day, end_at: end_at - 1.day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" do %>
+              <%= link_to maps_v2_path(start_at: start_at - 1.day, end_at: end_at - 1.day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" do %>
                 <%= icon 'chevron-left' %>
               <% end %>
             </span>
@@ -37,7 +37,7 @@
         <div class="w-full lg:w-1/12">
           <div class="flex flex-col space-y-2">
             <span class="tooltip" data-tip="<%= human_date(start_at + 1.day) %>">
-              <%= link_to maps_maplibre_path(start_at: start_at + 1.day, end_at: end_at + 1.day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" do %>
+              <%= link_to maps_v2_path(start_at: start_at + 1.day, end_at: end_at + 1.day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" do %>
                 <%= icon 'chevron-right' %>
               <% end %>
             </span>
@@ -51,18 +51,18 @@
         <div class="w-full lg:w-1/12">
           <div class="flex flex-col space-y-2 text-center">
             <%= link_to "Today",
-              maps_maplibre_path(start_at: Time.current.beginning_of_day, end_at: Time.current.end_of_day, import_id: params[:import_id]),
+              maps_v2_path(start_at: Time.current.beginning_of_day, end_at: Time.current.end_of_day, import_id: params[:import_id]),
               class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" %>
           </div>
         </div>
         <div class="w-full lg:w-2/12">
           <div class="flex flex-col space-y-2 text-center">
-            <%= link_to "Last 7 days", maps_maplibre_path(start_at: 1.week.ago.beginning_of_day, end_at: Time.current.end_of_day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" %>
+            <%= link_to "Last 7 days", maps_v2_path(start_at: 1.week.ago.beginning_of_day, end_at: Time.current.end_of_day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" %>
           </div>
         </div>
         <div class="w-full lg:w-2/12">
           <div class="flex flex-col space-y-2 text-center">
-            <%= link_to "Last month", maps_maplibre_path(start_at: 1.month.ago.beginning_of_day, end_at: Time.current.end_of_day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" %>
+            <%= link_to "Last month", maps_v2_path(start_at: 1.month.ago.beginning_of_day, end_at: Time.current.end_of_day, import_id: params[:import_id]), class: "btn btn-sm border border-base-300 hover:btn-ghost w-full" %>
           </div>
         </div>
       </div>
diff --git a/config/routes.rb b/config/routes.rb
index 310e78b4..bb5f9e19 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -118,11 +118,12 @@ Rails.application.routes.draw do
 
   # Maps namespace
   namespace :maps do
-    get '/maplibre', to: 'maplibre#index', as: :maplibre
+    get '/v2', to: 'maplibre#index', as: :v2
   end
 
-  # Backward compatibility redirect
-  get '/maps_v2', to: redirect('/maps/maplibre')
+  # Backward compatibility redirects
+  get '/maps_v2', to: redirect('/maps/v2')
+  get '/maps/maplibre', to: redirect('/maps/v2')
 
   namespace :api do
     namespace :v1 do
diff --git a/e2e/v2/helpers/setup.js b/e2e/v2/helpers/setup.js
index f9d8c734..86b61417 100644
--- a/e2e/v2/helpers/setup.js
+++ b/e2e/v2/helpers/setup.js
@@ -7,7 +7,7 @@
  * @param {Page} page - Playwright page object
  */
 export async function navigateToMapsV2(page) {
-  await page.goto('/maps/maplibre');
+  await page.goto('/maps/v2');
 }
 
 /**
diff --git a/e2e/v2/map/area-selection.spec.js b/e2e/v2/map/area-selection.spec.js
index 98113cd5..2dc6b7c9 100644
--- a/e2e/v2/map/area-selection.spec.js
+++ b/e2e/v2/map/area-selection.spec.js
@@ -5,7 +5,7 @@ import { waitForMapLibre, waitForLoadingComplete } from '../helpers/setup.js'
 test.describe('Area Selection in Maps V2', () => {
   test.beforeEach(async ({ page }) => {
     // Navigate to Maps V2 with specific date range that has data
-    await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+    await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
     await closeOnboardingModal(page)
     await waitForMapLibre(page)
     await waitForLoadingComplete(page)
diff --git a/e2e/v2/map/core.spec.js b/e2e/v2/map/core.spec.js
index 987f3cc5..3fded569 100644
--- a/e2e/v2/map/core.spec.js
+++ b/e2e/v2/map/core.spec.js
@@ -33,7 +33,7 @@ test.describe('Map Core', () => {
     })
 
     test('has valid initial center and zoom', async ({ page }) => {
-      await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+      await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
       await closeOnboardingModal(page)
       await waitForMapLibre(page)
       await waitForLoadingComplete(page)
@@ -83,7 +83,7 @@ test.describe('Map Core', () => {
 
   test.describe('Data Bounds', () => {
     test('fits map bounds to loaded data', async ({ page }) => {
-      await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+      await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
       await closeOnboardingModal(page)
       await waitForMapLibre(page)
       await waitForLoadingComplete(page)
@@ -96,7 +96,7 @@ test.describe('Map Core', () => {
 
   test.describe('Lifecycle', () => {
     test('cleans up and reinitializes on navigation', async ({ page }) => {
-      await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+      await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
       await closeOnboardingModal(page)
       await waitForLoadingComplete(page)
 
@@ -114,7 +114,7 @@ test.describe('Map Core', () => {
     })
 
     test('reloads data when changing date range', async ({ page }) => {
-      await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+      await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
       await closeOnboardingModal(page)
       await waitForLoadingComplete(page)
 
diff --git a/e2e/v2/map/interactions.spec.js b/e2e/v2/map/interactions.spec.js
index 5bf632cb..60bfef2e 100644
--- a/e2e/v2/map/interactions.spec.js
+++ b/e2e/v2/map/interactions.spec.js
@@ -9,7 +9,7 @@ import {
 
 test.describe('Map Interactions', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+    await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
     await closeOnboardingModal(page)
     await waitForLoadingComplete(page)
     await page.waitForTimeout(500)
diff --git a/e2e/v2/map/layers/advanced.spec.js b/e2e/v2/map/layers/advanced.spec.js
index ddee6f3c..04dd482c 100644
--- a/e2e/v2/map/layers/advanced.spec.js
+++ b/e2e/v2/map/layers/advanced.spec.js
@@ -3,12 +3,12 @@ import { closeOnboardingModal } from '../../../helpers/navigation.js'
 
 test.describe('Advanced Layers', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('/maps/maplibre')
+    await page.goto('/maps/v2')
     await page.evaluate(() => {
       localStorage.removeItem('dawarich-maps-maplibre-settings')
     })
 
-    await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+    await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
     await closeOnboardingModal(page)
     await page.waitForTimeout(2000)
   })
diff --git a/e2e/v2/map/layers/heatmap.spec.js b/e2e/v2/map/layers/heatmap.spec.js
index ccc082d8..9e36631d 100644
--- a/e2e/v2/map/layers/heatmap.spec.js
+++ b/e2e/v2/map/layers/heatmap.spec.js
@@ -3,7 +3,7 @@ import { closeOnboardingModal } from '../../../helpers/navigation.js'
 
 test.describe('Heatmap Layer', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+    await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
     await closeOnboardingModal(page)
     await page.waitForTimeout(2000)
   })
diff --git a/e2e/v2/map/layers/points.spec.js b/e2e/v2/map/layers/points.spec.js
index 974e2d51..e1c662c9 100644
--- a/e2e/v2/map/layers/points.spec.js
+++ b/e2e/v2/map/layers/points.spec.js
@@ -9,7 +9,7 @@ import {
 
 test.describe('Points Layer', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+    await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
     await closeOnboardingModal(page)
     await waitForLoadingComplete(page)
     await page.waitForTimeout(1500)
diff --git a/e2e/v2/map/layers/routes.spec.js b/e2e/v2/map/layers/routes.spec.js
index 7da4fc84..b1b87e83 100644
--- a/e2e/v2/map/layers/routes.spec.js
+++ b/e2e/v2/map/layers/routes.spec.js
@@ -11,7 +11,7 @@ import {
 
 test.describe('Routes Layer', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+    await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
     await closeOnboardingModal(page)
     await waitForMapLibre(page)
     await waitForLoadingComplete(page)
diff --git a/e2e/v2/map/performance.spec.js b/e2e/v2/map/performance.spec.js
index b64b1605..002e5eff 100644
--- a/e2e/v2/map/performance.spec.js
+++ b/e2e/v2/map/performance.spec.js
@@ -6,7 +6,7 @@ test.describe('Map Performance', () => {
   test('map loads within acceptable time', async ({ page }) => {
     const startTime = Date.now()
 
-    await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+    await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
     await closeOnboardingModal(page)
     await waitForMapLibre(page)
     await waitForLoadingComplete(page)
@@ -19,7 +19,7 @@ test.describe('Map Performance', () => {
   })
 
   test('handles large datasets efficiently', async ({ page }) => {
-    await page.goto('/maps/maplibre?start_at=2025-10-01T00:00&end_at=2025-10-31T23:59')
+    await page.goto('/maps/v2?start_at=2025-10-01T00:00&end_at=2025-10-31T23:59')
     await closeOnboardingModal(page)
 
     const startTime = Date.now()
diff --git a/e2e/v2/map/search.spec.js b/e2e/v2/map/search.spec.js
index 9cd84582..26e055f2 100644
--- a/e2e/v2/map/search.spec.js
+++ b/e2e/v2/map/search.spec.js
@@ -18,7 +18,7 @@ test.describe('Location Search', () => {
   test.setTimeout(60000)
 
   test.beforeEach(async ({ page }) => {
-    await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+    await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
     await closeOnboardingModal(page)
     await waitForMapLibre(page)
     await waitForLoadingComplete(page)
diff --git a/e2e/v2/map/settings.spec.js b/e2e/v2/map/settings.spec.js
index 3ae7a065..b11baef2 100644
--- a/e2e/v2/map/settings.spec.js
+++ b/e2e/v2/map/settings.spec.js
@@ -4,7 +4,7 @@ import { getLayerVisibility } from '../helpers/setup.js'
 
 test.describe('Map Settings', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('/maps/maplibre?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
+    await page.goto('/maps/v2?start_at=2025-10-15T00:00&end_at=2025-10-15T23:59')
     await closeOnboardingModal(page)
     await page.waitForTimeout(2000)
   })