#809 Guangzhou Metro 2024 facilities

src/components/svgs/nodes/facilities.tsx

@@ -34,11 +34,14 @@ export enum FacilitiesType {
     GardensByTheBay = 'gardens_by_the_bay',
     SingaporeFlyer = 'singapore_flyer',
     Esplanade = 'esplanade',
-    QingdaoAirport = 'qingdao_airport',
-    QingdaoCoachStation = 'qingdao_coach_station',
-    QingdaoCruiseTerminal = 'qingdao_cruise_terminal',
-    QingdaoRailway = 'qingdao_railway',
-    QingdaoTram = 'qingdao_tram',
+    AirportQingdao = 'airport_qingdao',
+    CoachStationQingdao = 'coach_station_qingdao',
+    CruiseTerminalQingdao = 'cruise_terminal_qingdao',
+    RailwayQingdao = 'railway_qingdao',
+    TramQingdao = 'tram_qingdao',
+    AirportGuangzhou = 'airport_guangzhou',
+    RailwayGuangzhou = 'railway_guangzhou',
+    IntercityGuangzhou = 'intercity_guangzhou',
 }
 
 const Facilities = (props: NodeComponentProps<FacilitiesAttributes>) => {
@@ -126,11 +129,14 @@ const attrsComponent = (props: AttrsProps<FacilitiesAttributes>) => {
                 [FacilitiesType.GardensByTheBay]: 'Gardens by the Bay',
                 [FacilitiesType.SingaporeFlyer]: 'Singapore Flyer',
                 [FacilitiesType.Esplanade]: 'Esplanade',
-                [FacilitiesType.QingdaoAirport]: 'Airport Qingdao',
-                [FacilitiesType.QingdaoRailway]: 'Railway Qingdao',
-                [FacilitiesType.QingdaoCoachStation]: 'Coach Station Qingdao',
-                [FacilitiesType.QingdaoCruiseTerminal]: 'Cruise Terminal Qingdao',
-                [FacilitiesType.QingdaoTram]: 'Tram Qingdao',
+                [FacilitiesType.AirportQingdao]: 'Airport Qingdao',
+                [FacilitiesType.RailwayQingdao]: 'Railway Qingdao',
+                [FacilitiesType.CoachStationQingdao]: 'Coach Station Qingdao',
+                [FacilitiesType.CruiseTerminalQingdao]: 'Cruise Terminal Qingdao',
+                [FacilitiesType.TramQingdao]: 'Tram Qingdao',
+                [FacilitiesType.AirportGuangzhou]: 'Airport Guangzhou',
+                [FacilitiesType.RailwayGuangzhou]: 'Railway Guangzhou',
+                [FacilitiesType.IntercityGuangzhou]: 'Intercity Guangzhou',
             },
             onChange: val => {
                 attrs.type = val as FacilitiesType;

src/util/save.test.ts

@@ -497,4 +497,16 @@ describe('Unit tests for param upgrade function', () => {
             '{"graph":{"options":{"type":"directed","multi":true,"allowSelfLoops":true},"attributes":{},"nodes":[],"edges":[]},"svgViewBoxZoom":100,"svgViewBoxMin":{"x":0,"y":0},"version":38}';
         expect(newParam).toEqual(expectParam);
     });
+
+    it('38 -> 39', () => {
+        // Bump save version to support Guangzhou 2024 facilities.
+        const oldParam =
+            '{"graph":{"options":{"type":"directed","multi":true,"allowSelfLoops":true},"attributes":{},"nodes":[],"edges":[]},"svgViewBoxZoom":100,"svgViewBoxMin":{"x":0,"y":0},"version":38}';
+        const newParam = UPGRADE_COLLECTION[38](oldParam);
+        const graph = new MultiDirectedGraph() as MultiDirectedGraph<NodeAttributes, EdgeAttributes, GraphAttributes>;
+        expect(() => graph.import(JSON.parse(newParam))).not.toThrow();
+        const expectParam =
+            '{"graph":{"options":{"type":"directed","multi":true,"allowSelfLoops":true},"attributes":{},"nodes":[],"edges":[]},"svgViewBoxZoom":100,"svgViewBoxMin":{"x":0,"y":0},"version":39}';
+        expect(newParam).toEqual(expectParam);
+    });
 });

src/util/save.ts

@@ -30,7 +30,7 @@ export interface RMPSave {
     svgViewBoxMin: { x: number; y: number };
 }
 
-export const CURRENT_VERSION = 38;
+export const CURRENT_VERSION = 39;
 
 /**
  * Load the tutorial.
@@ -453,4 +453,7 @@ export const UPGRADE_COLLECTION: { [version: number]: (param: string) => string
     37: param =>
         // Bump save version to support Shanghai 2024 facilities.
         JSON.stringify({ ...JSON.parse(param), version: 38 }),
+    38: param =>
+        // Bump save version to support Guangzhou 2024 facilities.
+        JSON.stringify({ ...JSON.parse(param), version: 39 }),
 };