@jacques_gordon/expo-mapbox-navigation 1.0.8 → 2.0.1

package/ios/ExpoMapboxNavigationModule.swift

@@ -1,81 +0,0 @@
-import ExpoModulesCore
-
-public class ExpoMapboxNavigationModule: Module {
-  public func definition() -> ModuleDefinition {
-    Name("ExpoMapboxNavigation")
-
-    View(ExpoMapboxNavigationView.self) {
-
-      // ─── Props ────────────────────────────────────────────────────────
-
-      Prop("coordinates") { (view: ExpoMapboxNavigationView, value: [[String: Double]]) in
-        view.coordinates = value
-        view.startNavigationIfReady()
-      }
-
-      Prop("waypointIndices") { (view: ExpoMapboxNavigationView, value: [Int]) in
-        view.waypointIndices = value
-      }
-
-      Prop("useRouteMatchingApi") { (view: ExpoMapboxNavigationView, value: Bool) in
-        view.useRouteMatchingApi = value
-      }
-
-      Prop("locale") { (view: ExpoMapboxNavigationView, value: String) in
-        view.locale = value
-      }
-
-      Prop("routeProfile") { (view: ExpoMapboxNavigationView, value: String) in
-        view.routeProfile = value
-      }
-
-      Prop("routeExcludeList") { (view: ExpoMapboxNavigationView, value: [String]) in
-        view.routeExcludeList = value
-      }
-
-      Prop("mapStyle") { (view: ExpoMapboxNavigationView, value: String) in
-        view.mapStyle = value
-      }
-
-      Prop("mute") { (view: ExpoMapboxNavigationView, value: Bool) in
-        view.mute = value
-      }
-
-      Prop("vehicleMaxHeight") { (view: ExpoMapboxNavigationView, value: Double) in
-        view.vehicleMaxHeight = value
-      }
-
-      Prop("vehicleMaxWidth") { (view: ExpoMapboxNavigationView, value: Double) in
-        view.vehicleMaxWidth = value
-      }
-
-      Prop("customRasterSourceUrl") { (view: ExpoMapboxNavigationView, value: String) in
-        view.customRasterSourceUrl = value
-      }
-
-      Prop("placeCustomRasterLayerAbove") { (view: ExpoMapboxNavigationView, value: String) in
-        view.placeCustomRasterLayerAbove = value
-      }
-
-      Prop("disableAlternativeRoutes") { (view: ExpoMapboxNavigationView, value: Bool) in
-        view.disableAlternativeRoutes = value
-      }
-
-      Prop("showsEndOfRouteFeedback") { (view: ExpoMapboxNavigationView, value: Bool) in
-        view.showsEndOfRouteFeedback = value
-      }
-
-      // ─── Events ───────────────────────────────────────────────────────
-
-      Events(
-        "onRouteProgressChanged",
-        "onWaypointArrival",
-        "onFinalDestinationArrival",
-        "onCancelNavigation",
-        "onRouteChanged",
-        "onUserOffRoute",
-        "onRoutesLoaded"
-      )
-    }
-  }
-}

package/ios/ExpoMapboxNavigationView.swift

