fix(ios): missing options and improvements

Author: farfromrefug

packages/ui-mapbox/platforms/ios/src/MapboxBridge.swift

@@ -176,10 +176,11 @@ public class MapboxBridge: NSObject {
     @objc public func createMap(_ x: Double, _ y: Double, _ width: Double, _ height: Double, _ accessToken: String, _ styleURIString: String?, _ optionsJSON: String) -> UIView {
         MapboxOptions.accessToken = accessToken
         let styleURI = getMapStyleURI(styleURIString)
-        
+        let optionsOpt = MapboxBridge.parseJSONParameter(optionsJSON) as? [String: Any]
+
         var centerCoordinate = CLLocationCoordinate2D(latitude: 48.858093, longitude: 2.294694)
         var zoom = 0.0
-        if let options = MapboxBridge.parseJSONParameter(optionsJSON) as? [String: Any] {
+        if let options = optionsOpt {
             if let z = options["zoomLevel"] as? Double {
                 zoom = z
             }
@@ -202,6 +203,31 @@ public class MapboxBridge: NSObject {
         MapboxBridge.registerBridge(self, for: mv)
 
         addImage("default_pin", image: UIImage(named: "default_pin"))
+
+        if let options = optionsOpt {
+            if ((options["hideLogo"] as? Bool) == true) {
+                mv.ornaments.logoView.isHidden = true
+            }
+            if ((options["hideAttribution"] as? Bool) == true) {
+                mv.ornaments.attributionButton.isHidden = true
+            }
+            if ((options["hideCompass"] as? Bool) == true) {
+                mv.ornaments.compassView.isHidden = true
+            }
+            if ((options["disableRotation"] as? Bool) == true) {
+                mv.gestures.options.rotateEnabled = false
+            }
+            if ((options["disableScroll"] as? Bool) == true) {
+                mv.gestures.options.panEnabled = false
+            }
+            if ((options["disableZoom"] as? Bool) == true) {
+                mv.gestures.options.pinchZoomEnabled = false
+                mv.gestures.options.quickZoomEnabled = false
+            }
+            if ((options["disableTilt"] as? Bool) == true) {
+                mv.gestures.options.pitchEnabled = false
+            }
+        }
 
         // mapLoaded
         mv.mapboxMap.onMapLoaded.observeNext { _ in
@@ -1162,7 +1188,7 @@ public class MapboxBridge: NSObject {
     }
 
 
-    @objc public func trackUser(_ optionsJSON: String) -> Bool {
+    @objc public func showUserLocationMarker(_ optionsJSON: String) -> Bool {
         guard let mv = mapView else { return false }
 
         guard let data = optionsJSON.data(using: .utf8),

src/ui-mapbox/index.ios.ts

@@ -143,10 +143,13 @@ export class MapboxView extends MapboxViewBase {
     private initCountHack = 50;
 
     setConfig(settings: any) {
-        if (Trace.isEnabled()) {
-            CLog(CLogTypes.info, 'setConfig(): settings:', settings);
+        if (settings.zoomLevel && !settings.center) {
+            // Eiffel tower, Paris
+            settings.center = {
+                lat: 48.858093,
+                lng: 2.294694
+            };
         }
-
         this.settings = settings;
     }
     getNativeMapView(): any {
@@ -189,7 +192,7 @@ export class MapboxView extends MapboxViewBase {
 
     initMap(): void {
         if (Trace.isEnabled()) {
-            CLog(CLogTypes.info, 'initMap() top with settings:', this.settings);
+            CLog(CLogTypes.info, 'initMap() top');
         }
 
         if (!this.settings && !this.config.accessToken) {
@@ -470,6 +473,10 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                 view.addSubview(nativeMap);
                 this.setMapboxViewInstance(nativeMap);
 
+                if (settings.showUserLocation) {
+                    this.showUserLocationMarker({});
+                }
+
                 this.initEventHandlerShim(settings, this._mapboxViewInstance);
                 if (settings.onMapReady) {
                     settings.onMapReady(this._mapboxViewInstance);
@@ -1575,15 +1582,15 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
 
     // ---------------- User location & tilt ----------------
 
-    showUserLocationMarker(show: boolean): Promise<void> {
+    showUserLocationMarker(options: Partial<TrackUserOptions>): Promise<void> {
         return new Promise((resolve, reject) => {
             try {
                 const b = this.bridgeInstance;
                 if (!b) {
                     reject('No bridge available');
                     return;
                 }
-                b.showUserLocationMarker(show);
+                b.showUserLocationMarker(JSON.stringify(options));
                 resolve();
             } catch (ex) {
                 reject(ex);
@@ -1634,7 +1641,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                 if (Trace.isEnabled()) {
                     CLog(CLogTypes.info, 'trackUser():', JSON.stringify(options));
                 }
-                const ok = b.trackUser(JSON.stringify(options));
+                const ok = b.showUserLocationMarker(JSON.stringify(options));
                 if (ok) {
                     resolve();
                 } else {

src/ui-mapbox/typings/mapbox.bridge.ios.d.ts

@@ -85,14 +85,13 @@ declare class MapboxBridge extends NSObject {
   deleteOfflineRegion(idOrName: string): void;
 
   // user location & tilt
-  showUserLocationMarker(show: boolean): void;
+  showUserLocationMarker(optionsJSON: string);
   hideUserLocationMarker(): void;
   forceUserLocationUpdate(): boolean;
   getTilt(): number | null;
   setTilt(tilt: number, animated: boolean): void;
   getUserLocation(): NSDictionary | null;
 
-  trackUser(optionsJSON: string): boolean;
   stopTrackingUser(): void;
 
   // added/updated methods