From 8a934d0bde8cf46492ebb91e85a1d9169da67ab3 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 2 Jun 2017 14:58:00 +0200
Subject: [PATCH] fix error when searching by coordinates query from session
---
.../src/main/js/map/overlay/AbstractDbOverlay.js | 1 +
.../test/js/map/overlay/SearchDbOverlay-test.js | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js b/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
index f7828221ef..fe99bfc0a4 100644
--- a/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
@@ -170,6 +170,7 @@ AbstractDbOverlay.prototype.searchByEncodedQuery = function(originalQuery, fitBo
} else if (query.type === AbstractDbOverlay.QueryType.SEARCH_BY_TARGET) {
return this.searchNamesByTarget(query.target);
} else if (query.type === AbstractDbOverlay.QueryType.SEARCH_BY_COORDINATES) {
+ query.coordinates = new google.maps.Point(query.coordinates.x,query.coordinates.y);
return this.searchByCoordinates(query);
} else {
throw new Error("Unknown type of query: " + query.type);
diff --git a/frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js b/frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js
index 33e05fe246..0b2c0291ec 100644
--- a/frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js
+++ b/frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js
@@ -6,6 +6,7 @@ var logger = require('../../logger');
var IdentifiedElement = require('../../../../main/js/map/data/IdentifiedElement');
var SearchDbOverlay = require('../../../../main/js/map/overlay/SearchDbOverlay');
+var AbstractDbOverlay = require('../../../../main/js/map/overlay/AbstractDbOverlay');
var assert = require('assert');
@@ -42,7 +43,21 @@ describe('SearchDbOverlay', function() {
}).then(function(result) {
assert.equal(result.length, 0);
});
+ });
+ it("searchByEncodedQuery", function() {
+ return ServerConnector.getProject().then(
+ function(project) {
+ var map = helper.createCustomMap(project);
+ map.getModel().setId(15781);
+ var searchDb = helper.createSearchDbOverlay(map);
+
+ var query = searchDb.encodeQuery(AbstractDbOverlay.QueryType.SEARCH_BY_COORDINATES, map.getModel().getId(),
+ new google.maps.Point(316.05, 253.61), 2);
+ return searchDb.searchByEncodedQuery(query);
+ }).then(function(result) {
+ assert.ok(result.length > 0);
+ });
});
it("searchByCoordinates with too far reaction as result", function() {
--
GitLab