@@ -1,236 +0,0 @@
-import ExpoModulesCore
-import MapboxNavigationCore
-import MapboxNavigationUIKit
-import MapboxMaps
-import MapboxDirections
-
-class ExpoMapboxNavigationView: ExpoView {
-
-  // ─── Props ──────────────────────────────────────────────────────────────
-  var coordinates: [[String: Double]] = []
-  var waypointIndices: [Int] = []
-  var useRouteMatchingApi: Bool = false
-  var locale: String = ""
-  var routeProfile: String = "mapbox/driving-traffic"
-  var routeExcludeList: [String] = []
-  var mapStyle: String? = nil
-  var mute: Bool = false
-  var vehicleMaxHeight: Double? = nil
-  var vehicleMaxWidth: Double? = nil
-  var customRasterSourceUrl: String? = nil
-  var placeCustomRasterLayerAbove: String? = nil
-  var disableAlternativeRoutes: Bool = false
-  var showsEndOfRouteFeedback: Bool = false
-
-  // ─── Events ─────────────────────────────────────────────────────────────
-  let onRouteProgressChanged = EventDispatcher()
-  let onWaypointArrival = EventDispatcher()
-  let onFinalDestinationArrival = EventDispatcher()
-  let onCancelNavigation = EventDispatcher()
-  let onRouteChanged = EventDispatcher()
-  let onUserOffRoute = EventDispatcher()
-  let onRoutesLoaded = EventDispatcher()
-
-  // ─── Internal ───────────────────────────────────────────────────────────
-  private var navigationViewController: NavigationViewController?
-  private var isNavigationStarted = false
-  private var currentWaypointIndex = 0
-  private var totalWaypoints = 0
-
-  required init(appContext: AppContext? = nil) {
-    super.init(appContext: appContext)
-  }
-
-  func startNavigationIfReady() {
-    guard coordinates.count >= 2, !isNavigationStarted else { return }
-    isNavigationStarted = true
-    setupNavigation()
-  }
-
-  override func layoutSubviews() {
-    super.layoutSubviews()
-    startNavigationIfReady()
-  }
-
-  // ─── Navigation Setup ───────────────────────────────────────────────────
-
-  private func setupNavigation() {
-    // Construire les waypoints
-    var allWaypoints: [Waypoint] = []
-
-    for (index, coord) in coordinates.enumerated() {
-      guard let lat = coord["latitude"], let lng = coord["longitude"] else { continue }
-      let location = CLLocationCoordinate2D(latitude: lat, longitude: lng)
-      let wp = Waypoint(coordinate: location)
-
-      // Marquer les waypoints intermédiaires vs simples pass-through
-      if !waypointIndices.isEmpty {
-        wp.separatesLegs = waypointIndices.contains(index)
-      } else {
-        wp.separatesLegs = true
-      }
-
-      allWaypoints.append(wp)
-    }
-
-    totalWaypoints = allWaypoints.filter { $0.separatesLegs }.count
-
-    // Choisir le profil de routing
-    let profile: ProfileIdentifier
-    switch routeProfile {
-    case "mapbox/driving": profile = .automobile
-    case "mapbox/walking": profile = .walking
-    case "mapbox/cycling": profile = .cycling
-    default: profile = .automobileAvoidingTraffic
-    }
-
-    // Options de route
-    let routeOptions = NavigationRouteOptions(waypoints: allWaypoints, profileIdentifier: profile)
-
-    let resolvedLocale = locale.isEmpty ? Locale.current.identifier : locale
-    routeOptions.locale = Locale(identifier: resolvedLocale)
-    routeOptions.includesSpokenInstructions = true
-    routeOptions.includesVisualInstructions = true
-
-    // Exclusions
-    if !routeExcludeList.isEmpty {
-      routeOptions.roadClassesToAvoid = buildRoadClassesToAvoid(routeExcludeList)
-    }
-
-    // Restrictions de véhicule
-    if let maxH = vehicleMaxHeight {
-      routeOptions.maximumHeight = Measurement(value: maxH, unit: .meters)
-    }
-    if let maxW = vehicleMaxWidth {
-      routeOptions.maximumWidth = Measurement(value: maxW, unit: .meters)
-    }
-
-    if disableAlternativeRoutes {
-      routeOptions.includesAlternativeRoutes = false
-    }
-
-    // Calcul de la route
-    Directions.shared.calculate(routeOptions) { [weak self] (_, result) in
-      guard let self = self else { return }
-      switch result {
-      case .failure(let error):
-        print("[ExpoMapboxNavigation] Erreur calcul route: \(error.localizedDescription)")
-      case .success(let response):
-        guard let routes = response.routes, !routes.isEmpty else { return }
-        self.onRoutesLoaded([:])
-        self.presentNavigationUI(routes: routes, options: routeOptions)
-      }
-    }
-  }
-
-  private func presentNavigationUI(routes: [Route], options: NavigationRouteOptions) {
-    DispatchQueue.main.async { [weak self] in
-      guard let self = self else { return }
-
-      let navigationService = MapboxNavigationService(
-        routes: routes,
-        customRoutingProvider: NavigationSettings.shared.directions,
-        credentials: NavigationSettings.shared.directions.credentials,
-        simulating: .onPoorGPS
-      )
-
-      let navigationOptions = NavigationOptions(navigationService: navigationService)
-      let navVC = NavigationViewController(
-        for: routes,
-        routeIndex: 0,
-        routeOptions: options,
-        navigationOptions: navigationOptions
-      )
-
-      navVC.delegate = self
-      navVC.showsEndOfRouteFeedback = self.showsEndOfRouteFeedback
-      navVC.showsReportFeedback = false
-
-      if self.mute {
-        navVC.navigationService.router.reroutesProactively = false
-      }
-
-      self.navigationViewController = navVC
-
-      guard let parentVC = self.parentViewController else { return }
-      parentVC.addChild(navVC)
-      navVC.view.frame = self.bounds
-      navVC.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-      self.addSubview(navVC.view)
-      navVC.didMove(toParent: parentVC)
-    }
-  }
-
-  private func buildRoadClassesToAvoid(_ list: [String]) -> RoadClasses {
-    var classes = RoadClasses()
-    for item in list {
-      switch item {
-      case "toll": classes.insert(.toll)
-      case "ferry": classes.insert(.ferry)
-      case "motorway": classes.insert(.motorway)
-      default: break
-      }
-    }
-    return classes
-  }
-
-  private var parentViewController: UIViewController? {
-    var responder: UIResponder? = self
-    while let r = responder {
-      if let vc = r as? UIViewController { return vc }
-      responder = r.next
-    }
-    return nil
-  }
-}
-
-// ─── NavigationViewControllerDelegate ───────────────────────────────────────
-
-extension ExpoMapboxNavigationView: NavigationViewControllerDelegate {
-
-  func navigationViewController(
-    _ vc: NavigationViewController,
-    didUpdate progress: RouteProgress,
-    with location: CLLocation,
-    rawLocation: CLLocation
-  ) {
-    onRouteProgressChanged([
-      "distanceRemaining": progress.currentLegProgress.distanceRemaining,
-      "distanceTraveled": progress.distanceTraveled,
-      "durationRemaining": progress.durationRemaining,
-      "fractionTraveled": progress.fractionTraveled
-    ])
-
-    // Détection hors route
-    if progress.currentLegProgress.userHasArrivedAtWaypoint {
-      currentWaypointIndex += 1
-      if currentWaypointIndex < totalWaypoints - 1 {
-        onWaypointArrival([
-          "distanceRemaining": progress.currentLegProgress.distanceRemaining,
-          "distanceTraveled": progress.distanceTraveled,
-          "durationRemaining": progress.durationRemaining,
-          "fractionTraveled": progress.fractionTraveled
-        ])
-      }
-    }
-  }
-
-  func navigationViewControllerDidFinishRouting(_ vc: NavigationViewController) {
-    onFinalDestinationArrival([:])
-  }
-
-  func navigationViewControllerDidDismiss(_ vc: NavigationViewController, byCanceling canceled: Bool) {
-    if canceled {
-      onCancelNavigation([:])
-    }
-  }
-
-  func navigationViewController(_ vc: NavigationViewController, didRerouteAlong route: Route) {
-    onRouteChanged([:])
-  }
-
-  func navigationViewController(_ vc: NavigationViewController, shouldRerouteFrom location: CLLocation) -> Bool {
-    onUserOffRoute([:])
-    return true
-  }
-}

