Skip to content

master<-dev #1342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TinyKitten merged 7 commits into from
Dec 6, 2025
Merged

master<-dev #1342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e3cd11
JR山陽本線ナンバリングカラー拡充
TinyKitten Dec 6, 2025
f3ce47c
Merge pull request #1339 from TrainLCD/data/sanyo-line
TinyKitten Dec 6, 2025
a193a84
不要な設定をcompose.ymlから削除
TinyKitten Dec 6, 2025
df7ea50
Merge pull request #1340 from TrainLCD/fix/compose
TinyKitten Dec 6, 2025
42b53c5
山陽本線 岡山〜姫路間ナンバリング修正
TinyKitten Dec 6, 2025
784cab1
山陽本線ラインカラー統一
TinyKitten Dec 6, 2025
50ef8d5
Merge pull request #1341 from TrainLCD/data/sanyo-line
TinyKitten Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ services:
HOST: 0.0.0.0
ports:
- 50051:50051
networks:
- sapi-link
restart: always

psql:
Expand All @@ -25,13 +23,6 @@ services:
POSTGRES_USER: stationapi
POSTGRES_PASSWORD: stationapi
POSTGRES_DB: stationapi
ports:
- 5432:5432
networks:
- sapi-link
restart: always
volumes:
- ./docker/postgres:/docker-entrypoint-initdb.d:ro

