Added support for new Overground lines; map accessibility refactor; c…

…leanup

client/src/scss/partials/setup/color/_color-brand.scss

@@ -21,9 +21,15 @@ $color-tfl-piccadilly: rgb(0 15 159);
 $color-tfl-victoria: rgb(0 160 223);
 $color-tfl-waterloo-city: rgb(107 205 178);
 
+$color-tfl-liberty: rgb(97 104 107);
+$color-tfl-lioness: rgb(255 166 0);
+$color-tfl-mildmay: rgb(0 111 230);
+$color-tfl-suffragette: rgb(24 169 93);
+$color-tfl-weaver: rgb(155 0 88);
+$color-tfl-windrush: rgb(220 36 31);
+
 $color-tfl-dlr: rgb(0 175 170);
 $color-tfl-elizabeth: rgb(119 61 189);
-$color-tfl-overground: rgb(238 118 35);
 $color-tfl-tram: rgb(118 188 33);
 $color-tfl-river-bus: rgb(0 160 223);
 
@@ -83,6 +89,36 @@ $brands: (
     colorBorder: $color-tfl-waterloo-city,
     colorText: $color-tfl-black,
   ),
+  'liberty': (
+    colorBackground: $color-tfl-liberty,
+    colorBorder: $color-tfl-liberty,
+    colorText: $color-tfl-white,
+  ),
+  'lioness': (
+    colorBackground: $color-tfl-lioness,
+    colorBorder: $color-tfl-lioness,
+    colorText: $color-tfl-black,
+  ),
+  'mildmay': (
+    colorBackground: $color-tfl-mildmay,
+    colorBorder: $color-tfl-mildmay,
+    colorText: $color-tfl-white,
+  ),
+  'suffragette': (
+    colorBackground: $color-tfl-suffragette,
+    colorBorder: $color-tfl-suffragette,
+    colorText: $color-tfl-white,
+  ),
+  'weaver': (
+    colorBackground: $color-tfl-weaver,
+    colorBorder: $color-tfl-weaver,
+    colorText: $color-tfl-white,
+  ),
+  'windrush': (
+    colorBackground: $color-tfl-windrush,
+    colorBorder: $color-tfl-windrush,
+    colorText: $color-tfl-white,
+  ),
   'dlr': (
     colorBackground: $color-tfl-dlr,
     colorBorder: $color-tfl-dlr,
@@ -93,11 +129,6 @@ $brands: (
     colorBorder: $color-tfl-elizabeth,
     colorText: $color-tfl-white,
   ),
-  'london-overground': (
-    colorBackground: $color-tfl-overground,
-    colorBorder: $color-tfl-overground,
-    colorText: $color-tfl-white,
-  ),
   'tram': (
     colorBackground: $color-tfl-tram,
     colorBorder: $color-tfl-tram,

server/constants/accessTypes.js

@@ -0,0 +1,2 @@
+export const ACCESS_TYPE_PLATFORM = 'platform';
+export const ACCESS_TYPE_TRAIN = 'train';

server/constants/serviceIds.js

@@ -13,8 +13,10 @@ export const SERVICE_ID_GREAT_NORTHERN = 'great-northern';
 export const SERVICE_ID_GREATER_ANGLIA = 'greater-anglia';
 export const SERVICE_ID_HAMMERSMITH_CITY = 'hammersmith-city';
 export const SERVICE_ID_JUBILEE = 'jubilee';
-export const SERVICE_ID_LONDON_OVERGROUND = 'london-overground';
+export const SERVICE_ID_LIBERTY = 'liberty';
+export const SERVICE_ID_LIONESS = 'lioness';
 export const SERVICE_ID_METROPOLITAN = 'metropolitan';
+export const SERVICE_ID_MILDMAY = 'mildmay';
 export const SERVICE_ID_NATIONAL_RAIL = 'national-rail';
 export const SERVICE_ID_NORTHERN = 'northern';
 export const SERVICE_ID_PICCADILLY = 'piccadilly';
@@ -25,12 +27,15 @@ export const SERVICE_ID_RIVER_BUS_6 = 'rb6';
 export const SERVICE_ID_SOUTH_WESTERN_RAILWAY = 'south-western-railway';
 export const SERVICE_ID_SOUTHEASTERN = 'southeastern';
 export const SERVICE_ID_SOUTHERN = 'southern';
+export const SERVICE_ID_SUFFRAGETTE = 'suffragette';
 export const SERVICE_ID_THAMES_RIVER_SERVICES = 'thames-river-services';
 export const SERVICE_ID_THAMESLINK = 'thameslink';
 export const SERVICE_ID_TRAM = 'tram';
 export const SERVICE_ID_VICTORIA = 'victoria';
 export const SERVICE_ID_WATERLOO_CITY = 'waterloo-city';
+export const SERVICE_ID_WEAVER = 'weaver';
 export const SERVICE_ID_WEST_MIDLANDS_TRAINS = 'west-midlands-trains';
+export const SERVICE_ID_WINDRUSH = 'windrush';
 export const SERVICE_ID_WOOLWICH_FERRY = 'woolwich-ferry';
 
 export const busServiceIds = [
@@ -46,7 +51,12 @@ export const elizabethLineServiceIds = [
 ];
 
 export const overgroundServiceIds = [
-  SERVICE_ID_LONDON_OVERGROUND,
+  SERVICE_ID_LIBERTY,
+  SERVICE_ID_LIONESS,
+  SERVICE_ID_MILDMAY,
+  SERVICE_ID_SUFFRAGETTE,
+  SERVICE_ID_WEAVER,
+  SERVICE_ID_WINDRUSH,
 ];
 
 export const nationalRailServiceIds = [

server/constants/serviceNames.js

@@ -12,8 +12,10 @@ export const SERVICE_NAME_GREAT_NORTHERN = 'Great Northern';
 export const SERVICE_NAME_GREATER_ANGLIA = 'Greater Anglia';
 export const SERVICE_NAME_HAMMERSMITH_CITY = 'Hammersmith & City';
 export const SERVICE_NAME_JUBILEE = 'Jubilee';
-export const SERVICE_NAME_LONDON_OVERGROUND = 'London Overground';
+export const SERVICE_NAME_LIBERTY = 'Liberty';
+export const SERVICE_NAME_LIONESS = 'Lioness';
 export const SERVICE_NAME_METROPOLITAN = 'Metropolitan';
+export const SERVICE_NAME_MILDMAY = 'Mildmay';
 export const SERVICE_NAME_NATIONAL_RAIL = 'National Rail';
 export const SERVICE_NAME_NORTHERN = 'Northern';
 export const SERVICE_NAME_PICCADILLY = 'Piccadilly';
@@ -24,9 +26,12 @@ export const SERVICE_NAME_RIVER_BUS_6 = 'RB6';
 export const SERVICE_NAME_SOUTH_WESTERN_RAILWAY = 'South Western Railway';
 export const SERVICE_NAME_SOUTHEASTERN = 'Southeastern';
 export const SERVICE_NAME_SOUTHERN = 'Southern';
+export const SERVICE_NAME_SUFFRAGETTE = 'Suffragette';
 export const SERVICE_NAME_THAMESLINK = 'Thameslink';
 export const SERVICE_NAME_TRAM = 'Tram';
 export const SERVICE_NAME_VICTORIA = 'Victoria';
 export const SERVICE_NAME_WATERLOO_CITY = 'Waterloo & City';
+export const SERVICE_NAME_WEAVER = 'Weaver';
 export const SERVICE_NAME_WEST_MIDLANDS_TRAINS = 'West Midlands Trains';
+export const SERVICE_NAME_WINDRUSH = 'Windrush';
 export const SERVICE_NAME_WOOLWICH_FERRY = 'Woolwich Ferry';

server/data/map-accessibility/a/_ma-a.js

@@ -0,0 +1,29 @@
+import maAbbeyRoad from './ma-abbey-road.js';
+import maAbbeyWood from './ma-abbey-wood.js';
+import maActonCentral from './ma-acton-central.js';
+import maActonMainLine from './ma-acton-mainline.js';
+import maActonTown from './ma-acton-town.js';
+import maAddingtonVillage from './ma-addington-village.js';
+import maAddiscombe from './ma-addiscombe.js';
+import maAllSaints from './ma-all-saints.js';
+import maAmersham from './ma-amersham.js';
+import maAmpereWay from './ma-ampere-way.js';
+import maAnerley from './ma-anerley.js';
+import maArena from './ma-arena.js';
+import maAvenueRoad from './ma-avenue-road.js';
+
+export default [
+  maAbbeyRoad,
+  maAbbeyWood,
+  maActonCentral,
+  maActonMainLine,
+  maActonTown,
+  maAddingtonVillage,
+  maAddiscombe,
+  maAllSaints,
+  maAmersham,
+  maAmpereWay,
+  maAnerley,
+  maArena,
+  maAvenueRoad,
+];

server/data/map-accessibility/a/ma-abbey-road.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_TRAIN,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_DLR,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: '940GZZDLABR', // Abbey Road
+  services: [
+    {
+      id: SERVICE_ID_DLR,
+      access: ACCESS_TYPE_TRAIN,
+      naptanId: '940GZZDLABR',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-abbey-wood.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_PLATFORM,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_ELIZABETH,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: 'HUBABW', // Abbey Wood
+  services: [
+    {
+      id: SERVICE_ID_ELIZABETH,
+      access: ACCESS_TYPE_PLATFORM,
+      naptanId: '910GABWDXR',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-acton-central.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_PLATFORM,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_MILDMAY,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: '910GACTNCTL', // Acton Central
+  services: [
+    {
+      id: SERVICE_ID_MILDMAY,
+      access: ACCESS_TYPE_PLATFORM,
+      naptanId: '910GACTNCTL',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-acton-mainline.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_PLATFORM,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_ELIZABETH,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: '910GACTONML', // Acton Main Line
+  services: [
+    {
+      id: SERVICE_ID_ELIZABETH,
+      access: ACCESS_TYPE_PLATFORM,
+      naptanId: '910GACTONML',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-acton-town.js

@@ -0,0 +1,24 @@
+import {
+  ACCESS_TYPE_PLATFORM,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_DISTRICT,
+  SERVICE_ID_PICCADILLY,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: '940GZZLUACT', // Acton Town
+  services: [
+    {
+      id: SERVICE_ID_DISTRICT,
+      access: ACCESS_TYPE_PLATFORM,
+      naptanId: '940GZZLUACT',
+    },
+    {
+      id: SERVICE_ID_PICCADILLY,
+      access: ACCESS_TYPE_PLATFORM,
+      naptanId: '940GZZLUACT',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-addington-village.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_TRAIN,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_TRAM,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: '940GZZCRADV', // Addington Village
+  services: [
+    {
+      id: SERVICE_ID_TRAM,
+      access: ACCESS_TYPE_TRAIN,
+      naptanId: '940GZZCRADV',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-addiscombe.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_TRAIN,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_TRAM,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: '940GZZCRADD', // Addiscombe
+  services: [
+    {
+      id: SERVICE_ID_TRAM,
+      access: ACCESS_TYPE_TRAIN,
+      naptanId: '940GZZCRADD',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-all-saints.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_TRAIN,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_DLR,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: '940GZZDLALL', // All Saints
+  services: [
+    {
+      id: SERVICE_ID_DLR,
+      access: ACCESS_TYPE_TRAIN,
+      naptanId: '940GZZDLALL',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-amersham.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_TRAIN,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_METROPOLITAN,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: 'HUBAMR', // Amersham
+  services: [
+    {
+      id: SERVICE_ID_METROPOLITAN,
+      access: ACCESS_TYPE_TRAIN,
+      naptanId: '940GZZLUAMS',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-ampere-way.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_TRAIN,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_TRAM,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: '940GZZCRAMP', // Ampere Way
+  services: [
+    {
+      id: SERVICE_ID_TRAM,
+      access: ACCESS_TYPE_TRAIN,
+      naptanId: '940GZZCRAMP',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-anerley.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_PLATFORM,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_WINDRUSH,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: '910GANERLEY', // Anerley
+  services: [
+    {
+      id: SERVICE_ID_WINDRUSH,
+      access: ACCESS_TYPE_PLATFORM,
+      naptanId: '910GANERLEY',
+    },
+  ],
+};

server/data/map-accessibility/a/ma-arena.js

@@ -0,0 +1,18 @@
+import {
+  ACCESS_TYPE_TRAIN,
+} from '../../../constants/accessTypes.js';
+
+import {
+  SERVICE_ID_TRAM,
+} from '../../../constants/serviceIds.js';
+
+export default {
+  topMostParentId: '940GZZCRARA', // Arena
+  services: [
+    {
+      id: SERVICE_ID_TRAM,
+      access: ACCESS_TYPE_TRAIN,
+      naptanId: '940GZZCRARA',
+    },
+  ],
+};