Removes duplicate options (#66)

Co-authored-by: Jonatan Kłosko <[email protected]>
livebook-dev · Jan 11, 2024 · 49458e9 · 49458e9
1 parent 74dcd97
commit 49458e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/kino/maplibre.ex b/lib/kino/maplibre.ex
@@ -172,7 +172,7 @@ defmodule Kino.MapLibre do
   """
   @spec add_nav_controls(maplibre(), keyword()) :: :ok | %__MODULE__{}
   def add_nav_controls(map, opts \\ []) do
-    position = Keyword.get(opts, :position, "top-right")
+    {position, opts} = Keyword.pop(opts, :position, "top-right")
     control = %{position: position, options: normalize_opts(opts)}
     update_events(map, :controls, control)
   end
@@ -203,7 +203,7 @@ defmodule Kino.MapLibre do
   """
   @spec add_locate(maplibre(), keyword()) :: :ok | %__MODULE__{}
   def add_locate(map, opts \\ []) do
-    high_accuracy = Keyword.get(opts, :high_accuracy, false)
+    {high_accuracy, opts} = Keyword.pop(opts, :high_accuracy, false)
     locate = %{high_accuracy: high_accuracy, options: normalize_opts(opts)}
     update_events(map, :locate, locate)
   end

diff --git a/test/kino/maplibre_test.exs b/test/kino/maplibre_test.exs
@@ -173,12 +173,12 @@ defmodule Kino.MapLibreTest do
       data = connect(ml)
 
       assert data.events.controls == [
-               %{options: %{"position" => "top-left", "showZoom" => false}, position: "top-left"},
+               %{options: %{"showZoom" => false}, position: "top-left"},
                %{options: %{"showCompass" => false}, position: "top-right"}
              ]
 
       assert_broadcast_event(ml, "add_nav_controls", %{
-        options: %{"position" => "top-left", "showZoom" => false},
+        options: %{"showZoom" => false},
         position: "top-left"
       })
     end
@@ -195,7 +195,7 @@ defmodule Kino.MapLibreTest do
       Kino.MapLibre.add_locate(ml, high_accuracy: true)
       data = connect(ml)
 
-      assert data.events.locate == [%{high_accuracy: true, options: %{"highAccuracy" => true}}]
+      assert data.events.locate == [%{high_accuracy: true, options: %{}}]
 
       assert_broadcast_event(ml, "add_locate", %{options: %{}, high_accuracy: true})
     end
@@ -207,7 +207,7 @@ defmodule Kino.MapLibreTest do
 
       assert data.events.locate == [
                %{options: %{"trackUserLocation" => true}, high_accuracy: false},
-               %{options: %{"highAccuracy" => true}, high_accuracy: true}
+               %{options: %{}, high_accuracy: true}
              ]
 
       assert_broadcast_event(ml, "add_locate", %{