Merge pull request #130 from OneBusAway/trip-nav

Trip Navigation, Linting, and Other Niceties

Author: aaronbrethorst

.github/workflows/test.yaml

@@ -12,8 +12,21 @@ on:
 # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
 
 jobs:
+  lint:
+    runs-on: macos-15
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install SwiftLint
+      run: brew install swiftlint
+
+    - name: Run SwiftLint
+      run: swiftlint --strict
+
   build:
     runs-on: macos-15
+    needs: lint
 
     steps:
     - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -0,0 +1,19 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: local
+    hooks:
+      - id: swiftlint
+        name: SwiftLint
+        entry: bash -c 'swiftlint lint --strict --force-exclude --quiet'
+        language: system
+        pass_filenames: false
+        always_run: true
+        stages: [pre-push]
+      - id: xcode-tests
+        name: Run Xcode Tests
+        entry: bash -c 'xcodebuild test -project OTPKitDemo.xcodeproj -scheme OTPKitDemo -destination "platform=iOS Simulator,name=iPhone 17 Pro" -quiet'
+        language: system
+        pass_filenames: false
+        always_run: true
+        stages: [pre-push]

.swiftlint.yml

@@ -1,6 +1,10 @@
 disabled_rules:
+  - function_parameter_count
   - identifier_name
+  - line_length
+  - multiple_closures_with_trailing_closure
   - todo
 
 excluded:
   - OTPKit/.build
+  - .build

CLAUDE.md

@@ -56,6 +56,26 @@ swiftlint --fix
 brew install swiftlint
 ```
 
+#### Pre-commit Hooks
+The project uses [pre-commit](https://pre-commit.com) to automatically run SwiftLint and tests before pushing to GitHub.
+
+```bash
+# Install pre-commit (first time setup)
+brew install pre-commit
+
+# Install the git hook scripts for pre-push
+pre-commit install --hook-type pre-push
+
+# (Optional) Run against all files manually
+pre-commit run --all-files
+```
+
+Once installed, the following checks will run automatically before each push:
+1. **SwiftLint** - Code style and best practices validation
+2. **Xcode Tests** - Full test suite must pass
+
+If either linting or tests fail, the push will be blocked until issues are fixed.
+
 ## Architecture
 
 ### Package Dependencies

OTPKit/.swiftlint.yml

@@ -12,10 +12,10 @@ public enum LocationMode {
 
 enum Sheet: Identifiable, Hashable {
     case locationOptions(LocationMode)
-    case directions
+    case directions(Trip)
     case search(LocationMode)
     case advancedOptions
-    case preview(Itinerary, Location?, Location?)
+    case preview(Trip)
 
     var id: Int {
         var hasher = Hasher()

OTPKit/Sources/OTPKit/Core/Enums.swift

@@ -176,6 +176,31 @@ public class MapCoordinator: ObservableObject {
         mapProvider.centerOnUserLocation(animated: animated)
     }
 
+    /// Focuses the map on a specific leg, showing the entire leg route
+    /// - Parameters:
+    ///   - leg: The leg to focus on
+    ///   - bottomPadding: Additional bottom padding to account for overlays like sheets (default: 0)
+    ///   - animated: Whether to animate the movement (default: true)
+    public func focusOnLeg(_ leg: Leg, bottomPadding: CGFloat = 0, animated: Bool = true) {
+        let mapRect = leg.polylineMapRect
+
+        guard !mapRect.isNull, !mapRect.isEmpty else {
+            Logger.main.warning("focusOnLeg: No coordinates available for leg")
+            return
+        }
+
+        // Add padding to ensure route is fully visible
+        // Use additional bottom padding to account for sheets or other UI overlays
+        let padding = UIEdgeInsets(
+            top: Constants.mapPadding * 2,
+            left: Constants.mapPadding * 2,
+            bottom: Constants.mapPadding * 2 + bottomPadding,
+            right: Constants.mapPadding * 2
+        )
+
+        mapProvider.setVisibleMapRect(mapRect, edgePadding: padding, animated: animated)
+    }
+
     // MARK: - User Location
 
     /// Shows or hides the user location on the map