From 8393734dc3e8f655c74f3f222c5fa1b4e35add6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=BA=D0=B8=D0=BD=20=D0=A1=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= <ckoshkin@yandex.ru>
Date: Tue, 9 Dec 2025 10:59:44 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B7=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainapp/multi_sources_playback_map.html   |  2 +-
 .../templates/mainapp/objitem_map.html        |  2 +-
 .../mainapp/source_averaging_map.html         |  2 +-
 .../mainapp/templates/mainapp/source_map.html |  2 +-
 .../mainapp/source_with_points_map.html       |  4 +--
 .../mapsapp/templates/mapsapp/map2d_base.html |  2 +-
 docker-compose.prod.yaml                      |  1 +
 nginx/nginx.conf                              | 26 +++++++++++++++++++
 8 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/dbapp/mainapp/templates/mainapp/multi_sources_playback_map.html b/dbapp/mainapp/templates/mainapp/multi_sources_playback_map.html
index 528e621..36bfe9c 100644
--- a/dbapp/mainapp/templates/mainapp/multi_sources_playback_map.html
+++ b/dbapp/mainapp/templates/mainapp/multi_sources_playback_map.html
@@ -170,7 +170,7 @@ const baseLayers = {
         maxZoom: 17,
         attribution: '&copy; OpenTopoMap'
     }),
-    'Локальная': L.tileLayer('http://127.0.0.1:8090/styles/basic-preview/512/{z}/{x}/{y}.png', {
+    'Локальная': L.tileLayer('/tiles/styles/basic-preview/512/{z}/{x}/{y}.png', {
       maxZoom: 19,
       attribution: 'Local Tiles'
     })
diff --git a/dbapp/mainapp/templates/mainapp/objitem_map.html b/dbapp/mainapp/templates/mainapp/objitem_map.html
index f7c5577..9c15fed 100644
--- a/dbapp/mainapp/templates/mainapp/objitem_map.html
+++ b/dbapp/mainapp/templates/mainapp/objitem_map.html
@@ -52,7 +52,7 @@
         attribution: 'Tiles &copy; Esri'
     });
     
-    const street_local = L.tileLayer('http://127.0.0.1:8090/styles/basic-preview/512/{z}/{x}/{y}.png', {
+    const street_local = L.tileLayer('/tiles/styles/basic-preview/512/{z}/{x}/{y}.png', {
         maxZoom: 19,
         attribution: 'Local Tiles'
     });
diff --git a/dbapp/mainapp/templates/mainapp/source_averaging_map.html b/dbapp/mainapp/templates/mainapp/source_averaging_map.html
index ad97a9e..53a1b56 100644
--- a/dbapp/mainapp/templates/mainapp/source_averaging_map.html
+++ b/dbapp/mainapp/templates/mainapp/source_averaging_map.html
@@ -86,7 +86,7 @@
         attribution: 'Tiles &copy; Esri'
     });
     
-    const street_local = L.tileLayer('http://127.0.0.1:8090/styles/basic-preview/512/{z}/{x}/{y}.png', {
+    const street_local = L.tileLayer('/tiles/styles/basic-preview/512/{z}/{x}/{y}.png', {
         maxZoom: 19,
         attribution: 'Local Tiles'
     });
diff --git a/dbapp/mainapp/templates/mainapp/source_map.html b/dbapp/mainapp/templates/mainapp/source_map.html
index 28a1efc..b158bb7 100644
--- a/dbapp/mainapp/templates/mainapp/source_map.html
+++ b/dbapp/mainapp/templates/mainapp/source_map.html
@@ -75,7 +75,7 @@
         attribution: 'Tiles &copy; Esri'
     });
     
-    const street_local = L.tileLayer('http://127.0.0.1:8090/styles/basic-preview/512/{z}/{x}/{y}.png', {
+    const street_local = L.tileLayer('/tiles/styles/basic-preview/512/{z}/{x}/{y}.png', {
         maxZoom: 19,
         attribution: 'Local Tiles'
     });
diff --git a/dbapp/mainapp/templates/mainapp/source_with_points_map.html b/dbapp/mainapp/templates/mainapp/source_with_points_map.html
index 418cd26..2e8c2d5 100644
--- a/dbapp/mainapp/templates/mainapp/source_with_points_map.html
+++ b/dbapp/mainapp/templates/mainapp/source_with_points_map.html
@@ -7,7 +7,7 @@
 <link href="{% static 'leaflet/leaflet.css' %}" rel="stylesheet">
 <link href="{% static 'leaflet-measure/leaflet-measure.css' %}" rel="stylesheet">
 <link href="{% static 'leaflet-tree/L.Control.Layers.Tree.css' %}" rel="stylesheet">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet-playback@1.0.2/dist/LeafletPlayback.css" />
+<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet-playback@1.0.2/dist/LeafletPlayback.css" /> -->
 <style>
     body {
         overflow: hidden;
@@ -193,7 +193,7 @@
         attribution: 'Tiles &copy; Esri'
     });
     
-    const street_local = L.tileLayer('http://127.0.0.1:8090/styles/basic-preview/512/{z}/{x}/{y}.png', {
+    const street_local = L.tileLayer('/tiles/styles/basic-preview/512/{z}/{x}/{y}.png', {
         maxZoom: 19,
         attribution: 'Local Tiles'
     });
diff --git a/dbapp/mapsapp/templates/mapsapp/map2d_base.html b/dbapp/mapsapp/templates/mapsapp/map2d_base.html
index e481219..b6ca0d0 100644
--- a/dbapp/mapsapp/templates/mapsapp/map2d_base.html
+++ b/dbapp/mapsapp/templates/mapsapp/map2d_base.html
@@ -56,7 +56,7 @@
     const satellite = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
         attribution: 'Tiles &copy; Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community'
     });
-    const street_local = L.tileLayer('http://127.0.0.1:8090/styles/basic-preview/512/{z}/{x}/{y}.png', {
+    const street_local = L.tileLayer('/tiles/styles/basic-preview/512/{z}/{x}/{y}.png', {
       maxZoom: 19,
       attribution: 'Local Tiles'
     });
diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index 9e163c1..1371c93 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -81,6 +81,7 @@ services:
       - tileserver_config:/config
     environment:
       - VERBOSE=true
+      - CORS_ENABLED=true
 
 volumes:
   pgdata:
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 6389478..1433dbc 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -27,6 +27,32 @@ server {
         add_header Cache-Control "public, max-age=2592000";
     }
 
+    # Прокси для tileserver-gl с CORS заголовками
+    location /tiles/ {
+        proxy_pass http://tileserver:8080/;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        
+        # CORS заголовки
+        add_header 'Access-Control-Allow-Origin' '*' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
+        add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
+        
+        # Обработка preflight запросов
+        if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Origin' '*';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+            add_header 'Access-Control-Max-Age' 1728000;
+            add_header 'Content-Type' 'text/plain; charset=utf-8';
+            add_header 'Content-Length' 0;
+            return 204;
+        }
+    }
+
     # Прокси для всех остальных запросов на Django (асинхронный / uvicorn или gunicorn)
     location / {
         proxy_pass http://django;