Fixed computation for number of rows in toolbar (#1665)

* Refactor toolbar into an ipywidgets subclass

* Remove unnecessary import

* Fixed typo

* Use `ee_initialize=False` in unit tests

* Fix formatting after merge

* Fix  computation bug in number of expanded rows

Author: bengalin

geemap/toolbar.py

@@ -75,8 +75,8 @@ def __init__(self, host_map, main_tools, extra_tools=None):
         resets = [tool.reset for tool in all_tools]
         self.num_collapsed_tools = len(main_tools) + 1
         # -(-a//b) is the same as math.ceil(a/b)
-        self.num_rows_expanded = -(-(len(all_tools) // self.NUM_COLS))
-        self.num_rows_collapsed = -(-(self.num_collapsed_tools) // self.NUM_COLS)
+        self.num_rows_expanded = -(-len(all_tools) // self.NUM_COLS)
+        self.num_rows_collapsed = -(-self.num_collapsed_tools // self.NUM_COLS)
 
         self.all_widgets = [
             widgets.ToggleButton(

tests/test_toolbar.py

@@ -47,6 +47,8 @@ def test_only_main_tools_exist_if_no_extra_tools(self):
         self.assertEqual(toolbar.all_widgets[0].icon, "info")
         self.assertEqual(toolbar.all_widgets[0].tooltip, "dummy item")
         self.assertFalse(toolbar.all_widgets[0].value)
+        self.assertEqual(toolbar.num_rows_collapsed, 1)
+        self.assertEqual(toolbar.num_rows_expanded, 1)
 
     def test_all_tools_and_toggle_exist_if_extra_tools(self):
         map = geemap.Map(ee_initialize=False)
@@ -56,6 +58,14 @@ def test_all_tools_and_toggle_exist_if_extra_tools(self):
         self.assertEqual(toolbar.all_widgets[2].icon, "question")
         self.assertEqual(toolbar.all_widgets[2].tooltip, "no reset item")
         self.assertFalse(toolbar.all_widgets[2].value)
+        self.assertEqual(toolbar.num_rows_collapsed, 1)
+        self.assertEqual(toolbar.num_rows_expanded, 1)
+
+    def test_has_correct_number_of_rows(self):
+        map = geemap.Map(ee_initialize=False)
+        toolbar = Toolbar(map, [self.item, self.item], [self.item, self.item])
+        self.assertEqual(toolbar.num_rows_collapsed, 1)
+        self.assertEqual(toolbar.num_rows_expanded, 2)
 
     def test_toggle_expands_and_collapses(self):
         map = geemap.Map(ee_initialize=False)