diff --git a/dbapp/mainapp/templates/mainapp/multi_sources_playback_map.html b/dbapp/mainapp/templates/mainapp/multi_sources_playback_map.html index 4c49cba..528e621 100644 --- a/dbapp/mainapp/templates/mainapp/multi_sources_playback_map.html +++ b/dbapp/mainapp/templates/mainapp/multi_sources_playback_map.html @@ -169,6 +169,10 @@ const baseLayers = { 'Топографическая': L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', { maxZoom: 17, attribution: '© OpenTopoMap' + }), + 'Локальная': L.tileLayer('http://127.0.0.1:8090/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 f0427eb..f7c5577 100644 --- a/dbapp/mainapp/templates/mainapp/objitem_map.html +++ b/dbapp/mainapp/templates/mainapp/objitem_map.html @@ -52,7 +52,7 @@ attribution: 'Tiles © Esri' }); - const street_local = L.tileLayer('http://127.0.0.1:8080/styles/basic-preview/{z}/{x}/{y}.png', { + const street_local = L.tileLayer('http://127.0.0.1:8090/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 2e4220a..ad97a9e 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 © Esri' }); - const street_local = L.tileLayer('http://127.0.0.1:8080/styles/basic-preview/{z}/{x}/{y}.png', { + const street_local = L.tileLayer('http://127.0.0.1:8090/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 c4cb005..28a1efc 100644 --- a/dbapp/mainapp/templates/mainapp/source_map.html +++ b/dbapp/mainapp/templates/mainapp/source_map.html @@ -75,7 +75,7 @@ attribution: 'Tiles © Esri' }); - const street_local = L.tileLayer('http://127.0.0.1:8080/styles/basic-preview/{z}/{x}/{y}.png', { + const street_local = L.tileLayer('http://127.0.0.1:8090/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 8c3b711..418cd26 100644 --- a/dbapp/mainapp/templates/mainapp/source_with_points_map.html +++ b/dbapp/mainapp/templates/mainapp/source_with_points_map.html @@ -193,7 +193,7 @@ attribution: 'Tiles © Esri' }); - const street_local = L.tileLayer('http://127.0.0.1:8080/styles/basic-preview/{z}/{x}/{y}.png', { + const street_local = L.tileLayer('http://127.0.0.1:8090/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 7117460..e481219 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 © 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:8080/styles/basic-preview/{z}/{x}/{y}.png', { + const street_local = L.tileLayer('http://127.0.0.1:8090/styles/basic-preview/512/{z}/{x}/{y}.png', { maxZoom: 19, attribution: 'Local Tiles' }); @@ -64,7 +64,7 @@ const baseLayers = { "Улицы": street, "Спутник": satellite, - // "Локально": street_local + "Локально": street_local }; L.control.layers(baseLayers).addTo(map); map.setMaxZoom(18); diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml index 22cf5ad..9e163c1 100644 --- a/docker-compose.prod.yaml +++ b/docker-compose.prod.yaml @@ -69,7 +69,20 @@ services: - LOG_LEVEL=info - LOG_HTML=false - CAPTCHA_SOLVER=none + + tileserver: + image: maptiler/tileserver-gl:latest + container_name: tileserver-gl + restart: unless-stopped + ports: + - "8090:8080" + volumes: + - ./tileserver_data:/data + - tileserver_config:/config + environment: + - VERBOSE=true volumes: pgdata: - static_volume: \ No newline at end of file + static_volume: + tileserver_config \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 45cbdc5..d5a9d8c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -52,24 +52,24 @@ services: # networks: # - app-network - # tileserver: - # image: maptiler/tileserver-gl:latest - # container_name: tileserver-gl-dev - # restart: unless-stopped - # ports: - # - "8080:8080" - # volumes: - # - ./tiles:/data - # - tileserver_config_dev:/config - # environment: - # - VERBOSE=true + tileserver: + image: maptiler/tileserver-gl:latest + container_name: tileserver-gl-dev + restart: unless-stopped + ports: + - "8090:8080" + volumes: + - /mnt/c/Users/I/Documents/TileServer:/data + - tileserver_config_dev:/config + environment: + - VERBOSE=true # networks: # - app-network volumes: postgres_data: redis_data: - # tileserver_config_dev: + tileserver_config_dev: networks: app-network: