#871 Tune stations of Guangzhou Metro (#873)

railmapgen · Nov 15, 2024 · e35dee6 · e35dee6
1 parent 60a6a29
commit e35dee6
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 22 deletions.
diff --git a/src/components/page-header/about-modal.tsx b/src/components/page-header/about-modal.tsx
@@ -131,6 +131,22 @@ const AboutModal = (props: { isOpen: boolean; onClose: () => void }) => {
                                 </Text>
                             </TagLabel>
                         </Tag>
+                        <Tag
+                            size="lg"
+                            w="85%"
+                            onClick={() => window.open('https://github.com/Minwtraft', '_blank')}
+                            cursor="pointer"
+                        >
+                            <Avatar src="https://github.com/Minwtraft.png" size="lg" my={2} ml={-1} mr={2} />
+                            <TagLabel display="block" width="100%">
+                                <Text fontSize="lg" fontWeight="bold" mb={1}>
+                                    Minwtraft
+                                </Text>
+                                <Text fontSize="sm" mb={1}>
+                                    {t('header.about.Minwtraft')}
+                                </Text>
+                            </TagLabel>
+                        </Tag>
                     </VStack>
 
                     <Heading as="h5" size="sm" mt={3} mb={2}>

diff --git a/src/components/svgs/stations/gzmtr-basic.tsx b/src/components/svgs/stations/gzmtr-basic.tsx
@@ -81,9 +81,9 @@ const GzmtrBasicStation = (props: StationComponentProps) => {
               (nameOffsetX === 'left' ? -1 : nameOffsetX === 'right' ? 1 : 0);
 
     return (
-        <g id={id} transform={`translate(${x}, ${y})scale(${tram ? 0.5 : 1})`}>
+        <g id={id} transform={`translate(${x}, ${y})`}>
             <g
-                transform="scale(0.6)"
+                transform={`scale(${0.57915 * (tram ? 0.729 : 1)})`}
                 onPointerDown={onPointerDown}
                 onPointerMove={onPointerMove}
                 onPointerUp={onPointerUp}
@@ -101,23 +101,23 @@ const GzmtrBasicStation = (props: StationComponentProps) => {
             <g ref={textRef} transform={`translate(${textX}, ${textY})`} textAnchor={textAnchor}>
                 <MultilineText
                     text={names[0].split('\\')}
-                    fontSize={16}
-                    lineHeight={16}
+                    fontSize={tram ? 7.29 : 13.13}
+                    lineHeight={tram ? 7.29 : 13.13}
                     grow="up"
                     className="rmp-name__zh"
                 />
                 <MultilineText
                     text={names[1].split('\\')}
-                    fontSize={10}
-                    lineHeight={10}
+                    fontSize={tram ? 5.08 : 6.56}
+                    lineHeight={tram ? 5.08 : 6.56}
                     grow="down"
                     className="rmp-name__en"
                 />
             </g>
             {secondaryNames.join('') !== '' && (
                 <g transform={`translate(${textX + secondaryDx}, ${textY})`} textAnchor="middle">
                     <text
-                        fontSize="20"
+                        fontSize="13.13"
                         dx={-(secondaryTextWidth + 5) / 2}
                         textAnchor="end"
                         dominantBaseline="middle"
@@ -126,7 +126,7 @@ const GzmtrBasicStation = (props: StationComponentProps) => {
                         （
                     </text>
                     <text
-                        fontSize="20"
+                        fontSize="13.13"
                         dx={(secondaryTextWidth + 5) / 2}
                         textAnchor="start"
                         dominantBaseline="middle"
@@ -135,10 +135,10 @@ const GzmtrBasicStation = (props: StationComponentProps) => {
                         ）
                     </text>
                     <g ref={secondaryTextRef}>
-                        <text fontSize="14" dy="-2" dominantBaseline="auto" className="rmp-name__zh">
+                        <text fontSize="10" dy="-2" dominantBaseline="auto" className="rmp-name__zh">
                             {secondaryNames[0]}
                         </text>
-                        <text fontSize="8" dy="2" dominantBaseline="hanging" className="rmp-name__en">
+                        <text fontSize="5.42" dy="2" dominantBaseline="hanging" className="rmp-name__en">
                             {secondaryNames[1]}
                         </text>
                     </g>
@@ -149,10 +149,10 @@ const GzmtrBasicStation = (props: StationComponentProps) => {
                     transform={`translate(${textX + underConstructionDx}, ${textY})`}
                     textAnchor={nameOffsetX === 'middle' ? 'start' : textAnchor}
                 >
-                    <text fontSize="8" dy="-2" dominantBaseline="auto" className="rmp-name__zh">
+                    <text fontSize="6.04" dy="-2" dominantBaseline="auto" className="rmp-name__zh">
                         （未开通）
                     </text>
-                    <text fontSize="6" dy="4" dominantBaseline="hanging" className="rmp-name__en">
+                    <text fontSize="3.6" dy="4" dominantBaseline="hanging" className="rmp-name__en">
                         (Under Construction)
                     </text>
                 </g>

diff --git a/src/components/svgs/stations/gzmtr-int-2024.tsx b/src/components/svgs/stations/gzmtr-int-2024.tsx
@@ -114,23 +114,23 @@ const GzmtrInt2024Station = (props: StationComponentProps) => {
             <g ref={textRef} transform={`translate(${textX}, ${textY})`} textAnchor={textAnchor}>
                 <MultilineText
                     text={names[0].split('\n')}
-                    fontSize={16}
-                    lineHeight={16}
+                    fontSize={13.13}
+                    lineHeight={13.13}
                     grow="up"
                     className="rmp-name__zh"
                 />
                 <MultilineText
                     text={names[1].split('\n')}
-                    fontSize={10}
-                    lineHeight={10}
+                    fontSize={6.56}
+                    lineHeight={6.56}
                     grow="down"
                     className="rmp-name__en"
                 />
             </g>
             {secondaryNames.join('') !== '' && (
                 <g transform={`translate(${textX + secondaryDx}, ${textY})`} textAnchor="middle">
                     <text
-                        fontSize="20"
+                        fontSize="13.13"
                         dx={-(secondaryTextWidth + 5) / 2}
                         textAnchor="end"
                         dominantBaseline="middle"
@@ -139,7 +139,7 @@ const GzmtrInt2024Station = (props: StationComponentProps) => {
                         （
                     </text>
                     <text
-                        fontSize="20"
+                        fontSize="13.13"
                         dx={(secondaryTextWidth + 5) / 2}
                         textAnchor="start"
                         dominantBaseline="middle"
@@ -148,21 +148,21 @@ const GzmtrInt2024Station = (props: StationComponentProps) => {
                         ）
                     </text>
                     <g ref={secondaryTextRef}>
-                        <text fontSize="14" dy="-2" dominantBaseline="auto" className="rmp-name__zh">
+                        <text fontSize="10" dy="-2" dominantBaseline="auto" className="rmp-name__zh">
                             {secondaryNames[0]}
                         </text>
-                        <text fontSize="8" dy="2" dominantBaseline="hanging" className="rmp-name__en">
+                        <text fontSize="5.42" dy="2" dominantBaseline="hanging" className="rmp-name__en">
                             {secondaryNames[1]}
                         </text>
                     </g>
                 </g>
             )}
             {!open && (
                 <g transform={`translate(${textX + underConstructionDx}, ${textY})`} textAnchor={textAnchor}>
-                    <text fontSize="8" dy="-2" dominantBaseline="auto" className="rmp-name__zh">
+                    <text fontSize="6.04" dy="-2" dominantBaseline="auto" className="rmp-name__zh">
                         （未开通）
                     </text>
-                    <text fontSize="6" dy="4" dominantBaseline="hanging" className="rmp-name__en">
+                    <text fontSize="3.6" dy="4" dominantBaseline="hanging" className="rmp-name__en">
                         (Under Construction)
                     </text>
                 </g>

diff --git a/src/i18n/translations/en.json b/src/i18n/translations/en.json
@@ -660,6 +660,7 @@
             "langonginc": "Live a life you will remember.",
             "203IhzElttil": "Special thanks for his diligent work in ensuring that the stations of Shanghai Metro match the original design.",
             "Swiftiecott": "Special thanks for his diligent work in ensuring that the stations of Beijing Subway match the original design.",
+            "Minwtraft": "Special thanks for his diligent work in ensuring that the stations of Guangzhou Metro match the original design.",
             "contactUs": "Contact Us",
             "github": "Project repository",
             "githubContent": "Face any problems? Search or raise an issue here!",

diff --git a/src/i18n/translations/ja.json b/src/i18n/translations/ja.json
@@ -659,6 +659,7 @@
             "styleContributors": "風格の貢献者",
             "203IhzElttil": "上海地下鉄の駅がオリジナルの設計と一致するように、彼の勤勉な仕事に特別な感謝を述べます。",
             "Swiftiecott": "北京地下鉄の駅がオリジナルの設計と一致するように、彼の勤勉な仕事に特別な感謝を述べます。",
+            "Minwtraft": "広州地下鉄の駅がオリジナルの設計と一致するように、彼の勤勉な仕事に特別な感謝を述べます。",
             "contactUs": "お問い合わせ",
             "github": "プロジェクトリポジトリ",
             "githubContent": "問題が発生しましたか？こちらで検索したり、問題を報告したりしてください！",

diff --git a/src/i18n/translations/ko.json b/src/i18n/translations/ko.json
@@ -659,6 +659,7 @@
             "langonginc": "기억에 남을 삶을 살아보세요.",
             "203IhzElttil": "상하이 지하철의 역들이 원래 디자인과 일치하도록 확실한 작업을 해준 그에게 특별한 감사의 말씀을 전합니다.",
             "Swiftiecott": "베이징 지하철의 역들이 원래 디자인과 일치하도록 확실한 작업을 해준 그에게 특별한 감사의 말씀을 전합니다.",
+            "Minwtraft": "광저우 지하철의 역들이 원래 디자인과 일치하도록 확실한 작업을 해준 그에게 특별한 감사의 말씀을 전합니다.",
             "contactUs": "우리에게 연락하기",
             "github": "프로젝트 저장소",
             "githubContent": "무슨 문제라도 있나요? 여기서 문제를 검색하거나 제기하십시오!",

diff --git a/src/i18n/translations/zh-Hans.json b/src/i18n/translations/zh-Hans.json
@@ -659,6 +659,7 @@
             "langonginc": "活出值得铭记的人生。",
             "203IhzElttil": "特别感谢他勤勉工作，确保上海地铁站与原始设计相符。",
             "Swiftiecott": "特别感谢他勤勉工作，确保北京地铁站与原始设计相符。",
+            "Minwtraft": "特别感谢他勤勉工作，确保广州地铁站与原始设计相符。",
             "contactUs": "联系我们",
             "github": "项目仓库",
             "githubContent": "遇到任何问题？在这里搜索或提出一个问题！",

diff --git a/src/i18n/translations/zh-Hant.json b/src/i18n/translations/zh-Hant.json
@@ -659,6 +659,7 @@
             "langonginc": "活出值得銘記的人生。",
             "203IhzElttil": "特別感謝他勤奮工作，確保上海地鐵站與原始設計相符。",
             "Swiftiecott": "特別感謝他勤奮工作，確保北京地鐵站與原始設計相符。",
+            "Minwtraft": "特別感謝他勤奮工作，確保廣州地鐵站與原始設計相符。",
             "contactUs": "聯繫我們",
             "github": "項目倉庫",
             "githubContent": "遇到任何問題？在這裡搜索或提出一個問題！",