From 8bbfe79a00da8de8fa0f7ee7e3aca8aa1e26bd29 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 28 Jun 2018 10:58:06 +0200
Subject: [PATCH] alias surfaces use whole alias area if bounds is not defined
---
.../src/main/js/map/surface/AliasSurface.js | 2 +-
.../test/js/map/surface/AliasSurface-test.js | 43 +++++++++++++------
2 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/frontend-js/src/main/js/map/surface/AliasSurface.js b/frontend-js/src/main/js/map/surface/AliasSurface.js
index 9226528c69..f7dc2968bc 100644
--- a/frontend-js/src/main/js/map/surface/AliasSurface.js
+++ b/frontend-js/src/main/js/map/surface/AliasSurface.js
@@ -251,7 +251,7 @@ AliasSurface.prototype.getEndX = function () {
*/
AliasSurface.prototype.setEndX = function (endX) {
if (endX === undefined) {
- endX = 0;
+ endX = 1;
}
this._endX = endX;
};
diff --git a/frontend-js/src/test/js/map/surface/AliasSurface-test.js b/frontend-js/src/test/js/map/surface/AliasSurface-test.js
index 5658cfd950..92ec4e6062 100644
--- a/frontend-js/src/test/js/map/surface/AliasSurface-test.js
+++ b/frontend-js/src/test/js/map/surface/AliasSurface-test.js
@@ -9,21 +9,38 @@ var ServerConnector = require('../../ServerConnector-mock');
var assert = require('assert');
describe('AliasSurface', function () {
- it("init", function () {
- var map = helper.createCustomMap();
- var alias = helper.createAlias(map);
- var layoutAlias = helper.createLayoutAlias(alias);
+ describe("init", function () {
+ it("default", function () {
+ var map = helper.createCustomMap();
+ var alias = helper.createAlias(map);
+ var layoutAlias = helper.createLayoutAlias(alias);
- var result = new AliasSurface({
- overlayAlias: layoutAlias,
- alias: alias,
- map: map,
- startX: 1,
- endX: 2
+ var result = new AliasSurface({
+ overlayAlias: layoutAlias,
+ alias: alias,
+ map: map,
+ startX: 1,
+ endX: 2
+ });
+ return result.init().then(function () {
+ assert.equal(logger.getWarnings.length, 0);
+ assert.ok(result.getIdentifiedElement());
+ });
});
- return result.init().then(function () {
- assert.equal(logger.getWarnings.length, 0);
- assert.ok(result.getIdentifiedElement());
+ it("no bounds", function () {
+ var map = helper.createCustomMap();
+ var alias = helper.createAlias(map);
+ var layoutAlias = helper.createLayoutAlias(alias);
+
+ var result = new AliasSurface({
+ overlayAlias: layoutAlias,
+ alias: alias,
+ map: map
+ });
+ return result.init().then(function () {
+ assert.equal(0, result.getStartX());
+ assert.equal(1, result.getEndX());
+ });
});
});
--
GitLab