From ff9c484c02cb132499e00528f9dad15cb70626f1 Mon Sep 17 00:00:00 2001
From: David Wheatley <david@davwheat.dev>
Date: Sun, 22 Sep 2024 02:09:36 +0100
Subject: [PATCH 1/3] fix: don't include destination in rtt import calling
 points

---
 src/data/RttUtils.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/data/RttUtils.ts b/src/data/RttUtils.ts
index bc7674730..fee2c4b50 100644
--- a/src/data/RttUtils.ts
+++ b/src/data/RttUtils.ts
@@ -23,12 +23,14 @@ export class RttUtils {
 
     return this.getEligibleLocationsInternal(rttService)
       .slice(fromLocationIndex + 1)
-      .filter(l => {
-        if (!l.isPublicCall || l.displayAs === 'CANCELLED_CALL') return false
+      .filter((l, i, arr) => {
+        if (!l.isPublicCall || l.displayAs === 'CANCELLED_CALL' || l.displayAs === 'DESTINATION' || l.displayAs === 'TERMINATES') return false
         if (!l.crs) {
           console.warn(`Location ${l.tiploc} has no CRS code`)
           return false
         }
+        // Ignore destination in calling points
+        if (i === arr.length - 1 && l.destination.some(d => d.tiploc === l.tiploc)) return false
         return true
       })
       .map(l => ({

From 94039eb2b8d3d0fee93a048f53d47a0e7c40784e Mon Sep 17 00:00:00 2001
From: David Wheatley <david@davwheat.dev>
Date: Sun, 22 Sep 2024 02:09:58 +0100
Subject: [PATCH 2/3] fix: css fixes for rtt modal

---
 src/components/ImportStateFromRtt.tsx | 49 +++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/components/ImportStateFromRtt.tsx b/src/components/ImportStateFromRtt.tsx
index 70b34cdb1..868bc7139 100644
--- a/src/components/ImportStateFromRtt.tsx
+++ b/src/components/ImportStateFromRtt.tsx
@@ -292,7 +292,7 @@ export default function ImportStateFromRtt({ importStateFromRttService, disabled
                     }
 
                     return (
-                      <ul>
+                      <ul css={{ margin: 0 }}>
                         {locations.map((location, i) => {
                           console.log(location)
 
@@ -328,18 +328,55 @@ export default function ImportStateFromRtt({ importStateFromRttService, disabled
                             <li
                               key={location.randomId}
                               css={{
+                                '--track-color': 'var(--primary-blue)',
+                                '--track-gap': '24px',
+                                '--track-line-weight': '6px',
+                                '--circle-radius': 'calc(var(--track-line-weight) * 1.75)',
+
+                                '& label::before, & label::after': {
+                                  pointerEvents: 'none',
+                                },
+
                                 '& label::before': {
                                   content: '""',
-                                  width: 8,
-                                  background: 'var(--primary-blue)',
+                                  width: 'var(--track-line-weight)',
+                                  background: 'var(--track-color)',
                                   position: 'absolute',
-                                  left: -24,
+                                  left: 'calc(-1 * var(--track-gap))',
                                   top: 'calc(-1 * var(--item-spacing))',
                                   bottom: 'calc(-1 * var(--item-spacing))',
                                 },
 
                                 '&:first-of-type label::before': {
-                                  top: '50%',
+                                  top: 'calc(50% - var(--circle-radius))',
+                                },
+
+                                '&:last-of-type label::before': {
+                                  bottom: 'calc(50% - var(--circle-radius))',
+                                },
+
+                                '& label::after': {
+                                  content: '""',
+                                  height: 'var(--track-line-weight)',
+                                  width: 'calc(var(--track-gap) / 2)',
+                                  background: 'var(--track-color)',
+                                  position: 'absolute',
+                                  left: 'calc(-1 * var(--track-gap) + var(--track-line-weight))',
+                                  top: 'calc(50% - var(--track-line-weight) / 2)',
+                                },
+
+                                '&:first-of-type label::after, &:last-of-type label::after': {
+                                  left: 'calc(-1 * var(--track-gap) - var(--circle-radius) + var(--track-line-weight) / 2)',
+                                  height: 'calc(var(--circle-radius) * 2)',
+                                  width: 'calc(var(--circle-radius) * 2)',
+                                  borderRadius: '50%',
+                                },
+
+                                '&:first-of-type label::after': {
+                                  top: 'calc(50% - var(--circle-radius))',
+                                },
+                                '&:last-of-type label::after': {
+                                  top: 'calc(50% - var(--circle-radius))',
                                 },
                               }}
                             >
@@ -347,7 +384,7 @@ export default function ImportStateFromRtt({ importStateFromRttService, disabled
                                 htmlFor={`originLocation-${i}`}
                                 css={{
                                   '--item-spacing': '8px',
-                                  marginLeft: 24,
+                                  marginLeft: 'var(--track-gap)',
                                   display: 'grid',
                                   gridTemplateAreas: `
                                     "radio arr location"

From e045707846179cf0b5ad73c79878eca8d8b54cfc Mon Sep 17 00:00:00 2001
From: David Wheatley <david@davwheat.dev>
Date: Sun, 22 Sep 2024 02:10:07 +0100
Subject: [PATCH 3/3] feat: pick up/set down only text in rtt modal

---
 src/components/ImportStateFromRtt.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/ImportStateFromRtt.tsx b/src/components/ImportStateFromRtt.tsx
index 868bc7139..9b2ff726b 100644
--- a/src/components/ImportStateFromRtt.tsx
+++ b/src/components/ImportStateFromRtt.tsx
@@ -293,7 +293,7 @@ export default function ImportStateFromRtt({ importStateFromRttService, disabled
 
                     return (
                       <ul css={{ margin: 0 }}>
-                        {locations.map((location, i) => {
+                        {locations.map((location, i, arr) => {
                           console.log(location)
 
                           let schedArr: Dayjs | null = null
@@ -324,6 +324,9 @@ export default function ImportStateFromRtt({ importStateFromRttService, disabled
                             console.warn(e)
                           }
 
+                          const isSetDownOnly = schedDep === null && i !== arr.length - 1
+                          const isPickUpOnly = schedArr === null && i !== 0
+
                           return (
                             <li
                               key={location.randomId}
@@ -455,7 +458,10 @@ export default function ImportStateFromRtt({ importStateFromRttService, disabled
                                 <div css={{ gridArea: 'detail', color: '#888', fontWeight: 'normal', fontSize: '0.8em' }}>
                                   {[
                                     location.rttPlatform && `Platform ${location.rttPlatform}`,
-                                    location.depLateness && `Departed ${latenessString(location.depLateness)}`,
+                                    !isSetDownOnly && location.depLateness && `Departed ${latenessString(location.depLateness)}`,
+                                    isPickUpOnly && location.arrLateness && `Arrived ${latenessString(location.arrLateness)}`,
+                                    isSetDownOnly && 'Set down only',
+                                    isPickUpOnly && 'Pick up only',
                                   ]
                                     .filter(Boolean)
                                     .join(' • ')}