From e4149ad5aa0ee074990681c944515a1e38eb49f0 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 22 May 2017 10:00:54 +0200
Subject: [PATCH] params of searchByCoordinates changed to params object
---
frontend-js/src/main/js/map/AbstractCustomMap.js | 2 +-
.../src/main/js/map/overlay/AbstractDbOverlay.js | 2 +-
.../src/main/js/map/overlay/SearchDbOverlay.js | 5 ++++-
.../test/js/gui/leftPanel/SearchPanel-test.js | 16 ++++++++++------
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/frontend-js/src/main/js/map/AbstractCustomMap.js b/frontend-js/src/main/js/map/AbstractCustomMap.js
index 6312bc1318..52a2150c14 100644
--- a/frontend-js/src/main/js/map/AbstractCustomMap.js
+++ b/frontend-js/src/main/js/map/AbstractCustomMap.js
@@ -317,7 +317,7 @@ AbstractCustomMap.prototype.registerMapClickEvents = function() {
google.maps.event.addListener(this.getGoogleMap(), 'click', function(mouseEvent) {
var point = self.fromLatLngToPoint(mouseEvent.latLng);
var searchDb = customMap.getOverlayByName('search');
- return searchDb.searchByCoordinates(self.getModel().getId(), point).catch(GuiConnector.alert);
+ return searchDb.searchByCoordinates({modelId: self.getModel().getId(), coordinates:point}).catch(GuiConnector.alert);
});
// select last clicked map
diff --git a/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js b/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
index 1f4775eb06..8f5b65bf1f 100644
--- a/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
@@ -164,7 +164,7 @@ AbstractDbOverlay.prototype.searchByEncodedQuery = function(originalQuery) {
} else if (query.type === AbstractDbOverlay.QueryType.SEARCH_BY_TARGET) {
return this.searchNamesByTarget(query.target);
} else if (query.type === AbstractDbOverlay.QueryType.SEARCH_BY_COORDINATES) {
- return this.searchByCoordinates(query.modelId, query.coordinates);
+ return this.searchByCoordinates(query);
} else {
throw new Error("Unknown type of query: " + query.type);
}
diff --git a/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js b/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
index edcb187a5d..15a8e3eb7c 100644
--- a/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
@@ -63,7 +63,10 @@ SearchDbOverlay.prototype.getElementsByQuery = function(query) {
});
};
-SearchDbOverlay.prototype.searchByCoordinates = function(modelId, coordinates) {
+SearchDbOverlay.prototype.searchByCoordinates = function(params) {
+ var modelId = params.modelId;
+ var coordinates = params.coordinates;
+
var self = this;
var query = self.encodeQuery(AbstractDbOverlay.QueryType.SEARCH_BY_COORDINATES, modelId, coordinates);
diff --git a/frontend-js/src/test/js/gui/leftPanel/SearchPanel-test.js b/frontend-js/src/test/js/gui/leftPanel/SearchPanel-test.js
index 1a58a790a0..483b7f4297 100644
--- a/frontend-js/src/test/js/gui/leftPanel/SearchPanel-test.js
+++ b/frontend-js/src/test/js/gui/leftPanel/SearchPanel-test.js
@@ -40,11 +40,15 @@ describe('SearchPanel', function() {
customMap : map
});
- return searchDbOverlay.searchByCoordinates(map.getModel().getId(), new google.maps.Point(26547.33, 39419.29)).then(
- function() {
- assert.equal(logger.getWarnings().length, 0);
- assert.ok(testDiv.innerHTML.indexOf("Reaction") >= 0);
- });
+ var searchParams = {
+ modelId : map.getModel().getId(),
+ coordinates : new google.maps.Point(26547.33, 39419.29)
+ };
+
+ return searchDbOverlay.searchByCoordinates(searchParams).then(function() {
+ assert.equal(logger.getWarnings().length, 0);
+ assert.ok(testDiv.innerHTML.indexOf("Reaction") >= 0);
+ });
});
it('on searchResults changed 2', function() {
@@ -74,7 +78,7 @@ describe('SearchPanel', function() {
});
panel.getControlElement(PanelControlElementType.SEARCH_INPUT).value = "s1";
-
+
return panel.searchByQuery().then(function() {
assert.equal(logger.getWarnings().length, 0);
assert.ok(testDiv.innerHTML.indexOf("s1") >= 0);
--
GitLab