Allow a subtype or implicit view in Field.apply(column)

Author: mattpap

bokeh/src/main/scala/HasFields.scala

@@ -94,7 +94,12 @@ trait Vectorization { self: HasFields =>
             owner
         }
 
-        def apply[M[_]](column: ColumnDataSource#Column[M, FieldType]): SelfType = {
+        def apply[M[_], T <: FieldType](column: ColumnDataSource#Column[M, T]): SelfType = {
+            setField(Some(column.name))
+            owner
+        }
+
+        def apply[M[_], T <% FieldType](column: ColumnDataSource#Column[M, T]): SelfType = {
             setField(Some(column.name))
             owner
         }
@@ -136,7 +141,12 @@ trait Vectorization { self: HasFields =>
             owner
         }
 
-        def apply[M[_]](column: ColumnDataSource#Column[M, FieldType], units: UnitsType): SelfType = {
+        def apply[M[_], T <: FieldType](column: ColumnDataSource#Column[M, T], units: UnitsType): SelfType = {
+            setUnits(units)
+            apply(column)
+        }
+
+        def apply[M[_], T <% FieldType](column: ColumnDataSource#Column[M, T], units: UnitsType): SelfType = {
             setUnits(units)
             apply(column)
         }

examples/src/main/scala/models/ColorSpec.scala

@@ -3,12 +3,10 @@ package examples
 package models
 
 object ColorSpec extends Example {
-    val colors: List[Color] = List(RGB(0, 100, 120), Color.Green, Color.Blue, "#2c7fb8", RGBA(120, 230, 150, 0.5))
-
     object source extends ColumnDataSource {
-        val x     = column(Array[Double](1, 2, 3, 4, 5))
-        val y     = column(Array[Double](5, 4, 3, 2, 1))
-        val color = column(colors)
+        val x     = values(1, 2, 3, 4, 5)
+        val y     = values(5, 4, 3, 2, 1)
+        val color = values(RGB(0, 100, 120), Color.Green, "#2c7fb8": Color, RGBA(120, 230, 150, 0.5))
     }
 
     import source.{x,y,color}

examples/src/main/scala/models/Maps.scala

@@ -66,7 +66,7 @@ object Maps extends Example {
     object source extends ColumnDataSource {
         val lat  = values(30.2861, 30.2855, 30.2869)
         val lon  = values(-97.7394, -97.7390, -97.7405)
-        val fill = values[Color](Color.Orange, Color.Blue, Color.Green)
+        val fill = values(Color.Orange, Color.Blue, Color.Green)
     }
 
     import source.{lat,lon,fill}