[OpenLayers-Commits] r11370 - in sandbox/elemoine/draw-feature: .
examples lib/OpenLayers lib/OpenLayers/Control
lib/OpenLayers/Handler tests tests/Control tests/Handler tests/Layer
commits-20090109 at openlayers.org
commits-20090109 at openlayers.org
Wed Feb 23 13:34:59 EST 2011
Author: erilem
Date: 2011-02-23 10:34:59 -0800 (Wed, 23 Feb 2011)
New Revision: 11370
Modified:
sandbox/elemoine/draw-feature/
sandbox/elemoine/draw-feature/examples/geolocation.html
sandbox/elemoine/draw-feature/examples/geolocation.js
sandbox/elemoine/draw-feature/lib/OpenLayers/Control/Geolocate.js
sandbox/elemoine/draw-feature/lib/OpenLayers/Handler/Drag.js
sandbox/elemoine/draw-feature/lib/OpenLayers/Map.js
sandbox/elemoine/draw-feature/tests/Control/Geolocate.html
sandbox/elemoine/draw-feature/tests/Control/PanZoom.html
sandbox/elemoine/draw-feature/tests/Handler/Drag.html
sandbox/elemoine/draw-feature/tests/Layer/EventPane.html
sandbox/elemoine/draw-feature/tests/run-tests.html
Log:
svn merge -r 11311:HEAD http://svn.openlayers.org/trunk/openlayers/ .
Property changes on: sandbox/elemoine/draw-feature
___________________________________________________________________
Modified: svn:mergeinfo
- /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11027-11037,11040-11091,11094-11140,11142-11154,11156-11266,11268-11310
+ /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11027-11037,11040-11091,11094-11140,11142-11154,11156-11266,11268-11310,11312-11369
Modified: sandbox/elemoine/draw-feature/examples/geolocation.html
===================================================================
--- sandbox/elemoine/draw-feature/examples/geolocation.html 2011-02-23 18:30:33 UTC (rev 11369)
+++ sandbox/elemoine/draw-feature/examples/geolocation.html 2011-02-23 18:34:59 UTC (rev 11370)
@@ -13,7 +13,7 @@
}
</style>
</head>
- <body onload="init()">
+ <body>
<h1 id="title">Geolocation Example</h1>
<div id="tags">
Modified: sandbox/elemoine/draw-feature/examples/geolocation.js
===================================================================
--- sandbox/elemoine/draw-feature/examples/geolocation.js 2011-02-23 18:30:33 UTC (rev 11369)
+++ sandbox/elemoine/draw-feature/examples/geolocation.js 2011-02-23 18:34:59 UTC (rev 11370)
@@ -1,8 +1,7 @@
var style = {
+ fillColor: '#000',
fillOpacity: 0.1,
- fillColor: '#000',
- strokeColor: '#f00',
- strokeOpacity: 0.6
+ strokeWidth: 0
}
var map = new OpenLayers.Map('map');
@@ -17,6 +16,34 @@
), 12
);
+var pulsate = function(feature) {
+ var point = feature.geometry.getCentroid(),
+ bounds = feature.geometry.getBounds(),
+ radius = Math.abs((bounds.right - bounds.left)/2),
+ count = 0,
+ grow = 'up';
+
+ var resize = function(){
+ if (count>16) clearInterval(window.resizeInterval);
+ var interval = radius * 0.03;
+ var ratio = interval/radius;
+ switch(count) {
+ case 4:
+ case 12:
+ grow = 'down'; break;
+ case 8:
+ grow = 'up'; break;
+ }
+ if (grow!=='up') {
+ ratio = - Math.abs(ratio);
+ }
+ feature.geometry.resize(1+ratio, point);
+ vector.drawFeature(feature);
+ count++;
+ }
+ window.resizeInterval = window.setInterval(resize, 50, point, radius);
+};
+
var geolocate = new OpenLayers.Control.Geolocate({
geolocationOptions: {
enableHighAccuracy: false,
@@ -27,6 +54,16 @@
map.addControl(geolocate);
geolocate.events.register("locationupdated",this,function(e) {
vector.removeAllFeatures();
+ var circle = new OpenLayers.Feature.Vector(
+ OpenLayers.Geometry.Polygon.createRegularPolygon(
+ new OpenLayers.Geometry.Point(e.point.x, e.point.y),
+ e.position.coords.accuracy/2,
+ 40,
+ 0
+ ),
+ {},
+ style
+ );
vector.addFeatures([
new OpenLayers.Feature.Vector(
e.point,
@@ -39,34 +76,28 @@
pointRadius: 10
}
),
- new OpenLayers.Feature.Vector(
- OpenLayers.Geometry.Polygon.createRegularPolygon(
- new OpenLayers.Geometry.Point(e.point.x, e.point.y),
- e.position.coords.accuracy/2,
- 50,
- 0
- ),
- {},
- style
- )
+ circle
]);
map.zoomToExtent(vector.getDataExtent());
+ pulsate(circle);
});
geolocate.events.register("locationfailed",this,function() {
OpenLayers.Console.log('Location detection failed');
});
$('locate').onclick = function() {
+ vector.removeAllFeatures();
geolocate.deactivate();
$('track').checked = false;
geolocate.watch = false;
geolocate.activate();
};
$('track').onclick = function() {
+ vector.removeAllFeatures();
geolocate.deactivate();
if (this.checked) {
geolocate.watch = true;
geolocate.activate();
}
};
-$('track').checked = false;
\ No newline at end of file
+$('track').checked = false;
Modified: sandbox/elemoine/draw-feature/lib/OpenLayers/Control/Geolocate.js
===================================================================
--- sandbox/elemoine/draw-feature/lib/OpenLayers/Control/Geolocate.js 2011-02-23 18:30:33 UTC (rev 11369)
+++ sandbox/elemoine/draw-feature/lib/OpenLayers/Control/Geolocate.js 2011-02-23 18:34:59 UTC (rev 11370)
@@ -85,7 +85,7 @@
this.events.triggerEvent("locationuncapable");
return false;
}
- if (!this.active) {
+ if (OpenLayers.Control.prototype.activate.apply(this, arguments)) {
if (this.watch) {
this.watchId = this.geolocation.watchPosition(
OpenLayers.Function.bind(this.geolocate, this),
@@ -93,16 +93,11 @@
this.geolocationOptions
);
} else {
- this.geolocation.getCurrentPosition(
- OpenLayers.Function.bind(this.geolocate, this),
- OpenLayers.Function.bind(this.failure, this),
- this.geolocationOptions
- );
+ this.getCurrentLocation();
}
+ return true;
}
- return OpenLayers.Control.prototype.activate.apply(
- this, arguments
- );
+ return false;
},
/**
@@ -146,6 +141,25 @@
},
/**
+ * APIMethod: getCurrentLocation
+ *
+ * Returns:
+ * {Boolean} Returns true if a event will be fired (successfull
+ * registration)
+ */
+ getCurrentLocation: function() {
+ if (!this.active || this.watch) {
+ return false;
+ }
+ this.geolocation.getCurrentPosition(
+ OpenLayers.Function.bind(this.geolocate, this),
+ OpenLayers.Function.bind(this.failure, this),
+ this.geolocationOptions
+ );
+ return true;
+ },
+
+ /**
* Method: failure
* method called on browser's geolocation failure
*
Modified: sandbox/elemoine/draw-feature/lib/OpenLayers/Handler/Drag.js
===================================================================
--- sandbox/elemoine/draw-feature/lib/OpenLayers/Handler/Drag.js 2011-02-23 18:30:33 UTC (rev 11369)
+++ sandbox/elemoine/draw-feature/lib/OpenLayers/Handler/Drag.js 2011-02-23 18:34:59 UTC (rev 11370)
@@ -156,9 +156,7 @@
this.down(evt);
this.callback("down", [evt.xy]);
- if (evt.type === "mousedown") {
- OpenLayers.Event.stop(evt);
- }
+ OpenLayers.Event.stop(evt);
if(!this.oldOnselectstart) {
this.oldOnselectstart = document.onselectstart ?
@@ -204,9 +202,7 @@
this.interval);
}
this.dragging = true;
- if (evt.type === "touchmove") {
- OpenLayers.Event.stop(evt);
- }
+
this.move(evt);
this.callback("move", [evt.xy]);
if(!this.oldOnselectstart) {
Modified: sandbox/elemoine/draw-feature/lib/OpenLayers/Map.js
===================================================================
--- sandbox/elemoine/draw-feature/lib/OpenLayers/Map.js 2011-02-23 18:30:33 UTC (rev 11369)
+++ sandbox/elemoine/draw-feature/lib/OpenLayers/Map.js 2011-02-23 18:34:59 UTC (rev 11370)
@@ -507,18 +507,27 @@
this.viewPortDiv.className = "olMapViewport";
this.div.appendChild(this.viewPortDiv);
+ // the eventsDiv is where we listen for all map events
+ var eventsDiv = document.createElement("div");
+ eventsDiv.id = this.id + "_events";
+ eventsDiv.style.position = "absolute";
+ eventsDiv.style.width = "100%";
+ eventsDiv.style.height = "100%";
+ eventsDiv.style.zIndex = this.Z_INDEX_BASE.Control - 1;
+ this.viewPortDiv.appendChild(eventsDiv);
+ this.eventsDiv = eventsDiv;
+ this.events = new OpenLayers.Events(
+ this, this.eventsDiv, this.EVENT_TYPES, this.fallThrough,
+ {includeXY: true}
+ );
+
// the layerContainerDiv is the one that holds all the layers
id = this.id + "_OpenLayers_Container";
this.layerContainerDiv = OpenLayers.Util.createDiv(id);
this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;
- this.viewPortDiv.appendChild(this.layerContainerDiv);
+ this.eventsDiv.appendChild(this.layerContainerDiv);
- this.events = new OpenLayers.Events(this,
- this.viewPortDiv,
- this.EVENT_TYPES,
- this.fallThrough,
- {includeXY: true});
this.updateSize();
if(this.eventListeners instanceof Object) {
this.events.on(this.eventListeners);
Modified: sandbox/elemoine/draw-feature/tests/Control/Geolocate.html
===================================================================
--- sandbox/elemoine/draw-feature/tests/Control/Geolocate.html 2011-02-23 18:30:33 UTC (rev 11369)
+++ sandbox/elemoine/draw-feature/tests/Control/Geolocate.html 2011-02-23 18:34:59 UTC (rev 11370)
@@ -62,6 +62,31 @@
map.removeControl(control);
map.setCenter(centerLL);
}
+ function test_getCurrentLocation(t) {
+ t.plan(5);
+ var control = new OpenLayers.Control.Geolocate({
+ geolocation: geolocation
+ });
+ map.addControl(control);
+ t.eq(control.getCurrentLocation(), false, 'getCurrentLocation return false if control hasnt been activated');
+ control.activate();
+ map.setCenter(centerLL);
+ t.eq(control.getCurrentLocation(), true, 'getCurrentLocation return true if control has been activated');
+ var center = map.getCenter();
+ t.eq(center.lon, 10, 'bound control sets the map lon when calling getCurrentLocation');
+ t.eq(center.lat, 10, 'bound control sets the map lat when calling getCurrentLocation');
+ control.deactivate();
+ map.removeControl(control);
+ map.setCenter(centerLL);
+ var control2 = new OpenLayers.Control.Geolocate({
+ geolocation: geolocation
+ });
+ map.addControl(control2);
+ t.eq(control2.getCurrentLocation(), false, 'getCurrentLocation return false if control is in watch mode');
+ control2.deactivate();
+ map.removeControl(control2);
+ map.setCenter(centerLL);
+ }
function test_watch(t) {
t.plan(2);
var control = new OpenLayers.Control.Geolocate({
Modified: sandbox/elemoine/draw-feature/tests/Control/PanZoom.html
===================================================================
--- sandbox/elemoine/draw-feature/tests/Control/PanZoom.html 2011-02-23 18:30:33 UTC (rev 11369)
+++ sandbox/elemoine/draw-feature/tests/Control/PanZoom.html 2011-02-23 18:34:59 UTC (rev 11370)
@@ -74,7 +74,7 @@
t.delay_call(2, function() {
t.ok( wnd.mapper.getCenter().lat > wnd.centerLL.lat, "1) Pan up works correctly" );
t.ok(!flag.mousedown, "1) mousedown does not get to the map");
- t.ok(flag.mouseup, "1) mouseup does get to the map");
+ t.ok(!flag.mouseup, "1) mouseup does not get to the map");
t.ok(!flag.click, "1) click does not get to the map");
t.ok(!flag.dblclick, "1) dblclick does not get to the map");
resetFlags();
@@ -83,7 +83,7 @@
}, 2, function() {
t.ok( wnd.mapper.getCenter().lon < wnd.centerLL.lon, "2) Pan left works correctly" );
t.ok(!flag.mousedown, "2) mousedown does not get to the map");
- t.ok(flag.mouseup, "2) mouseup does get to the map");
+ t.ok(!flag.mouseup, "2) mouseup does not get to the map");
t.ok(!flag.click, "2) click does not get to the map");
t.ok(!flag.dblclick, "2) dblclick does not get to the map");
resetFlags();
@@ -92,7 +92,7 @@
}, 2, function() {
t.ok( wnd.mapper.getCenter().lon == wnd.centerLL.lon, "3) Pan right works correctly" );
t.ok(!flag.mousedown, "3) mousedown does not get to the map");
- t.ok(flag.mouseup, "3) mouseup does get to the map");
+ t.ok(!flag.mouseup, "3) mouseup does not get to the map");
t.ok(!flag.click, "3) click does not get to the map");
t.ok(!flag.dblclick, "3) dblclick does not get to the map");
resetFlags();
@@ -101,7 +101,7 @@
}, 2, function() {
t.ok( wnd.mapper.getCenter().lat == wnd.centerLL.lat, "4) Pan down works correctly" );
t.ok(!flag.mousedown, "4) mousedown does not get to the map");
- t.ok(flag.mouseup, "4) mouseup does get to the map");
+ t.ok(!flag.mouseup, "4) mouseup does not get to the map");
t.ok(!flag.click, "4) click does not get to the map");
t.ok(!flag.dblclick, "4) dblclick does not get to the map");
resetFlags();
@@ -110,7 +110,7 @@
}, 2, function() {
t.eq( wnd.mapper.getZoom(), 6, "5) zoomin works correctly" );
t.ok(!flag.mousedown, "5) mousedown does not get to the map");
- t.ok(flag.mouseup, "5) mouseup does get to the map");
+ t.ok(!flag.mouseup, "5) mouseup does not get to the map");
t.ok(!flag.click, "5) click does not get to the map");
t.ok(!flag.dblclick, "5) dblclick does not get to the map");
resetFlags();
@@ -119,7 +119,7 @@
}, 2, function() {
t.eq( wnd.mapper.getZoom(), 5, "6) zoomout works correctly" );
t.ok(!flag.mousedown, "6) mousedown does not get to the map");
- t.ok(flag.mouseup, "6) mouseup does get to the map");
+ t.ok(!flag.mouseup, "6) mouseup does not get to the map");
t.ok(!flag.click, "6) click does not get to the map");
t.ok(!flag.dblclick, "6) dblclick does not get to the map");
resetFlags();
@@ -128,7 +128,7 @@
}, 2, function() {
t.eq( wnd.mapper.getZoom(), 2, "7) zoomworld works correctly" );
t.ok(!flag.mousedown, "7) mousedown does not get to the map");
- t.ok(flag.mouseup, "7) mouseup does get to the map");
+ t.ok(!flag.mouseup, "7) mouseup does not get to the map");
t.ok(!flag.click, "7) click does not get to the map");
t.ok(!flag.dblclick, "7) dblclick does not get to the map");
resetFlags();
Modified: sandbox/elemoine/draw-feature/tests/Handler/Drag.html
===================================================================
--- sandbox/elemoine/draw-feature/tests/Handler/Drag.html 2011-02-23 18:30:33 UTC (rev 11369)
+++ sandbox/elemoine/draw-feature/tests/Handler/Drag.html 2011-02-23 18:34:59 UTC (rev 11370)
@@ -294,7 +294,7 @@
// "touchend" events set expected states in the drag handler.
// We also verify that we stop event bubbling as appropriate.
- t.plan(12);
+ t.plan(14);
// set up
@@ -302,37 +302,44 @@
var c = new OpenLayers.Control();
m.addControl(c);
var h = new OpenLayers.Handler.Drag(c, {
- done: function(px) { log = px; }});
+ done: function(px) {
+ log.push(px);
+ }
+ });
h.activate();
var _stop = OpenLayers.Event.stop;
- OpenLayers.Event.stop = function(e) { log = e; };
+ OpenLayers.Event.stop = function(e) {
+ log.push(e);
+ };
- var Px = OpenLayers.Pixel, e, log;
+ var Px = OpenLayers.Pixel, e;
+ var log = [];
// test
-
e = {touches: [{}], xy: new Px(0, 0)};
m.events.triggerEvent('touchstart', e);
t.eq(h.started, true, '[touchstart] started is set');
t.eq(h.start.x, 0, '[touchstart] start.x is correct');
t.eq(h.start.y, 0, '[touchstart] start.y is correct');
- t.eq(log, undefined, '[touchstart] event is not stopped');
+ t.eq(log.length, 1, '[touchstart] one item in log');
+ t.ok(log[0] === e, "touchstart", '[touchstart] event is stopped');
e = {xy: new Px(1, 1)};
m.events.triggerEvent('touchmove', e);
t.eq(h.dragging, true, '[touchmove] dragging is set');
- t.eq(h.last.x, 1, '[touchstart] last.x is correct');
- t.eq(h.last.y, 1, '[touchstart] last.y is correct');
- t.ok(log == e, '[touchmove] event is stopped');
+ t.eq(h.last.x, 1, '[touchmove] last.x is correct');
+ t.eq(h.last.y, 1, '[touchmove] last.y is correct');
+ t.eq(log.length, 1, '[touchmove] one item in log (event is not stopped)');
e = {xy: new Px(2, 2)};
m.events.triggerEvent('touchend', e);
t.eq(h.started, false, '[touchend] started is reset');
t.eq(h.started, false, '[touchend] started is reset');
// the "done" callback gets the position of the last touchmove
- t.eq(log.x, 1, '[touchend] done callback got correct x position');
- t.eq(log.y, 1, '[touchend] done callback got correct y position');
+ t.eq(log.length, 2, '[touchend] two items in log');
+ t.ok(log[1] instanceof Px, '[touchend] got');
+ t.ok(log[1].equals(e.xy), '[touchend] done callback got correct position');
// tear down
Modified: sandbox/elemoine/draw-feature/tests/Layer/EventPane.html
===================================================================
--- sandbox/elemoine/draw-feature/tests/Layer/EventPane.html 2011-02-23 18:30:33 UTC (rev 11369)
+++ sandbox/elemoine/draw-feature/tests/Layer/EventPane.html 2011-02-23 18:34:59 UTC (rev 11370)
@@ -58,11 +58,11 @@
// t.plan( 2 );
if (OpenLayers.BROWSER_NAME != "firefox" && OpenLayers.BROWSER_NAME != "mozilla") {
- t.plan(4);
+ t.plan(4);
} else {
- t.plan(0);
- t.debug_print("Firefox gives different results for different browsers on setMap on EventPane, so just don't run it for now.")
- return;
+ t.plan(0);
+ t.debug_print("Firefox gives different results for different browsers on setMap on EventPane, so just don't run it for now.")
+ return;
}
var map = new OpenLayers.Map('map');
@@ -84,19 +84,23 @@
layer2.getWarningHTML = function() { this.warning = true; return ""; }
map.addLayer(layer2);
- t.ok( !layer2.warning, "warning not registered on mapObject load" );
+ t.ok(!layer2.warning, "warning not registered on mapObject load");
- map.events.register("mousemove", map, function () {
- t.ok(true, "got mouse move");
+ var log = [];
+ map.events.register("mousemove", map, function(event) {
+ log.push(event);
});
- if( document.createEvent ) { // Mozilla
- var evObj = document.createEvent('MouseEvents');
- evObj.initEvent( 'mousemove', true, false );
- layer.pane.dispatchEvent(evObj);
- } else if( document.createEventObject ) { // IE
- layer.pane.fireEvent('onmousemove');
+ if (document.createEvent) { // Mozilla
+ var evObj = document.createEvent('MouseEvents');
+ evObj.initEvent('mousemove', true, false);
+ map.eventsDiv.dispatchEvent(evObj);
+ } else if(document.createEventObject) { // IE
+ map.eventsDiv.fireEvent('onmousemove');
}
+
+ t.eq(log.length, 1, "got one event");
+
}
function test_Layer_EventPane_setVisibility (t) {
Modified: sandbox/elemoine/draw-feature/tests/run-tests.html
===================================================================
--- sandbox/elemoine/draw-feature/tests/run-tests.html 2011-02-23 18:30:33 UTC (rev 11369)
+++ sandbox/elemoine/draw-feature/tests/run-tests.html 2011-02-23 18:34:59 UTC (rev 11370)
@@ -686,7 +686,7 @@
timeout_seconds=4;
}
var no_close=document.getElementById( "dont_close_test_windows" );
- var action={ action_kind: "window", wnd_url: url.toString(), wnd_wnd: null, wnd_fn: fn, wnd_timeout_milliseconds: timeout_seconds*1000, wnd_no_close: no_close.checked };
+ var action={ action_kind: "window", wnd_url: url.toString() + (window.location.search || ""), wnd_wnd: null, wnd_fn: fn, wnd_timeout_milliseconds: timeout_seconds*1000, wnd_no_close: no_close.checked };
this.delay_total_milliseconds_left+=Test.AnotherWay._action_estimate_milliseconds( action );
this.delay_actions.push( action );
}
More information about the Commits
mailing list