From 469660abbe133cd03ecba3715182ae2f2c3aa95f Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 19 May 2019 16:56:40 +0300
Subject: [PATCH] #5937 Layers selector fix + disable layers selector for
 non-map geometries

Former-commit-id: 3b0ef2151a319ca7013009c897610682ee44c594
---
 .../web/view_template.html                    | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.data.gis.view/web/view_template.html b/plugins/org.jkiss.dbeaver.data.gis.view/web/view_template.html
index b0b284010b..1738111e85 100644
--- a/plugins/org.jkiss.dbeaver.data.gis.view/web/view_template.html
+++ b/plugins/org.jkiss.dbeaver.data.gis.view/web/view_template.html
@@ -30,6 +30,24 @@
         var geoMap = L.map('gisMap');
 
         if (${showMap}) {
+            let baseLayersObj = {
+                'Street': L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
+                    maxZoom: 18,
+                    attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/" target="_new">OpenStreetMap</a> contributors ' +
+                        '<a href="https://creativecommons.org/licenses/by-sa/2.0/" target="_new">CC-BY-SA</a>, ' +
+                        'Imagery <a href="https://www.mapbox.com/" target="_new">Mapbox</a>',
+                    id: 'mapbox.streets'
+                }),
+                'Topography': L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png',
+                  {
+                    maxZoom: 17,
+                    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>,' +
+                      ' &copy; <a href="http://viewfinderpanoramas.org" target="_blank">SRTM</a>,' +
+                      ' &copy; <a href="https://opentopomap.org" target="_blank">OpenTopoMap</a>',
+                  }),
+            };
+            L.control.layers(baseLayersObj).addTo(geoMap);
+
             L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
                 maxZoom: 18,
                 attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/" target="_new">OpenStreetMap</a> contributors ' +
@@ -39,24 +57,6 @@
             }).addTo(geoMap);
         }
 
-        let baseLayersObj = {
-            'Street': L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
-                maxZoom: 18,
-                attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/" target="_new">OpenStreetMap</a> contributors ' +
-                    '<a href="https://creativecommons.org/licenses/by-sa/2.0/" target="_new">CC-BY-SA</a>, ' +
-                    'Imagery <a href="https://www.mapbox.com/" target="_new">Mapbox</a>',
-                id: 'mapbox.streets'
-            }),
-            'Topography': L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png',
-              {
-                maxZoom: 17,
-                attribution: '&copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>,' +
-                  ' &copy; <a href="http://viewfinderpanoramas.org" target="_blank">SRTM</a>,' +
-                  ' &copy; <a href="https://opentopomap.org" target="_blank">OpenTopoMap</a>',
-              }),
-        };
-        L.control.layers(baseLayersObj).addTo(geoMap);
-
 
         const geojsonMarkerOptions = {
             radius: 4,
@@ -93,6 +93,12 @@
         });
         vectorLayer.addTo(geoMap);
 
+        if (${showMap}) {
+            // Make streetview active
+            var layerControlElement = document.getElementsByClassName('leaflet-control-layers')[0];
+            layerControlElement.getElementsByTagName('input')[0].click();
+        }
+
         for (i = 0; i < sourceValues.length; i++) {
             var geomValue = sourceValues[i];
 
-- 
GitLab