Skip to content
Snippets Groups Projects
Commit 8bc4f9f2 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

set zoom level for submaps sets info in JS session

parent 7e4928e1
No related branches found
No related tags found
1 merge request!5Frontend refactor
......@@ -551,16 +551,6 @@ ServerConnector.createSubmodelDialog = function(submodelId) {
} ]);
};
ServerConnector.setModelZoomLevel = function(id, zoom) {
_setModelZoomLevel([ {
name : 'mapId',
value : id
}, {
name : 'zoomLevel',
value : zoom
} ]);
};
ServerConnector.readFile = function(url) {
return new Promise(function(resolve, reject) {
request.get(url, function(error, response, body) {
......
......@@ -13,11 +13,11 @@ function SessionData(project) {
SessionData.prototype.setProject = function(project) {
this._project = project;
}
};
SessionData.prototype.getProjectId = function(project) {
SessionData.prototype.getProjectId = function() {
return this._project.getProjectId();
}
};
SessionData.prototype.getShowComments = function() {
var key = this.getKey(SessionObjectType.SHOW_COMMENT);
......
......@@ -73,7 +73,7 @@ Submap.prototype.init = function(htmlTag, jsVar) {
childDiv.style.height = '100%';
childDiv.style.width = '100%';
var mapOptions = this.creatMapOptions(this.configuration.MAPS.length);
var mapOptions = this.creatMapOptions(this.getLayouts().length);
this.setGoogleMap(new google.maps.Map(controlDiv, mapOptions));
if (this.isCustomTouchInterface()) {
......@@ -104,15 +104,16 @@ Submap.prototype.init = function(htmlTag, jsVar) {
this.registerMapClickEvents();
// after resizing center map
var centerPoint = new google.maps.LatLng(this.configuration.CENTER_LAT, this.configuration.CENTER_LNG);
var centerPoint = this.getModel().getCenterLatLng();
self.getGoogleMap().setCenter(centerPoint);
var sessionData = ServerConnector.getSessionData(this.getCustomMap().getProject());
// and now send the zoom level to the client side
google.maps.event.addListener(this.getGoogleMap(), 'zoom_changed', function() {
ServerConnector.setModelZoomLevel(self.getId(), self.getGoogleMap().getZoom());
sessionData.setZoomLevel(self.getModel(), self.getGoogleMap().getZoom());
});
ServerConnector.setModelZoomLevel(self.getId(), self.getGoogleMap().getZoom());
sessionData.setZoomLevel(self.getModel(), self.getGoogleMap().getZoom());
}
};
......
......@@ -23,4 +23,23 @@ describe('Submap', function() {
assert.equal(logger.getWarnings().length, 0);
assert.equal(logger.getErrors().length, 0);
});
it("init", function() {
var jsVarMock = {};
var map = helper.createCustomMap();
var model = helper.createModel();
var submap = new Submap(map, model);
var dialogDiv = document.createElement("div");
dialogDiv.className ="ui-dialog-content";
global.testDiv.appendChild(dialogDiv);
submap.init(global.testDiv, jsVarMock);
assert.ok(submap);
assert.equal(logger.getWarnings().length, 0);
assert.equal(logger.getErrors().length, 0);
});
});
......@@ -29,7 +29,7 @@ describe('minerva global', function() {
it("contructor with GET zoom param", function() {
var options = helper.createCustomMapOptions();
GuiConnector.getParams["zoom"] = "5";
return minerva.create(options).then(function(result) {
return minerva.create(options).then(function() {
assert.equal(ServerConnector.getSessionData(options.getProject()).getZoomLevel(options.getProject().getModel()), 5);
});
});
......@@ -38,7 +38,7 @@ describe('minerva global', function() {
var options = helper.createCustomMapOptions();
GuiConnector.getParams["x"] = "5";
GuiConnector.getParams["y"] = "6";
return minerva.create(options).then(function(result) {
return minerva.create(options).then(function() {
var center = ServerConnector.getSessionData(options.getProject()).getCenter(options.getProject().getModel());
assert.ok(center instanceof google.maps.Point);
assert.equal(center.x, 5);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment