From a642868cfaf81e82c3cf9fa38b745cdf89472f98 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 16 Apr 2013 16:28:41 +0200
Subject: [PATCH] Port examples to new extents

---
 examples/wms-custom-proj.js              | 5 ++---
 examples/wms-single-image-custom-proj.js | 5 ++---
 examples/wms-single-image.js             | 3 +--
 examples/wms-tiled.js                    | 3 +--
 examples/wmts.js                         | 8 ++++----
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js
index 2b829f3830..b1185b006b 100644
--- a/examples/wms-custom-proj.js
+++ b/examples/wms-custom-proj.js
@@ -1,5 +1,4 @@
 goog.require('ol.Attribution');
-goog.require('ol.Extent');
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
@@ -13,10 +12,10 @@ goog.require('ol.source.TiledWMS');
 
 var projection = ol.projection.configureProj4jsProjection({
   code: 'EPSG:21781',
-  extent: new ol.Extent(485869.5728, 76443.1884, 837076.5648, 299941.7864)
+  extent: [485869.5728, 837076.5648, 76443.1884, 299941.7864]
 });
 
-var extent = new ol.Extent(420000, 30000, 900000, 350000);
+var extent = [420000, 900000, 30000, 350000];
 var layers = [
   new ol.layer.TileLayer({
     source: new ol.source.TiledWMS({
diff --git a/examples/wms-single-image-custom-proj.js b/examples/wms-single-image-custom-proj.js
index d4b3444abf..1f51f91620 100644
--- a/examples/wms-single-image-custom-proj.js
+++ b/examples/wms-single-image-custom-proj.js
@@ -1,5 +1,4 @@
 goog.require('ol.Attribution');
-goog.require('ol.Extent');
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
@@ -10,10 +9,10 @@ goog.require('ol.source.SingleImageWMS');
 
 var projection = ol.projection.configureProj4jsProjection({
   code: 'EPSG:21781',
-  extent: new ol.Extent(485869.5728, 76443.1884, 837076.5648, 299941.7864)
+  extent: [485869.5728, 837076.5648, 76443.1884, 299941.7864]
 });
 
-var extent = new ol.Extent(420000, 30000, 900000, 350000);
+var extent = [420000, 900000, 30000, 350000];
 var layers = [
   new ol.layer.ImageLayer({
     source: new ol.source.SingleImageWMS({
diff --git a/examples/wms-single-image.js b/examples/wms-single-image.js
index ba63537379..98b429b7f0 100644
--- a/examples/wms-single-image.js
+++ b/examples/wms-single-image.js
@@ -1,4 +1,3 @@
-goog.require('ol.Extent');
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
@@ -16,7 +15,7 @@ var layers = [
     source: new ol.source.SingleImageWMS({
       url: 'http://demo.opengeo.org/geoserver/wms',
       params: {'LAYERS': 'topp:states'},
-      extent: new ol.Extent(-13884991, 2870341, -7455066, 6338219)
+      extent: [-13884991, -7455066, 2870341, 6338219]
     })
   })
 ];
diff --git a/examples/wms-tiled.js b/examples/wms-tiled.js
index f82a00293a..db2ba8a059 100644
--- a/examples/wms-tiled.js
+++ b/examples/wms-tiled.js
@@ -1,4 +1,3 @@
-goog.require('ol.Extent');
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
@@ -15,7 +14,7 @@ var layers = [
     source: new ol.source.TiledWMS({
       url: 'http://demo.opengeo.org/geoserver/wms',
       params: {'LAYERS': 'topp:states', 'TILED': true},
-      extent: new ol.Extent(-13884991, 2870341, -7455066, 6338219)
+      extent: [-13884991, -7455066, 2870341, 6338219]
     })
   })
 ];
diff --git a/examples/wmts.js b/examples/wmts.js
index e118592498..66c9923998 100644
--- a/examples/wmts.js
+++ b/examples/wmts.js
@@ -1,7 +1,7 @@
-goog.require('ol.Extent');
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
+goog.require('ol.extent');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.projection');
 goog.require('ol.source.OSM');
@@ -11,7 +11,7 @@ goog.require('ol.tilegrid.WMTS');
 
 var projection = ol.projection.get('EPSG:900913');
 var projectionExtent = projection.getExtent();
-var size = projectionExtent.getWidth() / 256;
+var size = ol.extent.getWidth(projectionExtent) / 256;
 var resolutions = new Array(26);
 var matrixIds = new Array(26);
 for (var z = 0; z < 26; ++z) {
@@ -34,12 +34,12 @@ var map = new ol.Map({
         format: 'image/png',
         projection: projection,
         tileGrid: new ol.tilegrid.WMTS({
-          origin: projectionExtent.getTopLeft(),
+          origin: ol.extent.getTopLeft(projectionExtent),
           resolutions: resolutions,
           matrixIds: matrixIds
         }),
         style: '_null',
-        extent: new ol.Extent(-13682835, 5204068, -13667473, 5221690)
+        extent: [-13682835, -13667473, 5204068, 5221690]
       })
     })
   ],