Revize d0a10e2e

removed originalId + minor fix

sources/src/main/webapp/js/components/group.js

@@ -463 +463 @@
 		});
 
 		return {
-			groupId: this.id,
 			id: this.id,
 			name: this.name,
 			verticesId: verticesId,
 			verticesEdgeFromId: [],	// TODO: what to put in here?
 			verticesEdgeToId: [],	// TODO: what to put in here?
+			position: position,
 		};
 	};
 

sources/src/main/webapp/js/components/vertex.js

@@ -471 +471 @@
 			archetype: this.archetype,
 			attributes: props.attributes,
 			id: this.id,
-			originalId: this.id,
 			text: '',
 			name: this.name,
+			position: position,
 		};
 	};
 

sources/src/main/webapp/js/graphLoader.js

@@ -27 +27 @@
 		data.vertices.forEach(function(component) {
 			var vertex = new Vertex(component);
 
-			var position = component.position
+			var position = component.position;
 
-			if (position === null) {
+			if (position === null || app.utils.isUndefined(position)) {
                 // set random
                 vertex.setPosition(new Coordinates(
                     Math.floor(Math.random() * canvasSize),
@@ -43 +43 @@
 			app.nodeList.push(vertex);
 			app.vertexList.push(vertex);
 
-			vertexMap[component.originalId] = vertex;
+			vertexMap[component.id] = vertex;
 		});
 
 		// construct edges
@@ -100 +100 @@
 
 			// position
 			var position = component.position
-			if (position === null) {
+			if (position === null || app.utils.isUndefined(position)) {
                 // set random
                 group.setPosition(new Coordinates(
                     Math.floor(Math.random() * canvasSize),