Merge branch '993-default-zoom-level-does-not-work-for-the-main-map' into 'master'

Resolve "Default zoom level does not work for the main map"

Closes #993

See merge request minerva/core!973

CHANGELOG

 minerva (14.0.3) stable; urgency=medium
+  * Bug fix: default zoom level on main map works even when x or y are
+    undefined (#993)
   * Bug fix: sbml parser had sometimes problems with combining layout and multi
     packages (#966)
   * Bug fix: parsing of CellDesigner files that contained substanceUnits could

frontend-js/src/main/js/map/CustomMap.js

@@ -105,9 +105,8 @@ CustomMap.prototype.init = function () {
   var zoom = self.getModel().getDefaultZoomLevel();
   var autoFit = false;
   if (self.getServerConnector().getSessionData(self.getProject()).getCenter(self.getModel()) === undefined &&
-    (x === undefined || y === undefined || zoom === undefined ||
-      x === null || y === null || zoom === null
-    )) {
+    (x === undefined || y === undefined || x === null || y === null) &&
+    (zoom === undefined || zoom === null)) {
     autoFit = true;
   }
 

frontend-js/src/main/js/map/data/MapModel.js

@@ -547,7 +547,7 @@ MapModel.prototype.setMinZoom = function (minZoom) {
 
 /**
  *
- * @returns {number|null}
+ * @returns {?null|number}
  */
 MapModel.prototype.getDefaultZoomLevel = function () {
   return this._defaultZoomLevel;
@@ -567,7 +567,7 @@ MapModel.prototype.setDefaultZoomLevel = function (defaultZoomLevel) {
 
 /**
  *
- * @returns {null|number}
+ * @returns {?null|number}
  */
 MapModel.prototype.getDefaultCenterX = function () {
   return this._defaultCenterX;
@@ -587,7 +587,7 @@ MapModel.prototype.setDefaultCenterX = function (defaultCenterX) {
 
 /**
  *
- * @returns {number|null}
+ * @returns {?null|number}
  */
 MapModel.prototype.getDefaultCenterY = function () {
   return this._defaultCenterY;