Merge branch '359-overlay-and-annotation-display' into 'master'

Resolve "Overlay and annotation display"

Closes #359

See merge request piotr.gawron/minerva!264

frontend-js/package-lock.json

@@ -45,38 +45,30 @@
         "litemol": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b"
       },
       "dependencies": {
-        "ProtVista": {
-          "version": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e",
-          "dev": true,
-          "requires": {
-            "d3": "3.5.17",
-            "file-saver": "1.3.3",
-            "jquery": "2.2.4",
-            "jszip": "3.1.4",
-            "underscore": "1.8.3"
-          },
-          "dependencies": {
-            "jquery": {
-              "version": "2.2.4",
-              "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
-              "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=",
-              "dev": true
-            }
-          }
-        },
         "jquery": {
           "version": "3.3.1",
           "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
           "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==",
           "dev": true
-        },
-        "litemol": {
-          "version": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b",
-          "dev": true,
-          "requires": {
-            "@types/react": "15.6.14",
-            "@types/react-dom": "15.5.7"
-          }
+        }
+      }
+    },
+    "ProtVista": {
+      "version": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e",
+      "dev": true,
+      "requires": {
+        "d3": "3.5.17",
+        "file-saver": "1.3.3",
+        "jquery": "2.2.4",
+        "jszip": "3.1.4",
+        "underscore": "1.8.3"
+      },
+      "dependencies": {
+        "jquery": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
+          "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=",
+          "dev": true
         }
       }
     },
@@ -2058,6 +2050,14 @@
         "immediate": "3.0.6"
       }
     },
