diff --git a/frontend-js/src/main/js/map/window/AliasInfoWindow.js b/frontend-js/src/main/js/map/window/AliasInfoWindow.js index 2d36ce0f7567142241eae5544dd3ffbf224f7f13..02afeb64a67a36f9f6e1818a31481448b678b01b 100644 --- a/frontend-js/src/main/js/map/window/AliasInfoWindow.js +++ b/frontend-js/src/main/js/map/window/AliasInfoWindow.js @@ -98,6 +98,23 @@ AliasInfoWindow.prototype.init = function () { }); }; +/** + * + * @param {DataOverlay} overlay + * @return {string} + * @package + */ +AliasInfoWindow.prototype._getPrintableOverlayName = function (overlay) { + var name = overlay.getName(); + if (name.length > 20) { + name = name.substr(0, 20) + "..."; + } + if (!overlay.getPublicOverlay()) { + name = "[" + overlay.getOrder() + "] " + name; + } + return name; +}; + /** * Creates and returns chart representing data related to alias on different * overlays. @@ -132,11 +149,7 @@ AliasInfoWindow.prototype.createChartDiv = function (params) { } else { rowDiv.className = "minerva-chart-row-odd"; } - var name = overlays[i].getName(); - if (name.length > 20) { - name = name.substr(0, 20) + "..."; - } - name = "[" + overlays[i].getOrder() + "] " + name; + var name = self._getPrintableOverlayName(overlays[i]); var nameDiv = document.createElement("div"); nameDiv.className = "minerva-chart-name"; nameDiv.innerHTML = name + " "; diff --git a/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js b/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js index 121874a5f0873656acfa57f92de3fb2e423d0769..854fb4258241c9ab5e938715373edb59813ad7d1 100644 --- a/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js +++ b/frontend-js/src/test/js/map/window/AliasInfoWindow-test.js @@ -362,6 +362,23 @@ describe('AliasInfoWindow', function () { assert.ok(functions.isDomElement(aliasWindow.createWaitingContentDiv())); }); + it("getPrintableOverlayName", function () { + var map = helper.createCustomMap(); + var alias = helper.createAlias(map); + alias.setIsComplete(true); + + var aliasWindow = new AliasInfoWindow({ + alias: alias, + map: map, + marker: helper.createMarker({element: alias, map: map}) + }); + + var overlay = helper.createOverlay(); + overlay.setPublicOverlay(true); + overlay.setOrder(137778); + assert.equal(-1, aliasWindow._getPrintableOverlayName(overlay).indexOf(overlay.getOrder() + "")); + }); + describe("createChartDiv ", function () { it("on submap map", function () { helper.setUrl("http://test/?id=complex_model_with_submaps");