From 14c9b8c57792dadc8451dfb25dca82d60531ddaa Mon Sep 17 00:00:00 2001
From: Ivan <Ppechenkooo@gmail.com>
Date: Tue, 3 Oct 2023 16:16:38 +0300
Subject: [PATCH] map update

---
 static/styles/main.css                | 4 +++-
 static/templates/live.html            | 2 +-
 static/templates/reports/pdf.html     | 2 +-
 static/templates/reports/report.html  | 2 +-
 static/templates/videos/export.html   | 4 ++--
 static/templates/videos/playback.html | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/static/styles/main.css b/static/styles/main.css
index 15cbd2a..862717b 100644
--- a/static/styles/main.css
+++ b/static/styles/main.css
@@ -2111,7 +2111,7 @@ input[type="datetime-local"] {
   padding-left: 7px;
   padding-top: 4px;
   padding-bottom: 2px;
-  margin-left: -40%;
+  margin-left: -25%;
   margin-bottom: 3px;
   font-weight: bold;
   font-size: 14px !important;
@@ -2119,6 +2119,8 @@ input[type="datetime-local"] {
 
 .marker {
   cursor: grab !important;
+  top: -35px !important;
+  left: -10px !important;
 }
 
 .leaflet-marker-icon {
diff --git a/static/templates/live.html b/static/templates/live.html
index 33ff148..fff2176 100644
--- a/static/templates/live.html
+++ b/static/templates/live.html
@@ -443,7 +443,7 @@
   
   var map = L.map('map').setView([59.855198, 30.282995], 12);
 
-        L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}').addTo(map);
+        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png').addTo(map);
 
         map.zoomControl.remove();
 
diff --git a/static/templates/reports/pdf.html b/static/templates/reports/pdf.html
index 952ed73..324fa80 100644
--- a/static/templates/reports/pdf.html
+++ b/static/templates/reports/pdf.html
@@ -106,7 +106,7 @@
 
   var map = L.map('map').setView(startPoint, 16);
 
-  L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}').addTo(map);
+  L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png').addTo(map);
 
   var routeStyle = {
       color: 'red',
diff --git a/static/templates/reports/report.html b/static/templates/reports/report.html
index 8e9db1f..6c3de80 100644
--- a/static/templates/reports/report.html
+++ b/static/templates/reports/report.html
@@ -173,7 +173,7 @@
 
   var map = L.map('map').setView(startPoint, 17);
 
-  L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}').addTo(map);
+  L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png').addTo(map);
 
   var routeStyle = {
       color: 'red',
diff --git a/static/templates/videos/export.html b/static/templates/videos/export.html
index 5bd14d3..6e122e0 100644
--- a/static/templates/videos/export.html
+++ b/static/templates/videos/export.html
@@ -481,7 +481,7 @@ async function sendPostRequest() {
                 });
 
                 // Добавляем слой с плитками OpenStreetMap
-                L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}').addTo(map);
+                L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png').addTo(map);
 
                 // Создаем слой для маршрута
                 const routeLayer = L.layerGroup().addTo(map);
@@ -898,7 +898,7 @@ endVideoTimeInput.addEventListener("blur", sendPostRequest);
         map = L.map('map').setView([59.855198, 30.282995], 10);
 
         // Добавляем базовый слой OpenStreetMap
-        L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}').addTo(map);
+        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png').addTo(map);
 
         // Создаем маркеры
         var startMarker = L.marker(startPoint, {
diff --git a/static/templates/videos/playback.html b/static/templates/videos/playback.html
index c23076a..88c8e04 100644
--- a/static/templates/videos/playback.html
+++ b/static/templates/videos/playback.html
@@ -451,7 +451,7 @@ async function sendPostRequest() {
                 });
 
                 // Добавляем слой с плитками OpenStreetMap
-                L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}').addTo(map);
+                L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png').addTo(map);
 
                 // Создаем слой для маршрута
                 const routeLayer = L.layerGroup().addTo(map);
@@ -717,7 +717,7 @@ videoTimeInput.addEventListener("blur", sendPostRequest);
         map = L.map('map').setView([59.855198, 30.282995], 10);
 
         // Добавляем базовый слой OpenStreetMap
-        L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}').addTo(map);
+        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png').addTo(map);
 
         // Создаем маркеры
         var startMarker = L.marker(startPoint, {