Revize d2d5eac2

Move positions to vertex.position and group.position

sources/src/main/webapp/js/graphExporter.js

@@ -22 +22 @@
 			return group.export();
 		});
 
-		// positions of nodes
-		var positions = app.nodeList.map(function(node) {
-			if (node instanceof Vertex) {
-				var id = 'vertex' + node.id;
-			} else if (node instanceof Group) {
-				var id = 'group' + node.id;
-			} else {
-				var id = node.id;
-			}
-
-			var position = node.getPosition();
-
-			return {
-				id: id,
-				x: position.x,
-				y: position.y,
-			};
-		});
-
 		// nodes excluded to the sidebar
 		var excludedNodeList = app.sidebarComponent.excludedNodeListComponent.getNodeList();
 		var sideBar = excludedNodeList.map(function(node) {
@@ -57 +38 @@
 			vertices: vertices,
 			edges: edges,
 			possibleEnumValues: app.possibleEnumValues,
-			archetypeIcons: app.archetype.icon,
 			groups: groups,
-			positions: positions,
 			sideBar: sideBar,
 			selectedVertex: null,	// TODO: selected == highlighted
 			selectedEdge: null,	// TODO selected == highlighted

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

@@ -27 +27 @@
 		data.vertices.forEach(function(component) {
 			var vertex = new Vertex(component);
 
-			// position
-			var position = data.positions.find(function(position) {
-				return position.id === ('vertex' + vertex.id);
-			});
+			var position = component.position
 
-			if (app.utils.isDefined(position)) {
-				vertex.setPosition(new Coordinates(position.x, position.y));
+			if (position === null) {
+                // set random
+                vertex.setPosition(new Coordinates(
+                    Math.floor(Math.random() * canvasSize),
+                    Math.floor(Math.random() * canvasSize),
+                ));
 
-			} else {
-				// set random
-				vertex.setPosition(new Coordinates(
-					Math.floor(Math.random() * canvasSize),
-					Math.floor(Math.random() * canvasSize),
-				));
+            } else {
+                vertex.setPosition(new Coordinates(position.x, position.y));
 			}
 
 			app.nodeList.push(vertex);
@@ -102 +99 @@
 			});
 
 			// position
-			var position = data.positions.find(function(position) {
-				return position.id === ('group' + group.id);
-			});
-
-			if (app.utils.isDefined(position)) {
-				group.setPosition(new Coordinates(position.x, position.y));
-
-			} else {
-				// set random
-				group.setPosition(new Coordinates(
-					Math.floor(Math.random() * canvasSize),
-					Math.floor(Math.random() * canvasSize),
-				));
-			}
+			var position = component.position
+			if (position === null) {
+                // set random
+                group.setPosition(new Coordinates(
+                    Math.floor(Math.random() * canvasSize),
+                    Math.floor(Math.random() * canvasSize),
+                ));
+
+            } else {
+                group.setPosition(new Coordinates(position.x, position.y));
+            }
 
 			app.nodeList.push(group);
 			app.groupList.push(group);