Merge branch...

Merge branch '108-handler-of-onsearch-listener-for-searching-by-coordinates-should-return-array-of-array' into 'master'

onSearch event handler always receive list of arrays as argument

Closes #108

See merge request !13

frontend-js/src/main/js/map/overlay/SearchDbOverlay.js

@@ -108,9 +108,9 @@ SearchDbOverlay.prototype.searchByCoordinates = function(params) {
   if (self._elementsByQuery[query] !== undefined) {
     return self.callListeners('onSearch', {
       fitBounds : false,
-      identifiedElements : self._elementsByQuery[query],
+      identifiedElements : [ self._elementsByQuery[query] ],
     }).then(function() {
-      Promise.resolve(self._elementsByQuery[query]);
+      return Promise.resolve(self._elementsByQuery[query]);
     });
   } else {
     var searchResult = null;
@@ -163,7 +163,7 @@ SearchDbOverlay.prototype.searchByCoordinates = function(params) {
       }
       return self.callListeners('onSearch', {
         fitBounds : params.fitBounds,
-        identifiedElements : self._elementsByQuery[query],
+        identifiedElements : [ self._elementsByQuery[query] ],
       });
     }).then(function() {
       return self._elementsByQuery[query];

frontend-js/src/test/js/minerva-test.js

@@ -213,7 +213,9 @@ describe('minerva global', function() {
         dbOverlayName : "search",
         type : "onSearch",
         callback : function(elements) {
-          callbackOk = elements.length > 0;
+          assert.ok(elements.length > 0);
+          assert.ok(elements[0].length !== undefined, "Array of arrays expected as onSearch result");
+          callbackOk = true;
         }
       });
       return result.customMap.getOverlayByName("search").searchByQuery("s1");
@@ -223,6 +225,16 @@ describe('minerva global', function() {
       return globalResult.customMap.getOverlayByName("search").searchByQuery("s1");
     }).then(function() {
       assert.ok(callbackOk);
+      callbackOk = false;
+      var params = {
+        coordinates : new google.maps.Point(184.79, 365.76),
+        zoom : 2,
+        modelId : globalResult.getProject().getModel().getId(),
+      };
+      return globalResult.customMap.getOverlayByName("search").searchByCoordinates(params);
+    }).then(function() {
+      logger.warn(callbackOk);
+      assert.ok(callbackOk);
     });
   });