Commit 96a8385e authored by Piotr Gawron's avatar Piotr Gawron

Merge branch '1046-project-without-background' into 'devel_14.0.x'

when there is no background don't check if overlay is nested

See merge request !1032
parents 0a4b8aff 0a646cd3
Pipeline #17943 passed with stage
in 30 minutes and 53 seconds
minerva (14.0.6) stable; urgency=medium
* Bug fix: opening map with no background overlays and search request in url
provides proper error message (#1046)
minerva (14.0.5) stable; urgency=medium
* Bug fix: copy-paste of genetic-variant data overlay into Add overlay
content dialog could crash upload (#1040)
......@@ -19,7 +23,6 @@ minerva (14.0.5) stable; urgency=medium
* Bug fix: CLEAR button disappears after legend, comment checkboxes when
plugin tab used to much space (#976)
-- Piotr Gawron <piotr.gawron@uni.lu> Tue, 03 Dec 2019 12:00:00 +0200
minerva (14.0.4) stable; urgency=high
......
......@@ -279,7 +279,7 @@ SearchDbOverlay.prototype.searchByCoordinates = function (params) {
if (elements.length === 0) {
return undefined;
} else {
if (self.getMap().getBackgroundDataOverlay().getName() === nestedOverlay) {
if (self.getMap().getBackgroundDataOverlay() !== null && self.getMap().getBackgroundDataOverlay().getName() === nestedOverlay) {
return self._getFirstVisibleParentOrObject(elements[0], zoom - model.getMinZoom(), coordinates);
} else {
return elements[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment