Add forklift moving to given section

magazine/static/magazine/forklift.js

@@ -8,6 +8,7 @@ class Forklift {
         this.velocity = createVector(0, 0);
         this.direction = createVector(0, 0);
         this.end = false;
+        this.currentSection = 0;
     }
 
     draw() {
@@ -16,6 +17,7 @@ class Forklift {
     }
 
     setPath(path) {
+        this.end = false;
         this.path = path;
         this.currentTarget = this.path[this.targetId];
         this.setVelocity();
@@ -27,10 +29,12 @@ class Forklift {
             this.currentTarget = this.path[this.targetId];
         } else {
             this.end = true;
+            this.targetId = 0;
         }
     }
 
     targetReached() {
+        this.currentSection = this.currentTarget;
         return this.end;
     }
 

magazine/static/magazine/sketch.js

@@ -66,10 +66,9 @@ function drawMagazine() {
 function deliver() {
     let data = {
         graph: magazineToGraph(),
-        start_node: 0,
+        start_node: forklift.currentSection,
         dest_node: int(target.value())
     };
-    console.log(data);
     httpPost(
         'http://localhost:8000/shortestPath',
         data,
@@ -91,13 +90,23 @@ function createMagazineLayout() {
     sections = {
         0: { x: unit * 2, y: 0 },
         1: createVector(unit, unit),
-        2: createVector(2 * unit, unit),
-        3: createVector(2 * unit, 2 * unit),
-        4: createVector(3 * unit, 2 * unit),
-        5: createVector(unit, 3 * unit),
-        6: createVector(2 * unit, 3 * unit)
+        2: createVector(unit, 2 * unit),
+        3: createVector(unit, 3 * unit),
+        4: createVector(3 * unit, unit),
+        5: createVector(3 * unit, 2 * unit),
+        6: createVector(3 * unit, 3 * unit)
     };
-    roads = [[0, 2], [1, 2], [1, 5], [5, 4], [5, 6], [4, 3], [2, 3], [3, 6]];
+    roads = [
+        [1, 5],
+        [2, 3],
+        [0, 1],
+        [0, 4],
+        [4, 5],
+        [5, 6],
+        [3, 6],
+        [4, 2],
+        [5, 3]
+    ];
 }
 
 function magazineToGraph() {

magazine/templates/magazine/index.html

@@ -41,24 +41,14 @@
     <div class="container">
         <div class="package">
             <h3 style="margin-top: 0;">Package description</h1>
-            <label for="width">Max Width</label>
+            <label for="width">Sepal Width</label>
             <input type="number" name="width">
-            <label for="topWidth">Top Width</label>
+            <label for="topWidth">Sepal Length</label>
             <input type="number" name="topWidth">
-            <label for="botWidth">Bottom Width</label>
+            <label for="botWidth">Petal Width</label>
             <input type="number" name="botWidth">
-            <label for="height">Max Height</label>
+            <label for="height">Petal Length</label>
             <input type="number" name="height">
-            <label for="topHeight">Top Height</label>
-            <input type="number" name="topHeight">
-            <label for="botHeight">Bottom Height</label>
-            <input type="number" name="botHeight">
-            <label for="depth">Max Depth</label>
-            <input type="number" name="depth">
-            <div style="margin-top: 5px">
-                <input type="radio" name="material"> Hard
-                <input type="radio" name="material"> Soft
-            </div>
             <label for="target">Target</label>
             <input type="number" id="target" name="target">
             <button id="button">Send Package</button>