fix: address station layout review

Author: duncanleo

data/station/CDT.json

@@ -33,23 +33,6 @@
   "townId": "toa-payoh",
   "firstLastTrain": {
     "services": [
-      {
-        "serviceId": "CCL_MAIN_CW",
-        "times": {
-          "weekday": {
-            "firstTrain": "05:34",
-            "lastTrain": "23:30"
-          },
-          "saturday": {
-            "firstTrain": "05:34",
-            "lastTrain": "23:30"
-          },
-          "sunday_public_holiday": {
-            "firstTrain": "06:02",
-            "lastTrain": "23:30"
-          }
-        }
-      },
       {
         "serviceId": "TEL_MAIN_N",
         "times": {
@@ -72,15 +55,15 @@
         "times": {
           "weekday": {
             "firstTrain": "05:48",
-            "lastTrain": "23:58"
+            "lastTrain": "23:52"
           },
           "saturday": {
             "firstTrain": "05:48",
-            "lastTrain": "23:58"
+            "lastTrain": "23:52"
           },
           "sunday_public_holiday": {
             "firstTrain": "06:08",
-            "lastTrain": "23:58"
+            "lastTrain": "23:52"
           }
         }
       }
@@ -91,37 +74,17 @@
     "exits": [],
     "platforms": [
       {
-        "id": "CCDT_A",
-        "label": "A",
-        "lineId": "CCL",
-        "serviceIds": [
-          "CCL_MAIN_CCW",
-          "CCL_EXT_CCW"
-        ],
-        "accessPoints": []
-      },
-      {
-        "id": "CCDT_B",
-        "label": "B",
-        "lineId": "CCL",
-        "serviceIds": [
-          "CCL_MAIN_CW",
-          "CCL_EXT_CW"
-        ],
-        "accessPoints": []
-      },
-      {
-        "id": "TCDT_B",
-        "label": "B",
+        "id": "TCDT_D",
+        "label": "D",
         "lineId": "TEL",
         "serviceIds": [
           "TEL_MAIN_N"
         ],
         "accessPoints": []
       },
       {
-        "id": "TCDT_A",
-        "label": "A",
+        "id": "TCDT_C",
+        "label": "C",
         "lineId": "TEL",
         "serviceIds": [
           "TEL_MAIN_S"

docs/plans/active/station-first-last-train-data.md

@@ -162,8 +162,8 @@ Calendar categories should be data categories first. Any mapping to GTFS
 The first narrow seeds are intentionally hand-reviewed station records rather
 than outputs from a reusable operator ingest script:
 
-- `CDT` seeds one SMRT-operated interchange slice, including CCL/TEL platform
-  relationship validation.
+- `CDT` seeds one SMRT-operated TEL platform relationship slice at an
+  interchange station.
 - `LTI` seeds one SBS Transit-operated interchange slice from the public SBS
   Transit first/last train page, covering both NEL and DTL timing table shapes.
 

docs/plans/active/station-layout-data.md

@@ -378,9 +378,10 @@ Exit criteria:
 
 ### Phase 4: Seed Real Data
 
-- Seed `CDT` first as a narrow platform-to-service mapping slice because its
-  reviewed platform direction data maps cleanly to current CCL and TEL service
-  patterns.
+- Seed `CDT` first as a narrow TEL platform-to-service mapping slice because
+  its reviewed platform direction data maps cleanly to current TEL service
+  patterns without depending on the expiring pre-CCL6 Circle Line service
+  catalog.
 - Keep `OTP` as a later complete-layout candidate because it covers three
   lines, multiple platform levels, door-anchored access points, and multiple
   transfer path classifications.

packages/core/src/schema/Station.test.ts

@@ -194,4 +194,29 @@ describe('StationSchema', () => {
       }),
     ).not.toThrow();
   });
+
+  it('rejects layout platforms without service ids', () => {
+    const result = StationSchema.safeParse({
+      ...minimalStation(),
+      layout: {
+        levels: [],
+        exits: [],
+        platforms: [
+          {
+            id: 'KET_ISL_A',
+            label: 'A',
+            lineId: 'ISL',
+            serviceIds: [],
+            accessPoints: [],
+          },
+        ],
+        transferPaths: [],
+      },
+    });
+
+    expect(result.success).toBe(false);
+    expect(result.error?.issues[0]?.path.join('.')).toBe(
+      'layout.platforms.0.serviceIds',
+    );
+  });
 });

packages/core/src/schema/Station.ts

@@ -178,7 +178,7 @@ export const StationLayoutPlatformSchema = z.object({
   label: z.string(),
   lineId: z.string(),
   levelId: z.string().optional(),
-  serviceIds: z.array(z.string()),
+  serviceIds: z.array(z.string()).nonempty(),
   doorCount: z.number().int().positive().optional(),
   accessPoints: z.array(StationLayoutAccessPointSchema),
 });

packages/fs/src/index.test.ts

@@ -2750,7 +2750,7 @@ describe('@mrtdown/fs', () => {
                 id: 'KET_TWL_A',
                 label: 'A',
                 lineId: 'ISL',
-                serviceIds: ['TWL_MAIN_N'],
+                serviceIds: ['TWL_MAIN_N', 'ISL_SKIP_KET'],
                 accessPoints: [
                   {
                     id: 'KET_AP_DUP',
@@ -2785,6 +2785,48 @@ describe('@mrtdown/fs', () => {
         2,
       )}\n`,
     );
+    await writeFile(
+      join(dataDir, 'service/ISL_SKIP_KET.json'),
+      `${JSON.stringify(
+        {
+          id: 'ISL_SKIP_KET',
+          name: {
+            'en-SG': 'Island Line Skip Kennedy Town',
+            'zh-Hans': null,
+            ms: null,
+            ta: null,
+          },
+          lineId: 'ISL',
+          revisions: [
+            {
+              id: 'r_current',
+              startAt: '1979-10-01',
+              endAt: null,
+              path: {
+                stations: [
+                  {
+                    stationId: 'HKU',
+                    displayCode: 'ISL2',
+                  },
+                ],
+              },
+              operatingHours: {
+                weekdays: {
+                  start: '05:30',
+                  end: '00:30',
+                },
+                weekends: {
+                  start: '05:30',
+                  end: '00:30',
+                },
+              },
+            },
+          ],
+        },
+        null,
+        2,
+      )}\n`,
+    );
 
     const result = await validateDataRoot(dataDir, ['station']);
 
@@ -2799,6 +2841,7 @@ describe('@mrtdown/fs', () => {
         'station/KET.json: layout.platforms.0.levelId MISSING does not exist in layout.levels',
         'station/KET.json: layout.platforms.0.serviceIds.0 MISSING_SERVICE does not exist in service/',
         'station/KET.json: layout.platforms.1.serviceIds.0 TWL_MAIN_N belongs to line TWL, not ISL',
+        'station/KET.json: layout.platforms.1.serviceIds.1 ISL_SKIP_KET revision r_current does not include station KET in its current service path',
         'station/KET.json: layout.platforms.0.accessPoints.0.connectsToLevelId MISSING does not exist in layout.levels',
         'station/KET.json: layout.platforms.0.accessPoints.0.nearestDoor 25 is outside doorCount 24',
         'station/KET.json: layout.transferPaths.0.from platform MISSING_PLATFORM does not exist in layout',

packages/fs/src/validate.ts

@@ -352,6 +352,31 @@ async function validateStationReferences(
             errors.push(
               `${station.path}: layout.platforms.${platformIndex}.serviceIds.${serviceIndex} ${serviceId} belongs to line ${service.value.lineId}, not ${platform.lineId}`,
             );
+            continue;
+          }
+
+          const currentRevisions = service.value.revisions.filter((revision) =>
+            revisionContainsTimestamp(revision, validationTimestamp),
+          );
+          if (currentRevisions.length === 0) {
+            errors.push(
+              `${station.path}: layout.platforms.${platformIndex}.serviceIds.${serviceIndex} ${serviceId} does not have a current service revision`,
+            );
+            continue;
+          }
+
+          for (const revision of currentRevisions) {
+            const stationIds = new Set(
+              revision.path.stations.map(
+                (serviceStation) => serviceStation.stationId,
+              ),
+            );
+
+            if (!stationIds.has(station.value.id)) {
+              errors.push(
+                `${station.path}: layout.platforms.${platformIndex}.serviceIds.${serviceIndex} ${serviceId} revision ${revision.id} does not include station ${station.value.id} in its current service path`,
+              );
+            }
           }
         }
       }