networks:
sapi-link:
- ./docker/postgres:/docker-entrypoint-initdb.d:ro
6 changes: 3 additions & 3 deletions data/2!lines.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ line_cd,company_cd,line_name,line_name_k,line_name_h,line_name_r,line_name_rn,li
11605,4,湖西線,コセイセン,湖西線,Kosei Line,Kosei Line,湖西线,고세이선,#576290,2,B,,,,#00ACD1,,,,REVERSED_SQUARE_WEST,,,,0,11605,3661.34487
11607,4,大和路線,ヤマトジセン,関西本線(加茂～ＪＲ難波),Yamatoji Line,Yamatoji Line,大和路线,야마토지선,#009933,2,Q,,,,#009933,,,,REVERSED_SQUARE_WEST,,,,0,11607,2418.324393
11608,4,JR神戸線,ジェーアールコウベセン,山陽本線(神戸～姫路),Kobe Line,Kobe Line,神户线,고베선,#0072BC,2,A,,,,#0072BC,,,,REVERSED_SQUARE_WEST,,,,0,11608,2466.633838
11609,4,山陽本線,サンヨウホンセン,山陽本線(姫路～岡山),San’yo Main Line,San’yo Main Line,山阳本线,산요 본선,#009966,2,S,,,,,,,,REVERSED_SQUARE_WEST,,,,0,11609,4545.316831
11610,4,山陽本線,サンヨウホンセン,山陽本線(岡山～三原),San’yo Main Line,San’yo Main Line,山阳本线,산요 본선,#009966,2,W,X,,,,,,,REVERSED_SQUARE_WEST,REVERSED_SQUARE_WEST,,,0,11610,4441.158781
11611,4,山陽本線,サンヨウホンセン,山陽本線(三原～岩国),San’yo Main Line,San’yo Main Line,山阳本线,산요 본선,#0072BC,2,G,R,,,,,,,REVERSED_SQUARE_WEST,REVERSED_SQUARE_WEST,,,0,11611,3436.124416
11609,4,山陽本線,サンヨウホンセン,山陽本線(姫路～岡山),San’yo Main Line,San’yo Main Line,山阳本线,산요 본선,#0072BC,2,S,A,,,#C1D612,#0072BC,,,REVERSED_SQUARE_WEST,,,,0,11609,4545.316831
11610,4,山陽本線,サンヨウホンセン,山陽本線(岡山～三原),San’yo Main Line,San’yo Main Line,山阳本线,산요 본선,#0072BC,2,W,X,,,#F5A200,#00A0E9,,,REVERSED_SQUARE_WEST,REVERSED_SQUARE_WEST,,,0,11610,4441.158781
11611,4,山陽本線,サンヨウホンセン,山陽本線(三原～岩国),San’yo Main Line,San’yo Main Line,山阳本线,산요 본선,#0072BC,2,G,R,,,#60AD3B,#CB342E,,,REVERSED_SQUARE_WEST,REVERSED_SQUARE_WEST,,,0,11611,3436.124416
11612,4,山陽本線,サンヨウホンセン,山陽本線(岩国～門司),San'yo Main Line,San'yo Main Line,山阳本线,산요 본선,#0072BC,2,JA,,,,#E24148,,,,HALF_SQUARE,,,,0,11612,4708.430629
11613,4,山陽本線,サンヨウホンセン,山陽本線(兵庫～和田岬),San’yo Main Line,San’yo Main Line,山阳本线,산요 본선,#0072BC,2,,,,,,,,,,,,,0,11613,1508.282986
11614,4,嵯峨野線,サガノセン,山陰本線(京都～園部),Sagano Line,Sagano Line,嵯峨野线,사가노선,#9370DB,2,E,,,,#9370DB,,,,REVERSED_SQUARE_WEST,,,,0,11614,2166.719095
Expand Down
42 changes: 21 additions & 21 deletions data/3!stations.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3298,7 +3298,7 @@ station_cd,station_g_cd,station_name,station_name_k,station_name_r,station_name_
1160820,1160820,御着,ゴチャク,Gochaku,Gochaku,御着,고차쿠,83,,,,,11608,28,671-0232,兵庫県姫路市御国野町御着,134.735486,34.816944,0000-00-00,0000-00-00,0,1160820
1160823,1160823,東姫路,ヒガシヒメジ,Higashi-Himeji,Higashi-Himeji,东姬路,히가시히메지,84,,,,,11608,28,670-0943,兵庫県姫路市市之郷字高田1046-26,134.712472,34.824361,2016-03-26,0000-00-00,0,1160820
1160821,1160821,姫路,ヒメジ,Himeji,Himeji,姬路,히메지,85,,,,,11608,28,670-0927,兵庫県姫路市駅前町御殿前,134.690769,34.827659,0000-00-00,0000-00-00,0,1160821
1160901,1160821,姫路,ヒメジ,Himeji,Himeji,姬路,히메지,,,,,,11609,28,670-0927,兵庫県姫路市駅前町御殿前,134.690769,34.827659,0000-00-00,0000-00-00,0,1160901
1160901,1160821,姫路,ヒメジ,Himeji,Himeji,姬路,히메지,,85,,,,11609,28,670-0927,兵庫県姫路市駅前町御殿前,134.690769,34.827659,0000-00-00,0000-00-00,0,1160901
1160902,1160902,英賀保,アガホ,Agaho,Agaho,英贺保,아가호,,,,,,11609,28,672-8097,兵庫県姫路市飾磨区山崎,134.644762,34.813235,0000-00-00,0000-00-00,0,1160902
1160918,1160918,はりま勝原,ハリマカツハラ,Harima-Katsuhara,Harima-Katsuhara,播磨胜原,하리마카쓰하라,,,,,,11609,28,671-1211,兵庫県姫路市勝原区熊見,134.614105,34.810157,0000-00-00,0000-00-00,0,1160902
1160903,1160903,網干,アボシ,Aboshi,Aboshi,网干,아보시,,,,,,11609,28,671-1227,兵庫県姫路市網干区和久,134.584035,34.814096,0000-00-00,0000-00-00,0,1160903
Expand All @@ -3317,26 +3317,26 @@ station_cd,station_g_cd,station_name,station_name_k,station_name_r,station_name_
1160916,1160916,高島,タカシマ,Takashima,Takashima,高岛,다카시마,,,,,,11609,33,703-8243,岡山県岡山市中区清水二丁目589,133.95774,34.683074,0000-00-00,0000-00-00,0,1160916
1160919,1160919,西川原,ニシガワラ,Nishigawara,Nishigawara,西川原,니시가와라,,,,,,11609,33,703-8258,岡山県岡山市中区西川原一丁目203-17,133.936555,34.678,0000-00-00,0000-00-00,0,1160916
1160917,1160917,岡山,オカヤマ,Okayama,Okayama,冈山,오카야마,,,,,,11609,33,700-0024,岡山県岡山市北区駅元町1番1号,133.918552,34.666572,0000-00-00,0000-00-00,0,1160917
1161001,1160917,岡山,オカヤマ,Okayama,Okayama,冈山,오카야마,,,,,,11610,33,700-0024,岡山県岡山市北区駅元町1番1号,133.918552,34.666572,0000-00-00,0000-00-00,0,1161001
1161002,1161002,北長瀬,キタナガセ,Kita-Nagase,Kita-Nagase,北长濑,기타나가세,,,,,,11610,33,700-0963,岡山県岡山市北区北長瀬表町二丁目17-85,133.885325,34.652995,0000-00-00,0000-00-00,0,1161002
1161003,1161003,庭瀬,ニワセ,Niwase,Niwase,庭濑,니와세,,,,,,11610,33,701-0151,岡山県岡山市北区平野319-1,133.854454,34.642858,0000-00-00,0000-00-00,0,1161003
1161004,1161004,中庄,ナカショウ,Nakashō,Nakasho,中庄,나카쇼,,,,,,11610,33,710-0012,岡山県倉敷市鳥羽,133.808225,34.626493,0000-00-00,0000-00-00,0,1161004
1161005,1161005,倉敷,クラシキ,Kurashiki,Kurashiki,仓敷,구라시키,,,,,,11610,33,710-0055,岡山県倉敷市阿知１丁目,133.765473,34.601567,0000-00-00,0000-00-00,0,1161005
1161006,1161006,西阿知,ニシアチ,Nishiachi,Nishiachi,西阿知,니시아치,,,,,,11610,33,710-0807,岡山県倉敷市西阿知町,133.727876,34.58578,0000-00-00,0000-00-00,0,1161006
1161007,1161007,新倉敷,シンクラシキ,Shin-Kurashiki,Shin-Kurashiki,新仓敷,신쿠라시키,,,,,,11610,33,710-0252,岡山県倉敷市玉島爪崎,133.678344,34.56509,0000-00-00,0000-00-00,0,1161007
1161008,1161008,金光,コンコウ,Konkō,Konko,金光,곤코,,,,,,11610,33,719-0104,岡山県浅口市金光町占見新田,133.620826,34.540909,0000-00-00,0000-00-00,0,1161008
1161009,1161009,鴨方,カモガタ,Kamogata,Kamogata,鸭方,가모가타,,,,,,11610,33,719-0252,岡山県浅口市鴨方町六条院中,133.587705,34.5273,0000-00-00,0000-00-00,0,1161009
1161010,1161010,里庄,サトショウ,Satoshō,Satosho,里庄,사토쇼,,,,,,11610,33,719-0302,岡山県浅口郡里庄町大字新庄,133.550763,34.507905,0000-00-00,0000-00-00,0,1161010
1161011,1161011,笠岡,カサオカ,Kasaoka,Kasaoka,笠冈,가사오카,,,,,,11610,33,714-0081,岡山県笠岡市笠岡,133.504705,34.504913,0000-00-00,0000-00-00,0,1161011
1161012,1161012,大門,ダイモン,Daimon,Daimon,大门,다이몬,,,,,,11610,34,721-0921,広島県福山市大門町大門,133.43995,34.498462,0000-00-00,0000-00-00,0,1161012
1161013,1161013,東福山,ヒガシフクヤマ,Higashi-Fukuyama,Higashi-Fukuyama,东福山,히가시후쿠야마,,,,,,11610,34,721-0942,広島県福山市引野町５丁目,133.40539,34.494949,0000-00-00,0000-00-00,0,1161013
1161014,1161014,福山,フクヤマ,Fukuyama,Fukuyama,福山,후쿠야마,,,,,,11610,34,720-0066,広島県福山市三之丸町,133.361429,34.489291,0000-00-00,0000-00-00,0,1161014
1161015,1161015,備後赤坂,ビンゴアカサカ,Bingo-Akasaka,Bingo-Akasaka,备后赤坂,빈고아카사카,,,,,,11610,34,720-0843,広島県福山市赤坂町大字赤坂,133.305417,34.472108,0000-00-00,0000-00-00,0,1161015
1161016,1161016,松永,マツナガ,Matsunaga,Matsunaga,松永,마쓰나가,,,,,,11610,34,729-0104,広島県福山市松永町,133.258532,34.450958,0000-00-00,0000-00-00,0,1161016
1161017,1161017,東尾道,ヒガシオノミチ,Higashi-Onomichi,Higashi-Onomichi,东尾道,히가시오노미치,,,,,,11610,34,729-0141,広島県尾道市高須町字東新涯,133.233168,34.434937,0000-00-00,0000-00-00,0,1161017
1161018,1161018,尾道,オノミチ,Onomichi,Onomichi,尾道,오노미치,,,,,,11610,34,722-0036,広島県尾道市東御所町,133.192884,34.404826,0000-00-00,0000-00-00,0,1161018
1161019,1161019,糸崎,イトザキ,Itozaki,Itozaki,糸崎,이토자키,17,,,,,11610,34,729-0324,広島県三原市糸崎町,133.104317,34.392429,0000-00-00,0000-00-00,0,1161019
1161020,1161020,三原,ミハラ,Mihara,Mihara,三原,미하라,16,,,,,11610,34,723-0014,広島県三原市城町,133.083049,34.400486,0000-00-00,0000-00-00,0,1161020
1161001,1160917,岡山,オカヤマ,Okayama,Okayama,冈山,오카야마,01,,,,,11610,33,700-0024,岡山県岡山市北区駅元町1番1号,133.918552,34.666572,0000-00-00,0000-00-00,0,1161001
1161002,1161002,北長瀬,キタナガセ,Kita-Nagase,Kita-Nagase,北长濑,기타나가세,02,,,,,11610,33,700-0963,岡山県岡山市北区北長瀬表町二丁目17-85,133.885325,34.652995,0000-00-00,0000-00-00,0,1161002
1161003,1161003,庭瀬,ニワセ,Niwase,Niwase,庭濑,니와세,03,,,,,11610,33,701-0151,岡山県岡山市北区平野319-1,133.854454,34.642858,0000-00-00,0000-00-00,0,1161003
1161004,1161004,中庄,ナカショウ,Nakashō,Nakasho,中庄,나카쇼,04,,,,,11610,33,710-0012,岡山県倉敷市鳥羽,133.808225,34.626493,0000-00-00,0000-00-00,0,1161004
1161005,1161005,倉敷,クラシキ,Kurashiki,Kurashiki,仓敷,구라시키,05,,,,,11610,33,710-0055,岡山県倉敷市阿知１丁目,133.765473,34.601567,0000-00-00,0000-00-00,0,1161005
1161006,1161006,西阿知,ニシアチ,Nishiachi,Nishiachi,西阿知,니시아치,06,,,,,11610,33,710-0807,岡山県倉敷市西阿知町,133.727876,34.58578,0000-00-00,0000-00-00,0,1161006
1161007,1161007,新倉敷,シンクラシキ,Shin-Kurashiki,Shin-Kurashiki,新仓敷,신쿠라시키,07,,,,,11610,33,710-0252,岡山県倉敷市玉島爪崎,133.678344,34.56509,0000-00-00,0000-00-00,0,1161007
1161008,1161008,金光,コンコウ,Konkō,Konko,金光,곤코,08,,,,,11610,33,719-0104,岡山県浅口市金光町占見新田,133.620826,34.540909,0000-00-00,0000-00-00,0,1161008
1161009,1161009,鴨方,カモガタ,Kamogata,Kamogata,鸭方,가모가타,09,,,,,11610,33,719-0252,岡山県浅口市鴨方町六条院中,133.587705,34.5273,0000-00-00,0000-00-00,0,1161009
1161010,1161010,里庄,サトショウ,Satoshō,Satosho,里庄,사토쇼,10,,,,,11610,33,719-0302,岡山県浅口郡里庄町大字新庄,133.550763,34.507905,0000-00-00,0000-00-00,0,1161010
1161011,1161011,笠岡,カサオカ,Kasaoka,Kasaoka,笠冈,가사오카,11,,,,,11610,33,714-0081,岡山県笠岡市笠岡,133.504705,34.504913,0000-00-00,0000-00-00,0,1161011
1161012,1161012,大門,ダイモン,Daimon,Daimon,大门,다이몬,12,,,,,11610,34,721-0921,広島県福山市大門町大門,133.43995,34.498462,0000-00-00,0000-00-00,0,1161012
1161013,1161013,東福山,ヒガシフクヤマ,Higashi-Fukuyama,Higashi-Fukuyama,东福山,히가시후쿠야마,13,,,,,11610,34,721-0942,広島県福山市引野町５丁目,133.40539,34.494949,0000-00-00,0000-00-00,0,1161013
1161014,1161014,福山,フクヤマ,Fukuyama,Fukuyama,福山,후쿠야마,14,14,,,,11610,34,720-0066,広島県福山市三之丸町,133.361429,34.489291,0000-00-00,0000-00-00,0,1161014
1161015,1161015,備後赤坂,ビンゴアカサカ,Bingo-Akasaka,Bingo-Akasaka,备后赤坂,빈고아카사카,,15,,,,11610,34,720-0843,広島県福山市赤坂町大字赤坂,133.305417,34.472108,0000-00-00,0000-00-00,0,1161015
1161016,1161016,松永,マツナガ,Matsunaga,Matsunaga,松永,마쓰나가,,16,,,,11610,34,729-0104,広島県福山市松永町,133.258532,34.450958,0000-00-00,0000-00-00,0,1161016
1161017,1161017,東尾道,ヒガシオノミチ,Higashi-Onomichi,Higashi-Onomichi,东尾道,히가시오노미치,,17,,,,11610,34,729-0141,広島県尾道市高須町字東新涯,133.233168,34.434937,0000-00-00,0000-00-00,0,1161017
1161018,1161018,尾道,オノミチ,Onomichi,Onomichi,尾道,오노미치,,18,,,,11610,34,722-0036,広島県尾道市東御所町,133.192884,34.404826,0000-00-00,0000-00-00,0,1161018
1161019,1161019,糸崎,イトザキ,Itozaki,Itozaki,糸崎,이토자키,,19,,,,11610,34,729-0324,広島県三原市糸崎町,133.104317,34.392429,0000-00-00,0000-00-00,0,1161019
1161020,1161020,三原,ミハラ,Mihara,Mihara,三原,미하라,,20,,,,11610,34,723-0014,広島県三原市城町,133.083049,34.400486,0000-00-00,0000-00-00,0,1161020
1161101,1161020,三原,ミハラ,Mihara,Mihara,三原,미하라,16,,,,,11611,34,723-0014,広島県三原市城町,133.083049,34.400486,0000-00-00,0000-00-00,0,1161101
1161102,1161102,本郷,ホンゴウ,Hongō,Hongo,本乡,혼고,15,,,,,11611,34,729-0412,広島県三原市本郷町本郷,132.987358,34.409617,0000-00-00,0000-00-00,0,1161102
1161103,1161103,河内,コウチ,Kōchi,Kochi,河内,고치,14,,,,,11611,34,739-2201,広島県東広島市河内町中河内,132.890113,34.469248,0000-00-00,0000-00-00,0,1161103
Expand Down