From b4069c6ffca8de7a78c79f5a68ed836dfca36680 Mon Sep 17 00:00:00 2001 From: Matt Walker Date: Sat, 27 Feb 2016 08:24:52 +0000 Subject: [PATCH] Upgrade examples and tests to OpenLayers v3.14.0 Test fixtures had to be updated to take into account `ol.tilegrid` changes in v3.6.0. No other changes required. --- examples/addlayer.html | 4 ++-- examples/layerswitcher.html | 4 ++-- examples/scroll.html | 4 ++-- package.json | 2 +- test/spec/ol3-layerswitcher.js | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/addlayer.html b/examples/addlayer.html index 8355c48..931bed6 100644 --- a/examples/addlayer.html +++ b/examples/addlayer.html @@ -4,13 +4,13 @@ OpenLayers 3 - LayerSwitcher Add Layer - +
- + diff --git a/examples/layerswitcher.html b/examples/layerswitcher.html index 45bc072..d0ae480 100644 --- a/examples/layerswitcher.html +++ b/examples/layerswitcher.html @@ -4,13 +4,13 @@ OpenLayers 3 - LayerSwitcher - +
- + diff --git a/examples/scroll.html b/examples/scroll.html index 56ea76a..69b795a 100644 --- a/examples/scroll.html +++ b/examples/scroll.html @@ -4,14 +4,14 @@ OpenLayers 3 - LayerSwitcher Scrolling - +
- + diff --git a/package.json b/package.json index aab81ed..e83bff4 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "doc": "node_modules/.bin/jsdoc --explain src/ol3-layerswitcher.js | node_modules/.bin/dirtydocs util/README.md > README.md" }, "dependencies": { - "openlayers": "~3.3.0" + "openlayers": "~3.14.0" }, "devDependencies": { "expect.js": "~0.3.1", diff --git a/test/spec/ol3-layerswitcher.js b/test/spec/ol3-layerswitcher.js index 02f017d..128f84a 100644 --- a/test/spec/ol3-layerswitcher.js +++ b/test/spec/ol3-layerswitcher.js @@ -16,7 +16,7 @@ describe('ol.control.LayerSwitcher', function() { type: 'base', source: new ol.source.TileDebug({ projection: 'EPSG:3857', - tileGrid: new ol.tilegrid.XYZ({ + tileGrid: ol.tilegrid.createXYZ({ maxZoom: 22 }) }) @@ -26,7 +26,7 @@ describe('ol.control.LayerSwitcher', function() { type: 'base', source: new ol.source.TileDebug({ projection: 'EPSG:3857', - tileGrid: new ol.tilegrid.XYZ({ + tileGrid: ol.tilegrid.createXYZ({ maxZoom: 22 }) }) @@ -40,7 +40,7 @@ describe('ol.control.LayerSwitcher', function() { title: 'Never shown', source: new ol.source.TileDebug({ projection: 'EPSG:3857', - tileGrid: new ol.tilegrid.XYZ({ + tileGrid: ol.tilegrid.createXYZ({ maxZoom: 22 }) }) @@ -48,7 +48,7 @@ describe('ol.control.LayerSwitcher', function() { new ol.layer.Tile({ source: new ol.source.TileDebug({ projection: 'EPSG:3857', - tileGrid: new ol.tilegrid.XYZ({ + tileGrid: ol.tilegrid.createXYZ({ maxZoom: 22 }) }) @@ -59,7 +59,7 @@ describe('ol.control.LayerSwitcher', function() { title: 'Bar', source: new ol.source.TileDebug({ projection: 'EPSG:3857', - tileGrid: new ol.tilegrid.XYZ({ + tileGrid: ol.tilegrid.createXYZ({ maxZoom: 22 }) }) @@ -68,7 +68,7 @@ describe('ol.control.LayerSwitcher', function() { new ol.layer.Tile({ source: new ol.source.TileDebug({ projection: 'EPSG:3857', - tileGrid: new ol.tilegrid.XYZ({ + tileGrid: ol.tilegrid.createXYZ({ maxZoom: 22 }) })