Refactoring of datasource selector functionality

Micka related stuff is moved to separate directory. Filter suggestions have been made dataset speciffic, because there is no need to set them for all micka instances or worse also for ckan, layman... services. Icon of datasource adding is fixed and also pagination. refs #241, #213, #214
hslayers · Jul 30, 2019 · e43b6a3 · e43b6a3
1 parent 0b357e2
commit e43b6a3
Show file tree

Hide file tree

Showing 19 changed files with 396 additions and 341 deletions.
diff --git a/common/wfs/get-capabilities.service.js b/common/wfs/get-capabilities.service.js
@@ -16,6 +16,7 @@ export default ['$http', 'hs.map.service', 'hs.utils.service', '$rootScope', fun
     };
 
     /**
+     * TODO: Probably the same as utils.paramsToURL
     * Create WFS parameter string from parameter object 
     * @memberof hs.wfs.getCapabilitiesService
     * @function param2String

diff --git a/common/wms/get-capabilities.service.js b/common/wms/get-capabilities.service.js
@@ -23,6 +23,7 @@ export default ['$http', 'hs.map.service', 'hs.utils.service', '$rootScope', fun
     };
 
     /**
+     * TODO: Probably the same as utils.paramsToURL
     * Create WMS parameter string from parameter object 
     * @memberof hs.wms.getCapabilitiesService
     * @function param2String

diff --git a/common/wmts/get-capabilities.service.js b/common/wmts/get-capabilities.service.js
@@ -24,6 +24,7 @@ export default ['$http', 'hs.map.service', 'hs.utils.service',
         };
 
         /**
+         * TODO: Probably the same as utils.paramsToURL
         * Create WMTS parameter string from parameter object 
         * @memberof hs.wmts.getCapabilitiesService
         * @function param2String

diff --git a/components/datasource-selector/advanced-micka-dialog.directive.js b/components/datasource-selector/advanced-micka-dialog.directive.js
diff --git a/components/datasource-selector/datasource-selector.component.js b/components/datasource-selector/datasource-selector.component.js
@@ -2,11 +2,11 @@ export default {
     template: require('components/datasource-selector/partials/datasource_selector.html'),
     controller:
         ['$scope', 'Core', '$compile', 'hs.utils.service', '$http', 'hs.datasource_selector.service', 'config',
-            function ($scope, Core, $compile, utils, $http, DS, config) {
+            function ($scope, Core, $compile, utils, $http, datasourceSelectorService, config) {
                 $scope.Core = Core;
-                $scope.data = DS.data;
-                $scope.DS = DS;
-                $scope.dsPaging = $scope.data.paging;
+                $scope.data = datasourceSelectorService.data;
+                $scope.DS = datasourceSelectorService;
+                datasourceSelectorService.paging = $scope.data.paging;
                 $scope.wms_connecting = false;
                 $scope.config = config;
                 $scope.advancedSearch = false;
@@ -19,63 +19,7 @@ export default {
                 $scope.datasetSelect = function (id_selected) {
                     $scope.wms_connecting = false;
                     $scope.id_selected = id_selected;
-                }
-
-                if (config.datasources && config.datasources.length > 0)
-                    $http({
-                        method: 'GET',
-                        url: utils.proxify('http://opentransportnet.eu:8082/api/3/action/vocabulary_show?id=36c07014-c461-4f19-b4dc-a38106144e66')
-                    }).then(function successCallback(response) {
-                        $scope.otn_keywords = [{ title: '-' }];
-                        angular.forEach(response.data.result.tags, function (tag) {
-                            $scope.otn_keywords.push({ title: tag.name });
-                        })
-                    });
-
-                /**
-                 * @function openMickaAdvancedSearch
-                 * @memberOf hs.datasource_selector
-                 * Opens Micka Advanced Search dialog, might pass current search string.
-                 */
-                $scope.openMickaAdvancedSearch = function () {
-                    if (document.getElementById('ds-advanced-micka') == null) {
-                        var el = angular.element('<div hs.datasource_selector.advanced_micka_dialog_directive></div>');
-                        $compile(el)($scope);
-                        document.getElementById("hs-dialog-area").appendChild(el[0]);
-                    } else {
-                        $scope.modalVisible = true;
-                    }
-                    DS.checkAdvancedMicka();
-                }
-
-                /**
-                 * @function showSuggestions
-                 * @memberOf hs.datasource_selector
-                 * @param {String} input Suggestion class type name (e.g. "Organisation Name")
-                 * @param {String} param Suggestion paramater of Micka service (e.g. "org")
-                 * @param {String} field Expected property name in response object (e.g. "value")
-                 * Shows suggestions dialog and edits suggestion config.
-                 */
-                $scope.showSuggestions = function (input, param, field) {
-                    DS.changeSuggestionConfig(input, param, field);
-                    if (config.design === "md") {
-                        DS.checkAdvancedMicka();
-                        $scope.data.suggestionFilter = $scope.data.query[input];
-                        DS.suggestionFilterChanged();
-                    } else {
-                        if (document.getElementById('ds-suggestions-micka') == null) {
-                            var el = angular.element('<div hs.datasource_selector.suggestions_dialog_directive></span>');
-                            document.getElementById("hs-dialog-area").appendChild(el[0]);;
-                            $compile(el)($scope);
-                        } else {
-                            $scope.suggestionsModalVisible = true;
-                            var filterElement = document.getElementById('ds-sug-filter');
-                            $scope.data.suggestionFilter = $scope.data.query[input];
-                            filterElement.focus();
-                            DS.suggestionFilterChanged();
-                        }
-                    }
-                }
+                }               
 
                 /**
                  * @function getPreviousRecords
@@ -84,14 +28,14 @@ export default {
                  * Loads previous records of datasets from selected datasource (based on number of results per page and current start)
                  */
                 $scope.getPreviousRecords = function (ds) {
-                    if (ds.start - $scope.data.dsPaging < 0) {
+                    if (ds.start - datasourceSelectorService.paging < 0) {
                         ds.start = 0;
-                        ds.next = $scope.data.dsPaging;
+                        ds.next = datasourceSelectorService.paging;
                     } else {
-                        ds.start -= $scope.data.dsPaging;
-                        ds.next = ds.start + $scope.data.dsPaging;
+                        ds.start -= datasourceSelectorService.paging;
+                        ds.next = ds.start + datasourceSelectorService.paging;
                     }
-                    DS.loadDataset(ds);
+                    datasourceSelectorService.loadDataset(ds);
                 }
 
                 /**
@@ -102,14 +46,14 @@ export default {
                  */
                 $scope.getNextRecords = function (ds) {
                     if (ds.next != 0) {
-                        ds.start = Math.floor(ds.next / $scope.data.dsPaging) * $scope.data.dsPaging;
+                        ds.start = Math.floor(ds.next / datasourceSelectorService.paging) * datasourceSelectorService.paging;
 
-                        if (ds.next + $scope.data.dsPaging > ds.matched) {
+                        if (ds.next + datasourceSelectorService.paging > ds.matched) {
                             ds.next = ds.matched;
                         } else {
-                            ds.next += $scope.data.dsPaging;
+                            ds.next += datasourceSelectorService.paging;
                         }
-                        DS.loadDataset(ds);
+                        datasourceSelectorService.loadDataset(ds);
                     }
                 }
 
@@ -166,7 +110,7 @@ export default {
                  * Add selected layer to map (into layer manager) if possible (supported formats: WMS, WFS, Sparql, kml, geojson, json)
                  */
                 $scope.addLayerToMap = function (ds, layer) {
-                    var result = DS.addLayerToMap(ds, layer);
+                    var result = datasourceSelectorService.addLayerToMap(ds, layer);
                     if (result == "WMS") {
                         if (Core.singleDatasources) {
                             $('.dss-tabs a[href="#OWS"]').tab('show')
@@ -191,19 +135,6 @@ export default {
                     $scope.metadataModalVisible = false;
                 }
 
-                /**
-                 * @function setOtnKeyword
-                 * @memberOf hs.datasource_selector
-                 * @param {String} theme Selected Otn theme keyword 
-                 * Select Otn Keyword as query subject (used with dropdown list in Gui)
-                 */
-                $scope.setOtnKeyword = function (theme) {
-                    if (theme == '-') theme = '';
-                    $scope.query.Subject = theme;
-                    DS.loadDatasets(DS.datasources);
-                    return false;
-                }
-
                 $scope.$emit('scope_loaded', "DatasourceSelector");
             }
         ]

diff --git a/components/datasource-selector/datasource-selector.module.js b/components/datasource-selector/datasource-selector.module.js
@@ -1,9 +1,11 @@
 import metadataDialogDirective from './metadata-dialog.directive';
-import advancedMickaDialogDirective from './advanced-micka-dialog.directive';
-import suggestionsDialogDirective from './suggestions-dialog.directive';
+import advancedMickaDialogDirective from './micka/advanced-micka-dialog.directive';
+import suggestionsDialogDirective from './micka/suggestions-dialog.directive';
 import objectDirective from './object.directive';
 import datasourceSelectorService from './datasource-selector.service';
 import datasourceSelectorComponent from './datasource-selector.component';
+import datasourceMickaFilterService from './micka/datasource-micka-filter.service';
+import datasourceMickaFilterDirective from './micka/datasource-micka-filter.directive';
 
 /**
  * @namespace hs.datasource_selector
@@ -42,8 +44,12 @@ angular.module('hs.datasource_selector', ['hs.map'])
      */
     .directive('hs.datasourceSelector.objectDirective', objectDirective)
 
+    .directive('hs.datasourceMickaFilter', datasourceMickaFilterDirective)
+
     .service('hs.datasource_selector.service', datasourceSelectorService)
 
+    .service('hs.datasourceMickaFilterService', datasourceMickaFilterService)
+
     /**
      * @ngdoc component
      * @memberof hs.datasource_selector