Merge pull request #335 from TileStache/migurski/update-layer-previews

Update layer previews
TileStache · Jun 23, 2018 · 541efd3 · 541efd3
2 parents 8dc30d8 + b9d896c
commit 541efd3
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2018-06-22: 1.51.8
+- Updated layer previews with Leaflet and GeoJSON
+
 2018-06-12: 1.51.7
 - Various Python 3.x compatibility fixes
 

diff --git a/TileStache/Core.py b/TileStache/Core.py
@@ -732,11 +732,27 @@ def _preview(layer):
     zoom = layer.preview_zoom
     ext = layer.preview_ext
 
+    try:
+        mimetype, _ = layer.provider.getTypeByExtension(layer.preview_ext)
+    except AttributeError:
+        mimetype = 'image/'
+
     return """<!DOCTYPE html>
 <html>
 <head>
     <title>TileStache Preview: %(layername)s</title>
-    <script src="//cdn.rawgit.com/stamen/modestmaps-js/v1.0.0-beta1/modestmaps.min.js" type="text/javascript"></script>
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@0.7.7/dist/leaflet.css"
+       integrity="sha512-BjUcsqlmxCfopFFJpQr57VRWk3/N+csTp8cwWSNeOmBnz8QriGor88ZiHlLKPvutKvTpRU7HRT08E0y/FM0TCA=="
+       crossorigin=""/>
+    <script src="https://unpkg.com/leaflet@0.7.7/dist/leaflet.js"
+       integrity="sha512-e+JSf1UWuoLdiGeXXi5byQqIN7ojQLLgvC+aV0w9rnKNwNDBAz99sCgS20+PjT/r+yitmU7kpGVZJQDDgevhoA=="
+       crossorigin=""></script>
+    <script src="https://raw.githubusercontent.com/mlevans/leaflet-hash/431bff5c6/leaflet-hash.js"
+       integrity="sha512-2KBa5eJPxTH3HX7jCWrbO+NYNLV8xrnX5lDB7FTs9HFJ8jpO1MTV6MkmNNaia79k+xOk8q965FkqAjwEYCfDAA==">
+       </script>
+    <script src="https://raw.githubusercontent.com/glenrobertson/leaflet-tilelayer-geojson/68b6030a6/TileLayer.GeoJSON.js"
+       integrity="sha512-Ryw/zIuShF0cScpLNLvdbx25oq4ZybL7LXwkfD3dJ++I61D494wmVlf7DjstJn6earWQwpqfGfLioCJ4UT2qVw==">
+       </script>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <style type="text/css">
         html, body, #map {
@@ -757,14 +773,24 @@ def _preview(layer):
     <div id="map"></div>
     <script type="text/javascript" defer>
     <!--
-        var template = '{Z}/{X}/{Y}.%(ext)s';
-        var map = new MM.Map('map', new MM.TemplatedLayer(template), null, [
-            new MM.TouchHandler(),
-            new MM.DragHandler(),
-            new MM.DoubleClickHandler()
-        ]);
-        map.setCenterZoom(new com.modestmaps.Location(%(lat).6f, %(lon).6f), %(zoom)d);
-        new MM.Hash(map);
+        var map = L.map('map').setView([%(lat).6f, %(lon).6f], %(zoom)d),
+            hash = new L.Hash(map);
+        
+        if('%(mimetype)s'.match(/^application\/json/))
+        {
+            L.tileLayer('https://tile-{s}.openstreetmap.fr/hot/{z}/{x}/{y}.png', {
+                attribution: '...',
+                maxZoom: 20
+            }).addTo(map);
+
+            map.addLayer(new L.TileLayer.GeoJSON('{z}/{x}/{y}.%(ext)s', {}, {}));
+        } else {
+            L.tileLayer('{z}/{x}/{y}.%(ext)s', {
+                attribution: '...',
+                maxZoom: 20
+            }).addTo(map);
+        }
+
     //-->
     </script>
 </body>

diff --git a/TileStache/VERSION b/TileStache/VERSION
@@ -1 +1 @@
-1.51.7
+1.51.8