Skip to content

master<-dev #1188

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 4 commits into from
Feb 17, 2025
Merged

master<-dev #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d19a2f
都庁前同一グループ化
TinyKitten Feb 14, 2025
28db403
Merge pull request #1187 from TrainLCD/data/tochomae-station
TinyKitten Feb 14, 2025
f631858
全ての種別が停車しない駅を路線リストに入れない&駅検索パフォチュー
TinyKitten Feb 16, 2025
e0129d6
Merge pull request #1189 from TrainLCD/fix/exclude-from-rapid-line
TinyKitten Feb 16, 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
4 changes: 2 additions & 2 deletions ...d7f08f7f033349592a4f4c5519042a6b651e.json → ...7de49b3c7564ce1935aa3d8f16feb48a59d9.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...1b27cebeed832df25f3ecf345497b505e36e.json → ...1cc7faf9b87eca1900dbc72289fbe236da7f.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...d6ff5df3189d34abdad178c3a596deca0c4b.json → ...251c2e9ff69770be5efc23d1ac478e831207.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion data/3!stations.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7810,7 +7810,7 @@ station_cd,station_g_cd,station_name,station_name_k,station_name_r,station_name_
9930126,9930126,国立競技場,コクリツキョウギジョウ,Kokuritsu-kyogijo,国立竞技场,고쿠리쓰쿄지조,25,,,,99301,13,160-0013,東京都新宿区霞ケ丘町１０-３,139.714932,35.679831,0000-00-00,0000-00-00,0,9930126
9930127,1130207,代々木,ヨヨギ,Yoyogi,代代木,요요기,26,,,,99301,13,151-0053,東京都渋谷区代々木一丁目35-5,139.701666,35.683218,0000-00-00,0000-00-00,0,9930127
9930128,1130208,新宿,シンジュク,Shinjuku,新宿,신주쿠,27,,,,99301,13,151-0053,東京都渋谷区代々木二丁目1-1,139.698812,35.68869,0000-00-00,0000-00-00,0,9930128
9930101,9930101,都庁前,トチョウマエ,Tochomae,都厅前,도초마에,28,,,,99301,13,160-0023,東京都新宿区西新宿２-８-１,139.69257,35.690551,0000-00-00,0000-00-00,0,9930129
9930101,9930100,都庁前,トチョウマエ,Tochomae,都厅前,도초마에,28,,,,99301,13,160-0023,東京都新宿区西新宿２-８-１,139.69257,35.690551,0000-00-00,0000-00-00,0,9930129
9930129,9930129,西新宿五丁目,ニシシンジュクゴチョウメ,Nishi-shinjuku-gochome,西新宿五丁目,니시신주쿠고초메,29,,,,99301,13,160-0023,東京都新宿区西新宿５-２５-９,139.684304,35.689798,0000-00-00,0000-00-00,0,9930129
9930130,2800220,中野坂上,ナカノサカウエ,Nakano-sakaue,中野坂上,나카노사카우에,30,,,,99301,13,164-0011,東京都中野区中央２-１-２,139.682279,35.69709,0000-00-00,0000-00-00,0,9930130
9930131,1131213,東中野,ヒガシナカノ,Higashi-nakano,东中野,히가시나카노,31,,,,99301,13,164-0003,東京都中野区東中野４丁目,139.682987,35.706891,0000-00-00,0000-00-00,0,9930131
Expand Down
9 changes: 5 additions & 4 deletions stationapi/src/infrastructure/line_repository.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ impl InternalLineRepository {
COALESCE(a.line_color_c, l.line_color_c) AS line_color_c
FROM `lines` AS l
JOIN `stations` AS s ON s.station_cd = ?
JOIN `station_station_types` AS sst ON sst.station_cd = s.station_cd
JOIN `station_station_types` AS sst ON sst.station_cd = s.station_cd AND sst.pass <> 1
LEFT JOIN `line_aliases` AS la ON la.station_cd = s.station_cd
LEFT JOIN `aliases` AS a ON la.alias_cd = a.id
WHERE l.line_cd = s.line_cd",
Expand Down Expand Up @@ -310,6 +310,7 @@ impl InternalLineRepository {
LEFT JOIN `aliases` AS a ON la.alias_cd = a.id
WHERE l.line_cd = s.line_cd
AND l.e_status = 0
AND IF(sst.line_group_cd IS NOT NULL, sst.pass <> 1, 1)
GROUP BY s.station_cd",
params
);
Expand Down Expand Up @@ -357,7 +358,7 @@ impl InternalLineRepository {
COALESCE(a.line_name_ko, l.line_name_ko) AS line_name_ko,
COALESCE(a.line_color_c, l.line_color_c) AS line_color_c
FROM `lines` AS l
JOIN `station_station_types` AS sst ON sst.line_group_cd = ?
JOIN `station_station_types` AS sst ON sst.line_group_cd = ? AND sst.pass <> 1
JOIN `stations` AS s ON s.station_cd = sst.station_cd
AND s.e_status = 0
LEFT JOIN `line_aliases` AS la ON la.station_cd = s.station_cd
Expand Down Expand Up @@ -396,7 +397,7 @@ impl InternalLineRepository {
s.station_cd,
s.station_g_cd
FROM `lines` AS l
JOIN `station_station_types` AS sst ON sst.line_group_cd IN ( {} )
JOIN `station_station_types` AS sst ON sst.line_group_cd IN ( {} ) AND sst.pass <> 1
JOIN `stations` AS s ON s.station_cd = sst.station_cd AND s.e_status = 0
LEFT JOIN `line_aliases` AS la ON la.station_cd = s.station_cd
LEFT JOIN `aliases` AS a ON la.alias_cd = a.id
Expand Down Expand Up @@ -440,7 +441,7 @@ impl InternalLineRepository {
s.station_cd,
s.station_g_cd
FROM `lines` AS l
JOIN `station_station_types` AS sst ON sst.line_group_cd IN ( {} )
JOIN `station_station_types` AS sst ON sst.line_group_cd IN ( {} ) AND sst.pass <> 1
JOIN `stations` AS s ON s.station_cd = sst.station_cd AND s.e_status = 0 AND s.line_cd = l.line_cd
LEFT JOIN `line_aliases` AS la ON la.station_cd = s.station_cd
LEFT JOIN `aliases` AS a ON la.alias_cd = a.id
Expand Down
Loading
Loading