Merge pull request #414 from MetOffice/nearcast-color-mapper

Nearcast color mapper

Author: andrewgryan

forest/__init__.py

@@ -28,7 +28,7 @@
 .. automodule:: forest.services
 
 """
-__version__ = '0.20.0'
+__version__ = '0.20.1'
 
 from .config import *
 from . import (

forest/drivers/nearcast.py

@@ -26,14 +26,15 @@
 class Dataset:
     def __init__(self, pattern=None, **kwargs):
         self.pattern = pattern
+        self.loader = NearCast(self.pattern)
 
     def navigator(self):
         return Navigator(self.pattern)
 
     def map_view(self, color_mapper):
-        view = forest.map_view.NearCast(NearCast(self.pattern), color_mapper)
-        view.set_hover_properties(NEARCAST_TOOLTIPS)
-        return view
+        return forest.map_view.map_view(self.loader,
+                                        color_mapper,
+                                        tooltips=NEARCAST_TOOLTIPS)
 
 
 class NearCast(object):

forest/map_view.py

@@ -8,20 +8,25 @@
 from forest.exceptions import FileNotFound, IndexNotFound
 
 
-def map_view(loader, color_mapper, use_hover_tool=True):
+def map_view(loader, color_mapper, use_hover_tool=True, tooltips=None):
     """Convenient method to simplify MapView construction"""
     if forest.data.FEATURE_FLAGS["multiple_colorbars"]:
         color_mapper = bokeh.models.LinearColorMapper(
             palette="Greys256",
             low=0,
             high=1)
         color_view = ColorView(color_mapper)
-        um_view = ImageView(loader, color_mapper,
-                            use_hover_tool=use_hover_tool)
-        return MapView(um_view, color_view)
+        image_view = ImageView(loader, color_mapper,
+                               use_hover_tool=use_hover_tool)
+        if tooltips is not None:
+            image_view.tooltips = tooltips
+        return MapView(image_view, color_view)
     else:
-        return ImageView(loader, color_mapper,
+        view = ImageView(loader, color_mapper,
                          use_hover_tool=use_hover_tool)
+        if tooltips is not None:
+            view.tooltips = tooltips
+        return view
 
 
 class AbstractMapView(ABC):
@@ -115,50 +120,3 @@ def add_figure(self, figure):
                     formatters=self.formatters)
             figure.add_tools(tool)
         return renderer
-
-
-class Image(object):
-    pass
-
-
-class Barbs(object):
-    pass
-
-
-class NearCast(object):
-    def __init__(self, loader, color_mapper):
-        self.loader = loader
-        self.color_mapper = color_mapper
-        self.color_mapper.nan_color = bokeh.colors.RGB(0, 0, 0, a=0)
-        self.source = bokeh.models.ColumnDataSource({
-                "x": [],
-                "y": [],
-                "dw": [],
-                "dh": [],
-                "image": []})
-        self.image_sources = [self.source]
-
-    @old_state
-    @unique
-    def render(self, state):
-        self.source.data = self.loader.image(state)
-
-    def set_hover_properties(self, tooltips):
-        self.tooltips = tooltips
-
-    def add_figure(self, figure):
-        renderer = figure.image(
-                   x="x",
-                   y="y",
-                   dw="dw",
-                   dh="dh",
-                   image="image",
-                   source=self.source,
-                   color_mapper=self.color_mapper)
-
-        tool = bokeh.models.HoverTool(
-               renderers=[renderer],
-               tooltips=self.tooltips)
-
-        figure.add_tools(tool)
-        return renderer

test/test_drivers_nearcast.py

@@ -21,7 +21,6 @@ def test_dataset_map_view():
     color_mapper = bokeh.models.ColorMapper()
     dataset = forest.drivers.get_dataset("nearcast")
     map_view = dataset.map_view(color_mapper)
-    assert isinstance(map_view, forest.map_view.NearCast)
     assert map_view.tooltips == forest.drivers.nearcast.NEARCAST_TOOLTIPS