#763 Upgrade save replacing all names from \\ to \n (#899)

railmapgen · Dec 29, 2024 · c8dc59a · c8dc59a
1 parent 1826dda
commit c8dc59a
Show file tree

Hide file tree

Showing 30 changed files with 262 additions and 174 deletions.
diff --git a/src/components/page-header/rmp-to-rmg.tsx b/src/components/page-header/rmp-to-rmg.tsx
@@ -214,7 +214,7 @@ export const ToRmgEndSelectModal = (props: {
                                 whiteSpace="nowrap"
                                 display="ruby"
                             >
-                                {name1.replaceAll('\\', '⏎')}/{name2.replaceAll('\\', '⏎')}
+                                {name1.replaceAll('\n', '⏎')}/{name2.replaceAll('\n', '⏎')}
                             </Button>
                         ))}
                     </Stack>

diff --git a/src/components/panels/details/info-multiple-selection.tsx b/src/components/panels/details/info-multiple-selection.tsx
@@ -100,7 +100,7 @@ export default function InfoMultipleSection() {
                                 whiteSpace="nowrap"
                                 display="ruby"
                             >
-                                {getName(id)?.replaceAll('\\', '⏎')}
+                                {getName(id)?.replaceAll('\n', '⏎')}
                             </Button>
                             <Button size="sm" onClick={() => dispatch(removeSelected(id))}>
                                 <MdDeselect />

diff --git a/src/components/svgs/nodes/jr-east-line-badge.tsx b/src/components/svgs/nodes/jr-east-line-badge.tsx
@@ -120,7 +120,7 @@ const JREastLineBadge = (props: NodeComponentProps<JREastLineBadgeAttributes>) =
             </text>
             <MultilineText
                 ref={textLineEl}
-                text={names[0].split('\\')}
+                text={names[0].split('\n')}
                 x={CIRCLE_X + CIRCLE_R + 1}
                 y="-1"
                 fill={color[3]}
@@ -130,7 +130,7 @@ const JREastLineBadge = (props: NodeComponentProps<JREastLineBadgeAttributes>) =
                 className="rmp-name__jreast_ja"
             />
             <MultilineText
-                text={names[1].split('\\')}
+                text={names[1].split('\n')}
                 textAnchor="middle"
                 dominantBaseline="hanging"
                 x={(bBox.width + CIRCLE_R + 10) / 2}
@@ -149,7 +149,7 @@ const JREastLineBadge = (props: NodeComponentProps<JREastLineBadgeAttributes>) =
  * JREastLineBadge specific props.
  */
 export interface JREastLineBadgeAttributes extends AttributesWithColor {
-    names: [string, string];
+    names: [string, ...string[]];
     num: number;
     crosshatchPatternFill: boolean;
 }
@@ -180,19 +180,19 @@ const jrEastLineBadgeAttrsComponent = (props: AttrsProps<JREastLineBadgeAttribut
         {
             type: 'textarea',
             label: t('panel.details.nodes.common.nameJa'),
-            value: attrs.names[0].replaceAll('\\', '\n'),
+            value: attrs.names[0],
             onChange: val => {
-                attrs.names[0] = val.replaceAll('\n', '\\');
+                attrs.names[0] = val;
                 handleAttrsUpdate(id, attrs);
             },
             minW: 'full',
         },
         {
             type: 'textarea',
             label: t('panel.details.nodes.common.nameEn'),
-            value: attrs.names[1].replaceAll('\\', '\n'),
+            value: attrs.names[1],
             onChange: val => {
-                attrs.names[1] = val.replaceAll('\n', '\\');
+                attrs.names[1] = val;
                 handleAttrsUpdate(id, attrs);
             },
             minW: 'full',

diff --git a/src/components/svgs/stations/bjsubway-basic.tsx b/src/components/svgs/stations/bjsubway-basic.tsx
@@ -44,17 +44,17 @@ const BjsubwayBasicStation = (props: StationComponentProps) => {
 
     const getTextOffset = (oX: NameOffsetX, oY: NameOffsetY) => {
         if (oX === 'left' && oY === 'top') {
-            return [-4, -(names[1].split('\\').length + (!open ? 1 : 0)) * LINE_HEIGHT[oY] - 1];
+            return [-4, -(names[1].split('\n').length + (!open ? 1 : 0)) * LINE_HEIGHT[oY] - 1];
         } else if (oX === 'middle' && oY === 'top') {
-            return [0, -(names[1].split('\\').length + (!open ? 1 : 0)) * LINE_HEIGHT[oY] - 4];
+            return [0, -(names[1].split('\n').length + (!open ? 1 : 0)) * LINE_HEIGHT[oY] - 4];
         } else if (oX === 'right' && oY === 'top') {
-            return [4, -(names[1].split('\\').length + (!open ? 1 : 0)) * LINE_HEIGHT[oY] - 1];
+            return [4, -(names[1].split('\n').length + (!open ? 1 : 0)) * LINE_HEIGHT[oY] - 1];
         } else if (oX === 'left' && oY === 'bottom') {
-            return [-4, names[0].split('\\').length * LINE_HEIGHT[oY] + 1];
+            return [-4, names[0].split('\n').length * LINE_HEIGHT[oY] + 1];
         } else if (oX === 'middle' && oY === 'bottom') {
-            return [0, names[0].split('\\').length * LINE_HEIGHT[oY] + 4];
+            return [0, names[0].split('\n').length * LINE_HEIGHT[oY] + 4];
         } else if (oX === 'right' && oY === 'bottom') {
-            return [4, names[0].split('\\').length * LINE_HEIGHT[oY] + 1];
+            return [4, names[0].split('\n').length * LINE_HEIGHT[oY] + 1];
         } else if (oX === 'left' && oY === 'middle') {
             return [-5, 0];
         } else if (oX === 'right' && oY === 'middle') {
@@ -81,15 +81,15 @@ const BjsubwayBasicStation = (props: StationComponentProps) => {
             />
             <g transform={`translate(${textX}, ${textY})`} textAnchor={textAnchor}>
                 <MultilineText
-                    text={names[0].split('\\')}
+                    text={names[0].split('\n')}
                     fontSize={LINE_HEIGHT.zh}
                     lineHeight={LINE_HEIGHT.zh}
                     grow="up"
                     className="rmp-name__zh"
                     baseOffset={1}
                 />
                 <MultilineText
-                    text={names[1].split('\\')}
+                    text={names[1].split('\n')}
                     fontSize={LINE_HEIGHT.en}
                     lineHeight={LINE_HEIGHT.en}
                     grow="down"
@@ -98,7 +98,7 @@ const BjsubwayBasicStation = (props: StationComponentProps) => {
                 />
                 {!open && (
                     <text
-                        dy={names[1].split('\\').length * LINE_HEIGHT.en + 2}
+                        dy={names[1].split('\n').length * LINE_HEIGHT.en + 2}
                         fontSize={LINE_HEIGHT.en}
                         dominantBaseline="hanging"
                         className="rmp-name__zh"
@@ -134,27 +134,25 @@ const bjsubwayBasicStationFields = [
     {
         type: 'textarea',
         label: 'panel.details.stations.common.nameZh',
-        value: (attrs?: BjsubwayBasicStationAttributes) =>
-            (attrs ?? defaultBjsubwayBasicStationAttributes).names[0].replaceAll('\\', '\n'),
+        value: (attrs?: BjsubwayBasicStationAttributes) => (attrs ?? defaultBjsubwayBasicStationAttributes).names[0],
         onChange: (val: string | number, attrs_: BjsubwayBasicStationAttributes | undefined) => {
             // set default value if switched from another type
             const attrs = attrs_ ?? defaultBjsubwayBasicStationAttributes;
             // set value
-            attrs.names[0] = val.toString().replaceAll('\n', '\\');
+            attrs.names[0] = val.toString();
             // return modified attrs
             return attrs;
         },
     },
     {
         type: 'textarea',
         label: 'panel.details.stations.common.nameEn',
-        value: (attrs?: BjsubwayBasicStationAttributes) =>
-            (attrs ?? defaultBjsubwayBasicStationAttributes).names[1].replaceAll('\\', '\n'),
+        value: (attrs?: BjsubwayBasicStationAttributes) => (attrs ?? defaultBjsubwayBasicStationAttributes).names[1],
         onChange: (val: string | number, attrs_: BjsubwayBasicStationAttributes | undefined) => {
             // set default value if switched from another type
             const attrs = attrs_ ?? defaultBjsubwayBasicStationAttributes;
             // set value
-            attrs.names[1] = val.toString().replaceAll('\n', '\\');
+            attrs.names[1] = val.toString();
             // return modified attrs
             return attrs;
         },

diff --git a/src/components/svgs/stations/bjsubway-int.tsx b/src/components/svgs/stations/bjsubway-int.tsx
@@ -40,17 +40,17 @@ const BjsubwayIntStation = (props: StationComponentProps) => {
 
     const getTextOffset = (oX: NameOffsetX, oY: NameOffsetY) => {
         if (oX === 'left' && oY === 'top') {
-            return [-5, -names[1].split('\\').length * LINE_HEIGHT[oY] - 4];
+            return [-5, -names[1].split('\n').length * LINE_HEIGHT[oY] - 4];
         } else if (oX === 'middle' && oY === 'top') {
-            return [0, -names[1].split('\\').length * LINE_HEIGHT[oY] - 7];
+            return [0, -names[1].split('\n').length * LINE_HEIGHT[oY] - 7];
         } else if (oX === 'right' && oY === 'top') {
-            return [5, -names[1].split('\\').length * LINE_HEIGHT[oY] - 4];
+            return [5, -names[1].split('\n').length * LINE_HEIGHT[oY] - 4];
         } else if (oX === 'left' && oY === 'bottom') {
-            return [-5, names[0].split('\\').length * LINE_HEIGHT[oY] + 4];
+            return [-5, names[0].split('\n').length * LINE_HEIGHT[oY] + 4];
         } else if (oX === 'middle' && oY === 'bottom') {
-            return [0, names[0].split('\\').length * LINE_HEIGHT[oY] + 7];
+            return [0, names[0].split('\n').length * LINE_HEIGHT[oY] + 7];
         } else if (oX === 'right' && oY === 'bottom') {
-            return [5, names[0].split('\\').length * LINE_HEIGHT[oY] + 4];
+            return [5, names[0].split('\n').length * LINE_HEIGHT[oY] + 4];
         } else if (oX === 'left' && oY === 'middle') {
             return [-8, 0];
         } else if (oX === 'right' && oY === 'middle') {
@@ -90,15 +90,15 @@ const BjsubwayIntStation = (props: StationComponentProps) => {
             </g>
             <g transform={`translate(${x + textX}, ${y + textY})`} textAnchor={textAnchor}>
                 <MultilineText
-                    text={names[0].split('\\')}
+                    text={names[0].split('\n')}
                     fontSize={LINE_HEIGHT.zh}
                     lineHeight={LINE_HEIGHT.zh}
                     grow="up"
                     className="rmp-name__zh"
                     baseOffset={1}
                 />
                 <MultilineText
-                    text={names[1].split('\\')}
+                    text={names[1].split('\n')}
                     fontSize={LINE_HEIGHT.en}
                     lineHeight={LINE_HEIGHT.en}
                     grow="down"
@@ -130,27 +130,25 @@ const bjsubwayIntStationFields = [
     {
         type: 'textarea',
         label: 'panel.details.stations.common.nameZh',
-        value: (attrs?: BjsubwayIntStationAttributes) =>
-            (attrs ?? defaultBjsubwayIntStationAttributes).names[0].replaceAll('\\', '\n'),
+        value: (attrs?: BjsubwayIntStationAttributes) => (attrs ?? defaultBjsubwayIntStationAttributes).names[0],
         onChange: (val: string | number, attrs_: BjsubwayIntStationAttributes | undefined) => {
             // set default value if switched from another type
             const attrs = attrs_ ?? defaultBjsubwayIntStationAttributes;
             // set value
-            attrs.names[0] = val.toString().replaceAll('\n', '\\');
+            attrs.names[0] = val.toString();
             // return modified attrs
             return attrs;
         },
     },
     {
         type: 'textarea',
         label: 'panel.details.stations.common.nameEn',
-        value: (attrs?: BjsubwayIntStationAttributes) =>
-            (attrs ?? defaultBjsubwayIntStationAttributes).names[1].replaceAll('\\', '\n'),
+        value: (attrs?: BjsubwayIntStationAttributes) => (attrs ?? defaultBjsubwayIntStationAttributes).names[1],
         onChange: (val: string | number, attrs_: BjsubwayIntStationAttributes | undefined) => {
             // set default value if switched from another type
             const attrs = attrs_ ?? defaultBjsubwayIntStationAttributes;
             // set value
-            attrs.names[1] = val.toString().replaceAll('\n', '\\');
+            attrs.names[1] = val.toString();
             // return modified attrs
             return attrs;
         },

diff --git a/src/components/svgs/stations/foshan-metro-basic.tsx b/src/components/svgs/stations/foshan-metro-basic.tsx
@@ -124,14 +124,14 @@ const FoshanMetroBasicStation = (props: StationComponentProps) => {
             </g>
             <g ref={textRef} transform={`translate(${textX}, ${textY})`} textAnchor={textAnchor}>
                 <MultilineText
-                    text={names[0].split('\\')}
+                    text={names[0].split('\n')}
                     fontSize={FONT_SIZE.zh}
                     lineHeight={FONT_SIZE.zh}
                     grow="up"
                     className="rmp-name__zh"
                 />
                 <MultilineText
-                    text={names[1].split('\\')}
+                    text={names[1].split('\n')}
                     fontSize={FONT_SIZE.en}
                     lineHeight={FONT_SIZE.en}
                     grow="down"
@@ -221,19 +221,19 @@ const foshanMetroBasicStationAttrsComponents = (props: AttrsProps<FoshanMetroBas
         {
             type: 'textarea',
             label: t('panel.details.stations.common.nameZh'),
-            value: attrs.names[0].replaceAll('\\', '\n'),
+            value: attrs.names[0],
             onChange: val => {
-                attrs.names[0] = val.replaceAll('\n', '\\');
+                attrs.names[0] = val;
                 handleAttrsUpdate(id, attrs);
             },
             minW: 'full',
         },
         {
             type: 'textarea',
             label: t('panel.details.stations.common.nameEn'),
-            value: attrs.names[1].replaceAll('\\', '\n'),
+            value: attrs.names[1],
             onChange: val => {
-                attrs.names[1] = val.replaceAll('\n', '\\');
+                attrs.names[1] = val;
                 handleAttrsUpdate(id, attrs);
             },
             minW: 'full',

diff --git a/src/components/svgs/stations/guangdong-intercity-railway.tsx b/src/components/svgs/stations/guangdong-intercity-railway.tsx
@@ -38,7 +38,7 @@ const GuangdongIntercityRailwayStation = (props: StationComponentProps) => {
 
     const textX = nameOffsetX === 'left' ? -13.33 : nameOffsetX === 'right' ? 13.33 : 0;
     const textY =
-        (names[NAME_DY[nameOffsetY].namesPos].split('\\').length * NAME_DY_SH_BASIC[nameOffsetY].lineHeight +
+        (names[NAME_DY[nameOffsetY].namesPos].split('\n').length * NAME_DY_SH_BASIC[nameOffsetY].lineHeight +
             NAME_DY_SH_BASIC[nameOffsetY].offset) *
         NAME_DY[nameOffsetY].polarity;
     const textAnchor = nameOffsetX === 'left' ? 'end' : nameOffsetX === 'right' ? 'start' : 'middle';
@@ -66,15 +66,15 @@ const GuangdongIntercityRailwayStation = (props: StationComponentProps) => {
                     strokeWidth="1"
                 >
                     <MultilineText
-                        text={names[0].split('\\')}
+                        text={names[0].split('\n')}
                         fontSize={13.13}
                         lineHeight={13.13}
                         grow="up"
                         baseOffset={1}
                         className="rmp-name__zh"
                     />
                     <MultilineText
-                        text={names[1].split('\\')}
+                        text={names[1].split('\n')}
                         dx={nameOffsetX === 'right' ? 1.67 : 0}
                         fontSize={5.83}
                         lineHeight={5.83}

diff --git a/src/components/svgs/stations/gzmtr-basic.tsx b/src/components/svgs/stations/gzmtr-basic.tsx
@@ -127,14 +127,14 @@ const GzmtrBasicStation = (props: StationComponentProps) => {
             </g>
             <g ref={textRef} transform={`translate(${textX}, ${textY})`} textAnchor={textAnchor}>
                 <MultilineText
-                    text={names[0].split('\\')}
+                    text={names[0].split('\n')}
                     fontSize={FONT_SIZE.zh}
                     lineHeight={FONT_SIZE.zh}
                     grow="up"
                     className="rmp-name__zh"
                 />
                 <MultilineText
-                    text={names[1].split('\\')}
+                    text={names[1].split('\n')}
                     fontSize={FONT_SIZE.en}
                     lineHeight={FONT_SIZE.en}
                     grow="down"
@@ -224,19 +224,19 @@ const gzmtrBasicStationAttrsComponents = (props: AttrsProps<GzmtrBasicStationAtt
         {
             type: 'textarea',
             label: t('panel.details.stations.common.nameZh'),
-            value: attrs.names[0].replaceAll('\\', '\n'),
+            value: attrs.names[0],
             onChange: val => {
-                attrs.names[0] = val.replaceAll('\n', '\\');
+                attrs.names[0] = val;
                 handleAttrsUpdate(id, attrs);
             },
             minW: 'full',
         },
         {
             type: 'textarea',
             label: t('panel.details.stations.common.nameEn'),
-            value: attrs.names[1].replaceAll('\\', '\n'),
+            value: attrs.names[1],
             onChange: val => {
-                attrs.names[1] = val.replaceAll('\n', '\\');
+                attrs.names[1] = val;
                 handleAttrsUpdate(id, attrs);
             },
             minW: 'full',

diff --git a/src/components/svgs/stations/gzmtr-int.tsx b/src/components/svgs/stations/gzmtr-int.tsx
@@ -314,14 +314,14 @@ const GzmtrIntStation = (props: StationComponentProps) => {
 
             <g ref={textRef} transform={`translate(${textX}, ${textY})`} textAnchor={textAnchor}>
                 <MultilineText
-                    text={names[0].split('\\')}
+                    text={names[0].split('\n')}
                     fontSize={FONT_SIZE.zh}
                     lineHeight={FONT_SIZE.zh}
                     grow="up"
                     className="rmp-name__zh"
                 />
                 <MultilineText
-                    text={names[1].split('\\')}
+                    text={names[1].split('\n')}
                     fontSize={FONT_SIZE.en}
                     lineHeight={FONT_SIZE.en}
                     grow="down"
@@ -404,19 +404,19 @@ const gzmtrIntStationAttrsComponents = (props: AttrsProps<GzmtrIntStationAttribu
         {
             type: 'textarea',
             label: t('panel.details.stations.common.nameZh'),
-            value: attrs.names[0].replaceAll('\\', '\n'),
+            value: attrs.names[0],
             onChange: val => {
-                attrs.names[0] = val.replaceAll('\n', '\\');
+                attrs.names[0] = val;
                 handleAttrsUpdate(id, attrs);
             },
             minW: 'full',
         },
         {
             type: 'textarea',
             label: t('panel.details.stations.common.nameEn'),
-            value: attrs.names[1].replaceAll('\\', '\n'),
+            value: attrs.names[1],
             onChange: val => {
-                attrs.names[1] = val.replaceAll('\n', '\\');
+                attrs.names[1] = val;
                 handleAttrsUpdate(id, attrs);
             },
             minW: 'full',