From 378c07981a9eeb4aab260907f30e51fefcf7958e Mon Sep 17 00:00:00 2001 From: minchao Date: Wed, 30 Sep 2020 08:46:06 +0800 Subject: [PATCH] Remove workaround #27 --- oas.bus.v2.json | 12 ++++----- oas.rail.v2.json | 60 ++++++++++++++++++++++----------------------- oas.tourism.v2.json | 32 ++++++++++++------------ spec/main.go | 25 ------------------- 4 files changed, 52 insertions(+), 77 deletions(-) diff --git a/oas.bus.v2.json b/oas.bus.v2.json index 1a910227..5794d7e8 100644 --- a/oas.bus.v2.json +++ b/oas.bus.v2.json @@ -2243,7 +2243,6 @@ "Taipei" ], "x-enum": { - "Taichung": "臺中市", "Taoyuan": "桃園市", "TaitungCounty": "臺東縣", "LienchiangCounty": "連江縣", @@ -2264,7 +2263,8 @@ "HualienCounty": "花蓮縣", "ChiayiCounty": "嘉義縣", "Chiayi": "嘉義市", - "Tainan": "臺南市" + "Tainan": "臺南市", + "Taichung": "臺中市" } }, { @@ -3668,7 +3668,6 @@ "KinmenCounty" ], "x-enum": { - "Kaohsiung": "高雄市", "YunlinCounty": "雲林縣", "TaitungCounty": "臺東縣", "PenghuCounty": "澎湖縣", @@ -3689,7 +3688,8 @@ "ChiayiCounty": "嘉義縣", "PingtungCounty": "屏東縣", "Hsinchu": "新竹市", - "ChanghuaCounty": "彰化縣" + "ChanghuaCounty": "彰化縣", + "Kaohsiung": "高雄市" } }, { @@ -3800,7 +3800,6 @@ "KinmenCounty" ], "x-enum": { - "Kaohsiung": "高雄市", "YunlinCounty": "雲林縣", "TaitungCounty": "臺東縣", "PenghuCounty": "澎湖縣", @@ -3821,7 +3820,8 @@ "ChiayiCounty": "嘉義縣", "PingtungCounty": "屏東縣", "Hsinchu": "新竹市", - "ChanghuaCounty": "彰化縣" + "ChanghuaCounty": "彰化縣", + "Kaohsiung": "高雄市" } }, { diff --git a/oas.rail.v2.json b/oas.rail.v2.json index f25256ab..aba0ff7d 100644 --- a/oas.rail.v2.json +++ b/oas.rail.v2.json @@ -106,10 +106,10 @@ "TRTCMG" ], "x-enum": { + "TRTC": "臺北捷運", "TRTCMG": "貓空纜車", "KRTC": "高雄捷運", - "TYMC": "桃園捷運", - "TRTC": "臺北捷運" + "TYMC": "桃園捷運" } }, { @@ -197,12 +197,12 @@ "TRTCMG" ], "x-enum": { + "TYMC": "桃園捷運", + "KLRT": "高雄輕軌", "TRTCMG": "貓空纜車", "TRTC": "臺北捷運", "NTDLRT": "淡海輕軌", - "KRTC": "高雄捷運", - "TYMC": "桃園捷運", - "KLRT": "高雄輕軌" + "KRTC": "高雄捷運" } }, { @@ -290,12 +290,12 @@ "TRTCMG" ], "x-enum": { - "TRTC": "臺北捷運", "KLRT": "高雄輕軌", + "KRTC": "高雄捷運", + "TRTC": "臺北捷運", "NTDLRT": "淡海輕軌", "TYMC": "桃園捷運", - "TRTCMG": "貓空纜車", - "KRTC": "高雄捷運" + "TRTCMG": "貓空纜車" } }, { @@ -389,9 +389,9 @@ "TRTCMG" ], "x-enum": { + "KLRT": "高雄輕軌", "TRTC": "臺北捷運", "KRTC": "高雄捷運", - "KLRT": "高雄輕軌", "TYMC": "桃園捷運", "NTDLRT": "淡海輕軌", "TRTCMG": "貓空纜車" @@ -563,8 +563,8 @@ "TYMC" ], "x-enum": { - "TRTC": "臺北捷運", "KRTC": "高雄捷運", + "TRTC": "臺北捷運", "TYMC": "桃園捷運" } }, @@ -651,9 +651,9 @@ "TRTCMG" ], "x-enum": { + "TRTC": "臺北捷運", "KLRT": "高雄輕軌", "TYMC": "桃園捷運", - "TRTC": "臺北捷運", "KRTC": "高雄捷運", "TRTCMG": "貓空纜車" } @@ -747,10 +747,10 @@ "NTDLRT" ], "x-enum": { + "KRTC": "高雄捷運", "NTDLRT": "淡海輕軌", "TRTC": "臺北捷運", - "TYMC": "桃園捷運", - "KRTC": "高雄捷運" + "TYMC": "桃園捷運" } }, { @@ -836,10 +836,10 @@ "NTDLRT" ], "x-enum": { - "KRTC": "高雄捷運", - "TYMC": "桃園捷運", "TRTC": "臺北捷運", - "NTDLRT": "淡海輕軌" + "NTDLRT": "淡海輕軌", + "KRTC": "高雄捷運", + "TYMC": "桃園捷運" } }, { @@ -926,9 +926,9 @@ ], "x-enum": { "KRTC": "高雄捷運", + "KLRT": "高雄輕軌", "TYMC": "桃園捷運", - "TRTC": "臺北捷運", - "KLRT": "高雄輕軌" + "TRTC": "臺北捷運" } }, { @@ -1100,10 +1100,10 @@ "KLRT" ], "x-enum": { - "TRTC": "臺北捷運", - "KLRT": "高雄輕軌", "KRTC": "高雄捷運", - "TYMC": "桃園捷運" + "TYMC": "桃園捷運", + "TRTC": "臺北捷運", + "KLRT": "高雄輕軌" } }, { @@ -1192,11 +1192,11 @@ ], "x-enum": { "TYMC": "桃園捷運", - "TRTCMG": "貓空纜車", - "KRTC": "高雄捷運", - "NTDLRT": "淡海輕軌", "KLRT": "高雄輕軌", - "TRTC": "臺北捷運" + "KRTC": "高雄捷運", + "TRTC": "臺北捷運", + "TRTCMG": "貓空纜車", + "NTDLRT": "淡海輕軌" } }, { @@ -1452,8 +1452,8 @@ "enum": [ "TRTC", "KRTC", - "NTDLRT", - "TYMC" + "TYMC", + "NTDLRT" ], "x-enum": { "KRTC": "高雄捷運", @@ -3482,7 +3482,7 @@ ], "summary": "**(開發用測試版)** 取得指定[日期]對號座即時剩餘位資料(加值型列車起迄段OD角度)", "description": "取得指定[日期]對號座即時剩餘位資料(加值型列車起迄段OD角度)\r\n- 當日(D)之更新頻率為每10分鐘\r\n- 當日後27日(D+1~D+27)之更新頻率為每日的10、16、22時\r\n- **(本服務尚在測試中,穩定度及更新頻率將持續優化)**", - "operationId": "THSRApi_AvailableSeatStatus_2", + "operationId": "THSRApi_AvailableSeatStatus_OD", "produces": [ "application/json", "application/xml" @@ -3565,7 +3565,7 @@ ], "summary": "**(開發用測試版)** 取得指定[日期], [起迄站]對號座即時剩餘位資料(加值型列車起迄段OD角度)", "description": "取得指定[日期], [起迄站]對號座即時剩餘位資料(加值型列車起迄段OD角度)\r\n- 當日(D)之更新頻率為每10分鐘\r\n- 當日後27日(D+1~D+27)之更新頻率為每日的10、16、22時\r\n- **(本服務尚在測試中,穩定度及更新頻率將持續優化)**", - "operationId": "THSRApi_AvailableSeatStatus_3", + "operationId": "THSRApi_AvailableSeatStatus_OD_1", "produces": [ "application/json", "application/xml" @@ -3662,7 +3662,7 @@ ], "summary": "**(開發用測試版)** 取得指定[日期], [車次], [起迄站]對號座即時剩餘位資料(加值型列車起迄段OD角度)", "description": "取得指定[日期], [起迄站]對號座即時剩餘位資料(加值型列車起迄段OD角度)\r\n- 當日(D)之更新頻率為每10分鐘\r\n- 當日後27日(D+1~D+27)之更新頻率為每日的10、16、22時\r\n- **(本服務尚在測試中,穩定度及更新頻率將持續優化)**", - "operationId": "THSRApi_AvailableSeatStatus_4", + "operationId": "THSRApi_AvailableSeatStatus_OD_2", "produces": [ "application/json", "application/xml" diff --git a/oas.tourism.v2.json b/oas.tourism.v2.json index 668a7e77..9514f01d 100644 --- a/oas.tourism.v2.json +++ b/oas.tourism.v2.json @@ -130,6 +130,12 @@ "LienchiangCounty" ], "x-enum": { + "Taoyuan": "桃園市", + "Keelung": "基隆市", + "ChiayiCounty": "嘉義縣", + "TaitungCounty": "臺東縣", + "Taipei": "臺北市", + "Chiayi": "嘉義市", "LienchiangCounty": "連江縣", "HsinchuCounty": "新竹縣", "KinmenCounty": "金門縣", @@ -138,20 +144,14 @@ "NantouCounty": "南投縣", "Taichung": "臺中市", "YilanCounty": "宜蘭縣", - "Taoyuan": "桃園市", "NewTaipei": "新北市", - "Keelung": "基隆市", - "Chiayi": "嘉義市", "Kaohsiung": "高雄市", "HualienCounty": "花蓮縣", "PingtungCounty": "屏東縣", "ChanghuaCounty": "彰化縣", "YunlinCounty": "雲林縣", "Hsinchu": "新竹市", - "PenghuCounty": "澎湖縣", - "ChiayiCounty": "嘉義縣", - "TaitungCounty": "臺東縣", - "Taipei": "臺北市" + "PenghuCounty": "澎湖縣" } }, { @@ -337,6 +337,9 @@ "LienchiangCounty" ], "x-enum": { + "Taoyuan": "桃園市", + "ChanghuaCounty": "彰化縣", + "HualienCounty": "花蓮縣", "TaitungCounty": "臺東縣", "NewTaipei": "新北市", "Taipei": "臺北市", @@ -344,8 +347,6 @@ "PenghuCounty": "澎湖縣", "PingtungCounty": "屏東縣", "Taichung": "臺中市", - "Taoyuan": "桃園市", - "HualienCounty": "花蓮縣", "YilanCounty": "宜蘭縣", "Chiayi": "嘉義市", "Tainan": "臺南市", @@ -357,7 +358,6 @@ "NantouCounty": "南投縣", "ChiayiCounty": "嘉義縣", "KinmenCounty": "金門縣", - "ChanghuaCounty": "彰化縣", "YunlinCounty": "雲林縣" } }, @@ -544,6 +544,8 @@ "LienchiangCounty" ], "x-enum": { + "NantouCounty": "南投縣", + "Taoyuan": "桃園市", "KinmenCounty": "金門縣", "Hsinchu": "新竹市", "PingtungCounty": "屏東縣", @@ -552,7 +554,6 @@ "Tainan": "臺南市", "YilanCounty": "宜蘭縣", "HualienCounty": "花蓮縣", - "NantouCounty": "南投縣", "Chiayi": "嘉義市", "Keelung": "基隆市", "Taipei": "臺北市", @@ -564,8 +565,7 @@ "Taichung": "臺中市", "YunlinCounty": "雲林縣", "ChanghuaCounty": "彰化縣", - "TaitungCounty": "臺東縣", - "Taoyuan": "桃園市" + "TaitungCounty": "臺東縣" } }, { @@ -751,6 +751,8 @@ "LienchiangCounty" ], "x-enum": { + "NantouCounty": "南投縣", + "Taoyuan": "桃園市", "KinmenCounty": "金門縣", "Hsinchu": "新竹市", "PingtungCounty": "屏東縣", @@ -759,7 +761,6 @@ "Tainan": "臺南市", "YilanCounty": "宜蘭縣", "HualienCounty": "花蓮縣", - "NantouCounty": "南投縣", "Chiayi": "嘉義市", "Keelung": "基隆市", "Taipei": "臺北市", @@ -771,8 +772,7 @@ "Taichung": "臺中市", "YunlinCounty": "雲林縣", "ChanghuaCounty": "彰化縣", - "TaitungCounty": "臺東縣", - "Taoyuan": "桃園市" + "TaitungCounty": "臺東縣" } }, { diff --git a/spec/main.go b/spec/main.go index ffdef2aa..ce4435de 100644 --- a/spec/main.go +++ b/spec/main.go @@ -29,9 +29,6 @@ func main() { { Filename: "oas.rail.v2.json", URL: "https://ptx.transportdata.tw/MOTC/v2/Rail/api-docs/oas", - Pipeline: []Step{ - fixNotDefinedProperty, - }, }, { Filename: "oas.rail.v3.json", @@ -48,9 +45,6 @@ func main() { { Filename: "oas.ship.v3.json", URL: "https://ptx.transportdata.tw/MOTC/v3/Ship/api-docs/oas", - Pipeline: []Step{ - fixProperty, - }, }, } { fmt.Printf("Generate %s\n", oas.Filename) @@ -94,22 +88,3 @@ func writeFile(filename string, data []byte) { _ = enc.Encode(v) _ = ioutil.WriteFile(filename, bf.Bytes(), 0644) } - -func fixProperty(data []byte) []byte { - return bytes.Replace(data, []byte(`"description": "資料版本編號", - "type": "integer" - }, - "Items": {`), []byte(`"description": "資料版本編號", - "type": "integer" - }, - "Ports": {`), -1) -} - -// see https://github.com/minchao/go-ptx/issues/27 -func fixNotDefinedProperty(data []byte) []byte { - return bytes.Replace(data, - []byte(`"EndingStationName","StopStations","SrcUpdateTime","UpdateTime"`), - []byte(`"EndingStationName","StopStations"`), - 1, - ) -}