From 3a3c6c430b6beaf519f9e4eb5aaaeac5e3a8f6f6 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 22 May 2017 18:00:58 +0200
Subject: [PATCH] lint issues
---
frontend-js/src/main/js/Functions.js | 15 +++++++++------
frontend-js/src/main/js/ServerConnector.js | 2 +-
.../src/main/js/map/overlay/AbstractDbOverlay.js | 2 +-
.../src/main/js/map/overlay/SearchDbOverlay.js | 2 +-
frontend-js/src/test/js/google-map-mock.js | 2 ++
.../test/js/map/overlay/SearchDbOverlay-test.js | 1 -
6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/frontend-js/src/main/js/Functions.js b/frontend-js/src/main/js/Functions.js
index af62768bb7..a560d351c4 100644
--- a/frontend-js/src/main/js/Functions.js
+++ b/frontend-js/src/main/js/Functions.js
@@ -259,32 +259,35 @@ Functions.createElement = function(params) {
};
function sqr(x) {
- return x * x
+ return x * x;
}
function dist2(v, w) {
- return sqr(v.x - w.x) + sqr(v.y - w.y)
+ return sqr(v.x - w.x) + sqr(v.y - w.y);
}
function distToSegmentSquared(p, v, w) {
var l2 = dist2(v, w);
- if (l2 == 0)
+ if (l2 === 0) {
return dist2(p, v);
+ }
var t = ((p.x - v.x) * (w.x - v.x) + (p.y - v.y) * (w.y - v.y)) / l2;
- if (t < 0)
+ if (t < 0) {
return dist2(p, v);
- if (t > 1)
+ }
+ if (t > 1) {
return dist2(p, w);
+ }
return dist2(p, new google.maps.Point(v.x + t * (w.x - v.x), v.y + t * (w.y - v.y)));
}
Functions.distance = function(p1, el2) {
if (el2 instanceof google.maps.Point) {
var p2 = el2;
- return Math.sqrt((Math.pow(p1.x - p2.x, 2)) + (Math.pow(p1.y - p2.y, 2)))
+ return Math.sqrt((Math.pow(p1.x - p2.x, 2)) + (Math.pow(p1.y - p2.y, 2)));
} else {
return Math.sqrt(distToSegmentSquared(p1, el2.start, el2.end));
}
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index f49f246c52..3a27530f94 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -897,7 +897,7 @@ ServerConnector.getLogoLink = function() {
};
ServerConnector.getMaxSearchDistance = function() {
- return this.getConfigurationParam(ConfigurationType.SEARCH_DISTANCE)
+ return this.getConfigurationParam(ConfigurationType.SEARCH_DISTANCE);
};
ServerConnector.getOverlayById = function(layoutId, projectId) {
diff --git a/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js b/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
index 8e53a66fb5..8ea6e8922f 100644
--- a/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
@@ -54,7 +54,7 @@ AbstractDbOverlay.prototype.encodeQuery = function(type, arg0, arg1, arg2) {
type : type,
modelId : modelId,
coordinates : coordinates,
- zoom : arg2,
+ zoom : zoom,
});
} else if (type === AbstractDbOverlay.QueryType.SEARCH_BY_TARGET) {
var target = arg0;
diff --git a/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js b/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
index ed38cfb876..7703aaf540 100644
--- a/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
@@ -128,7 +128,7 @@ SearchDbOverlay.prototype.searchByCoordinates = function(params) {
}).then(
function(elements) {
var nestedOverlay = "Pathways and compartments";
- if (self.getMap().getOpenLayout().getName() == "Pathways and compartments") {
+ if (self.getMap().getOpenLayout().getName() === nestedOverlay) {
return self._getFirstVisibleParentOrObject(elements[0], zoom
- self.getMap().getSubmodelById(modelId).getModel().getMinZoom());
} else {
diff --git a/frontend-js/src/test/js/google-map-mock.js b/frontend-js/src/test/js/google-map-mock.js
index e342ac1f0b..e6a827a1c3 100644
--- a/frontend-js/src/test/js/google-map-mock.js
+++ b/frontend-js/src/test/js/google-map-mock.js
@@ -1,5 +1,7 @@
"use strict";
+/* exported logger */
+
var logger = require('./logger');
var google = {
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 376a9698ac..4d6a9c0c48 100644
--- a/frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js
+++ b/frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js
@@ -4,7 +4,6 @@ var Helper = require('../../Helper');
var logger = require('../../logger');
-var IdentifiedElement = require('../../../../main/js/map/data/IdentifiedElement');
var SearchDbOverlay = require('../../../../main/js/map/overlay/SearchDbOverlay');
var assert = require('assert');
--
GitLab