diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js index ce5077d373dfbfbe81376e5d3903e1c209f97203..b5eda78f45282700cd76985a29475ac105d66de3 100644 --- a/frontend-js/src/main/js/ServerConnector.js +++ b/frontend-js/src/main/js/ServerConnector.js @@ -812,14 +812,16 @@ ServerConnector.getReactions = function(params) { }); }; -ServerConnector.getAliases = function(aliasIds, projectId, columns) { +ServerConnector.getAliases = function(params) { + // aliasIds, projectId, columns var self = this; var queryParams = {}; var filterParams = { - id : aliasIds, - columns : columns + id : params.ids, + columns : params.columns, + type : params.type, }; - return self.getProjectId(projectId).then(function(result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; if (filterParams.id.length > 100) { return self.sendPostRequest(self.getAliasesUrl(queryParams), filterParams); @@ -865,7 +867,11 @@ ServerConnector.getComments = function(params) { }; ServerConnector.getLightAliases = function(aliasIds, projectId) { - return this.getAliases(aliasIds, projectId, "id,bounds,modelId"); + return this.getAliases({ + ids : aliasIds, + projectId : projectId, + columns : "id,bounds,modelId" + }); }; ServerConnector.getSessionData = function(project) { diff --git a/frontend-js/src/main/js/map/data/MapModel.js b/frontend-js/src/main/js/map/data/MapModel.js index 7f2633fd1b825bcb7fff41c9f0bfc582f39ab917..92e408b074b442eef4bccb43d4e25ea4c78b6f94 100644 --- a/frontend-js/src/main/js/map/data/MapModel.js +++ b/frontend-js/src/main/js/map/data/MapModel.js @@ -139,7 +139,9 @@ MapModel.prototype.getCompleteAliasById = function(id) { if (self._aliases[id] !== undefined && self._aliases[id].isComplete()) { return Promise.resolve(self._aliases[id]); } else { - return ServerConnector.getAliases([ id ]).then(function(aliases) { + return ServerConnector.getAliases({ + ids : id + }).then(function(aliases) { if (self._aliases[id] === undefined) { self._aliases[id] = aliases[0]; } else { @@ -289,7 +291,9 @@ MapModel.prototype.getMissingElements = function(elements) { var aliasPromise = null; if (aliasIds.length > 0) { if (elements.complete) { - aliasPromise = ServerConnector.getAliases(aliasIds); + aliasPromise = ServerConnector.getAliases({ + ids : aliasIds + }); } else { aliasPromise = ServerConnector.getLightAliases(aliasIds); @@ -475,11 +479,11 @@ MapModel.prototype.setMinZoom = function(minZoom) { this._minZoom = minZoom; }; -MapModel.prototype.getSubmodelType= function() { +MapModel.prototype.getSubmodelType = function() { return this._submodelType; }; -MapModel.prototype.setSubmodelType= function(submodelType) { +MapModel.prototype.setSubmodelType = function(submodelType) { this._submodelType = submodelType; }; @@ -729,4 +733,11 @@ MapModel.prototype.getReactionsForElements = function(elements, complete) { }); }; +MapModel.prototype.getCompartments = function() { + var self = this; + + // throw new Error("Not Implemented"); + return []; +}; + module.exports = MapModel;