Fix declaration type on setCameraOptions

arnaudleclerc · Apr 17, 2021 · c54365d · c54365d
1 parent 5366c55
commit c54365d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/samples/AzureMapsControl.Sample/Pages/Controls.razor b/samples/AzureMapsControl.Sample/Pages/Controls.razor
@@ -2,6 +2,7 @@
 
 @using AzureMapsControl.Components.Map
 <AzureMap Id="map"
+          CameraOptions="new CameraOptions { Type = AzureMapsControl.Components.Map.CameraType.Fly }"
           Controls="new Components.Controls.Control[]
           {
                         new Components.Controls.ZoomControl(new Components.Controls.ZoomControlOptions { Style = AzureMapsControl.Components.Controls.ControlStyle.Dark }, AzureMapsControl.Components.Controls.ControlPosition.TopLeft),

diff --git a/samples/AzureMapsControl.Sample/Pages/Index.razor b/samples/AzureMapsControl.Sample/Pages/Index.razor
@@ -2,7 +2,7 @@
 
 @using AzureMapsControl.Components.Map
 <AzureMap Id="map"
-          CameraOptions="new CameraOptions { Center= new AzureMapsControl.Components.Atlas.Position(11.581990, 48.143534), Zoom= 8.5, MinZoom = 3, MaxZoom = 12.5 }"
+          CameraOptions="new CameraOptions { Type = AzureMapsControl.Components.Map.CameraType.Fly, Center= new AzureMapsControl.Components.Atlas.Position(11.581990, 48.143534), Zoom= 8.5, MinZoom = 3, MaxZoom = 12.5 }"
           StyleOptions="StyleOptions"/>
 
 @code {

diff --git a/samples/AzureMapsControl.Sample/Pages/WithCameraOptions.razor b/samples/AzureMapsControl.Sample/Pages/WithCameraOptions.razor
@@ -0,0 +1,29 @@
+@page "/WithCameraOptions"
+
+@using AzureMapsControl.Components.Map
+<AzureMap Id="map"
+          CameraOptions="new CameraOptions { Center= new AzureMapsControl.Components.Atlas.Position(11.581990, 48.143534), Zoom= 8.5, MinZoom = 3, MaxZoom = 12.5 }"
+          StyleOptions="StyleOptions"
+            EventActivationFlags="MapEventActivationFlags
+                                .None()
+                                .Enable(MapEventType.Click)"
+          OnClick="OnMapClick"          />
+
+@code {
+    public StyleOptions StyleOptions = new StyleOptions
+    {
+        Style = MapStyle.GrayscaleDark,
+        ShowLogo = false,
+        ShowFeedbackLink = false
+    };
+
+    public async Task OnMapClick(MapMouseEventArgs eventArgs)
+    {
+        var options = await eventArgs.Map.GetCameraOptionsAsync();
+        await eventArgs.Map.SetCameraOptionsAsync(cameraOptions => {
+            cameraOptions.Type = CameraType.Fly;
+            cameraOptions.Duration = 1000;
+            cameraOptions.Zoom = options.Zoom + 1;
+        });
+    }
+}
diff --git a/src/AzureMapsControl.Components/typescript/core/core.ts b/src/AzureMapsControl.Components/typescript/core/core.ts
@@ -357,15 +357,15 @@ export class Core {
         }
     }
 
-    public static setCameraOptions(cameraOptions: azmaps.CameraOptions & azmaps.CameraBoundsOptions): void {
-        const options: azmaps.CameraOptions & azmaps.CameraBoundsOptions = {
+    public static setCameraOptions(cameraOptions: (azmaps.CameraOptions | azmaps.CameraBoundsOptions) & azmaps.AnimationOptions): void {
+        const options: (azmaps.CameraOptions | azmaps.CameraBoundsOptions) & azmaps.AnimationOptions = {
             bearing: cameraOptions.bearing,
             centerOffset: cameraOptions.centerOffset,
             duration: cameraOptions.duration,
             maxZoom: cameraOptions.maxZoom,
             minZoom: cameraOptions.minZoom,
             pitch: cameraOptions.pitch,
-            type: cameraOptions.cameraType
+            type: cameraOptions.type
         };
 
         if (cameraOptions.bounds) {