+    "litemol": {
+      "version": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b",
+      "dev": true,
+      "requires": {
+        "@types/react": "15.6.14",
+        "@types/react-dom": "15.5.7"
+      }
+    },
     "lodash": {
       "version": "4.17.4",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",

frontend-js/src/main/js/ObjectWithListeners.js

@@ -15,13 +15,13 @@ function ObjectWithListeners() {
 
 /**
  * Adds a listener function to the object.
- * 
+ *
  * @param type
  *          string defining type of the listener
  * @param fun
  *          function that should be thrown when type event occurs
  */
-ObjectWithListeners.prototype.addListener = function(type, fun) {
+ObjectWithListeners.prototype.addListener = function (type, fun) {
   if (this._validListeners[type] === undefined) {
     throw new Error("Unknown listener type: " + type);
   }
@@ -35,14 +35,14 @@ ObjectWithListeners.prototype.addListener = function(type, fun) {
 
 /**
  * Adds a property change listener function to the object.
- * 
+ *
  * @param name
  *          string defining property name
  * @param fun
  *          function that should be thrown when firePropertyChangeListener is
  *          called
  */
-ObjectWithListeners.prototype.addPropertyChangeListener = function(name, fun) {
+ObjectWithListeners.prototype.addPropertyChangeListener = function (name, fun) {
   if (this._validPropertyListeners[name] === undefined) {
     throw new Error("Unknown property type: " + name);
   }
@@ -56,11 +56,11 @@ ObjectWithListeners.prototype.addPropertyChangeListener = function(name, fun) {
 
 /**
  * Register new type of listener.
- * 
+ *
  * @param type
  *          string identifying new type of listener
  */
-ObjectWithListeners.prototype.registerListenerType = function(type) {
+ObjectWithListeners.prototype.registerListenerType = function (type) {
   if (this._validListeners[type] !== undefined) {
     throw new Error("Listener type already registered: " + type);
   }
@@ -69,11 +69,11 @@ ObjectWithListeners.prototype.registerListenerType = function(type) {
 
 /**
  * Register new property for listening.
- * 
+ *
  * @param name
  *          string identifying property
  */
-ObjectWithListeners.prototype.registerPropertyType = function(name) {
+ObjectWithListeners.prototype.registerPropertyType = function (name) {
   if (this._validPropertyListeners[name] !== undefined) {
     throw new Error("Property already registered: " + name);
   }
@@ -82,13 +82,13 @@ ObjectWithListeners.prototype.registerPropertyType = function(name) {
 
 /**
  * Removes listener from the object.
- * 
+ *
  * @param type
  *          type of the listener
  * @param fun
  *          function that was call when event occurred that should be removed
  */
-ObjectWithListeners.prototype.removeListener = function(type, fun) {
+ObjectWithListeners.prototype.removeListener = function (type, fun) {
   if (this._validListeners[type] === undefined) {
     throw new Error("Unknown listener type: " + type);
   }
@@ -109,13 +109,13 @@ ObjectWithListeners.prototype.removeListener = function(type, fun) {
 
 /**
  * Removes property listener from the object.
- * 
+ *
  * @param name
  *          name of the property
  * @param fun
  *          function that was call when event occurred that should be removed
  */
-ObjectWithListeners.prototype.removePropertyListener = function(name, fun) {
+ObjectWithListeners.prototype.removePropertyListener = function (name, fun) {
   if (this._validPropertyListeners[name] === undefined) {
     throw new Error("Unknown property: " + name);
   }
@@ -136,30 +136,35 @@ ObjectWithListeners.prototype.removePropertyListener = function(name, fun) {
 
 /**
  * Fires listeners of a given type.
- * 
+ *
  * @param type
  *          type of the listener (string)
+ * @param arg
+ *          argument data passed to the handler
+ *
  */
-ObjectWithListeners.prototype.callListeners = function(type, arg) {
+ObjectWithListeners.prototype.callListeners = function (type, arg) {
   if (this._validListeners[type] === undefined) {
     throw new Error("Unknown listener type: " + type);
   }
   var listenerList = this._validListeners[type];
   var promises = [];
   if (listenerList.length > 0) {
-    for ( var i in listenerList) {
-      var e = {
-        type : type,
-        object : this,
-        arg : arg,
-      };
-      promises.push(listenerList[i](e));
+    for (var i in listenerList) {
+      if (listenerList.hasOwnProperty(i)) {
+        var e = {
+          type: type,
+          object: this,
+          arg: arg
+        };
+        promises.push(listenerList[i](e));
+      }
     }
   }
   return Promise.all(promises);
 };
 
-ObjectWithListeners.prototype.getListeners = function(type) {
+ObjectWithListeners.prototype.getListeners = function (type) {
   if (this._validListeners[type] === undefined) {
     throw new Error("Unknown listener type: " + type);
   }
@@ -168,7 +173,7 @@ ObjectWithListeners.prototype.getListeners = function(type) {
 
 /**
  * Fires property change listeners for a given property name.
- * 
+ *
  * @param propertyName
  *          name of the property
  * @param oldValue
@@ -176,7 +181,7 @@ ObjectWithListeners.prototype.getListeners = function(type) {
  * @param newValue
  *          new value of the property
  */
-ObjectWithListeners.prototype.firePropertyChangeListener = function(propertyName, oldValue, newValue) {
+ObjectWithListeners.prototype.firePropertyChangeListener = function (propertyName, oldValue, newValue) {
   var self = this;
   if (this._validPropertyListeners[propertyName] === undefined) {
     throw new Error("Unknown property type: " + propertyName);
@@ -184,12 +189,12 @@ ObjectWithListeners.prototype.firePropertyChangeListener = function(propertyName
   var listenerList = this._validPropertyListeners[propertyName];
   var promises = [];
   if (listenerList.length > 0) {
-    for ( var i in listenerList) {
+    for (var i in listenerList) {
       var e = {
-        propertyName : propertyName,
-        object : self,
-        oldVal : oldValue,
-        newVal : newValue,
+        propertyName: propertyName,
+        object: self,
+        oldVal: oldValue,
+        newVal: newValue,
       };
       promises.push(listenerList[i](e));
     }

frontend-js/src/main/js/gui/leftPanel/LeftPanel.js

@@ -129,7 +129,8 @@ LeftPanel.prototype.init = function () {
       return self.showElementDetails(e.arg);
     });
     self.getMap().getOverlayByName("search").addListener("onSearch", function (e) {
-      if (e.arg.type === AbstractDbOverlay.QueryType.SEARCH_BY_COORDINATES) {
+      if (e.arg.type === AbstractDbOverlay.QueryType.SEARCH_BY_COORDINATES ||
+        e.arg.type === AbstractDbOverlay.QueryType.SEARCH_BY_TARGET) {
         return self.showElementDetails(e.arg.identifiedElements[0][0]);
       } else {
         return self.showElementDetails(undefined);

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

@@ -11,6 +11,7 @@ var AliasSurface = require('./surface/AliasSurface');
 var GuiConnector = require('../GuiConnector');
 var IdentifiedElement = require('./data/IdentifiedElement');
 var ObjectWithListeners = require('../ObjectWithListeners');
+var PointData = require('./data/PointData');
 var PointInfoWindow = require('./window/PointInfoWindow');
 var Reaction = require('./data/Reaction');
 var ReactionInfoWindow = require('./window/ReactionInfoWindow');
@@ -759,6 +760,30 @@ AbstractCustomMap.prototype._hideSelectedLayout = function (overlayId) {
   this.selectedLayoutOverlays[overlayId] = [];
 };
 
+/**
+ * Opens {@link AbstractInfoWindow} for a marker.
+ *
+ * @param marker
+ *          marker for which we are opening window
+ */
+AbstractCustomMap.prototype._openInfoWindowForIdentifiedElement = function (element, googleMarker) {
+  var self = this;
+  if (element.getType() === "ALIAS") {
+    return self.getModel().getByIdentifiedElement(element).then(function (alias) {
+      return self._openInfoWindowForAlias(alias, googleMarker);
+    });
+  } else if (element.getType() === "POINT") {
+    return self._openInfoWindowForPoint(new PointData(element), googleMarker);
+  } else if (element.getType() === "REACTION") {
+    return self.getModel().getByIdentifiedElement(element).then(function (reaction) {
+      return self._openInfoWindowForReaction(reaction, googleMarker);
+    });
+  } else {
+    throw new Error("Unknown element type: " + element.getType());
+  }
+};
+
+
 /**
  * Opens {@link AliasInfoWindow} for given alias.
  *

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

@@ -1196,28 +1196,4 @@ CustomMap.prototype.getVisibleDataOverlays = function () {
 };
 
 
-/**
- * Opens {@link AbstractInfoWindow} for a marker.
- *
- * @param marker
- *          marker for which we are opening window
- */
-CustomMap.prototype._openInfoWindowForIdentifiedElement = function (element, googleMarker) {
-  var self = this;
-  var submap = self.getSubmapById(element.getModelId());
-  if (element.getType() === "ALIAS") {
-    return submap.getModel().getByIdentifiedElement(element).then(function (alias) {
-      return submap._openInfoWindowForAlias(alias, googleMarker);
-    });
-  } else if (element.getType() === "POINT") {
-    return submap._openInfoWindowForPoint(new PointData(element), googleMarker);
-  } else if (element.getType() === "REACTION") {
-    return submap.getModel().getByIdentifiedElement(element).then(function (reaction) {
-      return submap._openInfoWindowForReaction(reaction, googleMarker);
-    });
-  } else {
-    throw new Error("Unknown element type: " + element.getType());
-  }
-};
-
 module.exports = CustomMap;

frontend-js/src/main/js/map/marker/MarkerSurfaceCollection.js

@@ -116,9 +116,11 @@ MarkerSurfaceCollection.prototype.createSurfaceForDbOverlay = function (element,
 
   var map = self.getMap();
   var onclickFunctions = [function () {
-    return self.getMap().openInfoWindowForIdentifiedElement(element, result.getGoogleMarker());
+    logger.info("first listener called");
+    return self.getMap().getTopMap().openInfoWindowForIdentifiedElement(element, result.getGoogleMarker());
   }, function () {
-    return self.getMap().callListeners("onBioEntityClick", element);
+    logger.info("second listener called");
+    return self.getMap().getTopMap().callListeners("onBioEntityClick", element);
   }];
   if (element.getType() === "ALIAS") {
     return AliasSurface.createFromIdentifiedElement({

frontend-js/src/test/js/ServerConnector-test.js

@@ -88,7 +88,7 @@ describe('ServerConnector', function () {
 
   it('getPublications', function () {
     return ServerConnector.getPublications().then(function (result) {
-      assert.equal(result.totalSize, 1);
+      assert.equal(result.totalSize, 12);
     });
   });
 

frontend-js/src/test/js/map/marker/MarkerSurfaceCollection-test.js

@@ -125,6 +125,33 @@ describe('MarkerSurfaceCollection', function () {
         return surface.onClickHandler();
       });
     });
+
+    it("click on alias surface on submap", function () {
+      var map;
+      var submap;
+      var collection, overlay;
+      var projectId = "complex_model_with_submaps";
+      helper.setUrl("http://test/?id=" + projectId);
+      return ServerConnector.getProject(projectId).then(function (project) {
+        map = helper.createCustomMap(project);
+        submap = map.getSubmapById(16729);
+
+        var element = new IdentifiedElement({
+          modelId: submap.getId(),
+          id: 345325,
+          type: "ALIAS"
+        });
+
+        overlay = helper.createSearchDbOverlay(map);
+        collection = submap.getMarkerSurfaceCollection();
+        return collection.createSurfaceForDbOverlay(element, overlay);
+
+      }).then(function (surface) {
+        return surface.onClickHandler();
+      });
+    });
+
+
     it("update surface", function () {
       var map, collection, marker1, marker2, overlay;
       var element = new IdentifiedElement({

frontend-js/testFiles/apiCalls/projects/complex_model_with_images/models/all/token=MOCK_TOKEN_ID&

-[{"version":null,"name":"main","idObject":19397,"tileSize":256,"width":495,"height":357,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodels":[{"version":null,"name":"s3","idObject":19399,"tileSize":256,"width":421,"height":315,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodels":[],"centerLatLng":{"lat":79.19139766235872,"lng":-135.10688836104512},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":74.06362505154212,"lng":-90.0},"submodelType":"UNKNOWN"},{"version":null,"name":"s1","idObject":19398,"tileSize":256,"width":571,"height":276,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":4,"submodels":[],"centerLatLng":{"lat":79.18613072613702,"lng":-135.07880910683014},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":79.44906929997262,"lng":-90.0},"submodelType":"PATHWAY"},{"version":null,"name":"s2","idObject":19400,"tileSize":256,"width":451,"height":253,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodels":[],"centerLatLng":{"lat":79.19006423440219,"lng":-135.09977827050997},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":78.0903352323621,"lng":-90.0},"submodelType":"UNKNOWN"}],"centerLatLng":{"lat":79.18840067864828,"lng":-135.0909090909091},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":74.71754541589858,"lng":-90.0},"submodelType":"UNKNOWN"},{"version":null,"name":"s1","idObject":19398,"tileSize":256,"width":571,"height":276,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":4,"submodels":[],"centerLatLng":{"lat":79.18613072613702,"lng":-135.07880910683014},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":79.44906929997262,"lng":-90.0},"submodelType":"UNKNOWN"},{"version":null,"name":"s3","idObject":19399,"tileSize":256,"width":421,"height":315,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodels":[],"centerLatLng":{"lat":79.19139766235872,"lng":-135.10688836104512},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":74.06362505154212,"lng":-90.0},"submodelType":"UNKNOWN"},{"version":null,"name":"s2","idObject":19400,"tileSize":256,"width":451,"height":253,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodels":[],"centerLatLng":{"lat":79.19006423440219,"lng":-135.09977827050997},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":78.0903352323621,"lng":-90.0},"submodelType":"UNKNOWN"}]
\ No newline at end of file
+[{"version":null,"name":"main","idObject":19397,"tileSize":256,"width":495,"height":357,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodelType":"UNKNOWN"},{"version":null,"name":"s1","idObject":19398,"tileSize":256,"width":571,"height":276,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":4,"submodelType":"UNKNOWN"},{"version":null,"name":"s3","idObject":19399,"tileSize":256,"width":421,"height":315,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodelType":"UNKNOWN"},{"version":null,"name":"s2","idObject":19400,"tileSize":256,"width":451,"height":253,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodelType":"UNKNOWN"}]
\ No newline at end of file

frontend-js/testFiles/apiCalls/projects/complex_model_with_submaps/models/all/token=MOCK_TOKEN_ID&

-[{"version":null,"name":"main","idObject":16728,"tileSize":256,"width":515,"height":362,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":4,"submodels":[{"version":null,"name":"s3","idObject":16730,"tileSize":256,"width":421,"height":315,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodels":[],"centerLatLng":{"lat":79.19139766235872,"lng":-135.10688836104512},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":74.06362505154212,"lng":-90.0},"submodelType":"UNKNOWN"},{"version":null,"name":"s1","idObject":16729,"tileSize":256,"width":571,"height":276,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":4,"submodels":[],"centerLatLng":{"lat":79.18613072613702,"lng":-135.07880910683014},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":79.44906929997262,"lng":-90.0},"submodelType":"PATHWAY"},{"version":null,"name":"s2","idObject":16731,"tileSize":256,"width":451,"height":253,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodels":[],"centerLatLng":{"lat":79.19006423440219,"lng":-135.09977827050997},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":78.0903352323621,"lng":-90.0},"submodelType":"UNKNOWN"}],"centerLatLng":{"lat":79.18773841616675,"lng":-135.0873786407767},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":75.1456787592211,"lng":-90.0},"submodelType":"UNKNOWN"},{"version":null,"name":"s1","idObject":16729,"tileSize":256,"width":571,"height":276,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":4,"submodels":[],"centerLatLng":{"lat":79.18613072613702,"lng":-135.07880910683014},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":79.44906929997262,"lng":-90.0},"submodelType":"UNKNOWN"},{"version":null,"name":"s3","idObject":16730,"tileSize":256,"width":421,"height":315,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodels":[],"centerLatLng":{"lat":79.19139766235872,"lng":-135.10688836104512},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":74.06362505154212,"lng":-90.0},"submodelType":"UNKNOWN"},{"version":null,"name":"s2","idObject":16731,"tileSize":256,"width":451,"height":253,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodels":[],"centerLatLng":{"lat":79.19006423440219,"lng":-135.09977827050997},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":78.0903352323621,"lng":-90.0},"submodelType":"UNKNOWN"}]
\ No newline at end of file
+[{"version":null,"name":"main","idObject":16728,"tileSize":256,"width":515,"height":362,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":4,"submodelType":"UNKNOWN"},{"version":null,"name":"s1","idObject":16729,"tileSize":256,"width":571,"height":276,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":4,"submodelType":"UNKNOWN"},{"version":null,"name":"s3","idObject":16730,"tileSize":256,"width":421,"height":315,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodelType":"UNKNOWN"},{"version":null,"name":"s2","idObject":16731,"tileSize":256,"width":451,"height":253,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":3,"submodelType":"UNKNOWN"}]
\ No newline at end of file

frontend-js/testFiles/apiCalls/projects/drug_target_sample/models/all/token=MOCK_TOKEN_ID&

-[{"version":null,"name":"UNKNOWN DISEASE MAP","idObject":20637,"tileSize":256,"width":1305,"height":473,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":5,"submodels":[],"centerLatLng":{"lat":79.18277721779353,"lng":-135.06093781915757},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":81.26928406550978,"lng":-90.0},"submodelType":"UNKNOWN"}]
\ No newline at end of file
+[{"version":null,"name":"UNKNOWN DISEASE MAP","idObject":20637,"tileSize":256,"width":1305,"height":473,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":5,"submodelType":"UNKNOWN"}]
\ No newline at end of file

frontend-js/testFiles/apiCalls/projects/empty/models/all/token=MOCK_TOKEN_ID&

-[{"version":null,"name":"UNKNOWN DISEASE MAP","idObject":20638,"tileSize":256,"width":600,"height":400,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":4,"submodels":[],"centerLatLng":{"lat":79.17133464081945,"lng":-135.0},"topLeftLatLng":{"lat":85.05112877980659,"lng":-180.0},"bottomRightLatLng":{"lat":75.95934455387827,"lng":-90.0},"submodelType":"UNKNOWN"}]
\ No newline at end of file
+[{"version":null,"name":"UNKNOWN DISEASE MAP","idObject":20638,"tileSize":256,"width":600,"height":400,"defaultCenterX":null,"defaultCenterY":null,"defaultZoomLevel":null,"minZoom":2,"maxZoom":4,"submodelType":"UNKNOWN"}]
\ No newline at end of file

frontend-js/testFiles/apiCalls/projects/sample/models/all/bioEntities/reactions/id=153508&token=MOCK_TOKEN_ID&

-[{"centerPoint":{"x":218.0810527836747,"y":301.7307305003525},"hierarchyVisibilityLevel":null,"id":153508,"kineticLaw":null,"lines":[{"start":{"x":129.00000000000003,"y":269.9853478599471},"end":{"x":217.3857151822324,"y":271.4614610007049},"type":"START"},{"start":{"x":217.3857151822324,"y":271.4614610007049},"end":{"x":217.98919008325365,"y":297.73178548394236},"type":"MIDDLE"},{"start":{"x":218.17291548409574,"y":305.7296755167626},"end":{"x":218.77639038511697,"y":332.0},"type":"END"}],"modelId":15781,"modifiers":"","notes":"notes for reaction","products":"329171","reactants":"329166","reactionId":"re21","references":[{"annotatorClassName":"","article":{"title":"The importance of an innervated and intact antrum and pylorus in preventing postoperative duodenogastric reflux and gastritis.","authors":["Keighley MR"," Asquith P"," Edwards JA"," Alexander-Williams J."],"journal":"The British journal of surgery","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/123","id":"123","citationCount":14,"stringAuthors":"Keighley MR,  Asquith P,  Edwards JA,  Alexander-Williams J."},"descriptionByType":"","descriptionByTypeRelation":"","id":860355,"link":"http://www.ncbi.nlm.nih.gov/pubmed/123","resource":"123","type":"PUBMED"}],"type":"State transition"}]
\ No newline at end of file
+[{"centerPoint":{"x":218.0810527836747,"y":301.7307305003525},"hierarchyVisibilityLevel":null,"id":153508,"kineticLaw":null,"lines":[{"start":{"x":129.00000000000003,"y":269.9853478599471},"end":{"x":217.3857151822324,"y":271.4614610007049},"type":"START"},{"start":{"x":217.3857151822324,"y":271.4614610007049},"end":{"x":217.98919008325365,"y":297.73178548394236},"type":"MIDDLE"},{"start":{"x":218.17291548409574,"y":305.7296755167626},"end":{"x":218.77639038511697,"y":332.0},"type":"END"}],"modelId":15781,"modifiers":"","notes":"notes for reaction","products":"329171","reactants":"329166","reactionId":"re21","references":[{"annotatorClassName":"","article":{"title":"The importance of an innervated and intact antrum and pylorus in preventing postoperative duodenogastric reflux and gastritis.","authors":["Keighley MR"," Asquith P"," Edwards JA"," Alexander-Williams J."],"journal":"The British journal of surgery","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/123","id":"123","citationCount":14,"stringAuthors":"Keighley MR,  Asquith P,  Edwards JA,  Alexander-Williams J."},"descriptionByType":"","descriptionByTypeRelation":"","id":860355,"link":"http://www.ncbi.nlm.nih.gov/pubmed/123","resource":"123","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"Respiratory effects of H+ and dinitrophenol injections into the brain stem subarachnoid space of fetal lambs.","authors":["Jansen AH"," Russell BJ"," Chernick V."],"journal":"Canadian journal of physiology and pharmacology","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/134","id":"134","citationCount":1,"stringAuthors":"Jansen AH,  Russell BJ,  Chernick V."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126515,"link":"http://www.ncbi.nlm.nih.gov/pubmed/134","resource":"134","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"The prevention of autolysis of stored cornea using steroid as a lysosome membrane stabilizer.","authors":["Fook TJ"," Ranadive NS"," Basu PK."],"journal":"Canadian journal of ophthalmology. Journal canadien d'ophtalmologie","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/133","id":"133","citationCount":5,"stringAuthors":"Fook TJ,  Ranadive NS,  Basu PK."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126514,"link":"http://www.ncbi.nlm.nih.gov/pubmed/133","resource":"133","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"Cardiac output response to altered acid-base status during diethyl ether anaesthesia.","authors":["Sodipo JO"," Lee DC"," Morris LE."],"journal":"Canadian Anaesthetists' Society journal","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/132","id":"132","citationCount":4,"stringAuthors":"Sodipo JO,  Lee DC,  Morris LE."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126513,"link":"http://www.ncbi.nlm.nih.gov/pubmed/132","resource":"132","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"Processing of tRNA precursors in higher organisms.","authors":["Burdon RH."],"journal":"Brookhaven symposia in biology","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/131","id":"131","citationCount":2,"stringAuthors":"Burdon RH."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126512,"link":"http://www.ncbi.nlm.nih.gov/pubmed/131","resource":"131","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"Editorial: Childhood poisoning: prevention and first-aid management.","authors":[],"journal":"British Medical Journal","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/127","id":"127","citationCount":0,"stringAuthors":""},"descriptionByType":"","descriptionByTypeRelation":"","id":1126508,"link":"http://www.ncbi.nlm.nih.gov/pubmed/127","resource":"127","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"Phobias complicating treatment of uterine carcinoma.","authors":["Lloyd G"," Deakin HG."],"journal":"British Medical Journal","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/126","id":"126","citationCount":7,"stringAuthors":"Lloyd G,  Deakin HG."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126507,"link":"http://www.ncbi.nlm.nih.gov/pubmed/126","resource":"126","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"Endoscopic papillotomy and removal of gall stones.","authors":["Classen M"," Safrany L."],"journal":"British Medical Journal","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/125","id":"125","citationCount":46,"stringAuthors":"Classen M,  Safrany L."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126506,"link":"http://www.ncbi.nlm.nih.gov/pubmed/125","resource":"125","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"Haemoglobin Rahere (beta Lys-Thr): A new high affinity haemoglobin associated with decreased 2, 3-diphosphoglycerate binding and relative polycythaemia.","authors":["Lorkin PA"," Stephens AD"," Beard ME"," Wrigley PF"," Adams L"," Lehmann H."],"journal":"British medical journal","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/124","id":"124","citationCount":13,"stringAuthors":"Lorkin PA,  Stephens AD,  Beard ME,  Wrigley PF,  Adams L,  Lehmann H."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126505,"link":"http://www.ncbi.nlm.nih.gov/pubmed/124","resource":"124","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"The involvement of lysophosphoglycerides in neurotransmitter release; the composition and turnover of phospholipids of synaptic vesicles of guinea-pig cerebral cortex and Torpedo electric organ and the effect of stimulation.","authors":["Baker RR"," Dowdall MJ"," Whittaker VP."],"journal":"Brain research","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/129","id":"129","citationCount":7,"stringAuthors":"Baker RR,  Dowdall MJ,  Whittaker VP."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126510,"link":"http://www.ncbi.nlm.nih.gov/pubmed/129","resource":"129","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"Inhibitory postsynaptic actions of taurine, GABA and other amino acids on motoneurons of the isolated frog spinal cord.","authors":["Sonnhof U"," Grafe P"," Krumnikl J"," Linder M"," Schindler L."],"journal":"Brain research","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/128","id":"128","citationCount":44,"stringAuthors":"Sonnhof U,  Grafe P,  Krumnikl J,  Linder M,  Schindler L."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126509,"link":"http://www.ncbi.nlm.nih.gov/pubmed/128","resource":"128","type":"PUBMED"},{"annotatorClassName":"","article":{"title":"Uptake of radiolabeled glucose analogues by organotypic pia arachnoid cultures.","authors":["Spatz M"," Renkawek K"," Murray MR"," Klatzo I."],"journal":"Brain research","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/130","id":"130","citationCount":7,"stringAuthors":"Spatz M,  Renkawek K,  Murray MR,  Klatzo I."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126511,"link":"http://www.ncbi.nlm.nih.gov/pubmed/130","resource":"130","type":"PUBMED"}],"type":"State transition"}]
\ No newline at end of file

frontend-js/testFiles/apiCalls/projects/sample/models/all/publications/length=10&sortColumn=pubmedId&sortOrder=asc&start=0&token=MOCK_TOKEN_ID&

-{"data":[{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"The importance of an innervated and intact antrum and pylorus in preventing postoperative duodenogastric reflux and gastritis.","authors":["Keighley MR"," Asquith P"," Edwards JA"," Alexander-Williams J."],"journal":"The British journal of surgery","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/123","id":"123","citationCount":14,"stringAuthors":"Keighley MR,  Asquith P,  Edwards JA,  Alexander-Williams J."},"descriptionByType":"","descriptionByTypeRelation":"","id":860355,"link":"http://www.ncbi.nlm.nih.gov/pubmed/123","resource":"123","type":"PUBMED"}}],"filteredSize":1,"length":1,"start":0,"totalSize":1}
\ No newline at end of file
+{"data":[{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"The importance of an innervated and intact antrum and pylorus in preventing postoperative duodenogastric reflux and gastritis.","authors":["Keighley MR"," Asquith P"," Edwards JA"," Alexander-Williams J."],"journal":"The British journal of surgery","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/123","id":"123","citationCount":14,"stringAuthors":"Keighley MR,  Asquith P,  Edwards JA,  Alexander-Williams J."},"descriptionByType":"","descriptionByTypeRelation":"","id":860355,"link":"http://www.ncbi.nlm.nih.gov/pubmed/123","resource":"123","type":"PUBMED"}},{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"Haemoglobin Rahere (beta Lys-Thr): A new high affinity haemoglobin associated with decreased 2, 3-diphosphoglycerate binding and relative polycythaemia.","authors":["Lorkin PA"," Stephens AD"," Beard ME"," Wrigley PF"," Adams L"," Lehmann H."],"journal":"British medical journal","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/124","id":"124","citationCount":13,"stringAuthors":"Lorkin PA,  Stephens AD,  Beard ME,  Wrigley PF,  Adams L,  Lehmann H."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126505,"link":"http://www.ncbi.nlm.nih.gov/pubmed/124","resource":"124","type":"PUBMED"}},{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"Endoscopic papillotomy and removal of gall stones.","authors":["Classen M"," Safrany L."],"journal":"British Medical Journal","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/125","id":"125","citationCount":46,"stringAuthors":"Classen M,  Safrany L."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126506,"link":"http://www.ncbi.nlm.nih.gov/pubmed/125","resource":"125","type":"PUBMED"}},{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"Phobias complicating treatment of uterine carcinoma.","authors":["Lloyd G"," Deakin HG."],"journal":"British Medical Journal","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/126","id":"126","citationCount":7,"stringAuthors":"Lloyd G,  Deakin HG."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126507,"link":"http://www.ncbi.nlm.nih.gov/pubmed/126","resource":"126","type":"PUBMED"}},{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"Editorial: Childhood poisoning: prevention and first-aid management.","authors":[],"journal":"British Medical Journal","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/127","id":"127","citationCount":0,"stringAuthors":""},"descriptionByType":"","descriptionByTypeRelation":"","id":1126508,"link":"http://www.ncbi.nlm.nih.gov/pubmed/127","resource":"127","type":"PUBMED"}},{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"Inhibitory postsynaptic actions of taurine, GABA and other amino acids on motoneurons of the isolated frog spinal cord.","authors":["Sonnhof U"," Grafe P"," Krumnikl J"," Linder M"," Schindler L."],"journal":"Brain research","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/128","id":"128","citationCount":44,"stringAuthors":"Sonnhof U,  Grafe P,  Krumnikl J,  Linder M,  Schindler L."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126509,"link":"http://www.ncbi.nlm.nih.gov/pubmed/128","resource":"128","type":"PUBMED"}},{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"The involvement of lysophosphoglycerides in neurotransmitter release; the composition and turnover of phospholipids of synaptic vesicles of guinea-pig cerebral cortex and Torpedo electric organ and the effect of stimulation.","authors":["Baker RR"," Dowdall MJ"," Whittaker VP."],"journal":"Brain research","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/129","id":"129","citationCount":7,"stringAuthors":"Baker RR,  Dowdall MJ,  Whittaker VP."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126510,"link":"http://www.ncbi.nlm.nih.gov/pubmed/129","resource":"129","type":"PUBMED"}},{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"Uptake of radiolabeled glucose analogues by organotypic pia arachnoid cultures.","authors":["Spatz M"," Renkawek K"," Murray MR"," Klatzo I."],"journal":"Brain research","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/130","id":"130","citationCount":7,"stringAuthors":"Spatz M,  Renkawek K,  Murray MR,  Klatzo I."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126511,"link":"http://www.ncbi.nlm.nih.gov/pubmed/130","resource":"130","type":"PUBMED"}},{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"Processing of tRNA precursors in higher organisms.","authors":["Burdon RH."],"journal":"Brookhaven symposia in biology","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/131","id":"131","citationCount":2,"stringAuthors":"Burdon RH."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126512,"link":"http://www.ncbi.nlm.nih.gov/pubmed/131","resource":"131","type":"PUBMED"}},{"elements":[{"id":153508,"modelId":15781,"type":"REACTION"}],"publication":{"annotatorClassName":"","article":{"title":"Cardiac output response to altered acid-base status during diethyl ether anaesthesia.","authors":["Sodipo JO"," Lee DC"," Morris LE."],"journal":"Canadian Anaesthetists' Society journal","year":1975,"link":"http://www.ncbi.nlm.nih.gov/pubmed/132","id":"132","citationCount":4,"stringAuthors":"Sodipo JO,  Lee DC,  Morris LE."},"descriptionByType":"","descriptionByTypeRelation":"","id":1126513,"link":"http://www.ncbi.nlm.nih.gov/pubmed/132","resource":"132","type":"PUBMED"}}],"filteredSize":12,"length":10,"start":0,"totalSize":12}
\ No newline at end of file