diff --git a/frontend-js/src/main/js/map/AbstractCustomMap.js b/frontend-js/src/main/js/map/AbstractCustomMap.js index 6312bc1318fe3f725fbdf97c6c74a51f89874720..52a2150c1473e169109b492281bde2601976afe2 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 1f4775eb061810bea91ade16cf8ad02cf001456f..8f5b65bf1f3d8b065d5bea07c527e053411d46e3 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 edcb187a5d8eb407e444fe3c847b3f995be9143f..15a8e3eb7c1d3c9c296da4797f6427b3e4775d20 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 1a58a790a08510b376ef04d4f1ba82c97992c56e..483b7f4297cd8c63265711c9123afd0e66cd578d 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);