Fix testing framework and compositions test

hslayers · Nov 22, 2019 · f07badc · f07badc
1 parent dd01d65
commit f07badc
Show file tree

Hide file tree

Showing 12 changed files with 294 additions and 315 deletions.
diff --git a/components/compositions/compositions.component.js b/components/compositions/compositions.component.js
@@ -5,10 +5,10 @@ export default {
         else
             return require('components/compositions/partials/compositions.html')
     }],
-    controller: ['$scope', 'Core', 'hs.compositions.service',
+    controller: ['$scope', 'Core', 'hs.map.service', 'hs.compositions.service',
         'hs.compositions.service_parser', '$window', 'config', '$compile',
         'hs.compositions.mickaService', '$rootScope', 'hs.layout.service',
-        function ($scope, Core, Composition, compositionParser, $window, config,
+        function ($scope, Core, hsMap, Composition, compositionParser, $window, config,
             $compile, mickaEndpointService, $rootScope, layoutService) {
             $scope.CS = Composition;
             $scope.data = Composition.data;
@@ -100,14 +100,18 @@ export default {
              * @description Load list of compositions according to current filter values and pager position (filter, keywords, current extent, start composition, compositions number per page). Display compositions extent in map
              */
             $scope.loadCompositions = function (ds) {
-                Composition.loadCompositions(ds, {
-                    query: $scope.query,
-                    sortBy: $scope.sortBy,
-                    filterExtent: $scope.filterByExtent,
-                    keywords: $scope.keywords,
-                    start: ds.start,
-                    limit: ds.limit
-                });
+                return new Promise((resolve, reject) => {
+                    hsMap.loaded().then(map => {
+                        Composition.loadCompositions(ds, {
+                            query: $scope.query,
+                            sortBy: $scope.sortBy,
+                            filterExtent: $scope.filterByExtent,
+                            keywords: $scope.keywords,
+                            start: ds.start,
+                            limit: ds.limit
+                        }).then(_ => { resolve() });
+                    })
+                })
             }
 
             /**

diff --git a/components/compositions/compositions.service.js b/components/compositions/compositions.service.js
@@ -31,24 +31,45 @@ export default ['$rootScope', '$location', '$http', 'hs.map.service',
             })
         }
 
+        extentLayer = new VectorLayer({
+            title: "Composition extents",
+            show_in_manager: false,
+            source: new Vector(),
+            removable: false,
+            style: function (feature, resolution) {
+                return [new Style({
+                    stroke: new Stroke({
+                        color: '#005CB6',
+                        width: feature.get('highlighted') ? 4 : 1
+                    }),
+                    fill: new Fill({
+                        color: 'rgba(0, 0, 255, 0.01)'
+                    })
+                })]
+            }
+        });
+
         me.datasetSelect = function (id_selected) {
             me.data.id_selected = id_selected;
         }
 
         me.loadCompositions = function (ds, params) {
-            extentLayer.getSource().clear();
-            var bbox = OlMap.getMapExtentInEpsg4326();
-            switch (ds.type) {
-                case 'micka':
-                    mickaEndpointService.loadList(ds, params, bbox, extentLayer)
-                        .then(() => {
-                            statusManagerEndpointService.loadList(ds, params, bbox);
-                        })
-                    break;
-                case 'layman':
-                    laymanEndpointService.loadList(ds, params, bbox, extentLayer);
-                    break;
-            }
+            return new Promise((resolve, reject) => {
+                extentLayer.getSource().clear();
+                var bbox = OlMap.getMapExtentInEpsg4326();
+                switch (ds.type) {
+                    case 'micka':
+                        mickaEndpointService.loadList(ds, params, bbox, extentLayer)
+                            .then(() => {
+                                statusManagerEndpointService.loadList(ds, params, bbox);
+                                resolve()
+                            })
+                        break;
+                    case 'layman':
+                        laymanEndpointService.loadList(ds, params, bbox, extentLayer).then(_ => resolve());
+                        break;
+                }
+            })
         }
 
         me.resetCompositionCounter = function () {
@@ -87,24 +108,6 @@ export default ['$rootScope', '$location', '$http', 'hs.map.service',
         }
 
         function init(map) {
-            extentLayer = new VectorLayer({
-                title: "Composition extents",
-                show_in_manager: false,
-                source: new Vector(),
-                removable: false,
-                style: function (feature, resolution) {
-                    return [new Style({
-                        stroke: new Stroke({
-                            color: '#005CB6',
-                            width: feature.get('highlighted') ? 4 : 1
-                        }),
-                        fill: new Fill({
-                            color: 'rgba(0, 0, 255, 0.01)'
-                        })
-                    })]
-                }
-            });
-
             map.on('pointermove', function (evt) {
                 var features = extentLayer.getSource().getFeaturesAtCoordinate(evt.coordinate);
                 var somethingDone = false;

diff --git a/components/compositions/compositions.spec.js b/components/compositions/compositions.spec.js