From a00517100e2cf5897c396420b8da5c9a117eb491 Mon Sep 17 00:00:00 2001
From: raitis <raitisbe@gmail.com>
Date: Tue, 23 Jul 2019 15:09:09 +0300
Subject: [PATCH] Enable turning on/off geolocation

fixes #239
---
 .../geolocation/geolocation.directive.js      |   6 +-
 .../geolocation/partials/geolocation.html     |   2 +-
 components/map/map.controller.js              | 162 +++++++++---------
 wiki/config.txt                               |   4 +
 4 files changed, 91 insertions(+), 83 deletions(-)

diff --git a/components/geolocation/geolocation.directive.js b/components/geolocation/geolocation.directive.js
index 1ea7379616..2b731d2728 100644
--- a/components/geolocation/geolocation.directive.js
+++ b/components/geolocation/geolocation.directive.js
@@ -10,7 +10,7 @@ export default ['hs.map.service', 'hs.geolocation.service', 'Core', 'config', fu
                 }
             }
         },
-        controller: ['$scope', function ($scope) {
+        controller: ['$scope', 'config', function ($scope, config) {
             $scope.collapsed = true;
             $scope.blocateClick = function (e) {
                 //Checking target is needed because follow button is inside locate button (container) 
@@ -24,6 +24,10 @@ export default ['hs.map.service', 'hs.geolocation.service', 'Core', 'config', fu
                     Geolocation.geolocation.setTracking(true);
                 }
             }
+
+            $scope.geolocationVisible = function () {
+                return (angular.isUndefined(config.locationButtonVisible) || config.locationButtonVisible);
+            }
         }],
         replace: true
     };
diff --git a/components/geolocation/partials/geolocation.html b/components/geolocation/partials/geolocation.html
index 54749e75e0..cdae5a4903 100755
--- a/components/geolocation/partials/geolocation.html
+++ b/components/geolocation/partials/geolocation.html
@@ -1,4 +1,4 @@
-<div class="locate ol-unselectable ol-control locateToggler" ng-click="blocateClick($event)" ng-class="{'ol-collapsed': collapsed}"
+<div class="locate ol-unselectable ol-control locateToggler" ng-show="geolocationVisible()" ng-click="blocateClick($event)" ng-class="{'ol-collapsed': collapsed}"
     ng-controller="hs.geolocation.controller">
 
     <ul>
diff --git a/components/map/map.controller.js b/components/map/map.controller.js
index 58a546c10c..f051bb7c6f 100644
--- a/components/map/map.controller.js
+++ b/components/map/map.controller.js
@@ -2,100 +2,100 @@ import mapDirective from './map.directive';
 import { transform } from 'ol/proj';
 
 export default ['$scope', 'hs.map.service', 'config', 'hs.permalink.urlService', 'Core', '$rootScope',
-function ($scope, OlMap, config, permalink, Core, $rootScope) {
+    function ($scope, OlMap, config, permalink, Core, $rootScope) {
 
-    var map = OlMap.map;
+        var map = OlMap.map;
 
-    /**
-     * @ngdoc method
-     * @name hs.map.controller#setTargetDiv
-     * @public
-     * @description Sets div element of the map
-     * @param {string} div_id ID pf the container element
-     * @returns {ol.Map} 
-     */
-    $scope.setTargetDiv = function (div_id) {
-        OlMap.map.setTarget(div_id);
-    }
-
-    /**
-     * @ngdoc method
-     * @name hs.map.controller#findLayerByTitle
-     * @public
-     * @param {string} title Title of the layer (from layer creation)
-     * @returns {Ol.layer} Ol.layer object
-     * @description Find layer object by title of layer 
-     */
-    $scope.findLayerByTitle = OlMap.findLayerByTitle;
+        /**
+         * @ngdoc method
+         * @name hs.map.controller#setTargetDiv
+         * @public
+         * @description Sets div element of the map
+         * @param {string} div_id ID pf the container element
+         * @returns {ol.Map} 
+         */
+        $scope.setTargetDiv = function (div_id) {
+            OlMap.map.setTarget(div_id);
+        }
 
-    $scope.hs_map = OlMap;
+        /**
+         * @ngdoc method
+         * @name hs.map.controller#findLayerByTitle
+         * @public
+         * @param {string} title Title of the layer (from layer creation)
+         * @returns {Ol.layer} Ol.layer object
+         * @description Find layer object by title of layer 
+         */
+        $scope.findLayerByTitle = OlMap.findLayerByTitle;
 
-    //
-    $scope.showFeaturesWithAttrHideRest = function (source, attribute, value, attr_to_change, invisible_value, visible_value) {
+        $scope.hs_map = OlMap;
 
-    }
+        //
+        $scope.showFeaturesWithAttrHideRest = function (source, attribute, value, attr_to_change, invisible_value, visible_value) {
 
-    /**
-     * @ngdoc method
-     * @name hs.map.controller#init
-     * @public
-     * @description Initialization of map object, initialize map and map state from permalink.
-     */
-    $scope.init = function () {
-        if (permalink.getParamValue('visible_layers')) {
-            OlMap.visible_layers = permalink.getParamValue('visible_layers').split(';');
-        }
-        OlMap.init();
-        let hs_x = permalink.getParamValue('hs_x');
-        let hs_y = permalink.getParamValue('hs_y');
-        let hs_z = permalink.getParamValue('hs_z');
-        if (hs_x && hs_x != 'NaN' && hs_y && hs_y != 'NaN' && hs_z && hs_z != 'NaN') {
-            OlMap.moveToAndZoom(parseFloat(hs_x), parseFloat(hs_y), parseInt(hs_z));
         }
 
-        if (permalink.getParamValue("puremap")) {
-            Core.puremapApp = true;
-            OlMap.puremap();
+        /**
+         * @ngdoc method
+         * @name hs.map.controller#init
+         * @public
+         * @description Initialization of map object, initialize map and map state from permalink.
+         */
+        $scope.init = function () {
+            if (permalink.getParamValue('visible_layers')) {
+                OlMap.visible_layers = permalink.getParamValue('visible_layers').split(';');
+            }
+            OlMap.init();
+            let hs_x = permalink.getParamValue('hs_x');
+            let hs_y = permalink.getParamValue('hs_y');
+            let hs_z = permalink.getParamValue('hs_z');
+            if (hs_x && hs_x != 'NaN' && hs_y && hs_y != 'NaN' && hs_z && hs_z != 'NaN') {
+                OlMap.moveToAndZoom(parseFloat(hs_x), parseFloat(hs_y), parseInt(hs_z));
+            }
+
+            if (permalink.getParamValue("puremap")) {
+                Core.puremapApp = true;
+                OlMap.puremap();
+            }
         }
-    }
 
-    /**
-     * @ngdoc method
-     * @name hs.map.controller#onCenterSync
-     * @private
-     * @param {array} data Coordinates in lon/lat and resolution
-     * @description This gets called from Cesium map, to synchronize center and resolution between Ol and Cesium maps
-     */
-    function onCenterSync(event, data) {
-        if (angular.isUndefined(data) || data == null) return;
-        var transformed_cords = transform([data[0], data[1]], 'EPSG:4326', OlMap.map.getView().getProjection());
-        OlMap.moveToAndZoom(transformed_cords[0], transformed_cords[1], zoomForResolution(data[2]));
-    }
+        /**
+         * @ngdoc method
+         * @name hs.map.controller#onCenterSync
+         * @private
+         * @param {array} data Coordinates in lon/lat and resolution
+         * @description This gets called from Cesium map, to synchronize center and resolution between Ol and Cesium maps
+         */
+        function onCenterSync(event, data) {
+            if (angular.isUndefined(data) || data == null) return;
+            var transformed_cords = transform([data[0], data[1]], 'EPSG:4326', OlMap.map.getView().getProjection());
+            OlMap.moveToAndZoom(transformed_cords[0], transformed_cords[1], zoomForResolution(data[2]));
+        }
 
-    $rootScope.$on('map.sync_center', onCenterSync);
+        $rootScope.$on('map.sync_center', onCenterSync);
 
-    /**
-     * @ngdoc method
-     * @name hs.map.controller#zoomForResolution
-     * @private
-     * @param {number} resolution Resolution
-     * @description Calculates zoom level for a given resolution
-     */
-    function zoomForResolution(resolution) {
-        var zoom = 0;
-        resolution = Math.abs(resolution); //Sometimes resolution is under 0. Ratis
-        var r = 156543.03390625; // resolution for zoom 0
-        while (resolution < r) {
-            r /= 2.0;
-            zoom++;
-            if (resolution > r) {
-                return zoom;
+        /**
+         * @ngdoc method
+         * @name hs.map.controller#zoomForResolution
+         * @private
+         * @param {number} resolution Resolution
+         * @description Calculates zoom level for a given resolution
+         */
+        function zoomForResolution(resolution) {
+            var zoom = 0;
+            resolution = Math.abs(resolution); //Sometimes resolution is under 0. Ratis
+            var r = 156543.03390625; // resolution for zoom 0
+            while (resolution < r) {
+                r /= 2.0;
+                zoom++;
+                if (resolution > r) {
+                    return zoom;
+                }
             }
+            return zoom; // resolution was greater than 156543.03390625 so return 0
         }
-        return zoom; // resolution was greater than 156543.03390625 so return 0
-    }
 
-    $scope.init();
-    $scope.$emit('scope_loaded', "Map");
-}
+        $scope.init();
+        $scope.$emit('scope_loaded', "Map");
+    }
 ]
\ No newline at end of file
diff --git a/wiki/config.txt b/wiki/config.txt
index e63ac3ac2a..f75d54962a 100644
--- a/wiki/config.txt
+++ b/wiki/config.txt
@@ -315,6 +315,10 @@ DEPRECATED. Array of layers to be crossfilterable. Each element is an object whi
 }] 
 ```
 
+**locationButtonVisible**
+
+Show or hide geolocation button on map. Possible values: true/false
+
 **queryPoint**
 
 How to display point clicked on the map. Possible values are: hidden, notWithin