[OpenLayers-Commits] r11217 - in sandbox/cmoullet/openlayers: .
examples lib/OpenLayers/Layer tests/Layer
commits-20090109 at openlayers.org
commits-20090109 at openlayers.org
Tue Feb 22 04:26:36 EST 2011
Author: cmoullet
Date: 2011-02-22 01:26:35 -0800 (Tue, 22 Feb 2011)
New Revision: 11217
Added:
sandbox/cmoullet/openlayers/examples/mobile-navigation.html
Removed:
sandbox/cmoullet/openlayers/examples/mobile-touchnavigation-control.html
Modified:
sandbox/cmoullet/openlayers/
sandbox/cmoullet/openlayers/lib/OpenLayers/Layer/Grid.js
sandbox/cmoullet/openlayers/tests/Layer/Grid.html
Log:
Merge with trunk
Property changes on: sandbox/cmoullet/openlayers
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11161-11210
+ /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11161-11216
Copied: sandbox/cmoullet/openlayers/examples/mobile-navigation.html (from rev 11216, trunk/openlayers/examples/mobile-navigation.html)
===================================================================
--- sandbox/cmoullet/openlayers/examples/mobile-navigation.html (rev 0)
+++ sandbox/cmoullet/openlayers/examples/mobile-navigation.html 2011-02-22 09:26:35 UTC (rev 11217)
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
+ <meta name="apple-mobile-web-app-capable" content="yes" />
+ <title>OpenLayers TouchNavigation Control</title>
+ <link rel="stylesheet" href="../theme/default/style.css" type="text/css" />
+ <link rel="stylesheet" href="style.css" type="text/css" />
+ <script src="../lib/OpenLayers.js"></script>
+ <script type="text/javascript">
+ var map, layer;
+ function init() {
+ map = new OpenLayers.Map( 'map', { controls: [
+ new OpenLayers.Control.TouchNavigation({
+ dragPanOptions: {
+ interval: 0 // non-zero kills performance on some mobile phones
+ }
+ })
+ ] });
+ layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
+ "http://vmap0.tiles.osgeo.org/wms/vmap0",
+ {layers: 'basic'} );
+ map.addLayer(layer);
+ map.setCenter(new OpenLayers.LonLat(5, 40), 2);
+ }
+ </script>
+ </head>
+ <body onload="init()">
+ <h1 id="title">TouchNavigation Control</h1>
+
+ <div id="tags">
+ mobile, touch, drag, move, zoom, navigate
+ </div>
+
+ <div id="shortdesc">Demonstrate TouchNavigation Control features</div>
+
+ <div id="map" class="smallmap"></div>
+ <div id="docs">
+ This example demonstrates a couple features of the TouchNavigation
+ control. The TouchNavigation control controls most map dragging,
+ movement, zooming, etc, optimized for mobile devices.
+ </div>
+ </body>
+</html>
Deleted: sandbox/cmoullet/openlayers/examples/mobile-touchnavigation-control.html
===================================================================
--- sandbox/cmoullet/openlayers/examples/mobile-touchnavigation-control.html 2011-02-22 09:10:56 UTC (rev 11216)
+++ sandbox/cmoullet/openlayers/examples/mobile-touchnavigation-control.html 2011-02-22 09:26:35 UTC (rev 11217)
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" />
- <meta name="apple-mobile-web-app-capable" content="yes" />
- <title>OpenLayers TouchNavigation Control</title>
- <link rel="stylesheet" href="../theme/default/style.css" type="text/css" />
- <link rel="stylesheet" href="style.css" type="text/css" />
- <script src="../lib/OpenLayers.js"></script>
- <script type="text/javascript">
- var map, layer;
- function init() {
- map = new OpenLayers.Map( 'map', { controls: [
- new OpenLayers.Control.TouchNavigation({
- dragPanOptions: {
- interval: 0 // non-zero kills performance on some mobile phones
- }
- })
- ] });
- layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
- "http://vmap0.tiles.osgeo.org/wms/vmap0",
- {layers: 'basic'} );
- map.addLayer(layer);
- map.setCenter(new OpenLayers.LonLat(5, 40), 2);
- }
- </script>
- </head>
- <body onload="init()">
- <h1 id="title">TouchNavigation Control</h1>
-
- <div id="tags">
- mobile, touch, drag, move, zoom, navigate
- </div>
-
- <div id="shortdesc">Demonstrate TouchNavigation Control features</div>
-
- <div id="map" class="smallmap"></div>
- <div id="docs">
- This example demonstrates a couple features of the TouchNavigation
- control. The TouchNavigation control controls most map dragging,
- movement, zooming, etc, optimized for mobile devices.
- </div>
- </body>
-</html>
Modified: sandbox/cmoullet/openlayers/lib/OpenLayers/Layer/Grid.js
===================================================================
--- sandbox/cmoullet/openlayers/lib/OpenLayers/Layer/Grid.js 2011-02-22 09:10:56 UTC (rev 11216)
+++ sandbox/cmoullet/openlayers/lib/OpenLayers/Layer/Grid.js 2011-02-22 09:26:35 UTC (rev 11217)
@@ -239,7 +239,6 @@
if (this.timerId != null) {
window.clearTimeout(this.timerId);
}
- this._bounds = bounds;
this.timerId = window.setTimeout(
this._moveGriddedTiles,
this.tileLoadingDelay
@@ -663,7 +662,6 @@
* Method: moveGriddedTiles
*/
moveGriddedTiles: function() {
- var bounds = this._bounds;
var shifted = true;
var buffer = this.buffer || 1;
var tlLayer = this.grid[0][0].position;
@@ -678,7 +676,6 @@
this.shiftRow(false);
} else {
shifted = false;
- delete this._bounds;
}
if (shifted) {
// we may have other row or columns to shift, schedule it
Modified: sandbox/cmoullet/openlayers/tests/Layer/Grid.html
===================================================================
--- sandbox/cmoullet/openlayers/tests/Layer/Grid.html 2011-02-22 09:10:56 UTC (rev 11216)
+++ sandbox/cmoullet/openlayers/tests/Layer/Grid.html 2011-02-22 09:26:35 UTC (rev 11217)
@@ -195,7 +195,7 @@
};
layer._moveGriddedTiles = function() {
g_WhichFunc = "MoveGridded";
- g_Bounds = layer._bounds;
+ g_Bounds = layer.map.getExtent();
};
var clearTestBounds = function() {
g_WhichFunc = null;
More information about the Commits
mailing list