Use GTFS bus feed #111

Katsute · 2023-01-02T18:05:08Z

Prerequisites

Issues must meet the following criteria:

No similar pull request exists.
Code follows the general code style of this project.
No sensitive information is exposed.
Relevant comments have been added.

GitHub Copilot Disclaimer

The use of GitHub Copilot is strictly prohibited on this repository.

This pull does not use GitHub Copilot.

Changes Made

List any changes made and/or other relevant issues.

Add GTFS bus feed
Store token headers inside service provider
Optimize map usage
Remove redundant attribute classes
Remove redundant GTFS classes
Remove redundant reference classes
Optimize feed entity
Optimize alert feed entity
Remove json + unused regex count
Add missing variables
Rename similar methods

WF-3864033213

Bottom 🔽

Release Notes

🛑 This major update includes breaking changes 🛑

This update drops the SIRI bus API in favor of the GTFS bus API. This update is most likely not compatible with previous versions of the bus API; all other modes should still be compatible with this update.

Removed Json and JsonSyntaxException
Removed RailroadStop
Removed RailroadTripStop
Replaced merged GTFS types into transit types
Optimizations to request headers
Optimizations to token usage
Optimizations to vehicle feeds
Optimizations to vehicle requests
Optimizations to alert requests

Attributes

Inlined several attributes and removed respective interfaces:

Removed Bearing
Condensed RouteReference, StopReference, TripReference, and VehiclesReference into a single Reference class
Removed RouteDescription
Removed RouteShortName

Alerts

Added created time
Added updated time
Removed alert effect
Added alert type

Bus

Dropped SIRI API in favor of GTFS API.

Stop

Removed origin stop
Removed destination
Removed progress rate
Removed progress status
Removed aimed arrival time
Removed expected departure time

Vehicle

Added passenger count
Removed arrival proximity
Removed stop distance

Trip

Added stop sequence
Added delay

Subway

Vehicle

Added assigned indicator
Added rerouted indicator
Added skip stop indicator
Added turn train indicator
Added stop sequence

Long Island Railroad (LIRR)

Trip

Added trip stop sequence
Added trip stop schedule relationship

Metro North Railroad (MNR)

Vehicle

Added status

src/main/java/dev/katsute/onemta/MTAImpl.java

src/main/java/dev/katsute/onemta/MTASchema_Bus.java

Katsute · 2023-01-03T22:40:51Z

https://laidig.github.io/gtfs-rt-autodoc/structNyctTripDescriptor.html

src/main/java/dev/katsute/onemta/MTASchema_LIRR.java

            private final String stopCode = row.get(csv.getHeaderIndex("stop_code"));
            private final String stopName = row.get(csv.getHeaderIndex("stop_name"));
            private final String stopDesc = row.get(csv.getHeaderIndex("stop_desc"));

-            private final Double stopLat  = Double.valueOf(row.get(csv.getHeaderIndex("stop_lat")));
-            private final Double stopLon  = Double.valueOf(row.get(csv.getHeaderIndex("stop_lon")));
+            private final Double stopLat = Double.valueOf(row.get(csv.getHeaderIndex("stop_lat")));


src/main/java/dev/katsute/onemta/MTASchema_LIRR.java

-            private final Double stopLat  = Double.valueOf(row.get(csv.getHeaderIndex("stop_lat")));
-            private final Double stopLon  = Double.valueOf(row.get(csv.getHeaderIndex("stop_lon")));
+            private final Double stopLat = Double.valueOf(row.get(csv.getHeaderIndex("stop_lat")));
+            private final Double stopLon = Double.valueOf(row.get(csv.getHeaderIndex("stop_lon")));


src/main/java/dev/katsute/onemta/MTASchema_MNR.java

            private final String stopCode = row.get(csv.getHeaderIndex("stop_code"));
            private final String stopName = row.get(csv.getHeaderIndex("stop_name"));
            private final String stopDesc = row.get(csv.getHeaderIndex("stop_desc"));

-            private final Double stopLat  = Double.valueOf(row.get(csv.getHeaderIndex("stop_lat")));
-            private final Double stopLon  = Double.valueOf(row.get(csv.getHeaderIndex("stop_lon")));
+            private final Double stopLat = Double.valueOf(row.get(csv.getHeaderIndex("stop_lat")));


src/main/java/dev/katsute/onemta/MTASchema_MNR.java