package/plugin/index.js

@@ -1,167 +0,0 @@
-const {
-  withInfoPlist,
-  withAppBuildGradle,
-  withProjectBuildGradle,
-  withAndroidManifest,
-  withDangerousMod,
-  createRunOncePlugin,
-} = require('@expo/config-plugins');
-
-const fs = require('fs');
-const path = require('path');
-
-// ─── Mapbox Maven block ────────────────────────────────────────────────
-
-const MAPBOX_MAVEN_BLOCK = `
-    maven {
-      url 'https://api.mapbox.com/downloads/v2/releases/maven'
-      authentication { basic(BasicAuthentication) }
-      credentials {
-        username = "mapbox"
-        password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: System.getenv("MAPBOX_DOWNLOADS_TOKEN") ?: ""
-      }
-    }
-`;
-
-// ─── Inject into settings.gradle (SDK 53 FIX) ───────────────────────────
-
-const withMapboxMavenInSettings = (config) => {
-  return withDangerousMod(config, [
-    'android',
-    async (cfg) => {
-      const settingsPath = path.join(
-        cfg.modRequest.platformProjectRoot,
-        'settings.gradle'
-      );
-
-      if (!fs.existsSync(settingsPath)) return cfg;
-
-      let contents = fs.readFileSync(settingsPath, 'utf8');
-
-      if (contents.includes('api.mapbox.com/downloads')) return cfg;
-
-      if (contents.includes('dependencyResolutionManagement')) {
-        contents = contents.replace(
-          /dependencyResolutionManagement\s*\{([\s\S]*?)repositories\s*\{/,
-          `dependencyResolutionManagement {$1repositories {${MAPBOX_MAVEN_BLOCK}`
-        );
-      } else if (contents.includes('allprojects')) {
-        contents = contents.replace(
-          /allprojects\s*\{([\s\S]*?)repositories\s*\{/,
-          `allprojects {$1repositories {${MAPBOX_MAVEN_BLOCK}`
-        );
-      } else {
-        contents += `
-allprojects {
-  repositories {${MAPBOX_MAVEN_BLOCK}
-  }
-}`;
-      }
-
-      fs.writeFileSync(settingsPath, contents);
-      return cfg;
-    },
-  ]);
-};
-
-// ─── Plugin ─────────────────────────────────────────────────────────────
-
-const withExpoMapboxNavigation = (config, options) => {
-  const {
-    accessToken,
-    mapboxMapsVersion = '11.11.0',
-    androidColorOverrides = {},
-  } = options;
-
-  if (!accessToken) {
-    throw new Error('[expo-mapbox-navigation] accessToken is required');
-  }
-
-  // ── iOS ───────────────────────────────────────────────────────────────
-  config = withInfoPlist(config, (cfg) => {
-    cfg.modResults.MBXAccessToken = accessToken;
-
-    cfg.modResults.NSLocationWhenInUseUsageDescription =
-      cfg.modResults.NSLocationWhenInUseUsageDescription ??
-      'Navigation GPS requires location access.';
-
-    cfg.modResults.NSLocationAlwaysAndWhenInUseUsageDescription =
-      cfg.modResults.NSLocationAlwaysAndWhenInUseUsageDescription ??
-      'Background navigation requires location access.';
-
-    cfg.modResults.NSMotionUsageDescription =
-      cfg.modResults.NSMotionUsageDescription ??
-      'Motion is used to improve navigation experience.';
-
-    const modes = cfg.modResults.UIBackgroundModes || [];
-    if (!modes.includes('audio')) modes.push('audio');
-    if (!modes.includes('location')) modes.push('location');
-    cfg.modResults.UIBackgroundModes = modes;
-
-    return cfg;
-  });
-
-  // ── Android settings.gradle FIX (IMPORTANT SDK 53) ────────────────────
-  config = withMapboxMavenInSettings(config);
-
-  // ── Android Manifest ──────────────────────────────────────────────────
-  config = withAndroidManifest(config, (cfg) => {
-    const manifest = cfg.modResults.manifest;
-    const permissions = manifest['uses-permission'] || [];
-
-    const add = (name) => {
-      if (!permissions.find((p) => p.$?.['android:name'] === name)) {
-        permissions.push({ $: { 'android:name': name } });
-      }
-    };
-
-    add('android.permission.ACCESS_FINE_LOCATION');
-    add('android.permission.ACCESS_COARSE_LOCATION');
-    add('android.permission.FOREGROUND_SERVICE');
-    add('android.permission.FOREGROUND_SERVICE_LOCATION');
-
-    manifest['uses-permission'] = permissions;
-
-    const app = manifest.application?.[0];
-    if (app) {
-      const meta = app['meta-data'] || [];
-
-      if (!meta.find((m) => m.$?.['android:name'] === 'com.mapbox.token')) {
-        meta.push({
-          $: {
-            'android:name': 'com.mapbox.token',
-            'android:value': accessToken,
-          },
-        });
-      }
-
-      app['meta-data'] = meta;
-    }
-
-    return cfg;
-  });
-
-  // ── App build.gradle ──────────────────────────────────────────────────
-  config = withAppBuildGradle(config, (cfg) => {
-    if (!cfg.modResults.contents.includes('mapbox_access_token')) {
-      cfg.modResults.contents = cfg.modResults.contents.replace(
-        /defaultConfig\s*\{/,
-        `defaultConfig {
-        resValue "string", "mapbox_access_token", "${accessToken}"`
-      );
-    }
-
-    return cfg;
-  });
-
-  return config;
-};
-
-const plugin = createRunOncePlugin(
-  withExpoMapboxNavigation,
-  "expo-mapbox-navigation",
-  "1.0.8"
-);
-
-module.exports = plugin;
-module.exports.default = plugin;