web-fixes

arcgis_map_sdk_ios/ios/Classes/ArcgisMapView.swift

@@ -75,7 +75,7 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
         mapView = AGSMapView.init(frame: frame)
 
         super.init()
-        
+
         if let isAttributionTextVisible = mapOptions.isAttributionTextVisible {
             mapView.isAttributionTextVisible = isAttributionTextVisible
         }
@@ -180,12 +180,12 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             result(FlutterError(code: "missing_data", message: "Invalid arguments", details: nil))
             return
         }
-        
+
         guard let lodFactor = args["lodFactor"] as? Int else {
             result(FlutterError(code: "missing_data", message: "lodFactor not provided", details: nil))
             return
         }
-        
+
         let currentZoomLevel = convertScaleToZoomLevel(mapView.mapScale)
         let totalZoomLevel = currentZoomLevel + lodFactor
         if (totalZoomLevel > convertScaleToZoomLevel(map.maxScale)) {
@@ -207,12 +207,12 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             result(FlutterError(code: "missing_data", message: "Invalid arguments", details: nil))
             return
         }
-        
+
         guard let lodFactor = args["lodFactor"] as? Int else {
             result(FlutterError(code: "missing_data", message: "lodFactor not provided", details: nil))
             return
         }
-        
+
         let currentZoomLevel = convertScaleToZoomLevel(mapView.mapScale)
         let totalZoomLevel = currentZoomLevel - lodFactor
         if (totalZoomLevel < convertScaleToZoomLevel(map.minScale)) {
@@ -223,13 +223,13 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             result(success)
         }
     }
-    
+
     private func onRotate(_ call: FlutterMethodCall, _ result:@escaping FlutterResult) {
         guard let angleDouble = call.arguments as? Double else {
             result(FlutterError(code: "missing_data", message: "Invalid arguments", details: nil))
             return
         }
-        
+
         mapView.setViewpointRotation(angleDouble) { success in
             result(success)
         }
@@ -240,7 +240,7 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             result(FlutterError(code: "missing_data", message: "Invalid arguments", details: nil))
             return
         }
-        
+
         do {
             let padding: ViewPadding = try JsonUtil.objectOfJson(args)
 
@@ -269,7 +269,7 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             let animationOptions: AnimationOptions? = animationDict == nil ? nil : try JsonUtil.objectOfJson(animationDict!)
 
             let scale: Double
-            
+
             if let zoomLevel = zoomLevel {
                 scale = convertZoomLevelToMapScale(zoomLevel)
             } else {
@@ -322,26 +322,26 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             return
         }
 
-        
+
         let existingIds = defaultGraphicsOverlay.graphics.compactMap { object in
             let graphic = object as! AGSGraphic
             return graphic.attributes["id"] as? String
         }
-        
+
         let hasExistingGraphics = newGraphics.contains(where: { object in
             let graphic = object
             guard let id = graphic.attributes["id"] as? String else {
                 return false
             }
-            
+
             return existingIds.contains(id)
         })
-        
+
         if(hasExistingGraphics) {
             result(false)
             return
         }
-        
+
         // addObjects causes an internal exceptions this is why we add
         // them in this for loop instead.
         // ArcGis is the best <3.
@@ -356,7 +356,7 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             result(FlutterError(code: "missing_data", message: "graphicId not provided", details: nil))
             return
         }
-        
+
         let newGraphics = defaultGraphicsOverlay.graphics.filter({ element in
             let graphic = element as! AGSGraphic
             let id = graphic.attributes["id"] as? String
@@ -365,7 +365,7 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
 
         defaultGraphicsOverlay.graphics.removeAllObjects()
         defaultGraphicsOverlay.graphics.addObjects(from: newGraphics)
-        
+
         result(true)
     }
 
@@ -374,9 +374,9 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             result(FlutterError(code: "missing_data", message: "baseMapString not provided", details: nil))
             return
         }
-        
+
         map.basemap = AGSBasemap(style: parseBaseMapStyle(baseMapString))
-        
+
         result(true)
     }
 
@@ -394,12 +394,12 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             result(FlutterError(code: "missing_data", message: "Invalid arguments", details: nil))
             return
         }
-        
+
         guard let enabled = args["enabled"] as? Bool else {
             result(FlutterError(code: "missing_data", message: "enabled arguments", details: nil))
             return
         }
-        
+
         setMapInteractive(enabled)
         result(true)
     }
@@ -514,7 +514,7 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
         mapView.locationDisplay.autoPanMode = autoPanMode
         result(true)
     }
-    
+
     private func onGetAutoPanMode(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
         // autoPanMode.rawValue is any of [0; 3]:
         // https://developers.arcgis.com/ios/api-reference/_a_g_s_location_display_8h.html
@@ -524,17 +524,17 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
         }
         return result(stringName)
     }
-    
+
     private func onSetWanderExtentFactor(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
         guard let factor = call.arguments as? Double else {
             result(FlutterError(code: "missing_data", message: "Invalid argument, expected an WanderExtentFactor as Double.", details: nil))
             return
         }
-        
+
         mapView.locationDisplay.wanderExtentFactor = Float(factor)
         result(true)
     }
-    
+
     private func onGetWanderExtentFactor(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
         return result(mapView.locationDisplay.wanderExtentFactor)
     }
@@ -561,13 +561,13 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             result(FlutterError(code: "invalid_data", message: "Unknown data source type \(String(describing: type))", details: nil))
         }
     }
