fix: Mixed and Missing Garbage

lloydrichards · Jun 19, 2020 · e5c9077 · e5c9077
1 parent 2ce73d3
commit e5c9077
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/components/LifePlastic/Routes/GarbageRoutes.tsx b/components/LifePlastic/Routes/GarbageRoutes.tsx
@@ -54,8 +54,8 @@ export const GarbageRoutes: Array<PathType> = [
     amount: 1,
     name: "SeperatePETE-Garbage",
     path:
-    "M199.156 2479.8v0h-.002l-41.827 30a10.015 10.015 0 00-4.171 8.13V3766"
-},
+      "M199.156 2479.8v0h-.002l-41.827 30a10.015 10.015 0 00-4.171 8.13V3766",
+  },
   {
     type: "GARBAGE",
     plastic: "GARBAGE",
@@ -76,7 +76,7 @@ export const GarbageRoutes: Array<PathType> = [
     type: "GARBAGE",
     plastic: "GARBAGE",
     amount: 1,
-    name: "PP -Garbage",
+    name: "PP-Garbage",
     path:
       "M439.156 2488v30c0 5.52 4.477 10 10 10h8.941c1.994 0 3.942.6 5.595 1.71l13.059 8.82a9.991 9.991 0 014.405 8.28V3726",
   },

diff --git a/components/LifePlastic/Routes/MixedRoutes.tsx b/components/LifePlastic/Routes/MixedRoutes.tsx
@@ -58,39 +58,39 @@ export const MixedRoutes: Array<PathType> = [
       "M135.156 1768v245.98c0 5.53 4.488 10.01 10.018 10l380.637-.67c5.529-.01 10.017 4.47 10.017 10v93.99",
   },
   {
-    type: "PVC",
+    type: "MIXED",
     plastic: "MIXED",
     amount: 1,
     name: "Mixed-PVCRecovery",
     path:
       "M695.156 2448v45.97c0 5.53-4.477 10-10 10h-21.48a10.08 10.08 0 01-4.777-1.21l-39.512-21.49a9.966 9.966 0 00-4.778-1.21H97.156c-5.523 0-10-4.48-10-10v-770.77c0-5.53 4.477-10 10-10h27.929a9.996 9.996 0 0110.001 10V1768",
   },
   {
-    type: "PET",
+    type: "MIXED",
     plastic: "MIXED",
     amount: 1,
     name: "Mixed-SeperatePETRecovery",
     path:
       "M199.157 2480h-.149a9.951 9.951 0 01-4.993-1.34l-22.947-13.22a9.957 9.957 0 00-4.993-1.34H97.157c-5.523 0-10-4.47-10-10v-754.81c0-5.52 4.476-10 10-10h28c5.523 0 10 4.48 10 10V1768",
   },
   {
-    type: "PET",
+    type: "MIXED",
     plastic: "MIXED",
     amount: 1,
     name: "Mixed-MixedPETRecovery",
     path:
       "M247.156 2216v30c0 5.52-4.477 10-10 10h-3.344a9.93 9.93 0 01-4.961-1.32l-51.389-29.36a9.933 9.933 0 00-4.961-1.32H97.156c-5.523 0-10-4.48-10-10v-514.58c0-5.52 4.478-10 10-10h28.001c5.522 0 9.999 4.48 9.999 10V1768",
   },
   {
-    type: "HDPE",
+    type: "MIXED",
     plastic: "MIXED",
     amount: 1,
     name: "Mixed-HDPERecovery",
     path:
       "M311.156 2424v30c0 5.52-4.477 10-10 10h-2.972a9.963 9.963 0 01-5.547-1.68l-18.961-12.64a9.963 9.963 0 00-5.547-1.68H96.493a9.999 9.999 0 01-10-10.01l.654-738.58c.004-5.52 4.48-9.99 10-9.99h27.94c5.523 0 10 4.48 10 10V1768",
   },
   {
-    type: "HDPE",
+    type: "MIXED",
     plastic: "MIXED",
     amount: 1,
     name: "Mixed-HDPERecovery_2",

diff --git a/pages/experiment/011.tsx b/pages/experiment/011.tsx
@@ -21,7 +21,6 @@ import { ParticlePS } from "../../components/LifePlastic/Plastic/ParticlePS";
 import { ParticleLDPE } from "../../components/LifePlastic/Plastic/ParticleLDPE";
 import { ParticlePVC } from "../../components/LifePlastic/Plastic/ParticlePVC";
 import { ParticleOTHER } from "../../components/LifePlastic/Plastic/ParticleOTHER";
-import { ParticleMIXED } from "../../components/LifePlastic/Plastic/ParticleMIXED";
 import { ParticleGARBAGE } from "../../components/LifePlastic/Plastic/ParticleGARBAGE";
 import { ParticlePellet } from "../../components/LifePlastic/Plastic/ParticlePellet";
 import { ParticleBale } from "../../components/LifePlastic/Plastic/ParticleBale";
@@ -194,6 +193,12 @@ const Experiment011: React.FC = () => {
         when a particle finishes a route and then used to create the next
         particle when a certain amount arrive.
       </p>
+      <p>
+        First part is done, there are now different colours and forms for each
+        type and plastic as they go through the system. There are still things
+        to do now, but for now it feels quite full. I think I still need to
+        clean up the pipes and change the lines.
+      </p>
       <div
         style={{
           position: "absolute",
@@ -471,7 +476,7 @@ const Experiment011: React.FC = () => {
               );
             case "MIXED":
               return (
-                <ParticleMIXED
+                <ParticleGARBAGE
                   key={item.id}
                   id={item.id}
                   colour={plasticColourPicker(item.plastic)}