-            private final Double stopLat  = Double.valueOf(row.get(csv.getHeaderIndex("stop_lat")));
-            private final Double stopLon  = Double.valueOf(row.get(csv.getHeaderIndex("stop_lon")));
+            private final Double stopLat = Double.valueOf(row.get(csv.getHeaderIndex("stop_lat")));
+            private final Double stopLon = Double.valueOf(row.get(csv.getHeaderIndex("stop_lon")));


src/main/java/dev/katsute/onemta/MTASchema_MNR.java


-            private String status   = requireNonNull(() -> vehicle.getCurrentStatus().name());
+            private Integer stopID = requireNonNull(() -> Integer.valueOf(vehicle.hasStopId() ? vehicle.getStopId() : tripUpdate.getStopTimeUpdate(0).getStopId()));


ghost

@Katsute I have approved this pull request

Update pom.xml

0bb534b

Katsute added breaking change mta-bus Bus related issues and features labels Jan 2, 2023

Katsute self-assigned this Jan 2, 2023

This was linked to issues Jan 2, 2023

Use all bus data #84

Closed

Use GTFS bus feeds #100

Closed

Katsute added 4 commits January 2, 2023 13:19

add oba proto

fcaeea8

add gtfs feeds

75737b0

store token inside service provider, optimize empty maps

86eadf6

Update Regex9.java

0e6ba63

Katsute added this to the 2.0.0 milestone Jan 2, 2023

Katsute added 8 commits January 2, 2023 14:20

Update Regex9.java

826bd50

(c) 2023

358008a

bus wip

d9ff4af

move small interfaces

1c3d532

remove redundancies

c720555

condense reference redundancy

2ed3b39

bus

32c97ac

fix compile failure

c388c7c

github-advanced-security bot found potential problems Jan 3, 2023

View reviewed changes

Update MTASchema_Bus.java

1d75980

github-advanced-security bot found potential problems Jan 3, 2023

View reviewed changes

src/main/java/dev/katsute/onemta/MTASchema_Bus.java Fixed Show fixed Hide fixed

Katsute added 4 commits January 3, 2023 12:14

fix imports

c816035

optimize feed entity

b98382d

optimize alert feed

3fa9dd4

remove json

ea5a936

use bus id, add missing fields

bbf9eb8

Katsute added mta-subway Subway related issues and features mta-mnr Metro North Railroad related issues and features labels Jan 3, 2023

lint

602a93e

github-advanced-security bot found potential problems Jan 5, 2023

View reviewed changes

Katsute added 8 commits January 5, 2023 17:27

nullity, lint

660d30b

alert tests

56d598f

update route tests

51d2f7f

update stop tests

72214a0

prepare vehicle, trip tests

edfd476

add vehicle tests except ID & same

4730216

add reference tests

0d5e400

add id reference, lint

a16adad

Katsute marked this pull request as ready for review January 7, 2023 02:27

Katsute added 3 commits January 6, 2023 21:58

test fixes, bug fixes

3ddc17f

bus bug fixes

45e327b

metro north bug fixes

c7d2d01

github-advanced-security bot found potential problems Jan 7, 2023

View reviewed changes

long island railroad bug fixes

91a18e1

This comment has been minimized.

Sign in to view

Katsute added 3 commits January 7, 2023 13:27

mkdir

52e2cf6

fix failing tests

fa160d7

lint

9813056

This comment has been minimized.

Sign in to view

ghost approved these changes Jan 7, 2023

View reviewed changes

Katsute merged commit 2a14b21 into main Jan 8, 2023

Katsute deleted the gtfs-bus@c8dcb77 branch January 8, 2023 19:10

ghost locked and limited conversation to collaborators Jan 8, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use GTFS bus feed #111

Use GTFS bus feed #111

Katsute commented Jan 2, 2023 •

edited

Loading

Katsute commented Jan 3, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ghost left a comment


		private String status = requireNonNull(() -> vehicle.getCurrentStatus().name());
		private Integer stopID = requireNonNull(() -> Integer.valueOf(vehicle.hasStopId() ? vehicle.getStopId() : tripUpdate.getStopTimeUpdate(0).getStopId()));

Use GTFS bus feed #111

Use GTFS bus feed #111

Conversation

Katsute commented Jan 2, 2023 • edited Loading

Prerequisites

GitHub Copilot Disclaimer

Changes Made

Release Notes

🛑 This major update includes breaking changes 🛑

Attributes

Alerts

Bus

Stop

Vehicle

Trip

Subway

Vehicle

Long Island Railroad (LIRR)

Trip

Metro North Railroad (MNR)

Vehicle

Katsute commented Jan 3, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ghost left a comment

Choose a reason for hiding this comment

Katsute commented Jan 2, 2023 •

edited

Loading