Skip to content

Commit

Permalink
Upgrade examples and tests to OpenLayers v3.14.0
Browse files Browse the repository at this point in the history
Test fixtures had to be updated to take into account `ol.tilegrid`
changes in v3.6.0. No other changes required.
  • Loading branch information
walkermatt committed Feb 27, 2016
1 parent bf6dc3b commit b4069c6
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions examples/addlayer.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<meta charset="utf-8" />
<title>OpenLayers 3 - LayerSwitcher Add Layer</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.3.0/ol.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.14.0/ol.css" />
<link rel="stylesheet" href="../src/ol3-layerswitcher.css" />
<link rel="stylesheet" href="layerswitcher.css" />
</head>
<body>
<div id="map"></div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.3.0/ol.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.14.0/ol.js"></script>
<script src="../src/ol3-layerswitcher.js"></script>
<script src="addlayer.js"></script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions examples/layerswitcher.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<meta charset="utf-8" />
<title>OpenLayers 3 - LayerSwitcher</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.3.0/ol.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.14.0/ol.css" />
<link rel="stylesheet" href="../src/ol3-layerswitcher.css" />
<link rel="stylesheet" href="layerswitcher.css" />
</head>
<body>
<div id="map"></div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.3.0/ol.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.14.0/ol.js"></script>
<script src="../src/ol3-layerswitcher.js"></script>
<script src="layerswitcher.js"></script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions examples/scroll.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<meta charset="utf-8" />
<title>OpenLayers 3 - LayerSwitcher Scrolling</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.3.0/ol.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.14.0/ol.css" />
<link rel="stylesheet" href="../src/ol3-layerswitcher.css" />
<link rel="stylesheet" href="layerswitcher.css" />
<link rel="stylesheet" href="scroll.css" />
</head>
<body>
<div id="map"></div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.3.0/ol.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.14.0/ol.js"></script>
<script src="../src/ol3-layerswitcher.js"></script>
<script src="scroll.js"></script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions test/spec/ol3-layerswitcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
})
Expand All @@ -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
})
})
Expand All @@ -40,15 +40,15 @@ 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
})
})
}),
new ol.layer.Tile({
source: new ol.source.TileDebug({
projection: 'EPSG:3857',
tileGrid: new ol.tilegrid.XYZ({
tileGrid: ol.tilegrid.createXYZ({
maxZoom: 22
})
})
Expand All @@ -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
})
})
Expand All @@ -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
})
})
Expand Down

0 comments on commit b4069c6

Please sign in to comment.