[OpenLayers-Commits] r11612 - in sandbox/jennier/openlayers: .
build examples examples/img lib lib/Firebug lib/OpenLayers
lib/OpenLayers/BaseTypes lib/OpenLayers/Control
lib/OpenLayers/Format lib/OpenLayers/Geometry
lib/OpenLayers/Handler lib/OpenLayers/Layer
lib/OpenLayers/Layer/Google lib/OpenLayers/LocalTileStorage
lib/OpenLayers/Protocol/WFS lib/OpenLayers/Renderer
lib/OpenLayers/Strategy tests tests/Control tests/Format
tests/Handler tests/Layer tests/Strategy tests/node.js tools
commits-20090109 at openlayers.org
commits-20090109 at openlayers.org
Thu Mar 3 10:38:52 EST 2011
Author: jennier
Date: 2011-03-03 07:38:51 -0800 (Thu, 03 Mar 2011)
New Revision: 11612
Added:
sandbox/jennier/openlayers/examples/game-accel-ball.html
sandbox/jennier/openlayers/examples/img/locate.png
sandbox/jennier/openlayers/examples/img/mobile-layers.png
sandbox/jennier/openlayers/examples/img/mobile-loc.png
sandbox/jennier/openlayers/examples/img/openlayers.png
sandbox/jennier/openlayers/examples/mobile-jq.js
sandbox/jennier/openlayers/examples/multitouch.html
sandbox/jennier/openlayers/examples/style.mobile-jq.css
sandbox/jennier/openlayers/lib/OpenLayers/Control/PinchZoom.js
sandbox/jennier/openlayers/tests/Control/PinchZoom.html
sandbox/jennier/openlayers/tests/node.js/
sandbox/jennier/openlayers/tests/node.js/mockdom.js
sandbox/jennier/openlayers/tests/node.js/node-tests.cfg
sandbox/jennier/openlayers/tests/node.js/node.js
sandbox/jennier/openlayers/tests/node.js/run-test.js
sandbox/jennier/openlayers/tests/node.js/run.sh
Removed:
sandbox/jennier/openlayers/tests/node.js/mockdom.js
sandbox/jennier/openlayers/tests/node.js/node-tests.cfg
sandbox/jennier/openlayers/tests/node.js/node.js
sandbox/jennier/openlayers/tests/node.js/run-test.js
sandbox/jennier/openlayers/tests/node.js/run.sh
Modified:
sandbox/jennier/openlayers/
sandbox/jennier/openlayers/build/mobile.cfg
sandbox/jennier/openlayers/examples/accelerometer.html
sandbox/jennier/openlayers/examples/bing.html
sandbox/jennier/openlayers/examples/browser.html
sandbox/jennier/openlayers/examples/browser.js
sandbox/jennier/openlayers/examples/canvas.js
sandbox/jennier/openlayers/examples/controls.html
sandbox/jennier/openlayers/examples/mobile-base.js
sandbox/jennier/openlayers/examples/mobile-jq.html
sandbox/jennier/openlayers/examples/mobile-navigation.js
sandbox/jennier/openlayers/examples/mobile.js
sandbox/jennier/openlayers/examples/restricted-extent.html
sandbox/jennier/openlayers/examples/spherical-mercator.html
sandbox/jennier/openlayers/lib/Firebug/firebugx.js
sandbox/jennier/openlayers/lib/OpenLayers.js
sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes.js
sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes/Bounds.js
sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes/Element.js
sandbox/jennier/openlayers/lib/OpenLayers/Console.js
sandbox/jennier/openlayers/lib/OpenLayers/Control.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/ArgParser.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/Attribution.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/MousePosition.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/Navigation.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/PanZoomBar.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/ScaleLine.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/SelectFeature.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/Snapping.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/Split.js
sandbox/jennier/openlayers/lib/OpenLayers/Control/TouchNavigation.js
sandbox/jennier/openlayers/lib/OpenLayers/Events.js
sandbox/jennier/openlayers/lib/OpenLayers/Format/GML.js
sandbox/jennier/openlayers/lib/OpenLayers/Format/GPX.js
sandbox/jennier/openlayers/lib/OpenLayers/Format/GeoRSS.js
sandbox/jennier/openlayers/lib/OpenLayers/Format/KML.js
sandbox/jennier/openlayers/lib/OpenLayers/Geometry/Rectangle.js
sandbox/jennier/openlayers/lib/OpenLayers/Handler/Click.js
sandbox/jennier/openlayers/lib/OpenLayers/Handler/Feature.js
sandbox/jennier/openlayers/lib/OpenLayers/Handler/Path.js
sandbox/jennier/openlayers/lib/OpenLayers/Handler/Pinch.js
sandbox/jennier/openlayers/lib/OpenLayers/Handler/Point.js
sandbox/jennier/openlayers/lib/OpenLayers/Handler/Polygon.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/ArcIMS.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/EventPane.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/Google/v3.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/Grid.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/KaMap.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/MapGuide.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/MapServer.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/TMS.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/TileCache.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/VirtualEarth.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/WMS.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/WMTS.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/WorldWind.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/XYZ.js
sandbox/jennier/openlayers/lib/OpenLayers/Layer/Zoomify.js
sandbox/jennier/openlayers/lib/OpenLayers/LocalTileStorage/
sandbox/jennier/openlayers/lib/OpenLayers/LocalTileStorage/TileSQLStorage.js
sandbox/jennier/openlayers/lib/OpenLayers/LocalTileStorage/TileWebStorage.js
sandbox/jennier/openlayers/lib/OpenLayers/Map.js
sandbox/jennier/openlayers/lib/OpenLayers/Popup.js
sandbox/jennier/openlayers/lib/OpenLayers/Projection.js
sandbox/jennier/openlayers/lib/OpenLayers/Protocol/WFS/v1.js
sandbox/jennier/openlayers/lib/OpenLayers/Renderer/Elements.js
sandbox/jennier/openlayers/lib/OpenLayers/Renderer/SVG.js
sandbox/jennier/openlayers/lib/OpenLayers/Strategy/BBOX.js
sandbox/jennier/openlayers/lib/OpenLayers/Util.js
sandbox/jennier/openlayers/tests/Control/Geolocate.html
sandbox/jennier/openlayers/tests/Control/Measure.html
sandbox/jennier/openlayers/tests/Control/Navigation.html
sandbox/jennier/openlayers/tests/Events.html
sandbox/jennier/openlayers/tests/Format/GeoRSS.html
sandbox/jennier/openlayers/tests/Handler/Click.html
sandbox/jennier/openlayers/tests/Handler/Feature.html
sandbox/jennier/openlayers/tests/Handler/Path.html
sandbox/jennier/openlayers/tests/Handler/Point.html
sandbox/jennier/openlayers/tests/Handler/Polygon.html
sandbox/jennier/openlayers/tests/Layer/Image.html
sandbox/jennier/openlayers/tests/Map.html
sandbox/jennier/openlayers/tests/Strategy/BBOX.html
sandbox/jennier/openlayers/tests/list-tests.html
sandbox/jennier/openlayers/tools/release.sh
sandbox/jennier/openlayers/tools/update_dev_dir.sh
Log:
merging with trunk
Property changes on: sandbox/jennier/openlayers
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/roberthl/openlayers:9745-9748
+ /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11270-11499,11501-11611
Added: svn:ignore
+ .project
Modified: sandbox/jennier/openlayers/build/mobile.cfg
===================================================================
--- sandbox/jennier/openlayers/build/mobile.cfg 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/build/mobile.cfg 2011-03-03 15:38:51 UTC (rev 11612)
@@ -13,8 +13,11 @@
OpenLayers/Control/Geolocate.js
OpenLayers/Control/ZoomPanel.js
OpenLayers/Control/Attribution.js
+OpenLayers/Control/SelectFeature.js
OpenLayers/Layer/Vector.js
OpenLayers/Renderer/SVG.js
+OpenLayers/Renderer/Canvas.js
+OpenLayers/Format/GeoJSON.js
[exclude]
Modified: sandbox/jennier/openlayers/examples/accelerometer.html
===================================================================
--- sandbox/jennier/openlayers/examples/accelerometer.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/accelerometer.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -70,10 +70,16 @@
<h1 id="title">Accelerometer</h1>
<p id="shortdesc">
- The goal of this script is to demonstrate the usage of accelerometer.<br>
- The orientation specification can be found <a href="http://dev.w3.org/geo/api/spec-source-orientation.html">here</a>.
+ The goal of this script is to demonstrate the usage of accelerometer.
</p>
+<p>
+ The orientation specification can be found <a href="http://dev.w3.org/geo/api/spec-source-orientation.html">here</a>.
+</p>
+<div id="tags">
+ browser, vendor, mobile, orientation
+</div>
+
<h1>Device motion</h1>
<div id="resultDeviceMotion">
Modified: sandbox/jennier/openlayers/examples/bing.html
===================================================================
--- sandbox/jennier/openlayers/examples/bing.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/bing.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -12,9 +12,16 @@
<script>
var map;
-
+
function init(){
+ // setting restrictedExtent so that we can use the
+ // VirtualEarth-layers, see e.g.
+ // http://dev.openlayers.org/apidocs/files/OpenLayers/Layer/VirtualEarth-js.html
+ var restrictedExtent = new OpenLayers.Bounds(-180, -90,
+ 180, 90);
+
map = new OpenLayers.Map("map");
+
map.addControl(new OpenLayers.Control.LayerSwitcher());
var shaded = new OpenLayers.Layer.VirtualEarth("Shaded", {
Modified: sandbox/jennier/openlayers/examples/browser.html
===================================================================
--- sandbox/jennier/openlayers/examples/browser.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/browser.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -11,6 +11,10 @@
.olControlAttribution {
bottom: 5px;
}
+
+ .tester {
+ margin: 3px;
+ }
</style>
<script type="text/javascript">
function init() {
@@ -79,12 +83,15 @@
</head>
<body onload="init()">
<h1 id="title">Browser detection</h1>
+
<div id="tags">
- browser, vendor, mobile, events, HTML5, gesture, touch
-</div>
+ browser, vendor, mobile, events, HTML5, gesture, touch
+</div>
+
<p id="shortdesc">
The goal of this script is to inform about the capacity of the browser used by the user.
</p>
+
<div id="docs">
<p>
See the <a href="browser.js" target="_blank">
@@ -95,7 +102,50 @@
<h1>Your browser information</h1>
<div id="result">
+</div>
+<h1>Click or touch the red square to get information about the selected events</h1>
+
+<div>
+ <div class="tester">
+ <INPUT TYPE=CHECKBOX ID="clickID" checked>click<BR>
+ <INPUT TYPE=CHECKBOX ID="dblclickID">dblclick<BR>
+ <INPUT TYPE=CHECKBOX ID="mousedownID">mousedown<BR>
+ <INPUT TYPE=CHECKBOX ID="mouseupID">mouseup<BR>
+ <INPUT TYPE=CHECKBOX ID="mouseoverID">mouseover<BR>
+ <INPUT TYPE=CHECKBOX ID="mousemoveID">mousemove<BR>
+ <INPUT TYPE=CHECKBOX ID="mouseoutID">mouseout<BR>
+ <INPUT TYPE=CHECKBOX ID="touchstartID">touchstart<BR>
+ <INPUT TYPE=CHECKBOX ID="touchendID">touchend<BR>
+ <INPUT TYPE=CHECKBOX ID="touchmoveID">touchmove<BR>
+ <INPUT TYPE=CHECKBOX ID="touchcancelID">touchcancel<BR>
+ <INPUT TYPE=CHECKBOX ID="gesturestartID">gesturestart<BR>
+ <INPUT TYPE=CHECKBOX ID="gesturechangeID">gesturechange<BR>
+ <INPUT TYPE=CHECKBOX ID="gestureendID">gestureend<BR>
+ </div>
+
+ <div style="height: 200px;width: 200px;" class="tester">
+ <div id="box" style="height: 200px; width: 200px; background: none repeat scroll 0% 0% red; "
+ onclick="click(event)"
+ ondblclick="dblclick(event)"
+ onmousedown="mousedown(event)"
+ onmouseup="mouseup(event)"
+ onmouseover="mouseover(event)"
+ onmousemove="mousemove(event)"
+ onmouseout="mouseout(event)"
+ ontouchstart="touchstart(event)"
+ ontouchend="touchend(event)"
+ ontouchmove="touchmove(event)"
+ ontouchcancel="touchcancel(event)"
+ ongesturestart="gesturestart(event)"
+ ongesturechange="gesturechange(event)"
+ ongestureend="gestureend(event)">
+ </div>
+ </div>
+
+ <div id="log" class="tester"></div>
</div>
+
+
</body>
</html>
Modified: sandbox/jennier/openlayers/examples/browser.js
===================================================================
--- sandbox/jennier/openlayers/examples/browser.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/browser.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -49,4 +49,193 @@
);
div.innerHTML = div.innerHTML + "<br>";
}
+var counter = 1;
+function log(title, detail) {
+ var logDiv = document.getElementById("log");
+ idString = "'id" + counter + "'";
+ var newlink = document.createElement('a');
+ newlink.setAttribute('href', "javascript:toggle_visibility(" + idString + ")");
+ newlink.innerHTML = counter + ". " + title;
+ var br1 = document.createElement('br');
+ logDiv.appendChild(newlink);
+ logDiv.appendChild(br1);
+
+ var childDiv = document.createElement('div');
+ childDiv.setAttribute("id", idString.replace("'", "").replace("'", ""));
+ childDiv.setAttribute("style", 'display: none; margin-left : 5px;');
+ childDiv.innerHTML = detail;
+ var br2 = document.createElement('br');
+ logDiv.appendChild(childDiv);
+
+ counter = counter + 1;
+}
+
+function inspect(obj) {
+ if (typeof obj === "undefined") {
+ return "undefined";
+ }
+ var _props = [];
+
+ for (var i in obj) {
+ _props.push(i + " : " + obj[i]);
+ }
+ return " {" + _props.join(",<br>") + "} ";
+}
+
+function click(e) {
+ if (document.getElementById("clickID").checked) {
+ var box = document.getElementById("box");
+ log(e.type, inspect(e));
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function dblclick(e) {
+ if (document.getElementById("dblclickID").checked) {
+ var box = document.getElementById("box");
+ log(e.type, inspect(e));
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function mousedown(e) {
+ if (document.getElementById("mousedownID").checked) {
+ var box = document.getElementById("box");
+ log(e.type, inspect(e));
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function mouseup(e) {
+ if (document.getElementById("mouseupID").checked) {
+ var box = document.getElementById("box");
+ log(e.type, inspect(e));
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function mouseover(e) {
+ if (document.getElementById("mouseoverID").checked) {
+ var box = document.getElementById("box");
+ log(e.type, inspect(e));
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function mousemove(e) {
+ if (document.getElementById("mousemoveID").checked) {
+ var box = document.getElementById("box");
+ log(e.type, inspect(e));
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function mouseout(e) {
+ if (document.getElementById("mouseoutID").checked) {
+ var box = document.getElementById("box");
+ log(e.type, inspect(e));
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function touchstart(e) {
+ if (document.getElementById("touchstartID").checked) {
+ var box = document.getElementById("box");
+ var result = inspect(e);
+ for (var i = 0; i < e.touches.length; i++) {
+ result = result + "<br> Touches nr." + i + " <br>" + inspect(e.touches[i]);
+ }
+ log(e.type, result);
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function touchend(e) {
+ if (document.getElementById("touchendID").checked) {
+ var box = document.getElementById("box");
+ var result = inspect(e);
+ for (var i = 0; i < e.touches.length; i++) {
+ result = result + "<br> Touches nr." + i + " <br>" + inspect(e.touches[i]);
+ }
+ log(e.type, result);
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function touchmove(e) {
+ if (document.getElementById("touchmoveID").checked) {
+ var targetEvent = e.touches.item(0);
+ var box = document.getElementById("box");
+ box.style.left = targetEvent.clientX + "px";
+ box.style.top = targetEvent.clientY + "px";
+ var result = inspect(e);
+ for (var i = 0; i < e.touches.length; i++) {
+ result = result + "<br> Touches nr." + i + " <br>" + inspect(e.touches[i]);
+ }
+ log(e.type, result);
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function touchcancel(e) {
+ if (document.getElementById("touchcancelID").checked) {
+ var box = document.getElementById("box");
+ var result = inspect(e);
+ for (var i = 0; i < e.touches.length; i++) {
+ result = result + "<br> Touches nr." + i + " <br>" + inspect(e.touches[i]);
+ }
+ log(e.type, result);
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function gesturestart(e) {
+ if (document.getElementById("gesturestartID").checked) {
+ var box = document.getElementById("box");
+ log(e.type, inspect(e));
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function gesturechange(e) {
+ if (document.getElementById("gesturechangeID").checked) {
+ var box = document.getElementById("box");
+ log(e.type, inspect(e));
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function gestureend(e) {
+ if (document.getElementById("gestureendID").checked) {
+ var box = document.getElementById("box");
+ log(e.type, inspect(e));
+ if (e.preventDefault) e.preventDefault();
+ }
+ return false;
+}
+
+function toggle_visibility(id) {
+ var e = document.getElementById(id);
+ if (e.style.display == 'block') {
+ e.style.display = 'none';
+ } else {
+ e.style.display = 'block';
+ }
+}
+
+
+
Modified: sandbox/jennier/openlayers/examples/canvas.js
===================================================================
--- sandbox/jennier/openlayers/examples/canvas.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/canvas.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -43,9 +43,9 @@
protocol: new OpenLayers.Protocol.WFS({
version: "1.1.0",
srsName: "EPSG:900913",
- url: "http://demo.opengeo.org/geoserver/wfs",
+ url: "http://v2.suite.opengeo.org/geoserver/wfs",
featureType: "states",
- featureNS: "http://www.openplans.org/topp"
+ featureNS: "http://usa.opengeo.org"
}),
styleMap: styleMap,
renderers: ["Canvas", "SVG", "VML"]
Modified: sandbox/jennier/openlayers/examples/controls.html
===================================================================
--- sandbox/jennier/openlayers/examples/controls.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/controls.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -25,7 +25,6 @@
numZoomLevels: 6
});
-
var ol_wms = new OpenLayers.Layer.WMS(
"OpenLayers WMS",
@@ -49,7 +48,10 @@
);
map.addLayers([ol_wms, gwc, dm_wms]);
- map.zoomToMaxExtent();
+
+ if (!map.getCenter()) {
+ map.zoomToMaxExtent();
+ }
}
</script>
</head>
Copied: sandbox/jennier/openlayers/examples/game-accel-ball.html (from rev 11611, trunk/openlayers/examples/game-accel-ball.html)
===================================================================
--- sandbox/jennier/openlayers/examples/game-accel-ball.html (rev 0)
+++ sandbox/jennier/openlayers/examples/game-accel-ball.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1,80 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <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 Game: Bounce Ball</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?mobile"></script>
+ <style type="text/css">
+ html, body { height: 100%; }
+ #shortdesc { display: none; }
+ #tags { display: none; }
+ </style>
+
+ <script type="text/javascript">
+ var map, vlayer;
+ function adjustLocation(delta, feature) {
+ feature.geometry.move(delta.x, delta.y);
+ var me = map.maxExtent;
+ var rad = 6;
+ if (feature.geometry.x > (me.right - rad)) {
+ feature.geometry.x = me.right - rad;
+ } else if (feature.geometry.x < (me.left+rad)) {
+ feature.geometry.x = me.left+rad;
+ }
+ if (feature.geometry.y > (me.top-rad)) {
+ feature.geometry.y = me.top-rad;
+ } else if (feature.geometry.y < (me.bottom+rad)) {
+ feature.geometry.y = me.bottom+rad;
+ }
+ vlayer.drawFeature(feature);
+ }
+ function init() {
+ map = new OpenLayers.Map( 'map',
+ {
+ 'maxExtent': new OpenLayers.Bounds(0, 0, $("map").clientWidth, $("map").clientHeight),
+ controls: [],
+ maxResolution: 'auto'}
+ );
+ var layer = new OpenLayers.Layer("",
+ {isBaseLayer: true} );
+ map.addLayer(layer);
+ map.zoomToMaxExtent();
+ vlayer = new OpenLayers.Layer.Vector();
+ var feature = new OpenLayers.Feature.Vector(
+ new OpenLayers.Geometry.Point(map.getCenter().lon, map.getCenter().lat));
+ vlayer.addFeatures(feature);
+ map.addLayer(vlayer);
+ if (window.DeviceMotionEvent) {
+ window.addEventListener('devicemotion', function (evt) {
+ var delta = null;
+ if (typeof(evt.accelerationIncludingGravity) != 'undefined') {
+ delta = {
+ 'x': evt.accelerationIncludingGravity.x * 3,
+ 'y': evt.accelerationIncludingGravity.y * 3,
+ 'z': evt.accelerationIncludingGravity.z
+ }
+ }
+ adjustLocation(delta, feature);
+ }, true);
+ } else {
+ alert("This demo does not work on your browser.");
+ }
+ }
+ </script>
+ </head>
+ <body onload="init()">
+ <h1 id="title">Accelerometer Example</h1>
+ <div id="tags">
+ mobile, game
+ </div>
+ <div id="shortdesc">Simple acceleration demo; roll a vector feature around
+ on a map. (Only tested on iOS 4.)</div>
+
+ <div id="map" width="100%" height="100%" style="background-color: grey"></div>
+ <div id="docs">
+ Demo works best when device is locked in portrait mode.
+ </div>
+ </body>
+</html>
Copied: sandbox/jennier/openlayers/examples/img/locate.png (from rev 11611, trunk/openlayers/examples/img/locate.png)
===================================================================
(Binary files differ)
Copied: sandbox/jennier/openlayers/examples/img/mobile-layers.png (from rev 11611, trunk/openlayers/examples/img/mobile-layers.png)
===================================================================
(Binary files differ)
Copied: sandbox/jennier/openlayers/examples/img/mobile-loc.png (from rev 11611, trunk/openlayers/examples/img/mobile-loc.png)
===================================================================
(Binary files differ)
Copied: sandbox/jennier/openlayers/examples/img/openlayers.png (from rev 11611, trunk/openlayers/examples/img/openlayers.png)
===================================================================
(Binary files differ)
Modified: sandbox/jennier/openlayers/examples/mobile-base.js
===================================================================
--- sandbox/jennier/openlayers/examples/mobile-base.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/mobile-base.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -34,7 +34,7 @@
new OpenLayers.Control.Attribution(),
new OpenLayers.Control.TouchNavigation({
dragPanOptions: {
- interval: 0, // non-zero kills performance on some mobile phones
+ interval: 100,
enableKinetic: true
}
}),
@@ -68,9 +68,10 @@
transitionEffect: 'resize'
}),
vector
- ]
+ ],
+ center: new OpenLayers.LonLat(0, 0),
+ zoom: 1
});
- map.zoomToMaxExtent();
var style = {
fillOpacity: 0.1,
Modified: sandbox/jennier/openlayers/examples/mobile-jq.html
===================================================================
--- sandbox/jennier/openlayers/examples/mobile-jq.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/mobile-jq.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -1,8 +1,7 @@
<!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" />
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<title>OpenLayers with jQuery Mobile</title>
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0;">
<meta name="apple-mobile-web-app-capable" content="yes">
@@ -10,135 +9,67 @@
<script src="http://code.jquery.com/jquery-1.5.min.js"></script>
<script src="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.js"></script>
<link rel="stylesheet" href="style.mobile.css" type="text/css">
- <script src="../lib/OpenLayers.js"></script>
+ <link rel="stylesheet" href="style.mobile-jq.css" type="text/css">
+ <script src="../lib/OpenLayers.js?mobile"></script>
<script src="mobile-base.js"></script>
- <style>
- html {
- height: 100%;
- }
- body {
- margin: 0;
- padding: 0;
- height: 100%;
- }
- .ui-content {
- padding: 0;
- }
- .ui-footer, .ui-header {
- text-align: center;
- padding: 5px 0;
- }
- #map {
- width: 100%;
- height: 100%;
- }
- .olControlAttribution {
- font-size: 10px;
- bottom: 5px;
- right: 5px;
- }
- #title, #tags, #shortdesc {
- display: none;
- }
- </style>
- <script>
- $(document).ready(function() {
- // fix height of content to allow for header & footer
- function fixContentHeight() {
- var header = $("div[data-role='header']:visible");
- var footer = $("div[data-role='footer']:visible");
- var content = $("div[data-role='content']:visible:visible");
- var viewHeight = $(window).height();
-
- var contentHeight = viewHeight - header.outerHeight() - footer.outerHeight();
- if ((content.outerHeight() + header.outerHeight() + footer.outerHeight()) !== viewHeight) {
- contentHeight -= (content.outerHeight() - content.height());
- content.height(contentHeight);
- }
- if (window.map) {
- map.updateSize();
- } else {
- // initialize map
- init();
- }
- }
- $(window).bind("orientationchange resize pageshow", fixContentHeight);
- fixContentHeight();
-
- // add behavior to navigation buttons
- $("#west").click(function() {
- pan(-0.25, 0);
- });
- $("#north").click(function() {
- pan(0, -0.25);
- });
- $("#south").click(function() {
- pan(0, 0.25);
- });
- $("#east").click(function() {
- pan(0.25, 0);
- });
-
- // add behavior to drawing controls
- function deactivateControls() {
- $.each(map.getControlsByClass(/DrawFeature/), function(index, control) {
- control.deactivate();
- });
- map.getControlsBy("id", "mod-control")[0].deactivate();
- }
- $("#nav, #point, #line, #poly, #mod").change(function(event) {
- deactivateControls();
- // jquery mobile bug regarding change makes us go through all inputs
- // https://github.com/jquery/jquery-mobile/issues/issue/1088
- var val = $("input:radio[name=controls]:checked").val();
- if (val !== "nav") {
- map.getControlsBy("id", val + "-control")[0].activate();
- }
- });
-
- $("#nav").click();
- $("#nav").click(); // jquery mobile bug forces 2 calls to refresh radio ui
-
- });
-
- </script>
+ <script src="mobile-jq.js"></script>
</head>
<body>
<h1 id="title">OpenLayers with jQuery Mobile</h1>
<div id="tags">
- mobile, jquery
+ mobile, jquery
</div>
<p id="shortdesc">
- Using jQuery Mobile to display an OpenLayers map.
+ Using jQuery Mobile to display an OpenLayers map.
</p>
- <div data-role="page">
- <div data-role="header">
- <input id="west" type="button" data-icon="arrow-l" value="west">
- <input id="north" type="button" data-icon="arrow-u" value="north">
- <input id="south" type="button" data-icon="arrow-d" value="south">
- <input id="east" type="button" data-icon="arrow-r" value="east">
- </div>
- <div data-role="content">
- <div id="map"></div>
- </div>
+ <div data-role="page" id="mappage">
+ <div data-role="content">
+ <div id="map"></div>
+ </div>
- <div data-role="footer">
- <form id="controls">
- <fieldset data-role="controlgroup" data-type="horizontal" data-role="fieldcontain">
- <input id="nav" type="radio" name="controls" value="nav" checked="checked">
- <label for="nav">navigate</label>
- <input id="point" type="radio" name="controls" value="point">
- <label for="point">point</label>
- <input id="line" type="radio" name="controls" value="line">
- <label for="line">line</label>
- <input id="poly" type="radio" name="controls" value="poly">
- <label for="poly">poly</label>
- <input id="mod" type="radio" name="controls" value="mod">
- <label for="mod">modify</label>
- </fieldset>
- </form>
+ <div data-role="footer">
+ <a href="#searchpage" data-icon="search" data-role="button">Search</a>
+ <a href="#" id="locate" data-icon="locate" data-role="button">Locate</a>
+ <a href="#layerspage" data-icon="layers" data-role="button">Layers</a>
+ </div>
+ <div id="navigation" data-role="controlgroup" data-type="vertical">
+ <a href="#" data-role="button" data-icon="plus" id="plus"
+ data-iconpos="notext"></a>
+ <a href="#" data-role="button" data-icon="minus" id="minus"
+ data-iconpos="notext"></a>
+ </div>
+ </div>
+
+ <div data-role="page" id="searchpage">
+ <div data-role="header">
+ <h1>Search</h1>
+ </div>
+ <div data-role="fieldcontain">
+ <input type="search" name="query" id="query"
+ value="" placeholder="Search for places"
+ autocomplete="off"/>
+ </div>
+ <ul data-role="listview" data-inset="true" id="search_results"></ul>
+ </div>
+
+ <div data-role="page" id="layerspage">
+ <div data-role="header">
+ <h1>Layers</h1>
+ </div>
+ <div data-role="content">
+ <ul data-role="listview" data-inset="true" data-theme="d" data-dividertheme="c" id="layerslist">
+ </div>
+ </div>
+
+ <div id="popup" data-role="dialog">
+ <div data-position="inline" data-theme="d" data-role="header">
+ <h1>Details</h1>
</div>
+ <div data-theme="c" data-role="content">
+ <ul id="details-list" data-role="listview">
+ </ul>
+ </div>
</div>
</body>
</html>
Copied: sandbox/jennier/openlayers/examples/mobile-jq.js (from rev 11611, trunk/openlayers/examples/mobile-jq.js)
===================================================================
--- sandbox/jennier/openlayers/examples/mobile-jq.js (rev 0)
+++ sandbox/jennier/openlayers/examples/mobile-jq.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1,214 @@
+var selectedFeature = null;
+
+$(document).ready(function() {
+
+ // Start with the map page
+ if (window.location.hash && window.location.hash!='#mappage') {
+ $.mobile.changePage('mappage');
+ }
+
+ // fix height of content
+ function fixContentHeight() {
+ var footer = $("div[data-role='footer']:visible"),
+ content = $("div[data-role='content']:visible:visible"),
+ viewHeight = $(window).height(),
+ contentHeight = viewHeight - footer.outerHeight();
+
+ if ((content.outerHeight() + footer.outerHeight()) !== viewHeight) {
+ contentHeight -= (content.outerHeight() - content.height());
+ content.height(contentHeight);
+ }
+ if (window.map) {
+ map.updateSize();
+ } else {
+ // initialize map
+ init();
+ }
+ }
+ $(window).bind("orientationchange resize pageshow", fixContentHeight);
+ fixContentHeight();
+ //init();
+
+ // Map zoom
+ $("#plus").click(function(){
+ map.zoomIn();
+ });
+ $("#minus").click(function(){
+ map.zoomOut();
+ });
+ $("#locate").click(function(){
+ var control = map.getControlsBy("id", "locate-control")[0];
+ if (control.active) {
+ control.getCurrentLocation();
+ } else {
+ control.activate();
+ }
+ });
+
+ var sprintersLayer = new OpenLayers.Layer.Vector("Sprinters", {
+ styleMap: new OpenLayers.StyleMap({
+ externalGraphic: "img/mobile-loc.png",
+ graphicOpacity: 1.0,
+ graphicWith: 16,
+ graphicHeight: 26,
+ graphicYOffset: -26
+ })
+ });
+
+ var sprinters = getFeatures();
+ sprintersLayer.addFeatures(sprinters);
+
+ map.addLayer(sprintersLayer);
+
+ var selectControl = new OpenLayers.Control.SelectFeature(sprintersLayer, {onSelect: function(feature){
+ selectedFeature = feature;
+ $.mobile.changePage($("#popup"), "pop");
+ }});
+
+ map.addControl(selectControl);
+ selectControl.activate();
+
+ $('div#popup').live('pageshow',function(event, ui){
+ var li = "";
+ for(var attr in selectedFeature.attributes){
+ li += "<li><div style='width:25%;float:left'>" + attr + "</div><div style='width:75%;float:right'>"
+ + selectedFeature.attributes[attr] + "</div></li>";
+ }
+ $("ul#details-list").empty().append(li).listview("refresh");
+ });
+
+ $('#searchpage').live('pageshow',function(event, ui){
+ $('#query').bind('change', function(e){
+ $('#search_results').empty();
+ if ($('#query')[0].value === '') {
+ return;
+ }
+ $.mobile.pageLoading();
+
+ // Prevent form send
+ e.preventDefault();
+
+ var searchUrl = 'http://ws.geonames.org/searchJSON?featureClass=P&maxRows=10';
+ searchUrl += '&name_startsWith=' + $('#query')[0].value;
+ $.getJSON(searchUrl, function(data) {
+ $.each(data.geonames, function() {
+ var place = this;
+ $('<li>')
+ .hide()
+ .append($('<h2 />', {
+ text: place.name
+ }))
+ .append($('<p />', {
+ html: '<b>' + place.countryName + '</b> ' + place.fcodeName
+ }))
+ .appendTo('#search_results')
+ .click(function() {
+ $.mobile.changePage('mappage');
+ var lonlat = new OpenLayers.LonLat(place.lng, place.lat);
+ map.setCenter(lonlat.transform(gg, sm), 10);
+ })
+ .show();
+ });
+ $('#search_results').listview('refresh');
+ $.mobile.pageLoading(true);
+ });
+ });
+ // only listen to the first event triggered
+ $('#searchpage').die('pageshow', arguments.callee);
+ });
+
+ $('#layerslist').listview();
+ $('<li>', {
+ "data-role": "list-divider",
+ text: "Base Layers"
+ })
+ .appendTo('#layerslist');
+ var baseLayers = map.getLayersBy("isBaseLayer", true);
+ $.each(baseLayers, function() {
+ addLayerToList(this);
+ });
+
+ $('<li>', {
+ "data-role": "list-divider",
+ text: "Overlay Layers"
+ })
+ .appendTo('#layerslist');
+ var overlayLayers = map.getLayersBy("isBaseLayer", false);
+ $.each(overlayLayers, function() {
+ addLayerToList(this);
+ });
+ $('#layerslist').listview('refresh');
+
+ map.events.register("addlayer", this, function(e) {
+ addLayerToList(e.layer);
+ });
+});
+
+function addLayerToList(layer) {
+ var item = $('<li>', {
+ "data-icon": "check",
+ "class": layer.visibility ? "checked" : ""
+ })
+ .append($('<a />', {
+ text: layer.name
+ })
+ .click(function() {
+ $.mobile.changePage('mappage');
+ if (layer.isBaseLayer) {
+ layer.map.setBaseLayer(layer);
+ } else {
+ layer.setVisibility(!layer.getVisibility());
+ }
+ })
+ )
+ .appendTo('#layerslist');
+ layer.events.on({
+ 'visibilitychanged': function() {
+ $(item).toggleClass('checked');
+ }
+ });
+}
+
+function getFeatures(){
+ var features = {
+ "type": "FeatureCollection",
+ "features": [
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [1332700, 7906300]},
+ "properties": {"Name": "Igor Tihonov", "Country":"Sweden", "City":"Gothenburg"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [790300, 6573900]},
+ "properties": {"Name": "Marc Jansen", "Country":"Germany", "City":"Bonn"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [568600, 6817300]},
+ "properties": {"Name": "Bart van den Eijnden", "Country":"Netherlands", "City":"Utrecht"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [-7909900, 5215100]},
+ "properties": {"Name": "Christopher Schmidt", "Country":"United States of America", "City":"Boston"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [-937400, 5093200]},
+ "properties": {"Name": "Jorge Gustavo Rocha", "Country":"Portugal", "City":"Braga"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [-355300, 7547800]},
+ "properties": {"Name": "Jennie Fletcher ", "Country":"Scotland", "City":"Edinburgh"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [657068.53608487, 5712321.2472725]},
+ "properties": {"Name": "Bruno Binet ", "Country":"France", "City":"Chambéry"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [667250.8958124, 5668048.6072737]},
+ "properties": {"Name": "Eric Lemoine", "Country":"France", "City":"Theys"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [653518.03606319, 5721118.5122914]},
+ "properties": {"Name": "Antoine Abt", "Country":"France", "City":"La Motte Servolex"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [657985.78042416, 5711862.6251028]},
+ "properties": {"Name": "Pierre Giraud", "Country":"France", "City":"Chambéry"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [742941.93818208, 5861818.9477535]},
+ "properties": {"Name": "Stéphane Brunner", "Country":"Switzerland", "City":"Paudex"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [736082.61064069, 5908165.4649505]},
+ "properties": {"Name": "Frédéric Junod", "Country":"Switzerland", "City":"Montagny-près-Yverdon"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [771595.97057525, 5912284.7041793]},
+ "properties": {"Name": "Cédric Moullet", "Country":"Switzerland", "City":"Payerne"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [744205.23922364, 5861277.319748]},
+ "properties": {"Name": "Benoit Quartier", "Country":"Switzerland", "City":"Lutry"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [1717430.147101, 5954568.7127565]},
+ "properties": {"Name": "Andreas Hocevar", "Country":"Austria", "City":"Graz"}},
+ { "type": "Feature", "geometry": {"type": "Point", "coordinates": [-12362007.067301,5729082.2365672]},
+ "properties": {"Name": "Tim Schaub", "Country":"United States of America", "City":"Bozeman"}}
+ ]
+ };
+
+ var reader = new OpenLayers.Format.GeoJSON();
+
+ return reader.read(features);
+}
Modified: sandbox/jennier/openlayers/examples/mobile-navigation.js
===================================================================
--- sandbox/jennier/openlayers/examples/mobile-navigation.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/mobile-navigation.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -14,7 +14,7 @@
controls: [
new OpenLayers.Control.TouchNavigation({
dragPanOptions: {
- interval: 0, // non-zero kills performance on some mobile phones
+ interval: 100,
enableKinetic: true
}
}),
Modified: sandbox/jennier/openlayers/examples/mobile.js
===================================================================
--- sandbox/jennier/openlayers/examples/mobile.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/mobile.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -23,7 +23,7 @@
new OpenLayers.Control.Attribution(),
new OpenLayers.Control.TouchNavigation({
dragPanOptions: {
- interval: 0, // non-zero kills performance on some mobile phones
+ interval: 100,
enableKinetic: true
}
}),
Copied: sandbox/jennier/openlayers/examples/multitouch.html (from rev 11611, trunk/openlayers/examples/multitouch.html)
===================================================================
--- sandbox/jennier/openlayers/examples/multitouch.html (rev 0)
+++ sandbox/jennier/openlayers/examples/multitouch.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1,26 @@
+<html>
+ <head>
+ <title>Multitouch Test</title>
+ </head>
+ <body>
+ <div style="width:80%; height: 80%; border: 1px solid black; font-size: 5em;" id="box">
+ </div>
+ Touch inside the box. On a touch enabled browser, you will get the number
+ of detected touch events. If the box is red, your browser does not support
+ touch events.
+ <script>
+ var box = document.getElementById("box");
+ box.addEventListener("touchstart", function(evt) {
+ box.innerHTML = evt.touches.length;
+ evt.preventDefault();
+ });
+ box.addEventListener("touchmove", function(evt) {
+ box.innerHTML = evt.touches.length;
+ evt.preventDefault();
+ });
+ if (!(typeof box.ontouchstart != 'undefined')) {
+ box.style.backgroundColor = "red";
+ }
+ </script>
+ </body>
+</html>
Modified: sandbox/jennier/openlayers/examples/restricted-extent.html
===================================================================
--- sandbox/jennier/openlayers/examples/restricted-extent.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/restricted-extent.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -9,7 +9,7 @@
<script src="../lib/OpenLayers.js"></script>
<script type="text/javascript">
var map = null;
- var extent = new OpenLayers.Bounds(-180, -90, 180, 90);
+ var extent = new OpenLayers.Bounds(8, 44.5, 19, 50);
function init() {
var options = {
@@ -24,7 +24,7 @@
);
map.addLayers([wms]);
- map.setCenter(extent, 1);
+ map.zoomToExtent(extent);
document.getElementById("toggle").checked = true;
}
@@ -68,8 +68,8 @@
<input type="checkbox" id="toggle" checked="checked"
onclick="toggleRestrictedExtent();" />
<label for="toggle">
- Toggle restricted extent (to [-180, -90, 180, 90]).
+ Toggle restricted extent (to [8, 44.5, 19, 50]).
</label>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: sandbox/jennier/openlayers/examples/spherical-mercator.html
===================================================================
--- sandbox/jennier/openlayers/examples/spherical-mercator.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/examples/spherical-mercator.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -24,107 +24,111 @@
<script src="../lib/OpenLayers.js"></script>
<script type="text/javascript">
- // make map available for easy debugging
- var map;
+// make map available for easy debugging
+var map;
- // increase reload attempts
- OpenLayers.IMAGE_RELOAD_ATTEMPTS = 3;
+// increase reload attempts
+OpenLayers.IMAGE_RELOAD_ATTEMPTS = 3;
- function init(){
- var options = {
- projection: new OpenLayers.Projection("EPSG:900913"),
- displayProjection: new OpenLayers.Projection("EPSG:4326"),
- units: "m",
- numZoomLevels: 18,
- maxResolution: 156543.0339,
- maxExtent: new OpenLayers.Bounds(-20037508, -20037508,
- 20037508, 20037508.34)
- };
- map = new OpenLayers.Map('map', options);
+function init(){
+ var maxExtent = new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508),
+ restrictedExtent = maxExtent.clone(),
+ maxResolution = 156543.0339;
+
+ var options = {
+ projection: new OpenLayers.Projection("EPSG:900913"),
+ displayProjection: new OpenLayers.Projection("EPSG:4326"),
+ units: "m",
+ numZoomLevels: 18,
+ maxResolution: maxResolution,
+ maxExtent: maxExtent,
+ restrictedExtent: restrictedExtent
+ };
+ map = new OpenLayers.Map('map', options);
- // create Google Mercator layers
- var gmap = new OpenLayers.Layer.Google(
- "Google Streets",
- {'sphericalMercator': true}
- );
- var gsat = new OpenLayers.Layer.Google(
- "Google Satellite",
- {type: G_SATELLITE_MAP, 'sphericalMercator': true, numZoomLevels: 22}
- );
- var ghyb = new OpenLayers.Layer.Google(
- "Google Hybrid",
- {type: G_HYBRID_MAP, 'sphericalMercator': true}
- );
+ // create Google Mercator layers
+ var gmap = new OpenLayers.Layer.Google(
+ "Google Streets",
+ {sphericalMercator: true}
+ );
+ var gsat = new OpenLayers.Layer.Google(
+ "Google Satellite",
+ {type: G_SATELLITE_MAP, sphericalMercator: true, numZoomLevels: 22}
+ );
+ var ghyb = new OpenLayers.Layer.Google(
+ "Google Hybrid",
+ {type: G_HYBRID_MAP, sphericalMercator: true}
+ );
- // create Virtual Earth layers
- var veroad = new OpenLayers.Layer.VirtualEarth(
- "Virtual Earth Roads",
- {'type': VEMapStyle.Road, 'sphericalMercator': true}
- );
- var veaer = new OpenLayers.Layer.VirtualEarth(
- "Virtual Earth Aerial",
- {'type': VEMapStyle.Aerial, 'sphericalMercator': true}
- );
- var vehyb = new OpenLayers.Layer.VirtualEarth(
- "Virtual Earth Hybrid",
- {'type': VEMapStyle.Hybrid, 'sphericalMercator': true}
- );
+ // create Virtual Earth layers
+ var veroad = new OpenLayers.Layer.VirtualEarth(
+ "Virtual Earth Roads",
+ {'type': VEMapStyle.Road, sphericalMercator: true}
+ );
+ var veaer = new OpenLayers.Layer.VirtualEarth(
+ "Virtual Earth Aerial",
+ {'type': VEMapStyle.Aerial, sphericalMercator: true}
+ );
+ var vehyb = new OpenLayers.Layer.VirtualEarth(
+ "Virtual Earth Hybrid",
+ {'type': VEMapStyle.Hybrid, sphericalMercator: true}
+ );
- // create Yahoo layer
- var yahoo = new OpenLayers.Layer.Yahoo(
- "Yahoo Street",
- {'sphericalMercator': true}
- );
- var yahoosat = new OpenLayers.Layer.Yahoo(
- "Yahoo Satellite",
- {'type': YAHOO_MAP_SAT, 'sphericalMercator': true}
- );
- var yahoohyb = new OpenLayers.Layer.Yahoo(
- "Yahoo Hybrid",
- {'type': YAHOO_MAP_HYB, 'sphericalMercator': true}
- );
+ // create Yahoo layer
+ var yahoo = new OpenLayers.Layer.Yahoo(
+ "Yahoo Street",
+ {sphericalMercator: true}
+ );
+ var yahoosat = new OpenLayers.Layer.Yahoo(
+ "Yahoo Satellite",
+ {'type': YAHOO_MAP_SAT, sphericalMercator: true}
+ );
+ var yahoohyb = new OpenLayers.Layer.Yahoo(
+ "Yahoo Hybrid",
+ {'type': YAHOO_MAP_HYB, sphericalMercator: true}
+ );
- // create OSM layer
- var mapnik = new OpenLayers.Layer.OSM();
- // create OAM layer
- var oam = new OpenLayers.Layer.XYZ(
- "OpenAerialMap",
- "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/${z}/${x}/${y}.png",
- {
- sphericalMercator: true
- }
- );
+ // create OSM layer
+ var mapnik = new OpenLayers.Layer.OSM();
+ // create OAM layer
+ var oam = new OpenLayers.Layer.XYZ(
+ "OpenAerialMap",
+ "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/${z}/${x}/${y}.png",
+ {
+ sphericalMercator: true
+ }
+ );
- // create OSM layer
- var osmarender = new OpenLayers.Layer.OSM(
- "OpenStreetMap (Tiles at Home)",
- "http://tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png"
- );
+ // create OSM layer
+ var osmarender = new OpenLayers.Layer.OSM(
+ "OpenStreetMap (Tiles at Home)",
+ "http://tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png"
+ );
- // create WMS layer
- var wms = new OpenLayers.Layer.WMS(
- "World Map",
- "http://world.freemap.in/tiles/",
- {'layers': 'factbook-overlay', 'format':'png'},
- {
- 'opacity': 0.4, visibility: false,
- 'isBaseLayer': false,'wrapDateLine': true
- }
- );
+ // create WMS layer
+ var wms = new OpenLayers.Layer.WMS(
+ "World Map",
+ "http://world.freemap.in/tiles/",
+ {'layers': 'factbook-overlay', 'format':'png'},
+ {
+ 'opacity': 0.4, visibility: false,
+ 'isBaseLayer': false,'wrapDateLine': true
+ }
+ );
- // create a vector layer for drawing
- var vector = new OpenLayers.Layer.Vector("Editable Vectors");
+ // create a vector layer for drawing
+ var vector = new OpenLayers.Layer.Vector("Editable Vectors");
- map.addLayers([gmap, gsat, ghyb, veroad, veaer, vehyb,
- yahoo, yahoosat, yahoohyb, oam, mapnik, osmarender,
- wms, vector]);
- map.addControl(new OpenLayers.Control.LayerSwitcher());
- map.addControl(new OpenLayers.Control.EditingToolbar(vector));
- map.addControl(new OpenLayers.Control.Permalink());
- map.addControl(new OpenLayers.Control.MousePosition());
- if (!map.getCenter()) {map.zoomToMaxExtent()}
- }
+ map.addLayers([gmap, gsat, ghyb, veroad, veaer, vehyb,
+ yahoo, yahoosat, yahoohyb, oam, mapnik, osmarender,
+ wms, vector]);
+ map.addControl(new OpenLayers.Control.LayerSwitcher());
+ map.addControl(new OpenLayers.Control.EditingToolbar(vector));
+ map.addControl(new OpenLayers.Control.Permalink());
+ map.addControl(new OpenLayers.Control.MousePosition());
+ if (!map.getCenter()) {map.zoomToMaxExtent()}
+}
</script>
</head>
Copied: sandbox/jennier/openlayers/examples/style.mobile-jq.css (from rev 11611, trunk/openlayers/examples/style.mobile-jq.css)
===================================================================
--- sandbox/jennier/openlayers/examples/style.mobile-jq.css (rev 0)
+++ sandbox/jennier/openlayers/examples/style.mobile-jq.css 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1,120 @@
+html ,
+body {
+ margin: 0;
+ padding: 0;
+ height: 100%;
+}
+.ui-content {
+ padding: 0;
+}
+.ui-footer {
+ text-align: center;
+ padding: 5px 0;
+}
+.portrait, .portrait #mappage {
+ min-height: 0;
+}
+/*.portrait, .portrait .ui-page{*/
+ /*min-height: 0;*/
+/*}*/
+#mappage, #mappage .ui-content, #map {
+ width: 100%;
+ height: 100%;
+}
+.olControlAttribution {
+ font-size: 10px;
+ bottom: 5px;
+ right: 5px;
+}
+#navigation {
+ position: absolute;
+ bottom: 70px;
+ left: 10px;
+ z-index: 1000;
+}
+#navigation .ui-btn-icon-notext {
+ display: block;
+ padding: 7px 6px 7px 8px;
+}
+#title, #tags, #shortdesc {
+ display: none;
+}
+.ui-icon-check {
+ opacity: 0.3;
+}
+.checked .ui-icon-check {
+ opacity: 1;
+}
+.ui-icon-locate {
+ background-image: url(img/locate.png);
+}
+.ui-icon-layers {
+ background-image: url(img/openlayers.png);
+}
+.ui-content .ui-listview-inset, #search_results {
+ margin: 1em;
+}
+.ui-content .ui-listview {
+ margin: 0px;
+}
+#details-list li{
+ padding:15px 10px;
+}
+html {
+ height: 100%;
+}
+body {
+ margin: 0;
+ padding: 0;
+ height: 100%;
+}
+.ui-content {
+ padding: 0;
+}
+.ui-footer {
+ text-align: center;
+ padding: 5px 0;
+}
+#map {
+ width: 100%;
+ height: 100%;
+}
+.olControlAttribution {
+ font-size: 10px;
+ bottom: 5px;
+ right: 5px;
+}
+#navigation {
+ position: absolute;
+ bottom: 70px;
+ left: 10px;
+ z-index: 1000;
+}
+#navigation .ui-btn-icon-notext {
+ display: block;
+ padding: 7px 6px 7px 8px;
+}
+#title, #tags, #shortdesc {
+ display: none;
+}
+.ui-icon-check {
+ opacity: 0.3;
+}
+.checked .ui-icon-check {
+ opacity: 1;
+}
+.ui-icon-locate {
+ background-image: url(img/locate.png);
+}
+.ui-icon-layers {
+ background-image: url(img/openlayers.png);
+}
+.ui-content .ui-listview-inset, #search_results {
+ margin: 1em;
+}
+.ui-content .ui-listview {
+ margin: 0px;
+}
+#details-list li{
+ padding:15px 10px;
+}
\ No newline at end of file
Modified: sandbox/jennier/openlayers/lib/Firebug/firebugx.js
===================================================================
--- sandbox/jennier/openlayers/lib/Firebug/firebugx.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/Firebug/firebugx.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -1,9 +1,10 @@
+(function() {
+ if (!window.console || !console.firebug) {
+ var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
+ "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
-if (!window.console || !console.firebug) {
- var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
- "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
-
- window.console = {};
- for (var i = 0; i < names.length; ++i)
- window.console[names[i]] = function() {}
-}
+ window.console = {};
+ for (var i = 0; i < names.length; ++i)
+ window.console[names[i]] = function() {}
+ }
+})();
Modified: sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes/Bounds.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes/Bounds.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes/Bounds.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -260,7 +260,7 @@
* Default is center.
*
* Returns:
- * {<OpenLayers.Bound>} A new bounds that is scaled by ratio
+ * {<OpenLayers.Bounds>} A new bounds that is scaled by ratio
* from origin.
*/
@@ -560,6 +560,8 @@
* Parameters:
* maxExtent - {<OpenLayers.Bounds>}
* options - {Object} Some possible options are:
+ *
+ * Allowed Options:
* leftTolerance - {float} Allow for a margin of error
* with the 'left' value of this
* bound.
Modified: sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes/Element.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes/Element.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes/Element.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -45,12 +45,16 @@
/**
* APIFunction: hide
- * Hide element(s) passed in
+ * *Deprecated*. Hide element(s) passed in
*
* Parameters:
* element - {DOMElement} Actually user can pass any number of elements
*/
hide: function() {
+ OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated", {
+ newMethod: "element.style.display = 'none';"
+ }));
+
for (var i=0, len=arguments.length; i<len; i++) {
var element = OpenLayers.Util.getElement(arguments[i]);
if (element) {
@@ -61,12 +65,16 @@
/**
* APIFunction: show
- * Show element(s) passed in
+ * *Deprecated*. Show element(s) passed in
*
* Parameters:
* element - {DOMElement} Actually user can pass any number of elements
*/
show: function() {
+ OpenLayers.Console.warn(OpenLayers.i18n("methodDeprecated", {
+ newMethod: "element.style.display = '';"
+ }));
+
for (var i=0, len=arguments.length; i<len; i++) {
var element = OpenLayers.Util.getElement(arguments[i]);
if (element) {
Modified: sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/BaseTypes.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -25,7 +25,7 @@
*
* Parameters:
* str - {String} The string to test.
- * sub - {Sring} The substring to look for.
+ * sub - {String} The substring to look for.
*
* Returns:
* {Boolean} The first string starts with the second.
@@ -204,7 +204,7 @@
* *Deprecated*. Whether or not a string starts with another string.
*
* Parameters:
- * sStart - {Sring} The string we're testing for.
+ * sStart - {String} The string we're testing for.
*
* Returns:
* {Boolean} Whether or not this string starts with the string passed in.
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Console.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Console.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Console.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -101,7 +101,7 @@
* Expects a single error message
*
* Parameters:
- * object - {Object}
+ * error - {Object}
*/
userError: function(error) {
alert(error);
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/ArgParser.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/ArgParser.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/ArgParser.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -54,16 +54,6 @@
*/
displayProjection: null,
- /**
- * Constructor: OpenLayers.Control.ArgParser
- *
- * Parameters:
- * options - {Object}
- */
- initialize: function(options) {
- OpenLayers.Control.prototype.initialize.apply(this, arguments);
- },
-
getParameters: function(url) {
url = url || window.location.href;
var parameters = OpenLayers.Util.getParameters(url);
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/Attribution.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/Attribution.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/Attribution.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -24,16 +24,6 @@
*/
separator: ", ",
- /**
- * Constructor: OpenLayers.Control.Attribution
- *
- * Parameters:
- * options - {Object} Options for control.
- */
- initialize: function(options) {
- OpenLayers.Control.prototype.initialize.apply(this, arguments);
- },
-
/**
* Method: destroy
* Destroy control.
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -33,13 +33,6 @@
* Pixels to slide by.
*/
slideFactor: 75,
-
- /**
- * Constructor: OpenLayers.Control.KeyboardDefaults
- */
- initialize: function() {
- OpenLayers.Control.prototype.initialize.apply(this, arguments);
- },
/**
* APIMethod: destroy
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/MousePosition.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/MousePosition.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/MousePosition.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -82,16 +82,6 @@
displayProjection: null,
/**
- * Constructor: OpenLayers.Control.MousePosition
- *
- * Parameters:
- * options - {Object} Options for control.
- */
- initialize: function(options) {
- OpenLayers.Control.prototype.initialize.apply(this, arguments);
- },
-
- /**
* Method: destroy
*/
destroy: function() {
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/Navigation.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/Navigation.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/Navigation.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -32,7 +32,7 @@
dragPan: null,
/**
- * APIProprety: dragPanOptions
+ * APIProperty: dragPanOptions
* {Object} Options passed to the DragPan control.
*/
dragPanOptions: null,
@@ -163,6 +163,7 @@
}
var clickCallbacks = {
+ 'click': this.defaultClick,
'dblclick': this.defaultDblClick,
'dblrightclick': this.defaultDblRightClick
};
@@ -190,6 +191,18 @@
},
/**
+ * Method: defaultClick
+ *
+ * Parameters:
+ * evt - {Event}
+ */
+ defaultClick: function (evt) {
+ if (evt.lastTouches && evt.lastTouches.length == 2) {
+ this.map.zoomOut();
+ }
+ },
+
+ /**
* Method: defaultDblClick
*
* Parameters:
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/PanZoomBar.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/PanZoomBar.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/PanZoomBar.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -85,13 +85,6 @@
zoomStart: null,
/**
- * Constructor: OpenLayers.Control.PanZoomBar
- */
- initialize: function() {
- OpenLayers.Control.PanZoom.prototype.initialize.apply(this, arguments);
- },
-
- /**
* APIMethod: destroy
*/
destroy: function() {
Copied: sandbox/jennier/openlayers/lib/OpenLayers/Control/PinchZoom.js (from rev 11611, trunk/openlayers/lib/OpenLayers/Control/PinchZoom.js)
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/PinchZoom.js (rev 0)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/PinchZoom.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1,192 @@
+/* Copyright (c) 2006-2010 by OpenLayers Contributors (see authors.txt for
+ * full list of contributors). Published under the Clear BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * full text of the license. */
+
+/**
+ * @requires OpenLayers/Handler/Pinch.js
+ */
+
+/**
+ * Class: OpenLayers.Control.PinchZoom
+ *
+ * Inherits:
+ * - <OpenLayers.Control>
+ */
+OpenLayers.Control.PinchZoom = OpenLayers.Class(OpenLayers.Control, {
+
+ /**
+ * Property: type
+ * {OpenLayers.Control.TYPES}
+ */
+ type: OpenLayers.Control.TYPE_TOOL,
+
+ /**
+ * Property: containerOrigin
+ * {Object} Cached object representing the layer container origin (in pixels).
+ */
+ containerOrigin: null,
+
+ /**
+ * Property: pinchOrigin
+ * {Object} Cached object representing the pinch start (in pixels).
+ */
+ pinchOrigin: null,
+
+ /**
+ * Property: currentCenter
+ * {Object} Cached object representing the latest pinch center (in pixels).
+ */
+ currentCenter: null,
+
+ /**
+ * APIProperty: autoActivate
+ * {Boolean} Activate the control when it is added to a map. Default is
+ * true.
+ */
+ autoActivate: true,
+
+ /**
+ * Constructor: OpenLayers.Control.PinchZoom
+ * Create a control for zooming with pinch gestures. This works on devices
+ * with multi-touch support.
+ *
+ * Parameters:
+ * options - {Object} An optional object whose properties will be set on
+ * the control
+ */
+ initialize: function(options) {
+ OpenLayers.Control.prototype.initialize.apply(this, arguments);
+ this.handler = new OpenLayers.Handler.Pinch(this, {
+ start: this.pinchStart,
+ move: this.pinchMove,
+ done: this.pinchDone
+ }, this.handlerOptions);
+ },
+
+ /**
+ * APIMethod: activate
+ * Activate this control. Must be called after the control is added to a
+ * map.
+ *
+ * Returns:
+ * {Boolean} The control was successfully activated.
+ */
+ activate: function() {
+ var activated = OpenLayers.Control.prototype.activate.apply(this,arguments);
+ if (activated) {
+ this.map.events.on({
+ moveend: this.updateContainerOrigin,
+ scope: this
+ });
+ this.updateContainerOrigin();
+ }
+ return activated;
+ },
+
+ /**
+ * APIMethod: deactivate
+ * Deactivate this control.
+ *
+ * Returns:
+ * {Boolean} The control was successfully deactivated.
+ */
+ deactivate: function() {
+ var deactivated = OpenLayers.Control.prototype.deactivate.apply(this,arguments);
+ if (this.map && this.map.events) {
+ this.map.events.un({
+ moveend: this.updateContainerOrigin,
+ scope: this
+ });
+ }
+ return deactivated;
+ },
+
+ /**
+ * Method: updateContainerOrigin
+ * Must be called each time the layer container origin changes.
+ */
+ updateContainerOrigin: function() {
+ var container = this.map.layerContainerDiv;
+ this.containerOrigin = {
+ x: parseInt(container.style.left, 10),
+ y: parseInt(container.style.top, 10)
+ };
+ },
+
+ /**
+ * Method: pinchStart
+ *
+ * Parameters:
+ * evt - {Event}
+ * pinchData - {Object} pinch data object related to the current touchmove
+ * of the pinch gesture. This give us the current scale of the pinch.
+ */
+ pinchStart: function(evt, pinchData) {
+ this.pinchOrigin = evt.xy;
+ },
+
+ /**
+ * Method: pinchMove
+ *
+ * Parameters:
+ * evt - {Event}
+ * pinchData - {Object} pinch data object related to the current touchmove
+ * of the pinch gesture. This give us the current scale of the pinch.
+ */
+ pinchMove: function(evt, pinchData) {
+ var scale = pinchData.scale;
+ var containerOrigin = this.containerOrigin;
+ var pinchOrigin = this.pinchOrigin;
+ var current = evt.xy;
+
+ var dx = Math.round((current.x - pinchOrigin.x) + (scale - 1) * (containerOrigin.x - pinchOrigin.x));
+ var dy = Math.round((current.y - pinchOrigin.y) + (scale - 1) * (containerOrigin.y - pinchOrigin.y));
+
+ this.applyTransform(
+ "translate(" + dx + "px, " + dy + "px) scale(" + scale + ")"
+ );
+ this.currentCenter = current;
+ },
+
+ /**
+ * Method: applyTransform
+ * Applies the given transform to layers.
+ */
+ applyTransform: function(transform) {
+ var style = this.map.layerContainerDiv.style;
+ style['-webkit-transform'] = transform;
+ style['-moz-transform'] = transform;
+ },
+
+ /**
+ * Method: pinchDone
+ *
+ * Parameters:
+ * evt - {Event}
+ * start - {Object} pinch data object related to the touchstart event that
+ * started the pinch gesture.
+ * last - {Object} pinch data object related to the last touchmove event
+ * of the pinch gesture. This give us the final scale of the pinch.
+ */
+ pinchDone: function(evt, start, last) {
+ var zoom = this.map.getZoomForResolution(this.map.getResolution() / last.scale, true);
+ var resolution = this.map.getResolutionForZoom(zoom);
+
+ var location = this.map.getLonLatFromPixel(this.pinchOrigin);
+ var zoomPixel = this.currentCenter;
+ var size = this.map.getSize();
+
+ location.lon += resolution * ((size.w / 2) - zoomPixel.x);
+ location.lat -= resolution * ((size.h / 2) - zoomPixel.y);
+
+ this.map.setCenter(location, zoom);
+
+ var style = this.map.layerContainerDiv.style;
+ style['-webkit-transform'] = "";
+ style['-moz-transform'] = "";
+ },
+
+ CLASS_NAME: "OpenLayers.Control.PinchZoom"
+
+});
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/ScaleLine.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/ScaleLine.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/ScaleLine.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -73,18 +73,6 @@
geodesic: false,
/**
- * Constructor: OpenLayers.Control.ScaleLine
- * Create a new scale line control.
- *
- * Parameters:
- * options - {Object} An optional object whose properties will be used
- * to extend the control.
- */
- initialize: function(options) {
- OpenLayers.Control.prototype.initialize.apply(this, [options]);
- },
-
- /**
* Method: draw
*
* Returns:
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/SelectFeature.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/SelectFeature.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/SelectFeature.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -132,7 +132,7 @@
/**
* Property: layers
- * {Array(<OpenLayers.Layer.Vector>} The layers this control will work on,
+ * {Array(<OpenLayers.Layer.Vector>)} The layers this control will work on,
* or null if the control was configured with a single layer
*/
layers: null,
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/Snapping.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/Snapping.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/Snapping.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -372,7 +372,7 @@
* Method: considerSnapping
*
* Parameters:
- * point - {<OpenLayers.Geometry.Point}} The vertex to be snapped (or
+ * point - {<OpenLayers.Geometry.Point>} The vertex to be snapped (or
* unsnapped).
* loc - {<OpenLayers.Geometry.Point>} The location of the mouse in map
* coords.
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/Split.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/Split.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/Split.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -297,7 +297,7 @@
* Remove a feature from a list based on the given geometry.
*
* Parameters:
- * features - {Array(<OpenLayers.Feature.Vector>} A list of features.
+ * features - {Array(<OpenLayers.Feature.Vector>)} A list of features.
* geometry - {<OpenLayers.Geometry>} A geometry.
*/
removeByGeometry: function(features, geometry) {
@@ -340,7 +340,7 @@
* will be split if eligible.
*
* Parameters:
- * feature - {<OpenLayers.Feature.Vector}} The newly created or modified
+ * feature - {<OpenLayers.Feature.Vector>} The newly created or modified
* feature.
*
* Returns:
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control/TouchNavigation.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control/TouchNavigation.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control/TouchNavigation.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -5,14 +5,15 @@
/**
* @requires OpenLayers/Control/DragPan.js
+ * @requires OpenLayers/Control/PinchZoom.js
* @requires OpenLayers/Handler/Click.js
*/
/**
* Class: OpenLayers.Control.TouchNavigation
* The navigation control handles map browsing with touch events (dragging,
- * double-tapping, and tap with two fingers). Create a new navigation
- * control with the <OpenLayers.Control.TouchNavigation> control.
+ * double-tapping, tap with two fingers, and pinch zoom). Create a new
+ * control with the <OpenLayers.Control.TouchNavigation> constructor.
*
* Inherits:
* - <OpenLayers.Control>
@@ -26,12 +27,24 @@
dragPan: null,
/**
- * APIProprety: dragPanOptions
+ * APIProperty: dragPanOptions
* {Object} Options passed to the DragPan control.
*/
dragPanOptions: null,
/**
+ * Property: pinchZoom
+ * {<OpenLayers.Control.PinchZoom>}
+ */
+ pinchZoom: null,
+
+ /**
+ * APIProperty: pinchZoomOptions
+ * {Object} Options passed to the PinchZoom control.
+ */
+ pinchZoomOptions: null,
+
+ /**
* APIProperty: documentDrag
* {Boolean} Allow panning of the map by dragging outside map viewport.
* Default is false.
@@ -70,6 +83,10 @@
this.dragPan.destroy();
}
this.dragPan = null;
+ if (this.pinchZoom) {
+ this.pinchZoom.destroy();
+ delete this.pinchZoom;
+ }
OpenLayers.Control.prototype.destroy.apply(this,arguments);
},
@@ -80,6 +97,7 @@
if(OpenLayers.Control.prototype.activate.apply(this,arguments)) {
this.dragPan.activate();
this.handlers.click.activate();
+ this.pinchZoom.activate();
return true;
}
return false;
@@ -92,11 +110,12 @@
if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)) {
this.dragPan.deactivate();
this.handlers.click.deactivate();
+ this.pinchZoom.deactivate();
return true;
}
return false;
},
-
+
/**
* Method: draw
*/
@@ -119,6 +138,9 @@
}, this.dragPanOptions)
);
this.dragPan.draw();
+ this.pinchZoom = new OpenLayers.Control.PinchZoom(
+ OpenLayers.Util.extend({map: this.map}, this.pinchZoomOptions)
+ );
},
/**
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Control.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Control.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Control.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -71,13 +71,14 @@
map: null,
/**
- * Property: div
- * {DOMElement}
+ * APIProperty: div
+ * {DOMElement} The element that contains the control, if not present the
+ * control is placed inside the map.
*/
div: null,
/**
- * Property: type
+ * APIProperty: type
* {Number} Controls can have a 'type'. The type determines the type of
* interactions which are possible with them when they are placed in an
* <OpenLayers.Control.Panel>.
@@ -101,7 +102,7 @@
displayClass: "",
/**
- * Property: title
+ * APIProperty: title
* {string} This property is used for showing a tooltip over the
* Control.
*/
@@ -136,9 +137,9 @@
eventListeners: null,
/**
- * Property: events
- * {<OpenLayers.Events>} Events instance for triggering control specific
- * events.
+ * APIProperty: events
+ * {<OpenLayers.Events>} Events instance for listeners and triggering
+ * control specific events.
*/
events: null,
@@ -296,7 +297,7 @@
},
/**
- * Method: activate
+ * APIMethod: activate
* Explicitly activates a control and it's associated
* handler if one has been set. Controls can be
* deactivated by calling the deactivate() method.
@@ -324,7 +325,7 @@
},
/**
- * Method: deactivate
+ * APIMethod: deactivate
* Deactivates a control and it's associated handler if any. The exact
* effect of this depends on the control itself.
*
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Events.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Events.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Events.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -604,6 +604,9 @@
* events.register("loadstart", object, loadStartListener);
* events.register("loadstart", object, loadEndListener);
* (end)
+ *
+ * Parameters:
+ * object - {Object}
*/
on: function(object) {
for(var type in object) {
@@ -821,10 +824,20 @@
// noone's listening, bail out
return;
}
- // add clientX & clientY to all events - only corresponds to the first touch
- if (evt.touches && evt.touches[0]) {
- evt.clientX = evt.touches[0].clientX;
- evt.clientY = evt.touches[0].clientY;
+ // add clientX & clientY to all events - corresponds to average x, y
+ var touches = evt.touches;
+ if (touches && touches[0]) {
+ var x = 0;
+ var y = 0;
+ var num = touches.length;
+ var touch;
+ for (var i=0; i<num; ++i) {
+ touch = touches[i];
+ x += touch.clientX;
+ y += touch.clientY;
+ }
+ evt.clientX = x / num;
+ evt.clientY = y / num;
}
if (this.includeXY) {
evt.xy = this.getMousePosition(evt);
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Format/GML.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Format/GML.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Format/GML.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -582,7 +582,7 @@
* Method: parseAttributes
*
* Parameters:
- * node - {<DOMElement>}
+ * node - {DOMElement}
*
* Returns:
* {Object} An attributes object.
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Format/GPX.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Format/GPX.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Format/GPX.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -134,7 +134,7 @@
* Method: extractSegment
*
* Parameters:
- * segment - {<DOMElement>} a trkseg or rte node to parse
+ * segment - {DOMElement} a trkseg or rte node to parse
* segmentType - {String} nodeName of waypoints that form the line
*
* Returns:
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Format/GeoRSS.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Format/GeoRSS.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Format/GeoRSS.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -253,7 +253,7 @@
var eles = this.getElementsByTagNameNS(node, nsuri, name);
if(eles && eles[0] && eles[0].firstChild
&& eles[0].firstChild.nodeValue) {
- value = eles[0].firstChild.nodeValue;
+ value = OpenLayers.Format.XML.prototype.getChildValue(eles[0]);
} else {
value = (def == undefined) ? "" : def;
}
@@ -263,12 +263,12 @@
/**
* APIMethod: read
* Return a list of features from a GeoRSS doc
-
+ *
* Parameters:
- * data - {Element}
+ * doc - {Element}
*
* Returns:
- * An Array of <OpenLayers.Feature.Vector>s
+ * {Array(<OpenLayers.Feature.Vector>)}
*/
read: function(doc) {
if (typeof doc == "string") {
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Format/KML.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Format/KML.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Format/KML.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -1125,7 +1125,7 @@
* Accept Feature Collection, and return a string.
*
* Parameters:
- * features - {Array(<OpenLayers.Feature.Vector>} An array of features.
+ * features - {Array(<OpenLayers.Feature.Vector>)} An array of features.
*
* Returns:
* {String} A KML string.
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Geometry/Rectangle.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Geometry/Rectangle.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Geometry/Rectangle.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -50,7 +50,7 @@
* Constructor: OpenLayers.Geometry.Rectangle
*
* Parameters:
- * points - {Array(<OpenLayers.Geometry.Point>}
+ * points - {Array(<OpenLayers.Geometry.Point>)}
*/
initialize: function(x, y, width, height) {
OpenLayers.Geometry.prototype.initialize.apply(this, arguments);
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Handler/Click.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Handler/Click.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Handler/Click.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -85,24 +85,23 @@
/**
* Property: down
- * {<OpenLayers.Pixel>} The pixel location of the last mousedown.
+ * {Object} Object that store relevant information about the last
+ * mousedown or touchstart. Its 'xy' OpenLayers.Pixel property gives
+ * the average location of the mouse/touch event. Its 'touches'
+ * property records clientX/clientY of each touches.
*/
down: null,
/**
* Property: last
- * {<OpenLayers.Pixel>} The pixel for the last touchmove. This is
- * used to
+ * {Object} Object that store relevant information about the last
+ * touchmove. Its 'xy' OpenLayers.Pixel property gives
+ * the average location of the mouse/touch event. Its 'touches'
+ * property records clientX/clientY of each touches.
*/
last: null,
/**
- * Property: touch
- * {Boolean} Are we on a touch enabled device? Default is false.
- */
- touch: false,
-
- /**
* Property: rightclickTimerId
* {Number} The id of the right mouse timeout waiting to clear the
* <delayedEvent>.
@@ -127,10 +126,10 @@
*/
initialize: function(control, callbacks, options) {
OpenLayers.Handler.prototype.initialize.apply(this, arguments);
- // optionally register for mouseup and mousedown
+ // optionally register for mousedown
if(this.pixelTolerance != null) {
this.mousedown = function(evt) {
- this.down = evt;
+ this.down = this.getEventInfo(evt);
return true;
};
}
@@ -154,8 +153,7 @@
* {Boolean} Continue propagating this event.
*/
touchstart: function(evt) {
- this.touch = true;
- this.down = evt;
+ this.down = this.getEventInfo(evt);
this.last = null;
return true;
},
@@ -244,8 +242,9 @@
dblclick: function(evt) {
// for touch devices trigger dblclick only for
// "one finger" touch
- if(this.passesTolerance(evt) &&
- (!evt.lastTouches || evt.lastTouches.length == 1)) {
+ var last = this.down || this.last;
+ if (this.passesTolerance(evt) &&
+ (!last || !last.touches || last.touches.length == 1)) {
if(this["double"]) {
this.callback('dblclick', [evt]);
}
@@ -260,7 +259,7 @@
* an empty "touches" property.
*/
touchmove: function(evt) {
- this.last = evt;
+ this.last = this.getEventInfo(evt);
},
/**
@@ -287,13 +286,14 @@
*/
click: function(evt) {
// Sencha Touch emulates click events, see ticket 3079 for more info
- if (this.touch === true && evt.type === "click") {
+ if (this.down && this.down.touches && evt.type === "click") {
return !this.stopSingle;
}
if(this.passesTolerance(evt)) {
if(this.timerId != null) {
// already received a click
- if(evt.lastTouches) {
+ var last = this.down || this.last;
+ if (last && last.touches && last.touches.length > 0) {
// touch device - we may trigger dblclick
this.dblclick(evt);
} else {
@@ -367,6 +367,35 @@
},
/**
+ * Method: getEventInfo
+ * This method allows us to store event information without storing the
+ * actual event. In touch devices (at least), the same event is
+ * modified between touchstart, touchmove, and touchend.
+ *
+ * Returns:
+ * {Object} An object with event related info.
+ */
+ getEventInfo: function(evt) {
+ var touches;
+ if (evt.touches) {
+ var len = evt.touches.length;
+ touches = new Array(len);
+ var touch;
+ for (var i=0; i<len; i++) {
+ touch = evt.touches[i];
+ touches[i] = {
+ clientX: touch.clientX,
+ clientY: touch.clientY
+ };
+ }
+ }
+ return {
+ xy: evt.xy,
+ touches: touches
+ };
+ },
+
+ /**
* APIMethod: deactivate
* Deactivate the handler.
*
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Handler/Feature.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Handler/Feature.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Handler/Feature.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -29,7 +29,8 @@
'mousemove': {'in': 'over', 'out': 'out'},
'dblclick': {'in': 'dblclick', 'out': null},
'mousedown': {'in': null, 'out': null},
- 'mouseup': {'in': null, 'out': null}
+ 'mouseup': {'in': null, 'out': null},
+ 'touchstart': {'in': 'click', 'out': 'clickout'}
},
/**
@@ -117,6 +118,19 @@
this.layer = layer;
},
+ /**
+ * Method: touchstart
+ * Handle touchmove events
+ *
+ * Parameters:
+ * evt - {Event}
+ *
+ * Returns:
+ * {Boolean} Let the event propagate.
+ */
+ touchstart: function(evt) {
+ return this.mousedown(evt);
+ },
/**
* Method: mousedown
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Handler/Path.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Handler/Path.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Handler/Path.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -223,12 +223,12 @@
* Returns:
* {Boolean} Allow event propagation
*/
- mousedown: function(evt) {
+ down: function(evt) {
var stopDown = this.stopDown;
if(this.freehandMode(evt)) {
stopDown = true;
}
- if(!this.lastDown || !this.lastDown.equals(evt.xy)) {
+ if (!this.touch && (!this.lastDown || !this.passesTolerance(this.lastDown, evt.xy, this.pixelTolerance))) {
this.modifyFeature(evt.xy, !!this.lastUp);
}
this.mouseDown = true;
@@ -248,7 +248,7 @@
* Returns:
* {Boolean} Allow event propagation
*/
- mousemove: function (evt) {
+ move: function (evt) {
if(this.stoppedDown && this.freehandMode(evt)) {
if(this.persist) {
this.destroyPersistedFeature();
@@ -256,7 +256,7 @@
this.addPoint(evt.xy);
return false;
}
- if(!this.mouseDown || this.stoppedDown) {
+ if (!this.touch && (!this.mouseDown || this.stoppedDown)) {
this.modifyFeature(evt.xy, !!this.lastUp);
}
return true;
@@ -273,13 +273,17 @@
* Returns:
* {Boolean} Allow event propagation
*/
- mouseup: function (evt) {
- if(this.mouseDown && (!this.lastUp || !this.lastUp.equals(evt.xy))) {
+ up: function (evt) {
+ if (this.mouseDown && (!this.lastUp || !this.passesTolerance(
+ this.lastUp, evt.xy, this.dblclickTolerance))) {
if(this.stoppedDown && this.freehandMode(evt)) {
this.removePoint();
this.finalize();
} else {
- if(this.lastDown.equals(evt.xy)) {
+ if (this.passesTolerance(this.lastDown, evt.xy, this.pixelTolerance)) {
+ if (this.touch) {
+ this.modifyFeature(evt.xy);
+ }
if(this.lastUp == null && this.persist) {
this.destroyPersistedFeature();
}
@@ -290,10 +294,18 @@
}
this.stoppedDown = this.stopDown;
this.mouseDown = false;
- return !this.stopUp;
+ return !this.stopUp && !this.isDblclick;
},
/**
+ * Method: finishTouchGeometry
+ * Finish the geometry and send it back to the control.
+ */
+ finishTouchGeometry: function() {
+ this.finishGeometry();
+ },
+
+ /**
* APIMethod: finishGeometry
* Finish the geometry and send it back to the control.
*/
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Handler/Pinch.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Handler/Pinch.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Handler/Pinch.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -120,13 +120,15 @@
* {Boolean} Let the event propagate.
*/
touchmove: function(evt) {
+ var propagate = true;
if (this.started && OpenLayers.Event.isMultiTouch(evt)) {
this.pinching = true;
var current = this.getPinchData(evt);
this.callback("move", [evt, current]);
this.last = current;
+ propagate = false;
}
- return true;
+ return propagate;
},
/**
@@ -140,14 +142,16 @@
* {Boolean} Let the event propagate.
*/
touchend: function(evt) {
+ var propagate = true;
if (this.started) {
this.started = false;
this.pinching = false;
this.callback("done", [evt, this.start, this.last]);
this.start = null;
this.last = null;
+ propagate = false;
}
- return true;
+ return propagate;
},
/**
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Handler/Point.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Handler/Point.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Handler/Point.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -95,8 +95,51 @@
* {Object} Any optional properties to be set on the sketch layer.
*/
layerOptions: null,
+
+ /**
+ * APIProperty: pixelTolerance
+ * {Number} Maximum number of pixels between mouseup and mousedown for an
+ * event to be considered a click. Default is 5. If set to an
+ * integer value, clicks with a drag greater than the value will be
+ * ignored. This property can only be set when the handler is
+ * constructed.
+ */
+ pixelTolerance: 5,
/**
+ * APIProperty: dblclickTolerance
+ * {Number} Maximum number of pixels between two touchend for an
+ * event to be considered a dblclick. Default is 20.
+ */
+ dblclickTolerance: 20,
+
+ /**
+ * Property: touch
+ * {Boolean} Indcates the support of touch events.
+ */
+ touch: false,
+
+ /**
+ * Property: timerId
+ * {Integer} The timer used to test the double touch.
+ */
+ timerId: null,
+
+ /**
+ * Property: last
+ * {<OpenLayers.Pixel>} The last pixel used to know the distance between
+ * two touches (for double touch).
+ */
+ last: null,
+
+ /**
+ * Property: dblclick
+ * {Boolean} The current event is a dblclick.
+ */
+ isDblclick: false,
+
+
+ /**
* Constructor: OpenLayers.Handler.Point
* Create a new point handler.
*
@@ -214,6 +257,14 @@
},
/**
+ * Method: finishTouchGeometry
+ * Finish the geometry and send it back to the control.
+ */
+ finishTouchGeometry: function() {
+ this.finalize();
+ },
+
+ /**
* Method: finalize
* Finish the geometry and call the "done" callback.
*
@@ -333,6 +384,127 @@
var geom = this.getGeometry();
return geom && geom.clone();
},
+
+ /**
+ * Method: mousedown
+ * Handle mousedown.
+ *
+ * Parameters:
+ * evt - {Event} The browser event
+ *
+ * Returns:
+ * {Boolean} Allow event propagation
+ */
+ mousedown: function(evt) {
+ if (this.touch) {
+ return;
+ }
+ return this.down(evt);
+ },
+
+ /**
+ * Method: touchstart
+ * Handle touchstart.
+ *
+ * Parameters:
+ * evt - {Event} The browser event
+ *
+ * Returns:
+ * {Boolean} Allow event propagation
+ */
+ touchstart: function(evt) {
+ this.touch = true;
+
+ var last = this.last;
+ this.last = evt.xy;
+
+ if (this.timerId &&
+ this.passesTolerance(last, evt.xy, this.dblclickTolerance)) {
+ this.isDblclick = true;
+ // a valid touch immediately adds a component and leaves us with a
+ // complete geometry
+ this.finishTouchGeometry();
+ window.clearTimeout(this.timerId);
+ this.timerId = null;
+ return false;
+ }
+ else {
+ if (this.timerId) {
+ window.clearTimeout(this.timerId);
+ this.timerId = null;
+ }
+ this.isDblclick = false;
+ this.timerId = window.setTimeout(
+ OpenLayers.Function.bind(function() {
+ this.timerId = null;
+ }, this), 300);
+ return this.down(evt);
+ }
+ },
+
+ /**
+ * Method: mousemove
+ * Handle mousemove.
+ *
+ * Parameters:
+ * evt - {Event} The browser event
+ *
+ * Returns:
+ * {Boolean} Allow event propagation
+ */
+ mousemove: function(evt) {
+ if (this.touch) {
+ return;
+ }
+ return this.move(evt);
+ },
+
+ /**
+ * Method: touchmove
+ * Handle touchmove.
+ *
+ * Parameters:
+ * evt - {Event} The browser event
+ *
+ * Returns:
+ * {Boolean} Allow event propagation
+ */
+ touchmove: function(evt) {
+ this.last = evt.xy;
+ return this.move(evt);
+ },
+
+ /**
+ * Method: mouseup
+ * Handle mouseup.
+ *
+ * Parameters:
+ * evt - {Event} The browser event
+ *
+ * Returns:
+ * {Boolean} Allow event propagation
+ */
+ mouseup: function(evt) {
+ if (this.touch) {
+ return;
+ }
+ return this.up(evt);
+ },
+
+ /**
+ * Method: touchend
+ * Handle touchend.
+ *
+ * Parameters:
+ * evt - {Event} The browser event
+ *
+ * Returns:
+ * {Boolean} Allow event propagation
+ */
+ touchend: function(evt) {
+ evt.xy = this.last;
+ return this.up(evt);
+ },
/**
* Method: mousedown
@@ -345,10 +517,12 @@
* Returns:
* {Boolean} Allow event propagation
*/
- mousedown: function(evt) {
+ down: function(evt) {
this.mouseDown = true;
this.lastDown = evt.xy;
- this.modifyFeature(evt.xy);
+ if (!this.touch) {
+ this.modifyFeature(evt.xy);
+ }
this.stoppedDown = this.stopDown;
return !this.stopDown;
},
@@ -364,8 +538,8 @@
* Returns:
* {Boolean} Allow event propagation
*/
- mousemove: function (evt) {
- if(!this.mouseDown || this.stoppedDown) {
+ move: function (evt) {
+ if(!this.touch && (!this.mouseDown || this.stoppedDown)) {
this.modifyFeature(evt.xy);
}
return true;
@@ -382,18 +556,24 @@
* Returns:
* {Boolean} Allow event propagation
*/
- mouseup: function (evt) {
+ up: function (evt) {
this.mouseDown = false;
this.stoppedDown = this.stopDown;
+
// check keyboard modifiers
if(!this.checkModifiers(evt)) {
return true;
}
// ignore double-clicks
- if(this.lastUp && this.lastUp.equals(evt.xy)) {
+ if (this.lastUp && this.passesTolerance(this.lastUp, evt.xy,
+ this.dblclickTolerance)) {
return true;
}
- if(this.lastDown && this.lastDown.equals(evt.xy)) {
+ if (this.lastDown && this.passesTolerance(this.lastDown, evt.xy,
+ this.pixelTolerance)) {
+ if (this.touch) {
+ this.modifyFeature(evt.xy);
+ }
if(this.persist) {
this.destroyPersistedFeature();
}
@@ -420,5 +600,28 @@
}
},
+ /**
+ * Method: passesTolerance
+ * Determine whether the event is within the optional pixel tolerance.
+ * Note that the pixel tolerance check only works if mousedown events get
+ * to the listeners registered here. If they are stopped by other
+ * elements, <pixelTolerance> and <dblclickTolerance> will have no effect
+ * here (this method will always return true).
+ *
+ * Returns:
+ * {Boolean} The click is within the pixel tolerance (if specified).
+ */
+ passesTolerance: function(pixel1, pixel2, tolerance) {
+ var passes = true;
+
+ if (tolerance != null && pixel1 && pixel2) {
+ var dist = pixel1.distanceTo(pixel2);
+ if (dist > tolerance) {
+ passes = false;
+ }
+ }
+ return passes;
+ },
+
CLASS_NAME: "OpenLayers.Handler.Point"
});
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Handler/Polygon.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Handler/Polygon.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Handler/Polygon.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -148,8 +148,19 @@
point.y = last.y;
}
},
-
+
/**
+ * Method: finishTouchGeometry
+ * Finish the geometry and send it back to the control.
+ */
+ finishTouchGeometry: function() {
+ var index = this.line.geometry.components.length - 2;
+ this.line.geometry.removeComponent(this.line.geometry.components[index]);
+ this.removePoint();
+ this.finalize();
+ },
+
+ /**
* Method: finalizeInteriorRing
* Enforces that new ring has some area and doesn't contain vertices of any
* other rings.
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/ArcGIS93Rest.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -234,22 +234,5 @@
newArguments);
},
- /**
- * Method: addTile
- * addTile creates a tile, initializes it, and adds it to the layer div.
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
- */
- addTile:function(bounds,position) {
- return new OpenLayers.Tile.Image(this, position, bounds,
- null, this.tileSize);
- },
-
-
CLASS_NAME: "OpenLayers.Layer.ArcGIS93Rest"
});
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/ArcIMS.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/ArcIMS.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/ArcIMS.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -446,22 +446,5 @@
return obj;
},
- /**
- * Method: addTile
- * addTile creates a tile, initializes it, and adds it to the layer div.
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added image tile.
- */
- addTile:function(bounds,position) {
- return new OpenLayers.Tile.Image(
- this, position, bounds, null, this.tileSize
- );
- },
-
CLASS_NAME: "OpenLayers.Layer.ArcIMS"
});
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/EventPane.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/EventPane.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/EventPane.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -211,6 +211,24 @@
OpenLayers.Layer.prototype.setZIndex.apply(this, arguments);
this.pane.style.zIndex = parseInt(this.div.style.zIndex) + 1;
},
+
+ /**
+ * Method: moveByPx
+ * Move the layer based on pixel vector. To be implemented by subclasses.
+ *
+ * Parameters:
+ * dx - {Number} The x coord of the displacement vector.
+ * dy - {Number} The y coord of the displacement vector.
+ */
+ moveByPx: function(dx, dy) {
+ OpenLayers.Layer.prototype.moveByPx.apply(this, arguments);
+
+ if (this.dragPanMapObject) {
+ this.dragPanMapObject(dx, -dy);
+ } else {
+ this.moveTo(this.map.getCachedCenter());
+ }
+ },
/**
* Method: moveTo
@@ -240,7 +258,7 @@
if ( !(newCenter.equals(oldCenter)) ||
!(newZoom == oldZoom) ) {
- if (dragging && this.dragPanMapObject &&
+ if (!zoomChanged && oldCenter && this.dragPanMapObject &&
this.smoothDragPan) {
var oldPx = this.map.getViewPortPxFromLonLat(oldCenter);
var newPx = this.map.getViewPortPxFromLonLat(newCenter);
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/Google/v3.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/Google/v3.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/Google/v3.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -181,15 +181,16 @@
if (this.visibility) {
google.maps.event.trigger(this.mapObject, "resize");
} else {
- if (!this._resized) {
+ var cache = OpenLayers.Layer.Google.cache[this.map.id];
+ if (!cache.resized) {
var layer = this;
google.maps.event.addListenerOnce(this.mapObject, "tilesloaded", function() {
- delete layer._resized;
google.maps.event.trigger(layer.mapObject, "resize");
layer.moveTo(layer.map.getCenter(), layer.map.getZoom());
+ delete cache.resized;
});
}
- this._resized = true;
+ cache.resized = true;
}
},
@@ -202,7 +203,7 @@
*/
setGMapVisibility: function(visible) {
var cache = OpenLayers.Layer.Google.cache[this.map.id];
- if (cache) {
+ if (cache && !cache.resized) {
var type = this.type;
var layers = this.map.layers;
var layer;
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/Grid.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/Grid.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/Grid.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -263,19 +263,37 @@
if (forceReTile || !tilesBounds.containsBounds(bounds, true)) {
this.initGriddedTiles(bounds);
} else {
- // we might have to shift our buffer tiles, schedule
- // that
- if (this.timerId != null) {
- window.clearTimeout(this.timerId);
- }
- this.timerId = window.setTimeout(
- this._moveGriddedTiles,
- this.tileLoadingDelay
- );
+ this.scheduleMoveGriddedTiles();
}
}
}
},
+
+ /**
+ * Method: moveByPx
+ * Move the layer based on pixel vector.
+ *
+ * Parameters:
+ * dx - {Number}
+ * dy - {Number}
+ */
+ moveByPx: function(dx, dy) {
+ this.scheduleMoveGriddedTiles();
+ },
+
+ /**
+ * Method: scheduleMoveGriddedTiles
+ * Schedule the move of tiles.
+ */
+ scheduleMoveGriddedTiles: function() {
+ if (this.timerId != null) {
+ window.clearTimeout(this.timerId);
+ }
+ this.timerId = window.setTimeout(
+ this._moveGriddedTiles,
+ this.tileLoadingDelay
+ );
+ },
/**
* APIMethod: setTileSize
@@ -623,9 +641,7 @@
/**
* APIMethod: addTile
- * Gives subclasses of Grid the opportunity to create an
- * OpenLayer.Tile of their choosing. The implementer should initialize
- * the new tile and take whatever steps necessary to display it.
+ * Create a tile, initialize it, and add it to the layer div.
*
* Parameters
* bounds - {<OpenLayers.Bounds>}
@@ -635,7 +651,8 @@
* {<OpenLayers.Tile>} The added OpenLayers.Tile
*/
addTile:function(bounds, position) {
- // Should be implemented by subclasses
+ return new OpenLayers.Tile.Image(this, position, bounds, null,
+ this.tileSize, this.tileOptions);
},
/**
@@ -694,7 +711,9 @@
var shifted = true;
var buffer = this.buffer || 1;
var tlLayer = this.grid[0][0].position;
- var tlViewPort = this.map.getViewPortPxFromLayerPx(tlLayer);
+ var offsetX = parseInt(this.map.layerContainerDiv.style.left);
+ var offsetY = parseInt(this.map.layerContainerDiv.style.top);
+ tlViewPort = tlLayer.add(offsetX, offsetY);
if (tlViewPort.x > -this.tileSize.w * (buffer - 1)) {
this.shiftColumn(true);
} else if (tlViewPort.x < -this.tileSize.w * buffer) {
@@ -791,7 +810,7 @@
*
* Parameters:
* rows - {Integer} Maximum number of rows we want our grid to have.
- * colums - {Integer} Maximum number of columns we want our grid to have.
+ * columns - {Integer} Maximum number of columns we want our grid to have.
*/
removeExcessTiles: function(rows, columns) {
@@ -879,6 +898,7 @@
// check to see if the tile exists in the cache
var imageCached = this.store.get(url, tile.imgDiv);
+ console.log("in get Cache URL: "+imageCached);
if (imageCached) {
return imageCached;
}
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/KaMap.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/KaMap.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/KaMap.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -97,22 +97,6 @@
return OpenLayers.Layer.Grid.prototype.getCacheURL.apply(this, [url]);
},
- /**
- * Method: addTile
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>}
- */
- addTile:function(bounds,position) {
- var url = this.getURL(bounds);
- return new OpenLayers.Tile.Image(this, position, bounds,
- url, this.tileSize);
- },
-
/**
* Method: calculateGridLayout
* ka-Map uses the center point of the map as an origin for
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/MapGuide.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/MapGuide.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/MapGuide.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -234,22 +234,6 @@
},
/**
- * Method: addTile
- * Creates a tile, initializes it, and adds it to the layer div.
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
- */
- addTile:function(bounds,position) {
- return new OpenLayers.Tile.Image(this, position, bounds,
- null, this.tileSize);
- },
-
- /**
* Method: getURL
* Return a query string for this layer
*
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/MapServer.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/MapServer.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/MapServer.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -76,22 +76,6 @@
return obj;
},
-
- /**
- * Method: addTile
- * Creates a tile, initializes it, and adds it to the layer div.
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
- */
- addTile:function(bounds,position) {
- return new OpenLayers.Tile.Image(this, position, bounds,
- null, this.tileSize);
- },
/**
* Method: getURL
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/TMS.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/TMS.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/TMS.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -134,22 +134,6 @@
return OpenLayers.Layer.Grid.prototype.getCacheURL.apply(this, [url]);
},
- /**
- * Method: addTile
- * addTile creates a tile, initializes it, and adds it to the layer div.
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
- */
- addTile:function(bounds,position) {
- return new OpenLayers.Tile.Image(this, position, bounds,
- null, this.tileSize);
- },
-
/**
* APIMethod: setMap
* When the layer is added to a map, then we can fetch our origin
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/TileCache.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/TileCache.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/TileCache.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -147,23 +147,6 @@
// Check to see if the Image has been stored locally
return OpenLayers.Layer.Grid.prototype.getCacheURL.apply(this, [url]);
},
-
- /**
- * Method: addTile
- * Create a tile, initialize it, and add it to the layer div.
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added <OpenLayers.Tile.Image>
- */
- addTile:function(bounds, position) {
- var url = this.getURL(bounds);
- return new OpenLayers.Tile.Image(this, position, bounds,
- url, this.tileSize);
- },
CLASS_NAME: "OpenLayers.Layer.TileCache"
});
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/VirtualEarth.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/VirtualEarth.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/VirtualEarth.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -13,7 +13,11 @@
/**
* Class: OpenLayers.Layer.VirtualEarth
- *
+ * Instances of OpenLayers.Layer.VirtualEarth are used to display the data from
+ * the Bing Maps AJAX Control (see e.g.
+ * http://msdn.microsoft.com/library/bb429619.aspx). Create a VirtualEarth
+ * layer with the <OpenLayers.Layer.VirtualEarth> constructor.
+ *
* Inherits from:
* - <OpenLayers.Layer.EventPane>
* - <OpenLayers.Layer.FixedZoomLevels>
@@ -94,7 +98,23 @@
/**
* Constructor: OpenLayers.Layer.VirtualEarth
+ * Creates a new instance of a OpenLayers.Layer.VirtualEarth. If you use an
+ * instance of OpenLayers.Layer.VirtualEarth in you map, you should set
+ * the <OpenLayers.Map> option restrictedExtent to a meaningful value,
+ * e.g.:
+ * (code)
+ * var map = new OpenLayers.Map( 'map', {
+ * // other map options
+ * restrictedExtent : OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508)
+ * } );
*
+ * var veLayer = new OpenLayers.Layer.VirtualEarth (
+ * "Virtual Earth Layer"
+ * );
+ *
+ * map.addLayer( veLayer );
+ * (end)
+ *
* Parameters:
* name - {String}
* options - {Object}
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/WMS.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/WMS.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/WMS.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -199,29 +199,13 @@
newParams.WIDTH = imageSize.w;
newParams.HEIGHT = imageSize.h;
var url= this.getFullRequestString(newParams);
- console.log("in get URL");
+
// Check to see if the Image has been stored locally
return OpenLayers.Layer.Grid.prototype.getCacheURL.apply(this, [url, tile]);
},
/**
- * Method: addTile
- * addTile creates a tile, initializes it, and adds it to the layer div.
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
- */
- addTile:function(bounds,position) {
- return new OpenLayers.Tile.Image(this, position, bounds,
- null, this.tileSize, this.tileOptions);
- },
-
- /**
* APIMethod: mergeNewParams
* Catch changeParams and uppercase the new params to be merged in
* before calling changeParams on the super class.
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/WMTS.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/WMTS.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/WMTS.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -458,21 +458,5 @@
}
},
- /**
- * Method: addTile
- * Create a tile, initialize it, and add it to the layer div.
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
- */
- addTile: function(bounds,position) {
- return new OpenLayers.Tile.Image(this, position, bounds,
- null, this.tileSize);
- },
-
CLASS_NAME: "OpenLayers.Layer.WMTS"
});
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/WorldWind.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/WorldWind.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/WorldWind.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -59,20 +59,6 @@
this.params, this.DEFAULT_PARAMS
);
},
- /**
- * Method: addTile
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
- */
- addTile:function(bounds,position) {
- return new OpenLayers.Tile.Image(this, position, bounds,
- null, this.tileSize);
- },
/**
* Method: getZoom
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/XYZ.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/XYZ.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/XYZ.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -154,22 +154,6 @@
return {'x': x, 'y': y, 'z': z};
},
- /**
- * Method: addTile
- * addTile creates a tile, initializes it, and adds it to the layer div.
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
- */
- addTile:function(bounds,position) {
- return new OpenLayers.Tile.Image(this, position, bounds,
- null, this.tileSize);
- },
-
/* APIMethod: setMap
* When the layer is added to a map, then we can fetch our origin
* (if we don't have one.)
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer/Zoomify.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer/Zoomify.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer/Zoomify.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -242,22 +242,6 @@
},
/**
- * Method: addTile
- * addTile creates a tile, initializes it, and adds it to the layer div.
- *
- * Parameters:
- * bounds - {<OpenLayers.Bounds>}
- * position - {<OpenLayers.Pixel>}
- *
- * Returns:
- * {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
- */
- addTile:function(bounds,position) {
- return new OpenLayers.Tile.Image(this, position, bounds,
- null, this.tileSize);
- },
-
- /**
* APIMethod: setMap
* When the layer is added to a map, then we can fetch our origin
* (if we don't have one.)
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Layer.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Layer.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Layer.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -556,7 +556,7 @@
* Method: moveTo
*
* Parameters:
- * bound - {<OpenLayers.Bounds>}
+ * bounds - {<OpenLayers.Bounds>}
* zoomChanged - {Boolean} Tells when zoom has changed, as layers have to
* do some init work in that case.
* dragging - {Boolean}
@@ -570,6 +570,17 @@
},
/**
+ * Method: moveByPx
+ * Move the layer based on pixel vector. To be implemented by subclasses.
+ *
+ * Parameters:
+ * dx - {Number} The x coord of the displacement vector.
+ * dy - {Number} The y coord of the displacement vector.
+ */
+ moveByPx: function(dx, dy) {
+ },
+
+ /**
* Method: setMap
* Set the map property for the layer. This is done through an accessor
* so that subclasses can override this and take special action once
@@ -704,7 +715,7 @@
* subverted.
*
* Parameters:
- * visible - {Boolean} Whether or not to display the layer (if in range)
+ * visibility - {Boolean} Whether or not to display the layer (if in range)
*/
setVisibility: function(visibility) {
if (visibility != this.visibility) {
@@ -815,13 +826,13 @@
// map
// 7. hope for the best!
- var i, len;
+ var i, len, p;
var props = {}, alwaysInRange = true;
// get resolution data from layer config
// (we also set alwaysInRange in the layer as appropriate)
for(i=0, len=this.RESOLUTION_PROPERTIES.length; i<len; i++) {
- var p = this.RESOLUTION_PROPERTIES[i];
+ p = this.RESOLUTION_PROPERTIES[i];
props[p] = this.options[p];
if(alwaysInRange && this.options[p]) {
alwaysInRange = false;
@@ -845,7 +856,7 @@
// in the map
if(props.resolutions == null) {
for(i=0, len=this.RESOLUTION_PROPERTIES.length; i<len; i++) {
- var p = this.RESOLUTION_PROPERTIES[i];
+ p = this.RESOLUTION_PROPERTIES[i];
props[p] = this.options[p] != null ?
this.options[p] : this.map[p];
}
@@ -960,6 +971,8 @@
*/
calculateResolutions: function(props) {
+ var viewSize, wRes, hRes;
+
// determine maxResolution
var maxResolution = props.maxResolution;
if(props.minScale != null) {
@@ -967,9 +980,9 @@
OpenLayers.Util.getResolutionFromScale(props.minScale,
this.units);
} else if(maxResolution == "auto" && this.maxExtent != null) {
- var viewSize = this.map.getSize();
- var wRes = this.maxExtent.getWidth() / viewSize.w;
- var hRes = this.maxExtent.getHeight() / viewSize.h;
+ viewSize = this.map.getSize();
+ wRes = this.maxExtent.getWidth() / viewSize.w;
+ hRes = this.maxExtent.getHeight() / viewSize.h;
maxResolution = Math.max(wRes, hRes);
}
@@ -980,9 +993,9 @@
OpenLayers.Util.getResolutionFromScale(props.maxScale,
this.units);
} else if(props.minResolution == "auto" && this.minExtent != null) {
- var viewSize = this.map.getSize();
- var wRes = this.minExtent.getWidth() / viewSize.w;
- var hRes = this.minExtent.getHeight()/ viewSize.h;
+ viewSize = this.map.getSize();
+ wRes = this.minExtent.getWidth() / viewSize.w;
+ hRes = this.minExtent.getHeight()/ viewSize.h;
minResolution = Math.max(wRes, hRes);
}
@@ -1066,7 +1079,7 @@
* APIMethod: getZoomForExtent
*
* Parameters:
- * bounds - {<OpenLayers.Bounds>}
+ * extent - {<OpenLayers.Bounds>}
* closest - {Boolean} Find the zoom level that most closely fits the
* specified bounds. Note that this may result in a zoom that does
* not exactly contain the entire extent.
@@ -1141,14 +1154,14 @@
* value and the 'closest' specification.
*/
getZoomForResolution: function(resolution, closest) {
- var zoom;
+ var zoom, i, len;
if(this.map.fractionalZoom) {
var lowZoom = 0;
var highZoom = this.resolutions.length - 1;
var highRes = this.resolutions[lowZoom];
var lowRes = this.resolutions[highZoom];
var res;
- for(var i=0, len=this.resolutions.length; i<len; ++i) {
+ for(i=0, len=this.resolutions.length; i<len; ++i) {
res = this.resolutions[i];
if(res >= resolution) {
highRes = res;
@@ -1169,7 +1182,7 @@
} else {
var diff;
var minDiff = Number.POSITIVE_INFINITY;
- for(var i=0, len=this.resolutions.length; i<len; i++) {
+ for(i=0, len=this.resolutions.length; i<len; i++) {
if (closest) {
diff = Math.abs(this.resolutions[i] - resolution);
if (diff > minDiff) {
@@ -1199,22 +1212,17 @@
*/
getLonLatFromViewPortPx: function (viewPortPx) {
var lonlat = null;
- if (viewPortPx != null) {
- var size = this.map.getSize();
- var center = this.map.getCenter();
- if (center) {
- var res = this.map.getResolution();
-
- var delta_x = viewPortPx.x - (size.w / 2);
- var delta_y = viewPortPx.y - (size.h / 2);
-
- lonlat = new OpenLayers.LonLat(center.lon + delta_x * res ,
- center.lat - delta_y * res);
+ var map = this.map;
+ if (viewPortPx != null && map.minPx) {
+ var res = map.getResolution();
+ var maxExtent = map.getMaxExtent({restricted: true});
+ var lon = (viewPortPx.x - map.minPx.x) * res + maxExtent.left;
+ var lat = (map.minPx.y - viewPortPx.y) * res + maxExtent.top;
+ lonlat = new OpenLayers.LonLat(lon, lat);
- if (this.wrapDateLine) {
- lonlat = lonlat.wrapDateLine(this.maxExtent);
- }
- } // else { DEBUG STATEMENT }
+ if (this.wrapDateLine) {
+ lonlat = lonlat.wrapDateLine(this.maxExtent);
+ }
}
return lonlat;
},
Property changes on: sandbox/jennier/openlayers/lib/OpenLayers/LocalTileStorage
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/roberthl/openlayers/lib/OpenLayers/LocalTileStorage:9745-9748
/trunk/openlayers/lib/OpenLayers/LocalTileStorage:11270-11499*
+ /sandbox/roberthl/openlayers/lib/OpenLayers/LocalTileStorage:9745-9748
/trunk/openlayers/lib/OpenLayers/LocalTileStorage:11270-11499*,11501-11611*
Property changes on: sandbox/jennier/openlayers/lib/OpenLayers/LocalTileStorage/TileSQLStorage.js
___________________________________________________________________
Added: svn:mergeinfo
+ /sandbox/roberthl/openlayers/lib/OpenLayers/LocalTileStorage/TileSQLStorage.js:9745-9748
/trunk/openlayers/lib/OpenLayers/LocalTileStorage/TileSQLStorage.js:11270-11499,11501-11611
Modified: sandbox/jennier/openlayers/lib/OpenLayers/LocalTileStorage/TileWebStorage.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/LocalTileStorage/TileWebStorage.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/LocalTileStorage/TileWebStorage.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -48,8 +48,9 @@
}
},
get: function(key, imgDiv) {
- imgDiv.src = localStorage.getItem(key);
- return imgDiv.src;
+ var value = localStorage.getItem(key);
+ if (value) { imgDiv.src = value; }
+ return value;
},
clear: function() {
localStorage.clear();
Property changes on: sandbox/jennier/openlayers/lib/OpenLayers/LocalTileStorage/TileWebStorage.js
___________________________________________________________________
Added: svn:mergeinfo
+ /sandbox/roberthl/openlayers/lib/OpenLayers/LocalTileStorage/TileWebStorage.js:9745-9748
/trunk/openlayers/lib/OpenLayers/LocalTileStorage/TileWebStorage.js:11270-11499,11501-11611
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Map.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Map.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Map.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -416,6 +416,23 @@
paddingForPopups : null,
/**
+ * Property: minPx
+ * {<OpenLayers.Pixel>} Lower left of maxExtent in viewport pixel space.
+ * Used to verify in moveByPx that the new location we're moving to
+ * is valid. It is also used in the getLonLatFromViewPortPx function
+ * of Layer.
+ */
+ minPx: null,
+
+ /**
+ * Property: maxPx
+ * {<OpenLayers.Pixel>} Top right of maxExtent in viewport pixel space.
+ * Used to verify in moveByPx that the new location we're moving to
+ * is valid.
+ */
+ maxPx: null,
+
+ /**
* Constructor: OpenLayers.Map
* Constructor for a new OpenLayers.Map instance. There are two possible
* ways to call the map constructor. See the examples below.
@@ -722,7 +739,13 @@
* options - {Object} Hashtable of options to tag to the map
*/
setOptions: function(options) {
+ var updatePxExtent = this.minPx &&
+ options.restrictedExtent != this.restrictedExtent;
OpenLayers.Util.extend(this, options);
+ // force recalculation of minPx and maxPx
+ updatePxExtent && this.moveTo(this.getCachedCenter(), this.zoom, {
+ forceZoomChange: true
+ });
},
/**
@@ -1140,7 +1163,7 @@
if (OpenLayers.Util.indexOf(this.layers, newBaseLayer) != -1) {
// preserve center and scale when changing base layers
- var center = this.getCenter();
+ var center = this.getCachedCenter();
var newResolution = OpenLayers.Util.getResolutionFromScale(
this.getScale(), newBaseLayer.units
);
@@ -1402,7 +1425,7 @@
this.layers[i].onMapResize();
}
- var center = this.getCenter();
+ var center = this.getCachedCenter();
if (this.baseLayer != null && center != null) {
var zoom = this.getZoom();
@@ -1453,7 +1476,7 @@
var extent = null;
if (center == null) {
- center = this.getCenter();
+ center = this.getCachedCenter();
}
if (resolution == null) {
resolution = this.getResolution();
@@ -1493,12 +1516,27 @@
*/
getCenter: function () {
var center = null;
- if (this.center) {
- center = this.center.clone();
+ var cachedCenter = this.getCachedCenter();
+ if (cachedCenter) {
+ center = cachedCenter.clone();
}
return center;
},
+ /**
+ * Method: getCachedCenter
+ *
+ * Returns:
+ * {<OpenLayers.LonLat>}
+ */
+ getCachedCenter: function() {
+ if (!this.center && this.size) {
+ this.center = this.getLonLatFromViewPortPx(
+ new OpenLayers.Pixel(this.size.w / 2, this.size.h / 2)
+ );
+ }
+ return this.center;
+ },
/**
* APIMethod: getZoom
@@ -1527,22 +1565,30 @@
animate: true,
dragging: false
});
- // getCenter
- var centerPx = this.getViewPortPxFromLonLat(this.getCenter());
+ if (options.dragging) {
+ if (dx != 0 || dy != 0) {
+ this.moveByPx(dx, dy);
+ }
+ } else {
+ // if we don't have a center, we were using moveByPx previously
+ var forceSetCenter = !this.center;
+
+ // getCenter
+ var centerPx = this.getViewPortPxFromLonLat(this.getCachedCenter());
- // adjust
- var newCenterPx = centerPx.add(dx, dy);
-
- // only call setCenter if not dragging or there has been a change
- if (!options.dragging || !newCenterPx.equals(centerPx)) {
- var newCenterLonLat = this.getLonLatFromViewPortPx(newCenterPx);
- if (options.animate) {
- this.panTo(newCenterLonLat);
- } else {
- this.setCenter(newCenterLonLat, null, options.dragging);
- }
- }
+ // adjust
+ var newCenterPx = centerPx.add(dx, dy);
+ if (forceSetCenter || !newCenterPx.equals(centerPx)) {
+ var newCenterLonLat = this.getLonLatFromViewPortPx(newCenterPx);
+ if (options.animate) {
+ this.panTo(newCenterLonLat);
+ } else {
+ this.setCenter(newCenterLonLat, null, options.dragging);
+ }
+ }
+ }
+
},
/**
@@ -1551,14 +1597,14 @@
* If the new lonlat is in the current extent the map will slide smoothly
*
* Parameters:
- * lonlat - {<OpenLayers.Lonlat>}
+ * lonlat - {<OpenLayers.LonLat>}
*/
panTo: function(lonlat) {
if (this.panMethod && this.getExtent().scale(this.panRatio).containsLonLat(lonlat)) {
if (!this.panTween) {
this.panTween = new OpenLayers.Tween(this.panMethod);
}
- var center = this.getCenter();
+ var center = this.getCachedCenter();
// center will not change, don't do nothing
if (lonlat.lon == center.lon &&
@@ -1566,31 +1612,25 @@
return;
}
- var from = {
- lon: center.lon,
- lat: center.lat
- };
- var to = {
- lon: lonlat.lon,
- lat: lonlat.lat
- };
- this.panTween.start(from, to, this.panDuration, {
+ var from = this.getPixelFromLonLat(center);
+ var to = this.getPixelFromLonLat(lonlat);
+ var vector = { x: to.x - from.x, y: to.y - from.y };
+ var last = { x: 0, y: 0 };
+
+ this.panTween.start( { x: 0, y: 0 }, vector, this.panDuration, {
callbacks: {
- start: OpenLayers.Function.bind(function(lonlat) {
+ start: OpenLayers.Function.bind(function() {
this.events.triggerEvent("movestart");
}, this),
- eachStep: OpenLayers.Function.bind(function(lonlat) {
- lonlat = new OpenLayers.LonLat(lonlat.lon, lonlat.lat);
- this.moveTo(lonlat, this.zoom, {
- 'dragging': true,
- 'noEvent': true
- });
+ eachStep: OpenLayers.Function.bind(function(px) {
+ var x = px.x - last.x,
+ y = px.y - last.y;
+ this.moveByPx(x, y);
+ last.x = Math.round(px.x);
+ last.y = Math.round(px.y);
}, this),
- done: OpenLayers.Function.bind(function(lonlat) {
- lonlat = new OpenLayers.LonLat(lonlat.lon, lonlat.lat);
- this.moveTo(lonlat, this.zoom, {
- 'noEvent': true
- });
+ done: OpenLayers.Function.bind(function(px) {
+ this.moveTo(lonlat, this.zoom, {noEvent: true});
this.events.triggerEvent("moveend");
}, this)
}
@@ -1621,6 +1661,71 @@
'caller': 'setCenter'
});
},
+
+ /**
+ * Method: moveByPx
+ * Drag the map by pixels.
+ *
+ * Parameters:
+ * dx - {Number}
+ * dy - {Number}
+ */
+ moveByPx: function(dx, dy) {
+ dx = Math.round(dx);
+ dy = Math.round(dy);
+ var hw = this.size.w / 2;
+ var hh = this.size.h / 2;
+ var x = hw + dx;
+ var y = hh + dy;
+ var wrapDateLine = this.baseLayer.wrapDateLine;
+ var xRestriction = yRestriction = 0;
+ if (this.restrictedExtent) {
+ xRestriction = hw;
+ yRestriction = hh;
+ // wrapping the date line makes no sense for restricted extents
+ wrapDateLine = false;
+ }
+ var valid = y <= this.maxPx.y - yRestriction &&
+ y >= this.minPx.y + yRestriction;
+ var minX = this.minPx.x, maxX = this.maxPx.x;
+ if (!wrapDateLine) {
+ valid = valid &&
+ x <= this.maxPx.x - xRestriction &&
+ x >= this.minPx.x + xRestriction;
+ }
+ if (valid) {
+ this.center = null;
+ if (dx) {
+ this.layerContainerDiv.style.left =
+ parseInt(this.layerContainerDiv.style.left) - dx + "px";
+ this.minPx.x -= dx;
+ this.maxPx.x -= dx;
+ if (wrapDateLine) {
+ if (this.maxPx.x > maxX) {
+ this.maxPx.x -= (maxX - minX);
+ };
+ if (this.minPx.x < minX) {
+ this.minPx.x += (maxX - minX);
+ };
+ }
+ }
+ if (dy) {
+ this.layerContainerDiv.style.top =
+ parseInt(this.layerContainerDiv.style.top) - dy + "px";
+ this.minPx.y -= dy;
+ this.maxPx.y -= dy;
+ }
+ var layer, i, len;
+ for (i=0, len=this.layers.length; i<len; ++i) {
+ layer = this.layers[i];
+ if (layer.visibility) {
+ layer.moveByPx(dx, dy);
+ layer.events.triggerEvent("move");
+ }
+ }
+ this.events.triggerEvent("move");
+ }
+ },
/**
* Method: moveTo
@@ -1651,14 +1756,14 @@
this.panTween.stop();
}
- if (!this.center && !this.isValidLonLat(lonlat)) {
+ if (!this.getCachedCenter() && !this.isValidLonLat(lonlat)) {
lonlat = this.maxExtent.getCenterLonLat();
}
if(this.restrictedExtent != null) {
// In 3.0, decide if we want to change interpretation of maxExtent.
if(lonlat == null) {
- lonlat = this.getCenter();
+ lonlat = this.center;
}
if(zoom == null) {
zoom = this.getZoom();
@@ -1705,7 +1810,7 @@
}
if (centerChanged) {
- if ((!zoomChanged) && (this.center)) {
+ if (!zoomChanged && this.center) {
// if zoom hasnt changed, just slide layerContainer
// (must be done before setting this.center to new value)
this.centerLayerContainer(lonlat);
@@ -1713,16 +1818,28 @@
this.center = lonlat.clone();
}
+ var res = zoomChanged ?
+ this.getResolutionForZoom(zoom) : this.getResolution();
// (re)set the layerContainerDiv's location
- if ((zoomChanged) || (this.layerContainerOrigin == null)) {
- this.layerContainerOrigin = this.center.clone();
+ if (zoomChanged || this.layerContainerOrigin == null) {
+ this.layerContainerOrigin = this.getCachedCenter();
this.layerContainerDiv.style.left = "0px";
this.layerContainerDiv.style.top = "0px";
+ var maxExtent = this.getMaxExtent({restricted: true});
+ var maxExtentCenter = maxExtent.getCenterLonLat();
+ var lonDelta = this.center.lon - maxExtentCenter.lon;
+ var latDelta = maxExtentCenter.lat - this.center.lat;
+ var extentWidth = Math.round(maxExtent.getWidth() / res);
+ var extentHeight = Math.round(maxExtent.getHeight() / res);
+ var left = (this.size.w - extentWidth) / 2 - lonDelta / res;
+ var top = (this.size.h - extentHeight) / 2 - latDelta / res;
+ this.minPx = new OpenLayers.Pixel(left, top);
+ this.maxPx = new OpenLayers.Pixel(left + extentWidth, top + extentHeight);
}
if (zoomChanged) {
this.zoom = zoom;
- this.resolution = this.getResolutionForZoom(zoom);
+ this.resolution = res;
// zoom level has changed, increment viewRequestID.
this.viewRequestID++;
}
@@ -1804,14 +1921,23 @@
* lonlat - {<OpenLayers.LonLat>}
*/
centerLayerContainer: function (lonlat) {
-
var originPx = this.getViewPortPxFromLonLat(this.layerContainerOrigin);
var newPx = this.getViewPortPxFromLonLat(lonlat);
if ((originPx != null) && (newPx != null)) {
- this.layerContainerDiv.style.left = Math.round(originPx.x - newPx.x) + "px";
- this.layerContainerDiv.style.top = Math.round(originPx.y - newPx.y) + "px";
- }
+ var oldLeft = parseInt(this.layerContainerDiv.style.left);
+ var oldTop = parseInt(this.layerContainerDiv.style.top);
+ var newLeft = Math.round(originPx.x - newPx.x);
+ var newTop = Math.round(originPx.y - newPx.y);
+ this.layerContainerDiv.style.left = newLeft + "px";
+ this.layerContainerDiv.style.top = newTop + "px";
+ var dx = oldLeft - newLeft;
+ var dy = oldTop - newTop;
+ this.minPx.x -= dx;
+ this.maxPx.x -= dx;
+ this.minPx.y -= dy;
+ this.maxPx.y -= dy;
+ }
},
/**
@@ -2130,8 +2256,6 @@
/**
* APIMethod: zoomIn
*
- * Parameters:
- * zoom - {int}
*/
zoomIn: function() {
this.zoomTo(this.getZoom() + 1);
@@ -2140,8 +2264,6 @@
/**
* APIMethod: zoomOut
*
- * Parameters:
- * zoom - {int}
*/
zoomOut: function() {
this.zoomTo(this.getZoom() - 1);
@@ -2225,7 +2347,7 @@
var size = this.getSize();
var w_deg = size.w * res;
var h_deg = size.h * res;
- var center = this.getCenter();
+ var center = this.getCachedCenter();
var extent = new OpenLayers.Bounds(center.lon - w_deg / 2,
center.lat - h_deg / 2,
@@ -2337,8 +2459,8 @@
* {<OpenLayers.Size>} The geodesic size of the pixel in kilometers.
*/
getGeodesicPixelSize: function(px) {
- var lonlat = px ? this.getLonLatFromPixel(px) : (this.getCenter() ||
- new OpenLayers.LonLat(0, 0));
+ var lonlat = px ? this.getLonLatFromPixel(px) : (
+ this.getCachedCenter() || new OpenLayers.LonLat(0, 0));
var res = this.getResolution();
var left = lonlat.add(-res / 2, 0);
var right = lonlat.add(res / 2, 0);
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Popup.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Popup.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Popup.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -431,7 +431,7 @@
* Makes the popup visible.
*/
show: function() {
- OpenLayers.Element.show(this.div);
+ this.div.style.display = '';
if (this.panMapIfOutOfView) {
this.panIntoView();
@@ -443,7 +443,7 @@
* Makes the popup invisible.
*/
hide: function() {
- OpenLayers.Element.hide(this.div);
+ this.div.style.display = 'none';
},
/**
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Projection.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Projection.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Projection.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -30,7 +30,7 @@
/**
* Property: titleRegEx
- * {RegEx} regular expression to strip the title from a proj4js definition
+ * {RegExp} regular expression to strip the title from a proj4js definition
*/
titleRegEx: /\+title=[^\+]*/,
@@ -174,10 +174,10 @@
* the input point is transformed in place.
*
* Parameters:
- * point - {{OpenLayers.Geometry.Point> | Object} An object with x and y
+ * point - {<OpenLayers.Geometry.Point> | Object} An object with x and y
* properties representing coordinates in those dimensions.
- * sourceProj - {OpenLayers.Projection} Source map coordinate system
- * destProj - {OpenLayers.Projection} Destination map coordinate system
+ * source - {OpenLayers.Projection} Source map coordinate system
+ * dest - {OpenLayers.Projection} Destination map coordinate system
*
* Returns:
* point - {object} A transformed coordinate. The original point is modified.
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Protocol/WFS/v1.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Protocol/WFS/v1.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Protocol/WFS/v1.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -250,7 +250,7 @@
* is used.
*
* Parameters:
- * features - {Array(<OpenLayers.Feature.Vector>}
+ * features - {Array(<OpenLayers.Feature.Vector>)}
*
* Returns:
* {<OpenLayers.Protocol.Response>} A response object with a features
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Renderer/Elements.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Renderer/Elements.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Renderer/Elements.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -390,7 +390,7 @@
BACKGROUND_ID_SUFFIX: "_background",
/**
- * Constant: BACKGROUND_ID_SUFFIX
+ * Constant: LABEL_ID_SUFFIX
* {String}
*/
LABEL_ID_SUFFIX: "_label",
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Renderer/SVG.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Renderer/SVG.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Renderer/SVG.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -260,6 +260,10 @@
if (style.graphicTitle) {
node.setAttributeNS(null, "title", style.graphicTitle);
+ //Standards-conformant SVG
+ var label = this.nodeFactory(null, "title");
+ label.textContent = style.graphicTitle;
+ node.appendChild(label);
}
if (style.graphicWidth && style.graphicHeight) {
node.setAttributeNS(null, "preserveAspectRatio", "none");
@@ -281,6 +285,7 @@
node.setAttributeNS(null, "height", height);
node.setAttributeNS(this.xlinkns, "href", style.externalGraphic);
node.setAttributeNS(null, "style", "opacity: "+opacity);
+ node.onclick = OpenLayers.Renderer.SVG.preventDefault;
} else if (this.isComplexSymbol(style.graphicName)) {
// the symbol viewBox is three times as large as the symbol
var offset = style.pointRadius * 3;
@@ -795,9 +800,9 @@
* inside the valid range.
*
* Parameters:
- * badComponent - {<OpenLayers.Geometry.Point>)} original geometry of the
+ * badComponent - {<OpenLayers.Geometry.Point>} original geometry of the
* invalid point
- * goodComponent - {<OpenLayers.Geometry.Point>)} original geometry of the
+ * goodComponent - {<OpenLayers.Geometry.Point>} original geometry of the
* valid point
* Returns
* {String} the SVG coordinate pair of the clipped point (like
@@ -979,3 +984,12 @@
"t": "-70%",
"b": "0"
};
+
+/**
+ * Function: OpenLayers.Renderer.SVG.preventDefault
+ * Used to prevent default events (especially opening images in a new tab on
+ * ctrl-click) from being executed for externalGraphic symbols
+ */
+OpenLayers.Renderer.SVG.preventDefault = function(e) {
+ e.preventDefault && e.preventDefault();
+};
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Strategy/BBOX.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Strategy/BBOX.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Strategy/BBOX.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -90,6 +90,14 @@
"refresh": this.update,
scope: this
});
+ if(this.layer.visibility == true) {
+ this.update();
+ } else {
+ this.layer.events.on({
+ "visibilitychanged": this.update,
+ scope: this
+ });
+ }
}
return activated;
},
@@ -106,10 +114,8 @@
if(deactivated) {
this.layer.events.un({
"moveend": this.update,
- scope: this
- });
- this.layer.events.un({
"refresh": this.update,
+ "visibilitychanged": this.update,
scope: this
});
}
@@ -127,7 +133,8 @@
*/
update: function(options) {
var mapBounds = this.getMapBounds();
- if ((options && options.force) || this.invalidBounds(mapBounds)) {
+ if (mapBounds !== null && ((options && options.force) ||
+ this.invalidBounds(mapBounds))) {
this.calculateBounds(mapBounds);
this.resolution = this.layer.map.getResolution();
this.triggerRead();
@@ -142,6 +149,9 @@
* {<OpenLayers.Bounds>} Map bounds in the projection of the layer.
*/
getMapBounds: function() {
+ if (this.layer.map === null) {
+ return null;
+ }
var bounds = this.layer.map.getExtent();
if(!this.layer.projection.equals(this.layer.map.getProjectionObject())) {
bounds = bounds.clone().transform(
Modified: sandbox/jennier/openlayers/lib/OpenLayers/Util.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers/Util.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers/Util.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -22,6 +22,11 @@
/**
* Function: getElement
* This is the old $() from prototype
+ *
+ * Parameters:
+ * e - {String or DOMElement or Window}
+ * Return:
+ * {Array(DOMElement)}
*/
OpenLayers.Util.getElement = function() {
var elements = [];
@@ -105,7 +110,7 @@
*
* Parameters:
* array - {Array}
- * obj - {Object}
+ * obj - {*}
*
* Returns:
* {Integer} The index at, which the first object was found in the array.
@@ -134,6 +139,7 @@
* null to an individual parameter will avoid setting the attribute.
*
* Parameters:
+ * element - {DOMElement} DOM element to modify.
* id - {String} The element id attribute to set.
* px - {<OpenLayers.Pixel>} The left and top style position.
* sz - {<OpenLayers.Size>} The width and height style attributes.
@@ -404,6 +410,7 @@
/**
* Function: modifyAlphaImageDiv
*
+ * Parameters:
* div - {DOMElement} Div containing Alpha-adjusted Image
* id - {String}
* px - {<OpenLayers.Pixel>}
@@ -411,7 +418,7 @@
* imgURL - {String}
* position - {String}
* border - {String}
- * sizing {String} 'crop', 'scale', or 'image'. Default is "scale"
+ * sizing - {String} 'crop', 'scale', or 'image'. Default is "scale"
* opacity - {Float} Fractional value (0.0 - 1.0)
*/
OpenLayers.Util.modifyAlphaImageDiv = function(div, id, px, sz, imgURL,
@@ -452,6 +459,7 @@
/**
* Function: createAlphaImageDiv
*
+ * Parameters:
* id - {String}
* px - {<OpenLayers.Pixel>}
* sz - {<OpenLayers.Size>}
@@ -938,7 +946,7 @@
* lonlat - {<OpenLayers.LonLat>} (or any object with both .lat, .lon
* properties) The start point.
* brng - {Float} The bearing (degrees).
- * distance - {Float} The ground distance (meters).
+ * dist - {Float} The ground distance (meters).
*
* Returns:
* {<OpenLayers.LonLat>} The destination point.
@@ -1663,6 +1671,8 @@
* useful in the case where we have a limit in one dimension and must
* therefore meaure the flow in the other dimension.
* options - {Object}
+ *
+ * Allowed Options:
* displayClass - {String} Optional parameter. A CSS class name(s) string
* to provide the CSS context of the rendered content.
* containerElement - {DOMElement} Optional parameter. Insert the HTML to
Modified: sandbox/jennier/openlayers/lib/OpenLayers.js
===================================================================
--- sandbox/jennier/openlayers/lib/OpenLayers.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/lib/OpenLayers.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -182,6 +182,7 @@
"OpenLayers/Control/ZoomToMaxExtent.js",
"OpenLayers/Control/DragPan.js",
"OpenLayers/Control/Navigation.js",
+ "OpenLayers/Control/PinchZoom.js",
"OpenLayers/Control/TouchNavigation.js",
"OpenLayers/Control/MouseDefaults.js",
"OpenLayers/Control/MousePosition.js",
Modified: sandbox/jennier/openlayers/tests/Control/Geolocate.html
===================================================================
--- sandbox/jennier/openlayers/tests/Control/Geolocate.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Control/Geolocate.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -1,6 +1,6 @@
<html>
<head>
- <script src="../../lib/OpenLayers.js"></script>
+ <script src="../OLLoader.js"></script>
<script type="text/javascript">
var map, control, centerLL
watch = null,
Modified: sandbox/jennier/openlayers/tests/Control/Measure.html
===================================================================
--- sandbox/jennier/openlayers/tests/Control/Measure.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Control/Measure.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -96,6 +96,10 @@
measure: function(evt){
log.push(evt);
}
+ },
+ handlerOptions: {
+ pixelTolerance: 0,
+ dblclickTolerance: 0
}
}
);
@@ -131,8 +135,8 @@
// wait for delay then confirm event was logged
delay, function() {
t.eq(log.length, 1, "a) event logged")
- t.ok(log[0] && log[0].type == "measurepartial", "a) event logged");
- t.ok(log[0] && log[0].measure == 10, "a) correct measure");
+ t.eq(log[0] && log[0].type, "measurepartial", "a) event logged");
+ t.eq(log[0] && log[0].measure, 10, "a) correct measure");
// b) move 10 pixels and click
trigger("mousemove", 0, 20);
@@ -145,8 +149,8 @@
},
delay, function() {
t.eq(log.length, 2, "b) event logged");
- t.ok(log[1] && log[1].type == "measurepartial", "b) correct type");
- t.ok(log[1] && log[1].measure == 20, "b) correct measure");
+ t.eq(log[1] && log[1].type, "measurepartial", "b) correct type");
+ t.eq(log[1] && log[1].measure, 20, "b) correct measure");
// c) move 10 pixels and click
trigger("mousemove", 0, 30);
@@ -161,8 +165,8 @@
// wait for rest of delay and confirm event logged
delay / 2, function() {
t.eq(log.length, 3, "c) event logged");
- t.ok(log[2] && log[2].type == "measurepartial", "c) correct type");
- t.ok(log[2] && log[2].measure == 30, "c) correct measure");
+ t.eq(log[2] && log[2].type, "measurepartial", "c) correct type");
+ t.eq(log[2] && log[2].measure, 30, "c) correct measure");
// d) move 10 pixels and click
trigger("mousemove", 0, 40);
@@ -176,8 +180,8 @@
trigger("dblclick", 0, 40);
t.eq(log.length, 4, "e) event logged");
- t.ok(log[3] && log[3].type == "measure", "e) correct type");
- t.ok(log[3] && log[3].measure == 40, "e) correct measure");
+ t.eq(log[3] && log[3].type, "measure", "e) correct type");
+ t.eq(log[3] && log[3].measure, 40, "e) correct measure");
},
// wait for rest of delay and confirm no measurepartial logged
delay, function() {
@@ -198,22 +202,22 @@
trigger("mousemove", 10, 0);
t.eq(log.length, 1, "g) event logged");
- t.ok(log[0] && log[0].type == "measurepartial", "g) correct type");
- t.ok(log[0] && log[0].measure == 10, "g) correct measure");
+ t.eq(log[0] && log[0].type, "measurepartial", "g) correct type");
+ t.eq(log[0] && log[0].measure, 10, "g) correct measure");
// h) move 10 pixels
trigger("mousemove", 20, 0);
t.eq(log.length, 2, "h) event logged");
- t.ok(log[1] && log[1].type == "measurepartial", "h) correct type");
- t.ok(log[1] && log[1].measure == 20, "h) correct measure");
+ t.eq(log[1] && log[1].type, "measurepartial", "h) correct type");
+ t.eq(log[1] && log[1].measure, 20, "h) correct measure");
// i) mouse up to finish
trigger("mouseup", 20, 0);
t.eq(log.length, 3, "i) event logged");
- t.ok(log[2] && log[2].type == "measure", "i) correct type");
- t.ok(log[2] && log[2].measure == 20, "i) correct measure");
+ t.eq(log[2] && log[2].type, "measure", "i) correct type");
+ t.eq(log[2] && log[2].measure, 20, "i) correct measure");
// j) clean up
log = [];
@@ -254,6 +258,10 @@
measure: function(evt){
log.push(evt);
}
+ },
+ handlerOptions: {
+ pixelTolerance: 0,
+ dblclickTolerance: 0
}
}
);
@@ -296,10 +304,10 @@
// confirm measurepartial is fired 2 times
t.eq(log.length, 3, "b) event logged");
- t.ok(log[1] && log[1].type == "measurepartial", "b) correct type");
- t.ok(log[1] && log[1].measure == 20, "b) correct measure");
- t.ok(log[2] && log[2].type == "measurepartial", "c) correct type");
- t.ok(log[2] && log[2].measure == 30, "c) correct measure");
+ t.eq(log[1] && log[1].type, "measurepartial", "b) correct type");
+ t.eq(log[1] && log[1].measure, 20, "b) correct measure");
+ t.eq(log[2] && log[2].type, "measurepartial", "c) correct type");
+ t.eq(log[2] && log[2].measure, 30, "c) correct measure");
// d) switch immediate measurement off
control.setImmediate(false);
@@ -346,23 +354,23 @@
t.eq(log.length, 7, "i) no event fired yet");
},
delay, function() {
- t.eq(log.length, 8, "i) event logged");
- t.eq(log[7] && log[7].type, "measurepartial", "i) correct type");
- t.eq(log[7] && log[7].measure, 60, "i) correct measure");
+ t.eq(log.length, 8, "j) event logged");
+ t.eq(log[7] && log[7].type, "measurepartial", "j) correct type");
+ t.eq(log[7] && log[7].measure, 60, "j) correct measure");
trigger("dblclick", 0, 60);
- t.eq(log.length, 9, "i) event logged");
- t.eq(log[8] && log[8].type, "measure", "i) correct type");
- t.eq(log[8] && log[8].measure, 60, "i) correct measure");
+ t.eq(log.length, 9, "k) event logged");
+ t.eq(log[8] && log[8].type, "measure", "k) correct type");
+ t.eq(log[8] && log[8].measure, 60, "k) correct measure");
// clear log
log = [];
- // j) clean up
+ // l) clean up
map.destroy();
// wait for delay and confirm event not logged
},
delay, function() {
- t.eq(log.length, 0, "j) no event fired after destroy");
+ t.eq(log.length, 0, "l) no event fired after destroy");
}
);
}
Modified: sandbox/jennier/openlayers/tests/Control/Navigation.html
===================================================================
--- sandbox/jennier/openlayers/tests/Control/Navigation.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Control/Navigation.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -118,6 +118,27 @@
t.eq(nav.zoomWheelEnabled, true, "mouse wheel activated");
t.eq(wheel.active, true, "mouse wheel handler activated");
}
+
+ function test_touches_zoom(t) {
+ t.plan(3);
+ var nav = new OpenLayers.Control.Navigation({zoomWheelEnabled: false});
+ var map = new OpenLayers.Map({
+ div: "map",
+ controls: [nav],
+ layers: [
+ new OpenLayers.Layer(null, {isBaseLayer: true})
+ ],
+ center: new OpenLayers.LonLat(0, 0),
+ zoom: 3
+ });
+ t.eq(map.getZoom(), 3, "map zoom starts at 3");
+ nav.handlers.click.callback("click", [{lastTouches: ["foo", "bar"]}]);
+ t.eq(map.getZoom(), 2, "map zooms out with a two touch tap");
+ nav.handlers.click.callback("click", [{}]);
+ t.eq(map.getZoom(), 2, "map doesn't do anything with click");
+
+ map.destroy();
+ }
function test_documentDrag(t) {
@@ -149,5 +170,6 @@
</script>
</head>
<body>
+ <div id="map" style="width: 256px; height: 256px"></div>
</body>
</html>
Copied: sandbox/jennier/openlayers/tests/Control/PinchZoom.html (from rev 11611, trunk/openlayers/tests/Control/PinchZoom.html)
===================================================================
--- sandbox/jennier/openlayers/tests/Control/PinchZoom.html (rev 0)
+++ sandbox/jennier/openlayers/tests/Control/PinchZoom.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1,87 @@
+<html>
+<head>
+ <script src="../OLLoader.js"></script>
+ <script type="text/javascript">
+
+ function test_constructor(t) {
+ t.plan(2);
+ var control = new OpenLayers.Control.PinchZoom();
+ t.ok(control instanceof OpenLayers.Control.PinchZoom, "got an instance");
+ t.ok(control.handler instanceof OpenLayers.Handler.Pinch, "control has pinch handler");
+ control.destroy();
+ }
+
+ function test_destroy(t) {
+ t.plan(1);
+ var control = new OpenLayers.Control.PinchZoom();
+ control.destroy();
+ t.ok(!control.handler, "handler destroyed");
+ }
+
+ function test_activate(t) {
+ t.plan(3);
+ var control = new OpenLayers.Control.PinchZoom();
+ t.ok(!control.active, "control not activated after construction");
+
+ var map = new OpenLayers.Map({
+ div: "map",
+ controls: [control]
+ });
+ t.ok(control.active, "control activated after being added to the map");
+
+ control.deactivate();
+ t.ok(!control.active, "control deactivated");
+
+ map.destroy();
+ }
+
+ function test_pinchMove(t) {
+
+ var control = new OpenLayers.Control.PinchZoom();
+
+ var map = new OpenLayers.Map({
+ div: "map",
+ controls: [control]
+ });
+
+ var log = [];
+ control.applyTransform = function(transform) {
+ log.push(transform);
+ }
+
+ control.containerOrigin = {
+ x: 0, y: 0
+ };
+
+ control.pinchOrigin = {
+ x: 100, y: 50
+ };
+
+ var cases = [
+ {x: 100, y: 60, scale: 1, transform: "translate(0px, 10px) scale(1)"},
+ {x: 150, y: 60, scale: 1, transform: "translate(50px, 10px) scale(1)"},
+ {x: 150, y: 60, scale: 2, transform: "translate(-50px, -40px) scale(2)"},
+ {x: 50, y: 20, scale: 2.5, transform: "translate(-200px, -105px) scale(2.5)"},
+ {x: 150, y: 60, scale: 2, transform: "translate(-50px, -40px) scale(2)"},
+ {x: 50, y: 20, scale: 0.25, transform: "translate(25px, 8px) scale(0.25)"}
+ ];
+
+ var len = cases.length;
+ t.plan(len*2);
+
+ var c;
+ for (var i=0; i<len; ++i) {
+ c = cases[i];
+ control.pinchMove({xy: {x: c.x, y: c.y}}, {scale: c.scale});
+ t.eq(log.length, i+1, i + " called once");
+ t.eq(log[i], c.transform, i + " correct transform");
+ }
+
+ }
+
+ </script>
+</head>
+<body>
+ <div id="map" style="width: 256px; height: 256px;"></div>
+</body>
+</html>
Modified: sandbox/jennier/openlayers/tests/Events.html
===================================================================
--- sandbox/jennier/openlayers/tests/Events.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Events.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -318,8 +318,8 @@
touches: [{clientX: 1, clientY: 1}, {clientX: 2, clientY: 2}]
};
events.handleBrowserEvent(evt);
- t.eq(evt.clientX, 1, "evt.clientX value is correct");
- t.eq(evt.clientY, 1, "evt.clientY value is correct");
+ t.eq(evt.clientX, 1.5, "evt.clientX value is correct");
+ t.eq(evt.clientY, 1.5, "evt.clientY value is correct");
}
function test_Events_destroy (t) {
Modified: sandbox/jennier/openlayers/tests/Format/GeoRSS.html
===================================================================
--- sandbox/jennier/openlayers/tests/Format/GeoRSS.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Format/GeoRSS.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -73,6 +73,15 @@
t.xml_eq(out, expected_result, "Output gave expected value");
}
}
+
+ function test_leading_space(t) {
+ t.plan(2);
+
+ var parser = new OpenLayers.Format.GeoRSS();
+ var items = parser.read('<rss version="2.0" xmlns:georss="http://www.georss.org/georss"><item><description> <![CDATA[foo]]></description></item></rss>');
+ t.eq(items.length, 1, "item created");
+ t.eq(items[0].attributes.description, " foo", "description value is ok");
+ }
var shell_start = '<feed xmlns="http://www.w3.org/2005/Atom" \n xmlns:georss="http://www.georss.org/georss">\n <title>scribble</title>\n <id>http://featureserver.org/featureserver.cgi/scribble?format=atom</id>\n <author><name>FeatureServer</name></author>\n';
var shell_end = '</feed>';
Modified: sandbox/jennier/openlayers/tests/Handler/Click.html
===================================================================
--- sandbox/jennier/openlayers/tests/Handler/Click.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Handler/Click.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -2,6 +2,11 @@
<head>
<script src="../OLLoader.js"></script>
<script type="text/javascript">
+
+ function px(x, y) {
+ return new OpenLayers.Pixel(x, y);
+ }
+
function test_Handler_Click_constructor(t) {
t.plan(3);
var control = new OpenLayers.Control();
@@ -94,140 +99,182 @@
handler.activate();
}
+
+ var callbackMap;
+ function callbackSetup(log, options) {
+ callbackMap = new OpenLayers.Map('map', {controls: []});
- function test_Handler_Click_callbacks(t) {
- t.plan(13);
-
- var map = new OpenLayers.Map('map', {controls: []});
-
var control = {
- map: map
+ map: callbackMap
};
- var handler = new OpenLayers.Handler.Click(control, {});
+ var callbacks = {
+ "click": function(evt) {
+ log.push({callback: "click", evt: evt});
+ },
+ "dblclick": function(evt) {
+ log.push({callback: "dblclick", evt: evt});
+ }
+ };
+ var handler = new OpenLayers.Handler.Click(control, callbacks, options);
handler.activate();
-
- // set up for single click - three tests here
var timers = {};
- var sto = window.setTimeout;
+ window._setTimeout = window.setTimeout;
window.setTimeout = function(func, delay) {
- var key = Math.random();
+ log.push({method: "setTimeout", func: func, delay: delay});
+ var key = (new Date).getTime() + "-" + Math.random();
timers[key] = true;
- t.ok(typeof func == "function",
- "setTimeout called with a function");
- t.eq(delay, handler.delay,
- "setTimeout called with proper delay");
// execute function that is supposed to be delayed
func();
return key;
}
- var cto = window.clearTimeout;
+ window._clearTimeout = window.clearTimeout;
window.clearTimeout = function(key) {
- if(timers[key] === true) {
- delete timers[key];
- } else {
- t.fail("clearTimeout called with non-existent timerId");
- }
+ log.push({
+ method: "clearTimeout",
+ keyExists: (key in timers)
+ });
+ delete timers[key];
}
+ return handler;
+ }
+
+ function callbackTeardown() {
+ window.setTimeout = window._setTimeout;
+ window.clearTimeout = window._clearTimeout;
+ callbackMap.destroy();
+ callbackMap = null;
+ }
+
+ function test_callbacks_click_default(t) {
+ t.plan(6);
+
+ var log = [];
+ var handler = callbackSetup(log);
+
+ // set up for single click - three tests here
var testEvt = {id: Math.random()};
- handler.callbacks = {
- "click": function(evt) {
- t.eq(evt.id, testEvt.id,
- "(click w/ single true) click callback called with correct evt");
- },
- "dblclick": function(evt) {
- t.fail("(click w/ single true) dblclick should not be called here");
- }
- };
- map.events.triggerEvent("click", testEvt);
+ handler.map.events.triggerEvent("click", testEvt);
+ t.eq(log.length, 2, "(click w/ single true) two items logged");
+
+ // first item logged is setTimeout call
+ t.eq(log[0].method, "setTimeout", "setTimeout called");
+ t.eq(typeof log[0].func, "function", "setTimeout called with a function");
+ t.eq(log[0].delay, handler.delay, "setTimeout called with proper delay");
- // set up for double click with double false - no tests here (only failures)
- handler.callbacks = {
- "click": function(evt) {
- t.fail("(dblclick w/ double false) click should not be called here");
- },
- "dblclick": function(evt) {
- t.fail("(dblclick w/ double false) dblclick should not be called here");
- }
- };
- testEvt = Math.random();
- map.events.triggerEvent("dblclick", testEvt);
+ // second item logged is from click callback
+ t.eq(log[1].callback, "click", "click callback called");
+ t.eq(log[1].evt.id, testEvt.id, "got correct event");
+
+ callbackTeardown();
+ }
+
+ function test_callbacks_dblclick_default(t) {
+ t.plan(1);
- // set up for double click with double true - one test here
- handler.double = true;
- handler.callbacks = {
- "click": function(evt) {
- t.fail("(dblclick w/ double true) click should not be called here");
- },
- "dblclick": function(evt) {
- t.eq(evt, testEvt,
- "(dblclick w/ double true) dblclick called with correct evt");
- }
- };
- testEvt = Math.random();
- map.events.triggerEvent("dblclick", testEvt);
+ var log = [];
+ var handler = callbackSetup(log);
+ var testEvt = {id: Math.random()};
+ handler.map.events.triggerEvent("dblclick", testEvt);
- // set up for two clicks with double true - 6 tests here (with timeout ones from above)
- handler.double = true;
- handler.callbacks = {
- "click": function(evt) {
- t.ok(evt != null, "(two clicks w/ double true) click will not be called here if next three tests pass");
- },
- "dblclick": function(evt) {
- t.eq(evt, testEvt,
- "(two clicks w/ double true) dblclick called with correct evt");
- }
- };
- testEvt = Math.random();
- map.events.triggerEvent("click", testEvt);
- t.ok(handler.timerId != null,
- "(two clicks w/ double true) timer is set to call click");
- map.events.triggerEvent("click", testEvt);
- t.ok(handler.timerId == null,
- "(two clicks w/ double true) timer is cleared to call click");
- map.events.triggerEvent("dblclick", testEvt);
- handler.destroy();
+ t.eq(log.length, 0, "nothing happens by default with dblclick (double is false)");
- // set up to tests pixelTolerance - three tests here (2 from setTimeout above)
- handler = new OpenLayers.Handler.Click(control, {}, {
- pixelTolerance: 2
- });
- handler.activate();
- var downEvt = {
- xy: new OpenLayers.Pixel(0, 0)
+ callbackTeardown();
+
+ }
+
+ function test_callbacks_dblclick_double(t) {
+ t.plan(3);
+
+ var log = [];
+ var handler = callbackSetup(log, {"double": true});
+ var testEvt = {id: Math.random()};
+ handler.map.events.triggerEvent("dblclick", testEvt);
+
+ t.eq(log.length, 1, "one item logged");
+ t.eq(log[0].callback, "dblclick", "dblclick callback called")
+ t.eq(log[0].evt.id, testEvt.id, "dblclick callback called with event");
+
+ callbackTeardown();
+
+ }
+
+ function test_callbacks_dblclick_sequence(t) {
+ t.plan(8);
+
+ var log = [];
+ var handler = callbackSetup(log, {"double": true});
+ var testEvt = {id: Math.random()};
+
+ // first click - set timer for next
+ handler.map.events.triggerEvent("click", testEvt);
+ t.ok(handler.timerId != null, "timer is set");
+ log.pop(); // because the test setTimeout is synchronous we get the click callback immediately
+ t.eq(log.length, 1, "one item logged (after pop due to synchronous setTimeout call in our tests");
+ t.eq(log[0].method, "setTimeout", "setTimeout called first");
+
+ // second click - timer cleared
+ handler.map.events.triggerEvent("click", testEvt);
+ t.ok(handler.timerId == null, "timer is cleared");
+ t.eq(log.length, 2, "two items logged after second click");
+ t.eq(log[1].method, "clearTimeout", "clearTimeout called second");
+
+ // dblclick event - callback called
+ handler.map.events.triggerEvent("dblclick", testEvt);
+ t.eq(log.length, 3, "three items logged");
+ t.eq(log[2].callback, "dblclick", "dblclick callback called third");
+
+ callbackTeardown();
+
+ }
+
+ function test_callbacks_within_pixelTolerance(t) {
+ t.plan(1);
+
+ var log = [];
+ var handler = callbackSetup(log, {"double": true, pixelTolerance: 2});
+
+ var down = {
+ xy: px(0, 0)
};
- map.events.triggerEvent("mousedown", downEvt);
- var clickEvt = {
- xy: new OpenLayers.Pixel(0, 1)
+ var up = {
+ xy: px(0, 1)
};
- // mouse moves one pixel, click should be called
- handler.callbacks = {
- "click": function(evt) {
- t.ok(evt.xy == clickEvt.xy, "(pixelTolerance met) click called");
- }
- };
- map.events.triggerEvent("click", clickEvt);
- handler.clearTimer();
+
+ handler.map.events.triggerEvent("mousedown", down);
+ handler.map.events.triggerEvent("mouseup", up);
+ handler.map.events.triggerEvent("click", up);
- // mouse moves 3x3 pixels, click should not be called
- map.events.triggerEvent("mousedown", downEvt);
- var clickEvt = {
- xy: new OpenLayers.Pixel(3, 3)
+ t.eq(log[log.length-1].callback, "click", "click callback called");
+
+ callbackTeardown();
+
+ }
+
+ function test_callbacks_outside_pixelTolerance(t) {
+ t.plan(2);
+
+ var log = [];
+ var handler = callbackSetup(log, {pixelTolerance: 2});
+
+ var down = {
+ xy: px(0, 0)
};
- // mouse moves one pixel, click should be called
- handler.callbacks = {
- "click": function(evt) {
- t.fail("(pixelTolerance not met) click should not be called");
- }
+ var up = {
+ xy: px(2, 3)
};
- map.events.triggerEvent("click", clickEvt); // no test run
- handler.clearTimer();
+
+ handler.map.events.triggerEvent("mousedown", down);
+ t.ok(handler.down && handler.down.xy.equals(down.xy), "down position set");
+
+ handler.map.events.triggerEvent("mouseup", up);
+ handler.map.events.triggerEvent("click", up);
- window.setTimeout = sto;
- window.clearTimeout = cto;
+ t.eq(log.length, 0, "nothing logged - event outside tolerance");
-
+ callbackTeardown();
+
}
function test_Handler_Click_deactivate(t) {
@@ -253,42 +300,60 @@
}
function test_Handler_Click_mouseup(t) {
- t.plan(4);
- g_Propagate = {};
- g_evt = {};
-
- //no modifiers, no handlerightclicks, no isrightclick
+ t.plan(11);
+
+ var map = new OpenLayers.Map("map");
+ var control = new OpenLayers.Control();
+ map.addControl(control);
+ var handler = new OpenLayers.Handler.Click(control);
+
+ var testEvent = {id: Math.random()};
+ var propagate = true;
+ var log, got, modMatch, rightClick;
+
+ // override methods to log what is called
var temp = OpenLayers.Event.isRightClick;
OpenLayers.Event.isRightClick = function(e) {
- t.ok(e == g_evt, 'correct event passed in to checkModifiers');
- return false;
+ log.push({method: "isRightClick", evt: e});
+ return rightClick;
};
-
- var h = {
- 'checkModifiers': function(e) {
- t.ok(e == g_evt, 'correct event passed in to checkModifiers');
- return false;
- },
- 'control': {
- 'handleRightClicks': false
- },
- 'rightclick': function(e) {
- t.ok(e == g_evt, 'correct event passed in to checkModifiers');
- return g_Propagate;
- }
+ handler.checkModifiers = function(e) {
+ log.push({method: "checkModifiers", evt: e});
+ return modMatch;
};
- var propagate = OpenLayers.Handler.Click.prototype.mouseup.apply(h, [g_evt]);
- t.ok(propagate, "default propagate is true when no modifiers, no handlerightclicks, no isrightclick")
+ handler.rightclick = function(e) {
+ log.push({method: "rightclick", evt: e});
+ return propagate;
+ };
- //modifiers, handlerightclicks, and isrightclick
- h.checkModifiers = function() { return true; };
- h.control.handleRightClicks = true;
- OpenLayers.Event.isRightClick = function(e) { return true; };
- propagate = OpenLayers.Handler.Click.prototype.mouseup.apply(h, [g_evt]);
+
+ // simulate an event with non-matching modifiers
+ log = [];
+ modMatch = false;
+ rightClick = false;
+ got = handler.mouseup(testEvent);
+ t.eq(log.length, 1, "one item logged");
+ t.eq(log[0] && log[0].method, "checkModifiers", "a) checkModifiers called first");
+ t.eq(log[0] && log[0].evt, testEvent, "a) first method called with correct event");
- t.ok(propagate == g_Propagate, "return from handler's rightClick() returned from mouseup");
+ // modifiers, handlerightclicks, and isrightclick
+ log = [];
+ rightClick = true;
+ modMatch = true;
+ handler.control.handleRightClicks = true;
+ got = handler.mouseup(testEvent);
+ t.eq(log.length, 3, "three items logged");
+ t.eq(log[0] && log[0].method, "checkModifiers", "b) checkModifiers called first");
+ t.eq(log[0] && log[0].evt, testEvent, "b) first method called with correct event");
+ t.eq(log[1] && log[1].method, "isRightClick", "b) isRightClick called second");
+ t.eq(log[1] && log[1].evt, testEvent, "b) second method called with correct event");
+ t.eq(log[2] && log[2].method, "rightclick", "b) rightclick called third");
+ t.eq(log[2] && log[2].evt, testEvent, "b) third method called with correct event");
+ t.eq(got, propagate, "b) return from handler's rightclick returned from mouseup");
+
OpenLayers.Event.isRightClick = temp;
+ map.destroy();
}
function test_touch_click(t) {
@@ -315,15 +380,15 @@
// test
log = null;
- handler.touchstart({xy: {x: 1, y: 1}, touches: ["foo"]});
- handler.touchend({});
+ handler.touchstart({xy: px(1, 1), touches: ["foo"]});
+ handler.touchend({touches: ["foo"]});
t.delay_call(1, function() {
t.ok(log != null, "click callback called");
if(log != null) {
t.eq(log.x, 1, "evt.xy.x as expected");
t.eq(log.y, 1, "evt.xy.y as expected");
- t.eq(log.lastTouches, ["foo"], "evt.lastTouches as expected");
+ t.ok(log.lastTouches, "evt.lastTouches as expected");
}
// tear down
map.destroy();
@@ -354,12 +419,12 @@
// test
log = {};
- handler.touchstart({xy: {x: 1, y: 1}, touches: ["foo"]});
+ handler.touchstart({xy: px(1, 1), touches: ["foo"]});
handler.touchend({});
- handler.touchstart({xy: {x: 1, y: 1}, touches: ["foo"]});
+ handler.touchstart({xy: px(1, 1), touches: ["foo"]});
handler.touchend({type: "click"});
- t.eq(handler.touch, true, "Touch property should be true");
+ t.eq(!!handler.down.touches, true, "Handler down touches property should be truthy");
t.ok(log.dblclick == undefined, "dblclick callback not called with simulated click");
@@ -395,9 +460,9 @@
// test
log = {};
- handler.touchstart({xy: {x: 1, y: 1}, touches: ["foo"]});
+ handler.touchstart({xy: px(1, 1), touches: [{clientX:0, clientY:10}]});
handler.touchend({});
- handler.touchstart({xy: {x: 1, y: 1}, touches: ["foo"]});
+ handler.touchstart({xy: px(1, 1), touches: [{clientX:0, clientY:10}]});
handler.touchend({});
t.eq(log.click, undefined, "click callback not called");
@@ -405,7 +470,7 @@
if(log.dblclick != undefined) {
t.eq(log.dblclick.x, 1, "evt.xy.x as expected");
t.eq(log.dblclick.y, 1, "evt.xy.y as expected");
- t.eq(log.dblclick.lastTouches, ["foo"], "evt.lastTouches as expected");
+ t.ok(log.dblclick.lastTouches, "evt.lastTouches on evt");
}
// tear down
Modified: sandbox/jennier/openlayers/tests/Handler/Feature.html
===================================================================
--- sandbox/jennier/openlayers/tests/Handler/Feature.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Handler/Feature.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -53,7 +53,7 @@
}
function test_events(t) {
- t.plan(25);
+ t.plan(30);
var map = new OpenLayers.Map('map');
var control = new OpenLayers.Control();
@@ -64,7 +64,7 @@
// list below events that should be handled (events) and those
// that should not be handled (nonevents) by the handler
- var events = ["mousedown", "mouseup", "mousemove", "click", "dblclick"];
+ var events = ["mousedown", "mouseup", "mousemove", "click", "dblclick", "touchstart"];
var nonevents = ["mouseout", "resize", "focus", "blur"];
map.events.registerPriority = function(type, obj, func) {
var output = func();
@@ -123,7 +123,7 @@
}
function test_callbacks(t) {
- t.plan(9);
+ t.plan(13);
var map = new OpenLayers.Map('map', {controls: []});
var control = new OpenLayers.Control();
@@ -223,6 +223,36 @@
callbacks['dblclick'] = getCallback('dblclick', newFeature);
evtPx.type = "dblclick";
map.events.triggerEvent('dblclick', evtPx);
+
+ // test touchstart on a feature
+ // 'click' callback should be called
+ handler.feature = null;
+ lastFeature = null;
+ newFeature = new OpenLayers.Feature.Vector();
+ newFeature.layer = layer;
+ callbacks['click'] = getCallback('click (touch)', newFeature);
+ callbacks['clickout'] = getCallback('clickout (touch)', lastFeature);
+ evtPx.type = "touchstart";
+ map.events.triggerEvent('touchstart', evtPx);
+
+ // test touchstart in new feature and out of last feature
+ // both 'click' and 'clickout' callbacks should be called
+ lastFeature = newFeature;
+ newFeature = new OpenLayers.Feature.Vector();
+ newFeature.layer = layer;
+ callbacks['click'] = getCallback('click (touch)', newFeature);
+ callbacks['clickout'] = getCallback('clickout (touch)', lastFeature);
+ evtPx.type = "touchstart";
+ map.events.triggerEvent('touchstart', evtPx);
+
+ // test touchstart out of last feature
+ // only 'clickout' callback should be called
+ lastFeature = newFeature;
+ newFeature = null;
+ callbacks['click'] = getCallback('click (touch)', newFeature);
+ callbacks['clickout'] = getCallback('clickout (touch)', lastFeature);
+ evtPx.type = "touchstart";
+ map.events.triggerEvent('touchstart', evtPx);
}
function test_deactivate(t) {
Modified: sandbox/jennier/openlayers/tests/Handler/Path.html
===================================================================
--- sandbox/jennier/openlayers/tests/Handler/Path.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Handler/Path.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -145,6 +145,10 @@
cancel: function() {
logs.push({type: "cancel", args: arguments});
}
+ },
+ {
+ pixelTolerance: 0,
+ dblclickTolerance: 0
});
control.handler = handler;
map.addControl(control);
@@ -642,7 +646,11 @@
});
map.addLayer(layer);
var control = new OpenLayers.Control({});
- var handler = new OpenLayers.Handler.Path(control, {});
+ var handler = new OpenLayers.Handler.Path(control, {},
+ {
+ pixelTolerance: 0,
+ dblclickTolerance: 0
+ });
control.handler = handler;
map.addControl(control);
map.setCenter(new OpenLayers.LonLat(0, 0), 0);
@@ -741,6 +749,97 @@
]), "geometry is correct after mousemove");
}
+ function test_sequence_touch_1(t) {
+ t.plan(19);
+
+ log = [];
+ var map = new OpenLayers.Map("map", { // 300 x 150
+ resolutions: [1]
+ });
+ var layer = new OpenLayers.Layer.Vector("foo", {
+ maxExtent: new OpenLayers.Bounds(-100, -100, 100, 100),
+ isBaseLayer: true
+ });
+ map.addLayer(layer);
+ var control = new OpenLayers.Control({});
+ var handler = new OpenLayers.Handler.Path(control, {
+ "done": function(g, f) {
+ log.push({geometry: g, feature: f});
+ }
+ });
+ control.handler = handler;
+ map.addControl(control);
+ map.setCenter(new OpenLayers.LonLat(0, 0), 5);
+ handler.activate();
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(49, 75)});
+ t.eq(log.length, 0, "touch start 1");
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(50, 75)});
+ t.eq(log.length, 0, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 0, "touch end");
+ t.geom_eq(handler.line.geometry,
+ new OpenLayers.Geometry.LineString([
+ new OpenLayers.Geometry.Point(-100, 0),
+ new OpenLayers.Geometry.Point(-100, 0)
+ ]), "geometry is correct");
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(100, 75)});
+ t.eq(log.length, 0, "touch start 2");
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(250, 75)});
+ t.eq(log.length, 0, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 0, "touch end");
+ t.geom_eq(handler.line.geometry,
+ new OpenLayers.Geometry.LineString([
+ new OpenLayers.Geometry.Point(-100, 0),
+ new OpenLayers.Geometry.Point(-100, 0)
+ ]), "geometry is correct");
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(100, 75)});
+ t.eq(log.length, 0, "touch start 3");
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(100, 75)});
+ t.eq(log.length, 0, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 0, "touch end");
+ t.geom_eq(handler.line.geometry,
+ new OpenLayers.Geometry.LineString([
+ new OpenLayers.Geometry.Point(-100, 0),
+ new OpenLayers.Geometry.Point(-50, 0),
+ new OpenLayers.Geometry.Point(-50, 0)
+ ]), "geometry is correct");
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(252, 100)});
+ t.eq(log.length, 0, "touch start 4");
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(252, 100)});
+ t.eq(log.length, 0, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 0, "touch end");
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(250, 100)});
+ t.eq(log.length, 1, "touch start");
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(250, 100)});
+ t.eq(log.length, 1, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 1, "touch end");
+ t.geom_eq(log[0].geometry,
+ new OpenLayers.Geometry.LineString([
+ new OpenLayers.Geometry.Point(-100, 0),
+ new OpenLayers.Geometry.Point(-50, 0),
+ new OpenLayers.Geometry.Point(102, -25)
+ ]), "geometry is correct");
+ }
+
</script>
</head>
<body>
Modified: sandbox/jennier/openlayers/tests/Handler/Point.html
===================================================================
--- sandbox/jennier/openlayers/tests/Handler/Point.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Handler/Point.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -75,7 +75,7 @@
}
function test_Handler_Point_events(t) {
- t.plan(34);
+ t.plan(49);
var log = [];
var map = new OpenLayers.Map("map", {
resolutions: [1]
@@ -97,7 +97,7 @@
// list below events that should be handled (events) and those
// that should not be handled (nonevents) by the handler
- var events = ["click", "dblclick", "mousedown", "mouseup", "mousemove", "mouseout"];
+ var events = ["click", "dblclick", "mousedown", "mouseup", "mousemove", "mouseout", "touchstart", "touchmove", "touchend"];
var nonevents = ["resize", "focus", "blur"];
map.events.registerPriority = function(type, obj, func) {
var r = func();
@@ -166,6 +166,10 @@
cancel: function() {
logs.push({type: "cancel", args: arguments});
}
+ },
+ {
+ pixelTolerance: 0,
+ dblclickTolerance: 0
});
control.handler = handler;
map.addControl(control);
@@ -379,8 +383,49 @@
"handler.point is null after destroy");
}
+ function test_sequence_touch_1(t) {
+ t.plan(7);
+ log = [];
+ var map = new OpenLayers.Map("map", { // 300 x 150
+ resolutions: [1]
+ });
+ var layer = new OpenLayers.Layer.Vector("foo", {
+ maxExtent: new OpenLayers.Bounds(-100, -100, 100, 100),
+ isBaseLayer: true
+ });
+ map.addLayer(layer);
+ var control = new OpenLayers.Control();
+ var handler = new OpenLayers.Handler.Point(control, {
+ "done": function(g, f) {
+ log.push({geometry: g, feature: f});
+ }
+ });
+ control.handler = handler;
+ map.addControl(control);
+ map.setCenter(new OpenLayers.LonLat(0, 0), 5);
+ handler.activate();
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(50, 75)});
+ t.eq(log.length, 0, "touch start 1");
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(250, 75)});
+ t.eq(log.length, 0, "touch move");
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 0, "touch end");
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(99, 75)});
+ t.eq(log.length, 0, "touch start 2");
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(100, 75)});
+ t.eq(log.length, 0, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 1, "touch end");
+ t.geom_eq(log[0].geometry, new OpenLayers.Geometry.Point(-50, 0), "geometry is correct");
+ }
+
</script>
</head>
<body>
Modified: sandbox/jennier/openlayers/tests/Handler/Polygon.html
===================================================================
--- sandbox/jennier/openlayers/tests/Handler/Polygon.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Handler/Polygon.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -142,6 +142,10 @@
cancel: function() {
logs.push({type: "cancel", args: arguments});
}
+ },
+ {
+ pixelTolerance: 0,
+ dblclickTolerance: 0
});
control.handler = handler;
map.addControl(control);
@@ -531,7 +535,11 @@
var draw = new OpenLayers.Control.DrawFeature(
map.layers[0],
OpenLayers.Handler.Polygon,
- {handlerOptions: {holeModifier: "altKey"}}
+ {handlerOptions: {
+ holeModifier: "altKey",
+ pixelTolerance: 0,
+ dblclickTolerance: 0
+ }}
);
map.addControl(draw);
draw.activate();
@@ -745,7 +753,8 @@
var control = new OpenLayers.Control({});
var handler = new OpenLayers.Handler.Polygon(control,
{done: function(g) { log.geometry = g; }},
- {stopDown: true, stopUp: true}
+ {stopDown: true, stopUp: true,
+ pixelTolerance: 0, dblclickTolerance: 0}
);
control.handler = handler;
map.addControl(control);
@@ -816,7 +825,8 @@
var control = new OpenLayers.Control({});
var handler = new OpenLayers.Handler.Polygon(control,
{done: function(g) { log.geometry = g; }},
- {stopDown: false, stopUp: false}
+ {stopDown: false, stopUp: false,
+ pixelTolerance: 0, dblclickTolerance: 0}
);
control.handler = handler;
map.addControl(control);
@@ -868,6 +878,105 @@
]), "geometry is correct");
}
+
+ function test_sequence_touch_1(t) {
+ t.plan(19);
+
+ log = [];
+ var map = new OpenLayers.Map("map", { // 300 x 150
+ resolutions: [1]
+ });
+ var layer = new OpenLayers.Layer.Vector("foo", {
+ maxExtent: new OpenLayers.Bounds(-100, -100, 100, 100),
+ isBaseLayer: true
+ });
+ map.addLayer(layer);
+ var control = new OpenLayers.Control({});
+ var handler = new OpenLayers.Handler.Polygon(control, {
+ "done": function(g, f) {
+ log.push({geometry: g, feature: f});
+ }
+ });
+ control.handler = handler;
+ control.layer = layer;
+ map.addControl(control);
+ map.setCenter(new OpenLayers.LonLat(0, 0), 5);
+ handler.activate();
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(49, 75)});
+ t.eq(log.length, 0, "touch start 1");
+ var expectedRing = new OpenLayers.Geometry.LinearRing([
+ new OpenLayers.Geometry.Point(-100, 0),
+ new OpenLayers.Geometry.Point(-100, 0)
+ ]);
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(50, 75)});
+ t.eq(log.length, 0, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 0, "touch end");
+ expectedRing.addComponent(new OpenLayers.Geometry.Point(-100,0), 1);
+
+ t.geom_eq(handler.polygon.geometry.components[0], expectedRing, "geometry is correct");
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(100, 75)});
+ t.eq(log.length, 0, "touch start 2");
+ var expectedRing = new OpenLayers.Geometry.LinearRing([
+ new OpenLayers.Geometry.Point(-100, 0),
+ new OpenLayers.Geometry.Point(-100, 0)
+ ]);
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(250, 75)});
+ t.eq(log.length, 0, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 0, "touch end");
+ expectedRing.addComponent(new OpenLayers.Geometry.Point(-100,0), 1);
+
+ t.geom_eq(handler.polygon.geometry.components[0], expectedRing, "geometry is correct");
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(100, 75)});
+ t.eq(log.length, 0, "touch start 3");
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(100, 75)});
+ t.eq(log.length, 0, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 0, "touch end");
+ t.geom_eq(handler.polygon.geometry,
+ new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([
+ new OpenLayers.Geometry.Point(-100, 0),
+ new OpenLayers.Geometry.Point(-50, 0),
+ new OpenLayers.Geometry.Point(-50, 0),
+ new OpenLayers.Geometry.Point(-100, 0)
+ ])]), "geometry is correct");
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(252, 100)});
+ t.eq(log.length, 0, "touch start 4");
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(252, 100)});
+ t.eq(log.length, 0, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 0, "touch end");
+
+ handler.touchstart({type: "touchstart", xy: new OpenLayers.Pixel(250, 100)});
+ t.eq(log.length, 1, "touch start");
+
+ handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(250, 100)});
+ t.eq(log.length, 1, "touch move");
+
+ handler.touchend({type: "touchend"});
+ t.eq(log.length, 1, "touch end");
+ t.geom_eq(log[0].geometry,
+ new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([
+ new OpenLayers.Geometry.Point(-100, 0),
+ new OpenLayers.Geometry.Point(-50, 0),
+ new OpenLayers.Geometry.Point(102, -25),
+ new OpenLayers.Geometry.Point(-100, 0)
+ ])]), "geometry is correct");
+ }
+
</script>
</head>
<body>
Modified: sandbox/jennier/openlayers/tests/Layer/Image.html
===================================================================
--- sandbox/jennier/openlayers/tests/Layer/Image.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Layer/Image.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -146,7 +146,7 @@
delay = true;
});
- t.delay_call(0.4,function() {
+ t.delay_call(5, function() {
t.eq(delay, true, "registered for loadend");
t.eq(layer.tile.isLoading, false, "loadend triggered after tile is loaded");
map.destroy(); //tear down
Modified: sandbox/jennier/openlayers/tests/Map.html
===================================================================
--- sandbox/jennier/openlayers/tests/Map.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Map.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -1052,7 +1052,7 @@
}
function test_Map_restrictedExtent(t) {
- t.plan(24);
+ t.plan(25);
var extent = new OpenLayers.Bounds(-180, -90, 180, 90);
var options = {
maxResolution: "auto"
@@ -1147,8 +1147,28 @@
"map extent not restricted with null restrictedExtent for se");
map.destroy();
+
+ extent = new OpenLayers.Bounds(8, 44.5, 19, 50);
+ var options = {
+ restrictedExtent: extent
+ };
+ map = new OpenLayers.Map('map', options);
+
+ var wms = new OpenLayers.Layer.WMS(
+ "OpenLayers WMS",
+ "http://vmap0.tiles.osgeo.org/wms/vmap0?",
+ {layers: 'basic'}
+ );
+
+ map.addLayers([wms]);
+ map.zoomToExtent(extent);
+ map.zoomIn();
+ map.setOptions({restrictedExtent: null});
+ map.pan(-250, -250);
+ t.ok((map.getExtent().bottom == 48.3486328125 && map.getExtent().left == 7.45751953125), "Expected extent when toggling restrictedExtent");
+ map.destroy();
}
-
+
function test_Map_getResolutionForZoom(t) {
t.plan(2);
var map = new OpenLayers.Map("map");
@@ -1323,7 +1343,7 @@
var m = {
'baseLayer': { 'units': {} },
'getSize': function() { return {'w': 10, 'h': 15}; },
- 'getCenter': function() { return {'lon': -5, 'lat': -25}; },
+ 'getCachedCenter': function() { return {'lon': -5, 'lat': -25}; },
'zoomToExtent': function(extent, closest) {
t.ok(extent.equals(g_ExpectedExtent), "extent correctly calculated for zoomToExtent()");
t.ok(closest == g_Closest, "closest correctly passed on to zoomToExtent()");
@@ -1701,6 +1721,41 @@
map.destroy();
}
+ function test_moveByPx(t) {
+ t.plan(8);
+
+ var map = new OpenLayers.Map({
+ div: 'map',
+ maxExtent: new OpenLayers.Bounds(-50, -50, 50, 50),
+ restrictedExtent: new OpenLayers.Bounds(-10, -10, 10, 10),
+ layers: [
+ new OpenLayers.Layer('name', {isBaseLayer: true})
+ ]
+ });
+ map.zoomToExtent(new OpenLayers.Bounds(-1, -1, 1, 1));
+
+ // check initial state
+ t.eq(map.layerContainerDiv.style.left, '0px', 'layer container left correct');
+ t.eq(map.layerContainerDiv.style.top, '0px', 'layer container top correct');
+
+ // move to a valid position
+ map.moveByPx(-455, 455);
+ t.eq(map.layerContainerDiv.style.left, '455px', 'layer container left correct');
+ t.eq(map.layerContainerDiv.style.top, '-455px', 'layer container top correct');
+
+ // move outside the max extent
+ map.moveByPx(-4500, 4500);
+ t.eq(map.layerContainerDiv.style.left, '455px', 'layer container left correct');
+ t.eq(map.layerContainerDiv.style.top, '-455px', 'layer container top correct');
+
+ // move outside the restricted extent
+ map.moveByPx(-500, 500);
+ t.eq(map.layerContainerDiv.style.left, '455px', 'layer container left correct');
+ t.eq(map.layerContainerDiv.style.top, '-455px', 'layer container top correct');
+
+ map.destroy();
+ }
+
</script>
</head>
<body>
Modified: sandbox/jennier/openlayers/tests/Strategy/BBOX.html
===================================================================
--- sandbox/jennier/openlayers/tests/Strategy/BBOX.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/Strategy/BBOX.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -270,6 +270,29 @@
}
+ // Test fix for Ticket #3142
+ function test_layerLoadedAfterBeingAdded(t) {
+ t.plan(1);
+
+ var dummy = new OpenLayers.Layer(null, {isBaseLayer: true});
+
+ var strategy = new OpenLayers.Strategy.BBOX({
+ ratio: 1 // makes for easier comparison to map bounds
+ });
+ var layer = new OpenLayers.Layer.Vector(null, {
+ protocol: new OpenLayers.Protocol(),
+ strategies: [strategy]
+ });
+
+ var map = new OpenLayers.Map("map");
+ map.addLayer(dummy);
+ map.setCenter(new OpenLayers.LonLat(0, 0));
+ map.addLayer(layer);
+
+ // test that the strategy bounds were set
+ t.ok(map.getExtent().equals(strategy.bounds), "[set center] bounds set to map extent");
+ }
+
</script>
</head>
<body>
Modified: sandbox/jennier/openlayers/tests/list-tests.html
===================================================================
--- sandbox/jennier/openlayers/tests/list-tests.html 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/list-tests.html 2011-03-03 15:38:51 UTC (rev 11612)
@@ -32,6 +32,7 @@
<li>Control/PanZoom.html</li>
<li>Control/PanZoomBar.html</li>
<li>Control/Permalink.html</li>
+ <li>Control/PinchZoom.html</li>
<li>Control/Scale.html</li>
<li>Control/ScaleLine.html</li>
<li>Control/SelectFeature.html</li>
Deleted: sandbox/jennier/openlayers/tests/node.js/mockdom.js
===================================================================
--- trunk/openlayers/tests/node.js/mockdom.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/node.js/mockdom.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -1,106 +0,0 @@
-XMLHttpRequest = function() {
- return {
- 'open': function() { },
- 'send': function() { }
- }
-};
-
-alert = print;
-
-navigator = {
- 'appName': 'mockdom',
- 'userAgent': 'mockdom',
- 'appVersion': '0.1',
- 'language': 'en',
- 'userLanguage': 'en'
-}
-
-element = function(type) {
- type = type || "";
-
- return {
- 'childNodes': [],
- 'className': '',
- 'tagName': type.toUpperCase(),
- 'style': {},
- 'setAttribute': function(attr, value) {
- this[attr] = value;
- },
- 'appendChild': function(element) {
- if (this.childNodes.length) {
- this.childNodes[this.childNodes.length - 1].nextSibling = element;
- } else {
- this.firstChild = element;
- }
- element.parentNode = this;
- this.childNodes.push(element);
-
- },
- 'removeChild': function(element) {
- var i = this.childNodes.indexOf(element);
- this.childNodes.splice(i, 1);
- },
- 'addEventListener': function() {
- },
- 'removeEventListener': function() {
- },
- 'getElementsByTagName': function(name, externalList) {
- var uc = name.toUpperCase();
- var list = externalList || [];
- for(var i = 0; i < this.childNodes.length; i++) {
- if (this.childNodes[i].tagName == uc) {
- list.push(this.childNodes[i]);
- }
- this.childNodes[i].getElementsByTagName(name, list);
- }
- return list;
- },
- 'getElementById': function(id) {
- for(var i = 0; i < this.childNodes.length; i++) {
- if (this.childNodes[i].id == id) {
- return this.childNodes[i];
- } else {
- var elem = this.childNodes[i].getElementById(id);
- if (elem) {
- return elem
- }
- }
- }
- }
- }
-};
-
-document = element();
-document.createElement = function(type) {
- return element(type);
-};
-document.createTextNode = function(text) {
- var e = element("Text");
- e.innerHTML = text;
-}
-
-document.appendChild(element("head"));
-document.body = element("body");
-document.appendChild(document.body);
-
-window = {
- 'addEventListener': function() {
- },
- 'getSelection': function() {
- return {
- collapseToStart: function() {}
- }
- },
- document: document,
- navigator: navigator,
- location: {
- href: '#',
- port: '',
- hostname: 'openlayers.org',
- host: 'openlayers.org',
- proto: 'https'
- }
-};
-document.location = window.location;
-
-window.Function = Function;
Copied: sandbox/jennier/openlayers/tests/node.js/mockdom.js (from rev 11611, trunk/openlayers/tests/node.js/mockdom.js)
===================================================================
--- sandbox/jennier/openlayers/tests/node.js/mockdom.js (rev 0)
+++ sandbox/jennier/openlayers/tests/node.js/mockdom.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1,106 @@
+XMLHttpRequest = function() {
+ return {
+ 'open': function() { },
+ 'send': function() { }
+ }
+};
+
+alert = print;
+
+navigator = {
+ 'appName': 'mockdom',
+ 'userAgent': 'mockdom',
+ 'appVersion': '0.1',
+ 'language': 'en',
+ 'userLanguage': 'en'
+}
+
+element = function(type) {
+ type = type || "";
+
+ return {
+ 'childNodes': [],
+ 'className': '',
+ 'tagName': type.toUpperCase(),
+ 'style': {},
+ 'setAttribute': function(attr, value) {
+ this[attr] = value;
+ },
+ 'appendChild': function(element) {
+ if (this.childNodes.length) {
+ this.childNodes[this.childNodes.length - 1].nextSibling = element;
+ } else {
+ this.firstChild = element;
+ }
+ element.parentNode = this;
+ this.childNodes.push(element);
+
+ },
+ 'removeChild': function(element) {
+ var i = this.childNodes.indexOf(element);
+ this.childNodes.splice(i, 1);
+ },
+ 'addEventListener': function() {
+ },
+ 'removeEventListener': function() {
+ },
+ 'getElementsByTagName': function(name, externalList) {
+ var uc = name.toUpperCase();
+ var list = externalList || [];
+ for(var i = 0; i < this.childNodes.length; i++) {
+ if (this.childNodes[i].tagName == uc) {
+ list.push(this.childNodes[i]);
+ }
+ this.childNodes[i].getElementsByTagName(name, list);
+ }
+ return list;
+ },
+ 'getElementById': function(id) {
+ for(var i = 0; i < this.childNodes.length; i++) {
+ if (this.childNodes[i].id == id) {
+ return this.childNodes[i];
+ } else {
+ var elem = this.childNodes[i].getElementById(id);
+ if (elem) {
+ return elem
+ }
+ }
+ }
+ }
+ }
+};
+
+document = element();
+document.createElement = function(type) {
+ return element(type);
+};
+document.createTextNode = function(text) {
+ var e = element("Text");
+ e.innerHTML = text;
+}
+
+document.appendChild(element("head"));
+document.body = element("body");
+document.appendChild(document.body);
+
+window = {
+ 'addEventListener': function() {
+ },
+ 'getSelection': function() {
+ return {
+ collapseToStart: function() {}
+ }
+ },
+ document: document,
+ navigator: navigator,
+ location: {
+ href: '#',
+ port: '',
+ hostname: 'openlayers.org',
+ host: 'openlayers.org',
+ proto: 'https'
+ }
+};
+document.location = window.location;
+
+window.Function = Function;
Deleted: sandbox/jennier/openlayers/tests/node.js/node-tests.cfg
===================================================================
--- trunk/openlayers/tests/node.js/node-tests.cfg 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/node.js/node-tests.cfg 2011-03-03 15:38:51 UTC (rev 11612)
@@ -1,12 +0,0 @@
-# This build config is supposed to be used for the units tests with "mode=build"
-
-[first]
-mockdom.js
-[last]
-node.js
-
-[include]
-
-[exclude]
-OpenLayers.js
-Firebug/firebug.js
Copied: sandbox/jennier/openlayers/tests/node.js/node-tests.cfg (from rev 11611, trunk/openlayers/tests/node.js/node-tests.cfg)
===================================================================
--- sandbox/jennier/openlayers/tests/node.js/node-tests.cfg (rev 0)
+++ sandbox/jennier/openlayers/tests/node.js/node-tests.cfg 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1,12 @@
+# This build config is supposed to be used for the units tests with "mode=build"
+
+[first]
+mockdom.js
+[last]
+node.js
+
+[include]
+
+[exclude]
+OpenLayers.js
+Firebug/firebug.js
Deleted: sandbox/jennier/openlayers/tests/node.js/node.js
===================================================================
--- trunk/openlayers/tests/node.js/node.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/node.js/node.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -1 +0,0 @@
-exports.OpenLayers = OpenLayers;
Copied: sandbox/jennier/openlayers/tests/node.js/node.js (from rev 11611, trunk/openlayers/tests/node.js/node.js)
===================================================================
--- sandbox/jennier/openlayers/tests/node.js/node.js (rev 0)
+++ sandbox/jennier/openlayers/tests/node.js/node.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1 @@
+exports.OpenLayers = OpenLayers;
Deleted: sandbox/jennier/openlayers/tests/node.js/run-test.js
===================================================================
--- trunk/openlayers/tests/node.js/run-test.js 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/node.js/run-test.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -1,26 +0,0 @@
-// Requires:
-/// 0. nodejs
-// 1. jsdom installed (npm install jsdom)
-// 2. A build profile with mockdom.js included in [first], and node.js
-// inclded in [last], at ../../build/OpenLayers.js , like node-tests.js.
-// 3. Run with node run-tests.js
-//
-// Missing: integration with a solid node.js testrunner.
-var jsdom = require('jsdom');
-jsdom.env('<html><body></body></html>', function(errors, window) {
- for (var i in window) {
- if (i == "console") {
- continue;
- }
- eval(i+"=window['"+i+"'];");
- }
- OpenLayers = require("../../build/OpenLayers.js")['OpenLayers'];
- var map = new OpenLayers.Map(document.createElement("map"));
- map.addLayer(new OpenLayers.Layer("", {isBaseLayer:true}));
- map.setCenter(new OpenLayers.LonLat(-71,42), 10);
- var px = map.getPixelFromLonLat(map.getLonLatFromPixel(new OpenLayers.Pixel(100,100)));
- console.log(px);
- var px = map.getLonLatFromPixel(map.getPixelFromLonLat(new OpenLayers.LonLat(10,10)));
- console.log(px);
-
-});
Copied: sandbox/jennier/openlayers/tests/node.js/run-test.js (from rev 11611, trunk/openlayers/tests/node.js/run-test.js)
===================================================================
--- sandbox/jennier/openlayers/tests/node.js/run-test.js (rev 0)
+++ sandbox/jennier/openlayers/tests/node.js/run-test.js 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1,26 @@
+// Requires:
+/// 0. nodejs
+// 1. jsdom installed (npm install jsdom)
+// 2. A build profile with mockdom.js included in [first], and node.js
+// inclded in [last], at ../../build/OpenLayers.js , like node-tests.js.
+// 3. Run with node run-tests.js
+//
+// Missing: integration with a solid node.js testrunner.
+var jsdom = require('jsdom');
+jsdom.env('<html><body></body></html>', function(errors, window) {
+ for (var i in window) {
+ if (i == "console") {
+ continue;
+ }
+ eval(i+"=window['"+i+"'];");
+ }
+ OpenLayers = require("../../build/OpenLayers.js")['OpenLayers'];
+ var map = new OpenLayers.Map(document.createElement("map"));
+ map.addLayer(new OpenLayers.Layer("", {isBaseLayer:true}));
+ map.setCenter(new OpenLayers.LonLat(-71,42), 10);
+ var px = map.getPixelFromLonLat(map.getLonLatFromPixel(new OpenLayers.Pixel(100,100)));
+ console.log(px);
+ var px = map.getLonLatFromPixel(map.getPixelFromLonLat(new OpenLayers.LonLat(10,10)));
+ console.log(px);
+
+});
Deleted: sandbox/jennier/openlayers/tests/node.js/run.sh
===================================================================
--- trunk/openlayers/tests/node.js/run.sh 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tests/node.js/run.sh 2011-03-03 15:38:51 UTC (rev 11612)
@@ -1,10 +0,0 @@
-#!/bin/sh
-cp mockdom.js node.js ../../lib
-cp node-tests.cfg ../../build
-cd ../../build
-python build.py -c none node-tests
-cd ../tests/node.js/
-
-node run-test.js
-rm ../../lib/mockdom.js
-rm ../../lib/node.js
Copied: sandbox/jennier/openlayers/tests/node.js/run.sh (from rev 11611, trunk/openlayers/tests/node.js/run.sh)
===================================================================
--- sandbox/jennier/openlayers/tests/node.js/run.sh (rev 0)
+++ sandbox/jennier/openlayers/tests/node.js/run.sh 2011-03-03 15:38:51 UTC (rev 11612)
@@ -0,0 +1,10 @@
+#!/bin/sh
+cp mockdom.js node.js ../../lib
+cp node-tests.cfg ../../build
+cd ../../build
+python build.py -c none node-tests
+cd ../tests/node.js/
+
+node run-test.js
+rm ../../lib/mockdom.js
+rm ../../lib/node.js
Modified: sandbox/jennier/openlayers/tools/release.sh
===================================================================
--- sandbox/jennier/openlayers/tools/release.sh 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tools/release.sh 2011-03-03 15:38:51 UTC (rev 11612)
@@ -13,7 +13,9 @@
rm ../tools/closure-compiler.jar
cd ..
-
+cd tools
+python exampleparser.py
+cd ..
for i in google ie6-style style; do
csstidy theme/default/$i.css --template=highest theme/default/$i.tidy.css
done
Modified: sandbox/jennier/openlayers/tools/update_dev_dir.sh
===================================================================
--- sandbox/jennier/openlayers/tools/update_dev_dir.sh 2011-03-03 14:40:29 UTC (rev 11611)
+++ sandbox/jennier/openlayers/tools/update_dev_dir.sh 2011-03-03 15:38:51 UTC (rev 11612)
@@ -19,14 +19,18 @@
python exampleparser.py
cd /osgeo/openlayers/docs/dev/build
./build.py -c closure tests.cfg
+ ./build.py -c closure mobile.cfg OpenLayers.mobile.js
cp OpenLayers.js ..
+ cp OpenLayers.mobile.js ..
+
cd ..
for i in google ie6-style style; do
csstidy theme/default/$i.css --template=highest theme/default/$i.tidy.css
cp theme/default/$i.tidy.css theme/default/$i.css
done
+ sed -i -e 's!../lib/OpenLayers.js?mobile!../OpenLayers.mobile.js!' examples/*.html
sed -i -e 's!../lib/OpenLayers.js!../OpenLayers.js!' examples/*.html
naturaldocs -i /osgeo/openlayers/docs/dev/lib -o HTML /osgeo/openlayers/dev/apidocs -p /osgeo/openlayers/docs/dev/apidoc_config -s Default OL >/dev/null
naturaldocs -i /osgeo/openlayers/docs/dev/lib -o HTML /osgeo/openlayers/dev/docs -p /osgeo/openlayers/docs/dev/doc_config -s Default OL >/dev/null
More information about the Commits
mailing list