-    
+
     private func onUpdateIsAttributionTextVisible(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
         guard let isVisible = call.arguments as? Bool else {
             result(FlutterError(code: "missing_data", message: "Invalid arguments", details: nil))
             return
         }
-        
+
         mapView.isAttributionTextVisible = isVisible
         result(true)
     }

arcgis_map_sdk_web/lib/arcgis_map_web_js.dart

@@ -185,7 +185,7 @@ abstract class JsAttributes {
 }
 
 /// https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html
-@JS("esri.geometry.Extent")
+@JS("esri.core.geometry.Extent")
 abstract class JsExtent {
   /// https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html#contains
   external bool contains(dynamic geometry);
@@ -198,6 +198,10 @@ abstract class JsExtent {
   external double get height;
 
   external double get width;
+
+  external factory JsExtent(dynamic map);
+
+  external JsExtent expand(double ratio);
 }
 
 /// https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html

arcgis_map_sdk_web/lib/src/arcgis_map_sdk_web.dart

@@ -42,6 +42,23 @@ class ArcgisMapWeb extends ArcgisMapPlatform {
     return controller;
   }
 
+  @override
+  Future<void> setMethodCallHandler({
+    required int mapId,
+    required Future<dynamic> Function(MethodCall) onCall,
+  }) async {
+    // No-Op
+  }
+
+  @override
+  Future<void> moveCameraToPoints({
+    required List<LatLng> points,
+    required int mapId,
+    double? padding,
+  }) {
+    return _map(mapId).moveCameraToPoints(points: points, padding: padding);
+  }
+
   @override
   Future<void> init(int mapId) async {
     await _hasScriptLoaded.future;

arcgis_map_sdk_web/lib/src/arcgis_map_web_controller.dart

@@ -410,6 +410,17 @@ class ArcgisMapWebController {
     );
   }
 
+  Future<void> moveCameraToPoints({
+    required List<LatLng> points,
+    double? padding,
+  }) async {
+    await _layerController!.moveCameraToPoints(
+      points: points,
+      padding: padding,
+      view: _activeView!,
+    );
+  }
+
   Future<void> moveCamera({
     required LatLng point,
     double? zoomLevel,

arcgis_map_sdk_web/lib/src/layer_controller.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:html' hide VoidCallback;
 import 'dart:js_util';
+import 'dart:math' as math;
 
 import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart';
 import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart';
@@ -828,6 +829,50 @@ class LayerController {
     return zoom >= minZoom && zoom <= maxZoom;
   }
 
+  Future<void> moveCameraToPoints({
+    required List<LatLng> points,
+    double? padding,
+    AnimationOptions? animationOptions,
+    required JsView view,
+  }) async {
+    // Compute bounding coordinates for the list of points.
+    double minLat = double.infinity;
+    double minLon = double.infinity;
+    double maxLat = -double.infinity;
+    double maxLon = -double.infinity;
+
+    for (final point in points) {
+      minLat = math.min(minLat, point.latitude);
+      maxLat = math.max(maxLat, point.latitude);
+      minLon = math.min(minLon, point.longitude);
+      maxLon = math.max(maxLon, point.longitude);
+    }
+
+    final extentMap = JsExtent(
+      jsify({
+        'xmin': minLon,
+        'ymin': minLat,
+        'xmax': maxLon,
+        'ymax': maxLat,
+        'spatialReference': {'wkid': 4326},
+      }),
+    ).expand(1.5);
+
+    final target = {
+      'target': extentMap,
+    };
+
+    final targetOptions = <String, dynamic>{};
+    if (animationOptions != null) {
+      targetOptions.addAll({
+        'duration': animationOptions.duration,
+        'easing': animationOptions.animationCurve.value,
+      });
+    }
+
+    await view.goTo(jsify(target), jsify(targetOptions)).toFuture();
+  }
+
   /// Go to the given point and zoom if wanted
   Future<void> moveCamera({
     required LatLng point,

arcgis_webpack/src/main.js

@@ -13,7 +13,7 @@ import VectorTileLayer from "@arcgis/core/layers/VectorTileLayer";
 import Basemap from "@arcgis/core/Basemap";
 import SceneLayer from "@arcgis/core/layers/SceneLayer";
 import GraphicsLayer from "@arcgis/core/layers/GraphicsLayer";
-
+import Extent from "@arcgis/core/geometry/Extent";
 window.esri = {
   'core': {
     'Map': Map,
@@ -24,6 +24,7 @@ window.esri = {
     },
     'geometry': {
       'Point': Point,
+      'Extent': Extent,
     },
     'widgets': {
       'Attribution': Attribution,

example/lib/main.dart

@@ -735,16 +735,12 @@ class _ExampleMapState extends State<ExampleMap> {
                         onPressed: () => _controller?.retryLoad(),
                         child: const Text('Reload map'),
                       ),
-                      if (!kIsWeb)
-                        ElevatedButton(
-                          onPressed: () => _makePolylineVisible(
-                            points: [
-                              _firstPinCoordinates,
-                              _secondPinCoordinates
-                            ],
-                          ),
-                          child: const Text('Zoom to polyline'),
+                      ElevatedButton(
+                        onPressed: () => _makePolylineVisible(
+                          points: [_firstPinCoordinates, _secondPinCoordinates],
                         ),
+                        child: const Text('Zoom to polyline'),
+                      ),
                     ],
                   ),
                 ),