Consistently use construct_color_bar() (#16)

* use construct_color_bar consistently

* Add info on ColorBar object

* Fix typo

* Fix envs

* fix env indentation

* Update notebooks/05_styling.ipynb

---------

Co-authored-by: Ian Thomas <[email protected]>

Author: tcmetzger

notebooks/05_styling.ipynb

@@ -673,6 +673,10 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
+    "The ``construct_color_bar()`` method automatically creates a `ColorBar` object. This\n",
+    "method uses the color mapper of the object you call it on.\n",
+    "\n",
+    "You can also create a `ColorBar` object manually.\n",
     "See [Color bars](https://docs.bokeh.org/en/latest/docs/user_guide/basic/annotations.html#color-bars)\n",
     "in the user guide for more information."
    ]

notebooks/09_more_plot_types.ipynb

@@ -357,7 +357,7 @@
     "* Configuring plot tools\n",
     "* Configuring visual elements of the plot\n",
     "* Using a ColorMapper to map values to colors from a palette\n",
-    "* Adding a ColorBar as a visual guide"
+    "* Adding a color bar as a visual guide"
    ]
   },
   {
@@ -369,7 +369,7 @@
     "import geopandas as gpd\n",
     "\n",
     "from bokeh.plotting import figure, show\n",
-    "from bokeh.models import ColorBar, GeoJSONDataSource, NumeralTickFormatter\n",
+    "from bokeh.models import GeoJSONDataSource, NumeralTickFormatter\n",
     "from bokeh.palettes import Cividis\n",
     "from bokeh.transform import linear_cmap\n",
     "\n",
@@ -410,7 +410,7 @@
     ")\n",
     "\n",
     "# add color bar\n",
-    "color_bar = ColorBar(color_mapper=us.glyph.fill_color.transform, formatter=NumeralTickFormatter(format=\"0,0\"), orientation=\"horizontal\", height=10)\n",
+    "color_bar = us.construct_color_bar(formatter=NumeralTickFormatter(format=\"0,0\"), height=10)\n",
     "map_plot.add_layout(obj=color_bar, place=\"below\")\n",
     "\n",
     "show(map_plot)"
@@ -724,11 +724,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.11.4"
-  },
-  "vscode": {
-   "interpreter": {
-    "hash": "0494a81e5f69860dcb844ce8e12eb9c88a7e813ddbfb0fbade72137f5ce45437"
-   }
   }
  },
  "nbformat": 4,

notebooks/12_demo_dashboard.ipynb

@@ -1293,7 +1293,7 @@
    "source": [
     "import geopandas as gpd\n",
     "\n",
-    "from bokeh.models import ColorBar, GeoJSONDataSource\n",
+    "from bokeh.models import GeoJSONDataSource\n",
     "from bokeh.palettes import Cividis\n",
     "from bokeh.transform import linear_cmap"
    ]
@@ -1422,21 +1422,16 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "- Set up and add the **[ColorBar](05_styling.ipynb#Color-mappers-and-pallets)**.\n",
-    "    The ColorBar provides a key to which color relates to which\n",
+    "- Set up and add the **[color bar](05_styling.ipynb#Color-mappers-and-pallets)**.\n",
+    "    The color bar provides a key to which color relates to which\n",
     "    number of routes. Adding the color bar takes two steps:\n",
-    "    1. Defining the color bar as a ``ColorBar`` object. This uses the following\n",
-    "        parameters:\n",
-    "        - `color_mapper`: The color mapper to use. In this case, you use the\n",
-    "            linear color mapper that you defined for the patches renderer in the\n",
-    "            previous step.\n",
+    "    1. Defining the color bar with the ``construct_color_bar()`` method. This uses the\n",
+    "        following parameters:\n",
     "        - `formatter`: How to format the numbers in the color bar. Use a\n",
     "            `NumeralTickFormatter` with the format string `0,0`. This means that\n",
     "            Bokeh uses a comma as a thousands separator.\n",
-    "        - `orientation`: The orientation of the color bar. In this case, create a\n",
-    "            horizontal color bar by setting the value to `\"horizontal\"`.\n",
     "        - `height`: The height of the color bar in pixels.\n",
-    "    2. Adding the `ColorBar` object to the figure. Use the `add_layout` method to\n",
+    "    2. Adding the color bar to the figure. Use the `add_layout` method to\n",
     "        add the object and place it below the map plot."
    ]
   },
@@ -1447,7 +1442,8 @@
    "outputs": [],
    "source": [
     "# add the color bar\n",
-    "color_bar = ColorBar(color_mapper=us.glyph.fill_color.transform, formatter=NumeralTickFormatter(format=\"0,0\"), orientation=\"horizontal\", height=10)\n",
+    "color_bar = us.construct_color_bar(formatter=NumeralTickFormatter(format=\"0,0\"), height=10)\n",
+    "\n",
     "map_plot.add_layout(obj=color_bar, place=\"below\")"
    ]
   },
@@ -1482,7 +1478,7 @@
    "source": [
     "import geopandas as gpd\n",
     "\n",
-    "from bokeh.models import ColorBar, GeoJSONDataSource\n",
+    "from bokeh.models import GeoJSONDataSource\n",
     "from bokeh.palettes import Cividis\n",
     "from bokeh.transform import linear_cmap\n",
     "\n",
@@ -1523,7 +1519,7 @@
     ")\n",
     "\n",
     "# add color bar\n",
-    "color_bar = ColorBar(color_mapper=us.glyph.fill_color.transform, formatter=NumeralTickFormatter(format=\"0,0\"), orientation=\"horizontal\", height=10)\n",
+    "color_bar = us.construct_color_bar(formatter=NumeralTickFormatter(format=\"0,0\"), height=10)\n",
     "map_plot.add_layout(obj=color_bar, place=\"below\")\n",
     "\n",
     "show(map_plot)"
@@ -1928,11 +1924,6 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.11.4"
-  },
-  "vscode": {
-   "interpreter": {
-    "hash": "0494a81e5f69860dcb844ce8e12eb9c88a7e813ddbfb0fbade72137f5ce45437"
-   }
   }
  },
  "nbformat": 4,

notebooks/tutorial_dashboard.py

@@ -4,7 +4,6 @@
 import geopandas as gpd
 from bokeh.layouts import column, layout
 from bokeh.models import (
-    ColorBar,
     ColumnDataSource,
     CustomJS,
     Div,
@@ -245,7 +244,7 @@ def departures_map():
     )
 
     # add color bar
-    color_bar = ColorBar(color_mapper=us.glyph.fill_color.transform, formatter=NumeralTickFormatter(format="0,0"), orientation="horizontal", height=10)
+    color_bar = us.construct_color_bar(formatter=NumeralTickFormatter(format="0,0"), height=10)
     map_plot.add_layout(obj=color_bar, place="below")
 
     return map_plot