refactor: rename gtfs import to remoteGtfs to avoid conflict with internal package

Author: 0xaboomar

internal/geo/geo_cluster.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/golang/geo/s2"
-	"github.com/jamespfennell/gtfs"
+	remoteGtfs "github.com/jamespfennell/gtfs"
 )
 
 const s2Level = 13 // S2 cell level with 850–1225 m spatial resolution
@@ -65,7 +65,7 @@ func s2ClusterID(lat, lon float64, level int) string {
 //   - Invalid: grandparent exists but is not a Station, or coordinates are missing for fallback - data is malformed.
 //
 // Returns false if hierarchy rules are violated or required parent/coordinate data is missing.
-func getClusterID(stop gtfs.Stop) (clusterID string, clusterType string, ok bool) {
+func getClusterID(stop remoteGtfs.Stop) (clusterID string, clusterType string, ok bool) {
 	switch stop.Type {
 	case 0: // Stop or Platform
 		if stop.Parent != nil {

internal/gtfs/gtfs_bundles.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/getsentry/sentry-go"
-	"github.com/jamespfennell/gtfs"
+	remoteGtfs "github.com/jamespfennell/gtfs"
 	"watchdog.onebusaway.org/internal/geo"
 	"watchdog.onebusaway.org/internal/models"
 	"watchdog.onebusaway.org/internal/report"
@@ -157,7 +157,7 @@ func downloadAndStoreGTFSBundle(url string, serverID int, staticStore *StaticSto
 		return err
 	}
 
-	staticBundle, err := gtfs.ParseStatic(data, gtfs.ParseStaticOptions{})
+	staticBundle, err := remoteGtfs.ParseStatic(data, remoteGtfs.ParseStaticOptions{})
 	if err != nil {
 		err = fmt.Errorf("failed to parse GTFS static data from %s: %w", url, err)
 		report.ReportErrorWithSentryOptions(err, report.SentryReportOptions{
@@ -180,7 +180,7 @@ func downloadAndStoreGTFSBundle(url string, serverID int, staticStore *StaticSto
 
 // ParseGTFSFromCache reads a GTFS bundle from the cache and parses it into a gtfs.Static object.
 // It returns the parsed static data or an error if parsing fails.
-func ParseGTFSFromCache(cachePath string, serverID int) (*gtfs.Static, error) {
+func ParseGTFSFromCache(cachePath string, serverID int) (*remoteGtfs.Static, error) {
 	fileBytes, err := os.ReadFile(cachePath)
 	if err != nil {
 		report.ReportErrorWithSentryOptions(err, report.SentryReportOptions{
@@ -192,7 +192,7 @@ func ParseGTFSFromCache(cachePath string, serverID int) (*gtfs.Static, error) {
 		return nil, err
 	}
 
-	staticData, err := gtfs.ParseStatic(fileBytes, gtfs.ParseStaticOptions{})
+	staticData, err := remoteGtfs.ParseStatic(fileBytes, remoteGtfs.ParseStaticOptions{})
 	if err != nil {
 		report.ReportErrorWithSentryOptions(err, report.SentryReportOptions{
 			Tags: utils.MakeMap("server_id", strconv.Itoa(serverID)),
@@ -209,7 +209,7 @@ func ParseGTFSFromCache(cachePath string, serverID int) (*gtfs.Static, error) {
 // getStopLocationsByIDs retrieves stop locations by their IDs from the GTFS cache.
 // It returns a map of stop IDs to gtfs.Stop objects.
 
-func getStopLocationsByIDs(serverID int, stopIDs []string, staticStore *StaticStore) (map[string]gtfs.Stop, error) {
+func getStopLocationsByIDs(serverID int, stopIDs []string, staticStore *StaticStore) (map[string]remoteGtfs.Stop, error) {
 	staticData, ok := staticStore.Get(serverID)
 	if !ok || staticData == nil {
 		err := fmt.Errorf("no GTFS static data found for server ID %d", serverID)
@@ -224,7 +224,7 @@ func getStopLocationsByIDs(serverID int, stopIDs []string, staticStore *StaticSt
 		stopIDSet[id] = struct{}{}
 	}
 
-	result := make(map[string]gtfs.Stop)
+	result := make(map[string]remoteGtfs.Stop)
 	for _, stop := range staticData.Stops {
 		if _, exists := stopIDSet[stop.Id]; exists {
 			result[stop.Id] = stop
@@ -283,7 +283,7 @@ func fetchAndStoreGTFSRTFeed(server models.ObaServer, realtimeStore *RealtimeSto
 		return err
 	}
 
-	gtfsRT, err := gtfs.ParseRealtime(data, &gtfs.ParseRealtimeOptions{})
+	gtfsRT, err := remoteGtfs.ParseRealtime(data, &remoteGtfs.ParseRealtimeOptions{})
 	if err != nil {
 		report.ReportError(err)
 		return err

internal/gtfs/gtfs_bundles_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jamespfennell/gtfs"
+	remoteGtfs "github.com/jamespfennell/gtfs"
 	"watchdog.onebusaway.org/internal/geo"
 	"watchdog.onebusaway.org/internal/models"
 )
@@ -54,7 +54,7 @@ func TestDownloadAndStoreGTFSBundle(t *testing.T) {
 		}
 
 		data := readFixture(t, "gtfs.zip")
-		expectedStaticData, err := gtfs.ParseStatic(data, gtfs.ParseStaticOptions{})
+		expectedStaticData, err := remoteGtfs.ParseStatic(data, remoteGtfs.ParseStaticOptions{})
 		if err != nil {
 			t.Fatalf("failed to parse expected GTFS static data from fixture: %v", err)
 		}
@@ -117,7 +117,7 @@ func TestGetStopLocationsByIDs(t *testing.T) {
 	server := models.ObaServer{ID: 1, Name: "test"}
 
 	data := readFixture(t, "gtfs.zip")
-	staticBundle, err := gtfs.ParseStatic(data, gtfs.ParseStaticOptions{})
+	staticBundle, err := remoteGtfs.ParseStatic(data, remoteGtfs.ParseStaticOptions{})
 	if err != nil {
 		t.Fatal("failed to parse gtfs static data")
 	}
@@ -215,7 +215,7 @@ func TestFetchAndStoreGTFSRTFeed(t *testing.T) {
 		}
 
 		data := readFixture(t, "gtfs_rt_feed_vehicles.pb")
-		gtfsRT, err := gtfs.ParseRealtime(data, &gtfs.ParseRealtimeOptions{})
+		gtfsRT, err := remoteGtfs.ParseRealtime(data, &remoteGtfs.ParseRealtimeOptions{})
 		if err != nil {
 			t.Fatalf("Failed to parse GTFS-RT data: %v", err)
 		}

internal/metrics/stop_clusters.go

@@ -1,7 +1,7 @@
 package metrics
 
 import (
-	"github.com/jamespfennell/gtfs"
+	remoteGtfs "github.com/jamespfennell/gtfs"
 	"watchdog.onebusaway.org/internal/geo"
 )
 
@@ -19,7 +19,7 @@ import (
 // - slugID: a unique identifier for the server or deployment instance
 // - agencyID: the GTFS agency identifier
 // - unmatchedStops: a map of stop IDs to GTFS stop objects not matched to gtfs static data
-func reportUnmatchedStopClusters(slugID, agencyID string, unmatchedStops map[string]gtfs.Stop) {
+func reportUnmatchedStopClusters(slugID, agencyID string, unmatchedStops map[string]remoteGtfs.Stop) {
 	clusterCount := make(map[string]int)
 	clusterType := make(map[string]string) // station or s2