[OpenLayers-Commits] r11772 - in sandbox/cmoullet/openlayers: .
examples lib/OpenLayers/Handler tests/Handler
commits-20090109 at openlayers.org
commits-20090109 at openlayers.org
Wed Mar 30 05:57:42 EDT 2011
Author: fredj
Date: 2011-03-30 02:57:41 -0700 (Wed, 30 Mar 2011)
New Revision: 11772
Modified:
sandbox/cmoullet/openlayers/
sandbox/cmoullet/openlayers/examples/mobile-navigation.html
sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Click.js
sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/RegularPolygon.js
sandbox/cmoullet/openlayers/tests/Handler/Click.html
sandbox/cmoullet/openlayers/tests/Handler/Path.html
sandbox/cmoullet/openlayers/tests/Handler/Polygon.html
Log:
svn merge -r 11161:HEAD http://svn.openlayers.org/trunk/openlayers .
Property changes on: sandbox/cmoullet/openlayers
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11161-11688,11690-11762
+ /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11161-11771
Modified: sandbox/cmoullet/openlayers/examples/mobile-navigation.html
===================================================================
--- sandbox/cmoullet/openlayers/examples/mobile-navigation.html 2011-03-30 08:25:40 UTC (rev 11771)
+++ sandbox/cmoullet/openlayers/examples/mobile-navigation.html 2011-03-30 09:57:41 UTC (rev 11772)
@@ -23,8 +23,8 @@
<div id="docs">
<p>
- This example demonstates what OpenLayers provides for map
- navigation on mobile.
+ This example demonstrates what OpenLayers provides for map
+ navigation on mobile devices.
</p>
<p>
Modified: sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Click.js
===================================================================
--- sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Click.js 2011-03-30 08:25:40 UTC (rev 11771)
+++ sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Click.js 2011-03-30 09:57:41 UTC (rev 11772)
@@ -191,6 +191,7 @@
evt.xy = this.last.xy;
evt.lastTouches = this.last.touches;
this.handleSingle(evt);
+ this.down = null;
}
return true;
},
Modified: sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/RegularPolygon.js
===================================================================
--- sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/RegularPolygon.js 2011-03-30 08:25:40 UTC (rev 11771)
+++ sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/RegularPolygon.js 2011-03-30 09:57:41 UTC (rev 11772)
@@ -303,7 +303,7 @@
* evt - {Event} The mouse out event
*/
out: function(evt) {
- this.finalize();
+ this.cancel();
},
/**
Modified: sandbox/cmoullet/openlayers/tests/Handler/Click.html
===================================================================
--- sandbox/cmoullet/openlayers/tests/Handler/Click.html 2011-03-30 08:25:40 UTC (rev 11771)
+++ sandbox/cmoullet/openlayers/tests/Handler/Click.html 2011-03-30 09:57:41 UTC (rev 11772)
@@ -489,7 +489,7 @@
}
function test_touch_click(t) {
- t.plan(4);
+ t.plan(5);
// set up
@@ -511,6 +511,7 @@
// test
+ // the common case: a touchstart followed by a touchend
log = null;
handler.touchstart({xy: px(1, 1), touches: ["foo"]});
handler.touchend({touches: ["foo"]});
@@ -522,8 +523,19 @@
t.eq(log.y, 1, "evt.xy.y as expected");
t.ok(log.lastTouches, "evt.lastTouches as expected");
}
- // tear down
- map.destroy();
+
+ // now emulate a touch where touchstart doesn't propagate
+ // to the click handler, i.e. the click handler gets a
+ // touchend only
+ log = null;
+ handler.touchend({touches: ["foo"]});
+
+ t.delay_call(1, function() {
+ t.ok(log == null, "click callback not called");
+
+ // tear down
+ map.destroy();
+ });
});
}
Modified: sandbox/cmoullet/openlayers/tests/Handler/Path.html
===================================================================
--- sandbox/cmoullet/openlayers/tests/Handler/Path.html 2011-03-30 08:25:40 UTC (rev 11771)
+++ sandbox/cmoullet/openlayers/tests/Handler/Path.html 2011-03-30 09:57:41 UTC (rev 11772)
@@ -774,7 +774,6 @@
// a) tap
- // b) tap
// c) doubletap
function test_touch_sequence1(t) {
t.plan(17);
@@ -824,7 +823,7 @@
t.geom_eq(log.geometry, new OpenLayers.Geometry.Point(-149, 75),
"[touchend] correct point");
- // tap on (10, 10)
+ // doubletap on (10, 10)
log = null;
ret = handler.touchstart({xy: new OpenLayers.Pixel(9, 10)});
t.ok(ret, '[touchstart] event propagates');
@@ -837,8 +836,6 @@
t.eq(log.type, 'modify', '[touchend] feature modified');
t.geom_eq(log.geometry, new OpenLayers.Geometry.Point(-140, 65),
"[touchend] correct point");
-
- // tap on (11, 10) -> doubletap
log = null;
ret = handler.touchstart({xy: new OpenLayers.Pixel(11, 10)});
t.ok(!ret, '[touchstart] event does not propagate');
@@ -856,8 +853,7 @@
// a) tap
// b) tap-move
- // c) tap
- // d) doubletap
+ // c) doubletap
function test_touch_sequence2(t) {
t.plan(23);
@@ -918,7 +914,7 @@
t.ok(ret, '[touchend] event propagates');
t.eq(log, null, '[touchend] feature not finalized or modified');
- // tap on (10, 10)
+ // doubletap on (10, 10)
log = null;
ret = handler.touchstart({xy: new OpenLayers.Pixel(9, 10)});
t.ok(ret, '[touchstart] event propagates');
@@ -931,8 +927,6 @@
t.eq(log.type, 'modify', '[touchend] feature modified');
t.geom_eq(log.geometry, new OpenLayers.Geometry.Point(-140, 65),
"[touchend] correct point");
-
- // tap on (11, 10) -> doubletap
log = null;
ret = handler.touchstart({xy: new OpenLayers.Pixel(11, 10)});
t.ok(!ret, '[touchstart] event does not propagate');
Modified: sandbox/cmoullet/openlayers/tests/Handler/Polygon.html
===================================================================
--- sandbox/cmoullet/openlayers/tests/Handler/Polygon.html 2011-03-30 08:25:40 UTC (rev 11771)
+++ sandbox/cmoullet/openlayers/tests/Handler/Polygon.html 2011-03-30 09:57:41 UTC (rev 11772)
@@ -904,103 +904,209 @@
]), "geometry is correct");
}
+ // a) tap
+ // b) tap
+ // c) doubletap
+ function test_touch_sequence1(t) {
+ t.plan(24);
- function test_sequence_touch_1(t) {
- t.plan(19);
-
- log = [];
- var map = new OpenLayers.Map("map", { // 300 x 150
+ // set up
+
+ var log;
+ var map = new OpenLayers.Map("map", {
resolutions: [1]
});
var layer = new OpenLayers.Layer.Vector("foo", {
- maxExtent: new OpenLayers.Bounds(-100, -100, 100, 100),
+ maxExtent: new OpenLayers.Bounds(-10, -10, 10, 10),
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});
+ done: function(g, f) {
+ log = {type: 'done', geometry: g, feature: f};
+ },
+ modify: function(g, f) {
+ log = {type: 'modify', geometry: g, feature: f};
}
+ }, {
+ dblclickTolerance: 2
});
control.handler = handler;
- control.layer = layer;
map.addControl(control);
- map.setCenter(new OpenLayers.LonLat(0, 0), 5);
+ map.setCenter(new OpenLayers.LonLat(0, 0), 0);
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);
+ // test
- t.geom_eq(handler.polygon.geometry.components[0], expectedRing, "geometry is correct");
+ var ret;
- 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)
- ]);
+ // tap on (0, 0)
+ log = null;
+ ret = handler.touchstart({xy: new OpenLayers.Pixel(1, 0)});
+ t.ok(ret, '[touchstart] event propagates');
+ t.eq(log, null, '[touchstart] feature not finalized or modified');
+ ret = handler.touchmove({xy: new OpenLayers.Pixel(0, 0)});
+ t.ok(ret, '[touchmove] event propagates');
+ t.eq(log, null, '[touchmove] feature not finalized or modified');
+ ret = handler.touchend({});
+ t.ok(ret, '[touchend] event propagates');
+ t.eq(log.type, 'modify', '[touchend] feature modified');
+ t.geom_eq(log.geometry, new OpenLayers.Geometry.Point(-150, 75),
+ "[touchend] correct point");
- handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(250, 75)});
- t.eq(log.length, 0, "touch move");
+ // tap on (0, 10)
+ log = null;
+ ret = handler.touchstart({xy: new OpenLayers.Pixel(1, 10)});
+ t.ok(ret, '[touchstart] event propagates');
+ t.eq(log, null, '[touchstart] feature not finalized or modified');
+ ret = handler.touchmove({xy: new OpenLayers.Pixel(0, 10)});
+ t.ok(ret, '[touchmove] event propagates');
+ t.eq(log, null, '[touchmove] feature not finalized or modified');
+ ret = handler.touchend({});
+ t.ok(ret, '[touchend] event propagates');
+ t.eq(log.type, 'modify', '[touchend] feature modified');
+ t.geom_eq(log.geometry, new OpenLayers.Geometry.Point(-150, 65),
+ "[touchend] correct point");
- 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");
+ // doubletap on (10, 10)
+ log = null;
+ ret = handler.touchstart({xy: new OpenLayers.Pixel(9, 10)});
+ t.ok(ret, '[touchstart] event propagates');
+ t.eq(log, null, '[touchstart] feature not finalized or modified');
+ ret = handler.touchmove({xy: new OpenLayers.Pixel(10, 10)});
+ t.ok(ret, '[touchmove] event propagates');
+ t.eq(log, null, '[touchmove] feature not finalized or modified');
+ ret = handler.touchend({});
+ t.ok(ret, '[touchend] event propagates');
+ t.eq(log.type, 'modify', '[touchend] feature modified');
+ t.geom_eq(log.geometry, new OpenLayers.Geometry.Point(-140, 65),
+ "[touchend] correct point");
+ log = null;
+ ret = handler.touchstart({xy: new OpenLayers.Pixel(11, 10)});
+ t.ok(!ret, '[touchstart] event does not propagate');
+ t.eq(log.type, 'done', '[touchend] feature finalized');
+ t.geom_eq(log.geometry,
+ new OpenLayers.Geometry.Polygon([
+ new OpenLayers.Geometry.LinearRing([
+ new OpenLayers.Geometry.Point(-150, 75), // (0, 0)
+ new OpenLayers.Geometry.Point(-150, 65), // (0, 10)
+ new OpenLayers.Geometry.Point(-140, 65) // (10, 10)
+ ])
+ ]), "[touchstart] geometry is correct");
- handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(100, 75)});
- t.eq(log.length, 0, "touch move");
+ // tear down
- 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");
+ map.destroy();
+ }
- handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(252, 100)});
- t.eq(log.length, 0, "touch move");
+ // a) tap
+ // b) tap-move
+ // c) tap
+ // d) doubletap
+ function test_touch_sequence2(t) {
+ t.plan(30);
- 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");
+ // set up
- handler.touchmove({type: "touchmove", xy: new OpenLayers.Pixel(250, 100)});
- t.eq(log.length, 1, "touch move");
+ var log;
+ var map = new OpenLayers.Map("map", {
+ resolutions: [1]
+ });
+ var layer = new OpenLayers.Layer.Vector("foo", {
+ maxExtent: new OpenLayers.Bounds(-10, -10, 10, 10),
+ isBaseLayer: true
+ });
+ map.addLayer(layer);
+ var control = new OpenLayers.Control({});
+ var handler = new OpenLayers.Handler.Polygon(control, {
+ done: function(g, f) {
+ log = {type: 'done', geometry: g, feature: f};
+ },
+ modify: function(g, f) {
+ log = {type: 'modify', geometry: g, feature: f};
+ }
+ }, {
+ dblclickTolerance: 2
+ });
+ control.handler = handler;
+ map.addControl(control);
+ map.setCenter(new OpenLayers.LonLat(0, 0), 0);
+ handler.activate();
- 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");
+ // test
+
+ var ret;
+
+ // tap on (0, 0)
+ log = null;
+ ret = handler.touchstart({xy: new OpenLayers.Pixel(1, 0)});
+ t.ok(ret, '[touchstart] event propagates');
+ t.eq(log, null, '[touchstart] feature not finalized or modified');
+ ret = handler.touchmove({xy: new OpenLayers.Pixel(0, 0)});
+ t.ok(ret, '[touchmove] event propagates');
+ t.eq(log, null, '[touchmove] feature not finalized or modified');
+ ret = handler.touchend({});
+ t.ok(ret, '[touchend] event propagates');
+ t.eq(log.type, 'modify', '[touchend] feature modified');
+ t.geom_eq(log.geometry, new OpenLayers.Geometry.Point(-150, 75),
+ "[touchend] correct point");
+
+ // tap-move
+ log = null;
+ ret = handler.touchstart({xy: new OpenLayers.Pixel(1, 10)});
+ t.ok(ret, '[touchstart] event propagates');
+ t.eq(log, null, '[touchstart] feature not finalized or modified');
+ ret = handler.touchmove({xy: new OpenLayers.Pixel(20, 20)});
+ t.ok(ret, '[touchmove] event propagates');
+ t.eq(log, null, '[touchmove] feature not finalized or modified');
+ ret = handler.touchend({});
+ t.ok(ret, '[touchend] event propagates');
+ t.eq(log, null, '[touchend] feature not finalized or modified');
+
+ // tap on (0, 10)
+ log = null;
+ ret = handler.touchstart({xy: new OpenLayers.Pixel(1, 10)});
+ t.ok(ret, '[touchstart] event propagates');
+ t.eq(log, null, '[touchstart] feature not finalized or modified');
+ ret = handler.touchmove({xy: new OpenLayers.Pixel(0, 10)});
+ t.ok(ret, '[touchmove] event propagates');
+ t.eq(log, null, '[touchmove] feature not finalized or modified');
+ ret = handler.touchend({});
+ t.ok(ret, '[touchend] event propagates');
+ t.eq(log.type, 'modify', '[touchend] feature modified');
+ t.geom_eq(log.geometry, new OpenLayers.Geometry.Point(-150, 65),
+ "[touchend] correct point");
+
+ // doubletap on (10, 10)
+ log = null;
+ ret = handler.touchstart({xy: new OpenLayers.Pixel(9, 10)});
+ t.ok(ret, '[touchstart] event propagates');
+ t.eq(log, null, '[touchstart] feature not finalized or modified');
+ ret = handler.touchmove({xy: new OpenLayers.Pixel(10, 10)});
+ t.ok(ret, '[touchmove] event propagates');
+ t.eq(log, null, '[touchmove] feature not finalized or modified');
+ ret = handler.touchend({});
+ t.ok(ret, '[touchend] event propagates');
+ t.eq(log.type, 'modify', '[touchend] feature modified');
+ t.geom_eq(log.geometry, new OpenLayers.Geometry.Point(-140, 65),
+ "[touchend] correct point");
+ log = null;
+ ret = handler.touchstart({xy: new OpenLayers.Pixel(11, 10)});
+ t.ok(!ret, '[touchstart] event does not propagate');
+ t.eq(log.type, 'done', '[touchend] feature finalized');
+ t.geom_eq(log.geometry,
+ new OpenLayers.Geometry.Polygon([
+ new OpenLayers.Geometry.LinearRing([
+ new OpenLayers.Geometry.Point(-150, 75), // (0, 0)
+ new OpenLayers.Geometry.Point(-150, 65), // (0, 10)
+ new OpenLayers.Geometry.Point(-140, 65) // (10, 10)
+ ])
+ ]), "[touchstart] geometry is correct");
+
+ // tear down
+
+ map.destroy();
}
</script>
More information about the Commits
mailing list