feat: show home and workplace

PredictiveMovement · Apr 5, 2023 · aaec304 · aaec304
1 parent ae62006
commit aaec304
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/packages/sampleAddresses/lib/elasticsearch.js b/packages/sampleAddresses/lib/elasticsearch.js
@@ -19,9 +19,14 @@ const fetchAdresses = async (query) => {
     .map(
       ({
         _id: id,
-        _source: { center_point: position, address_parts: address },
+        _source: {
+          center_point: position,
+          address_parts: address,
+          name: { default: name } = {},
+        },
       }) => ({
         address,
+        name,
         position,
         id,
       })

diff --git a/packages/simulator/lib/models/citizen.js b/packages/simulator/lib/models/citizen.js
@@ -199,6 +199,8 @@ class Citizen {
       position: this.position,
       waitTime: this.waitTime,
       kommun: this.kommun.name,
+      home: this.home,
+      workplace: this.workplace,
     }
     return obj
   }

diff --git a/packages/visualisation/src/components/HoverInfoBox/index.js b/packages/visualisation/src/components/HoverInfoBox/index.js
@@ -183,20 +183,8 @@ const PassengerInfo = ({ data }) => {
       <Paragraph>
         Namn: <strong>{data.name}</strong>
       </Paragraph>
-      <Paragraph>Resor:</Paragraph>
-      <Paragraph>
-        <ul>
-          {data.bookings &&
-            data.bookings.map((j) => {
-              return (
-                <li>
-                  {j.pickup.departureTime && `(${j.pickup.departureTime}) `}
-                  {j.pickup.name} &gt; {j.destination.name}
-                </li>
-              )
-            })}
-        </ul>
-      </Paragraph>
+      <Paragraph>Bostad: {data.home.name}</Paragraph>
+      <Paragraph>Arbetsplats: {data.workplace.name}</Paragraph>
       <Paragraph>
         CO<sub>2</sub>:{' '}
         <strong>{Math.ceil((10 * data.co2) / 10) || 0} kg</strong>