update OpenLayers to latest trunk

diff --git a/patches/openlayers/0002-xyz-wrapdateline-fixes-2246.patch b/patches/openlayers/0002-xyz-wrapdateline-fixes-2246.patch
deleted file mode 100644 (file)
index 9ff45dd..0000000
--- a/patches/openlayers/0002-xyz-wrapdateline-fixes-2246.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f738bc5fed1dbc67177cdd7066713ee68bcf8df8 Mon Sep 17 00:00:00 2001
-From: arno <arno@renevier.net>
-Date: Mon, 21 Mar 2011 19:57:20 +0100
-Subject: [PATCH 2/5] xyz-wrapdateline: fixes #2246
-
----
- openlayers/lib/OpenLayers/Layer/XYZ.js |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/openlayers/lib/OpenLayers/Layer/XYZ.js b/openlayers/lib/OpenLayers/Layer/XYZ.js
-index d8cbf53..95769bb 100644
---- a/openlayers/lib/OpenLayers/Layer/XYZ.js
-+++ b/openlayers/lib/OpenLayers/Layer/XYZ.js
-@@ -147,6 +147,12 @@ OpenLayers.Layer.XYZ = OpenLayers.Class(OpenLayers.Layer.Grid, {
-         var z = this.serverResolutions != null ?
-             OpenLayers.Util.indexOf(this.serverResolutions, res) :
-             this.map.getZoom() + this.zoomOffset;
-+        var limit = Math.pow(2, z);
-+
-+        if (this.wrapDateLine)
-+        {
-+            x = ((x % limit) + limit) % limit;
-+        }
- 
-         return {'x': x, 'y': y, 'z': z};
-     },
--- 
-1.7.4.1
-

diff --git a/public/js/syj.js b/public/js/syj.js
index fbe3f737efcc06d9ff0eef3a091e0b03aa59c554..62b2936a1248da6545966d3b0e95a43a41d0628f 100644 (file)
--- a/public/js/syj.js
+++ b/public/js/syj.js
@@ -292,7 +292,7 @@ var SYJView = {
                 'http://a.tile.openstreetmap.org/${z}/${x}/${y}.png',
                 'http://b.tile.openstreetmap.org/${z}/${x}/${y}.png',
                 'http://c.tile.openstreetmap.org/${z}/${x}/${y}.png'],
-                { wrapDateLine: true , attribution: SyjStrings.osmAttribution });
+                { attribution: SyjStrings.osmAttribution });
 
         layerOptions = {format:     OpenLayers.Format.WKT,
                         projection: WGS84,