Skip to content
Snippets Groups Projects

Resolve "Show overview - link to model does not work"

Merged Piotr Gawron requested to merge 164-show-overview-link-to-model-does-not-work into master
2 files
+ 51
20
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -113,26 +113,7 @@ OverviewDialog.prototype.showOverview = function(overviewImageId) {
}
}
if (link !== null) {
if (link.type === "OverviewModelLink") {
logger.debug("Opening model from overview. ModelId: " + link.modelLinkId);
logger.debug("link coordinates [" + link.idObject + "]: " + link.latLng);
map.openSubmap(link.modelLinkId);
var submap = this.getSubmapById(link.modelLinkId);
submap.setCenter(link.latLng);
submap.setZoom(link.zoomLevel + submap.getMinZoom());
$(self.getElement()).dialog("close");
} else if (link.type === "OverviewImageLink") {
logger.debug("Opening image from overview. ImageId: " + link.imageLinkId);
self.showOverview(link.imageLinkId);
} else if (link.type === "OverviewSearchLink") {
logger.debug("Sending search query. Query: " + link.query);
GuiConnector.search(link.query);
$(self.getElement()).dialog("close");
} else {
logger.warn("Unknown type of link: " + link.type + ". Don't know what to do... LinkId: " + link.idObject);
}
self.openLink(link);
}
};
@@ -198,6 +179,31 @@ OverviewDialog.prototype.showOverview = function(overviewImageId) {
$(self.getElement()).dialog("open");
};
OverviewDialog.prototype.openLink = function(link) {
var self = this;
var map = self.getMap();
if (link.type === "OverviewModelLink") {
logger.debug("Opening model from overview. ModelId: " + link.modelLinkId);
logger.debug("link coordinates [" + link.idObject + "]: ", link.latLng);
map.openSubmap(link.modelLinkId);
var submap = map.getSubmapById(link.modelLinkId);
submap.setCenter(link.latLng);
submap.setZoom(link.zoomLevel + submap.getMinZoom());
$(self.getElement()).dialog("close");
} else if (link.type === "OverviewImageLink") {
logger.debug("Opening image from overview. ImageId: " + link.imageLinkId);
self.showOverview(link.imageLinkId);
} else if (link.type === "OverviewSearchLink") {
logger.debug("Sending search query. Query: " + link.query);
GuiConnector.search(link.query);
$(self.getElement()).dialog("close");
} else {
logger.warn("Unknown type of link: " + link.type + ". Don't know what to do... LinkId: " + link.idObject);
}
}
OverviewDialog.prototype.drawClickableShapes = function(canvas, ratio) {
var ctx = canvas.getContext("2d");
// clear canvas
Loading