Recognize different MercatorTileSource formats

geoviews/element/geo.py

@@ -23,9 +23,9 @@
     Cube = None
 
 try:
-    from bokeh.models import WMTSTileSource
+    from bokeh.models import MercatorTileSource
 except:
-    WMTSTileSource = None
+    MercatorTileSource = None
 
 try:
     from owslib.wmts import WebMapTileService
@@ -154,7 +154,7 @@ class WMTS(_GeoFeature):
     layer = param.String(doc="The layer on the tile service")
 
     def __init__(self, data, kdims=None, vdims=None, **params):
-        if ((WMTSTileSource and isinstance(data, WMTSTileSource)) or
+        if ((MercatorTileSource and isinstance(data, MercatorTileSource)) or
             (GoogleTiles and isinstance(data, GoogleTiles))):
             data = data.url
         elif WebMapTileService and isinstance(data, WebMapTileService):

geoviews/plotting/bokeh/__init__.py

@@ -2,7 +2,7 @@
 
 import param
 import shapely.geometry
-from bokeh.models import WMTSTileSource
+from bokeh.models import WMTSTileSource, BBoxTileSource, QUADKEYTileSource
 
 from holoviews import Store, Overlay, NdOverlay
 from holoviews.core import util
@@ -43,7 +43,15 @@ def get_data(self, element, ranges, style):
         if not isinstance(element.data, util.basestring):
             SkipRendering("WMTS element data must be a URL string, "
                           "bokeh cannot render %r" % element.data)
-        return {}, {'tile_source': WMTSTileSource(url=element.data)}, style
+        if '{Q}' in element.data:
+            tile_source = QUADKEYTileSource
+        elif all(kw in element.data for kw in ('{XMIN}', '{XMAX}', '{YMIN}', '{YMAX}')):
+            tile_source = BBoxTileSource
+        elif all(kw in element.data for kw in ('{X}', '{Y}', '{Z}')):
+            tile_source = WMTSTileSource
+        else:
+            raise ValueError('Tile source URL format not recognized.')
+        return {}, {'tile_source': tile_source(url=element.data)}, style
 
     def _update_glyph(self, renderer, properties, mapping, glyph):
         allowed_properties = glyph.properties()