Add WMS test, fix WMS. Fixes mapbox#70

Franzz · May 18, 2016 · e1856ab · e1856ab
1 parent daddac6
commit e1856ab
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -7,6 +7,8 @@ var cacheBusterDate = +new Date();
 // leaflet-image
 module.exports = function leafletImage(map, callback) {
 
+    var hasMapbox = !L.mapbox;
+
     var dimensions = map.getSize(),
         layerQueue = new queue(1);
 
@@ -78,7 +80,8 @@ module.exports = function leafletImage(map, callback) {
         if (zoom > layer.options.maxZoom ||
             zoom < layer.options.minZoom ||
             // mapbox.tileLayer
-            (layer.options.format && !layer.options.tiles)) {
+            (hasMapbox &&
+                layer instanceof L.mapbox.tileLayer && !layer.options.tiles)) {
             return callback();
         }
 

diff --git a/leaflet-image.js b/leaflet-image.js
@@ -8,6 +8,8 @@ var cacheBusterDate = +new Date();
 // leaflet-image
 module.exports = function leafletImage(map, callback) {
 
+    var hasMapbox = !L.mapbox;
+
     var dimensions = map.getSize(),
         layerQueue = new queue(1);
 
@@ -79,7 +81,8 @@ module.exports = function leafletImage(map, callback) {
         if (zoom > layer.options.maxZoom ||
             zoom < layer.options.minZoom ||
             // mapbox.tileLayer
-            (layer.options.format && !layer.options.tiles)) {
+            (hasMapbox &&
+                layer instanceof L.mapbox.tileLayer && !layer.options.tiles)) {
             return callback();
         }
 

diff --git a/test/out/one-point-oh.png b/test/out/one-point-oh.png
diff --git a/test/out/osm.png b/test/out/osm.png
diff --git a/test/out/wms.png b/test/out/wms.png
diff --git a/test/pages/wms.html b/test/pages/wms.html
@@ -0,0 +1,41 @@
+<head>
+<script>L_PREFER_CANVAS = true;</script>
+<script src='https://api.tiles.mapbox.com/mapbox.js/v2.4.0/mapbox.js'></script>
+<link href='https://api.tiles.mapbox.com/mapbox.js/v2.4.0/mapbox.css' rel='stylesheet' />
+<link href='./shared/style.css' rel='stylesheet' />
+</head>
+<body>
+<div id='snapshot'></div>
+<div id='map'></div>
+<script src='../../leaflet-image.js'></script>
+<script>
+var snapshot = document.getElementById('snapshot');
+var map = L.map('map')
+  .setView([38.88995, -77.00906], 8);
+
+L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+  attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+}).addTo(map);
+
+var precipitation = L.tileLayer.wms('http://nowcoast.noaa.gov/arcgis/services/nowcoast/analysis_meteohydro_sfc_qpe_time/MapServer/WmsServer', {
+  format: 'image/png',
+  transparent: true,
+  layers: '5'
+}).addTo(map);
+
+setTimeout(function() {
+  leafletImage(map, doImage);
+}, 2000);
+
+function doImage(err, canvas) {
+  var img = document.createElement('img');
+  var dimensions = map.getSize();
+  img.width = dimensions.x;
+  img.height = dimensions.y;
+  img.src = canvas.toDataURL();
+  snapshot.innerHTML = '';
+  snapshot.appendChild(img);
+}
+</script>
+</body>
+</html>
diff --git a/test/test.js b/test/test.js
@@ -5,7 +5,8 @@ var pixelmatch = require('pixelmatch');
 var fs = require('fs');
 var Pageres = require('pageres');
 
-['simple', 'circle-marker', 'osm', 'one-point-oh', 'style-layer', 'no-tiles'].forEach(name => {
+['simple', 'circle-marker', 'osm', 'one-point-oh',
+    'style-layer', 'no-tiles', 'wms'].forEach(name => {
     test(name, t => {
         const pageres = new Pageres({ delay: 5 })
             .src(path.join(__dirname, 'pages/', name + '.html'), ['400x400'])