Don't always load keyword list for dataset filter

fixes #167
hslayers · Mar 14, 2019 · a468320 · a468320
1 parent 30d4c4e
commit a468320
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/components/datasource_selector/datasource_selector.js b/components/datasource_selector/datasource_selector.js
@@ -624,15 +624,16 @@ define(['angular', 'ol', 'map'],
                         $scope.id_selected = id_selected;
                     }
 
-                    $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 });
-                        })
-                    });
+                    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

diff --git a/materialComponents/panelContents/datasourceBrowser.js b/materialComponents/panelContents/datasourceBrowser.js
@@ -32,16 +32,16 @@ define(['angular', 'ol', 'angular-material'],
                         }
                     }
                 );
-
-                $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 });
-                    })
-                });
+                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 });
+                        })
+                    });
 
                 $scope.changeDS = function(dataset){
                     $scope.selectedDS = dataset;