ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make it possible to activate a drawing handler before the map is centered, r=ahocevar (closes #3179)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@11717 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Éric Lemoine
2011-03-21 08:28:58 +00:00
parent 96198dee07
commit 04ee616947
2 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/OpenLayers/Handler/Point.js
View File

@@ -200,13 +200,14 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, {
* pixel - {<OpenLayers.Pixel>} A pixel location on the map.
*/
createFeature: function(pixel) {
if(!pixel) {
pixel = new OpenLayers.Pixel(-50, -50);
var geometry;
if(pixel) {
var lonlat = this.map.getLonLatFromPixel(pixel);
geometry = new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat);
} else {
geometry = new OpenLayers.Geometry.Point();
}
var lonlat = this.map.getLonLatFromPixel(pixel);
this.point = new OpenLayers.Feature.Vector(
new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat)
);
this.point = new OpenLayers.Feature.Vector(geometry);
this.callback("create", [this.point.geometry, this.point]);
this.point.geometry.clearBounds();
this.layer.addFeatures([this.point], {silent: true});

44
tests/Handler/Point.html
View File

@@ -63,7 +63,7 @@
"activate adds the feature to the layer");
t.eq(log.length, 1,
"activate calls \"create\" once");
t.geom_eq(log[0].geometry, handler.point.geometry,
t.ok(log[0].geometry == handler.point.geometry,
"\"create\" called with expected geometry");
t.ok(log[0].feature == handler.point,
"\"create\" called with expected feature");
@@ -82,6 +82,32 @@
map.destroy();
}
// http://trac.osgeo.org/openlayers/ticket/3179
function test_activate_before_map_is_centered(t) {
t.plan(1);
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.Point(control, {});
control.handler = handler;
map.addControl(control);
var error;
try {
handler.activate();
error = false;
} catch(err) {
error = true;
}
t.ok(!error, "no error on activate");
}
function test_Handler_Point_events(t) {
t.plan(49);
var log = [];
@@ -188,8 +214,8 @@
t.eq(logs.length, 1, "[activate] called back");
log = logs.shift();
t.eq(log.type, "create", "[activate] create called");
t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125),
"[activate] correct point");
t.ok(isNaN(log.args[0].x) && isNaN(log.args[0].y),
"[activate] initial point");
// mouse down
handler.mousedown(
{type: "mousedown", xy: new OpenLayers.Pixel(0, 0)});
@@ -239,8 +265,8 @@
"[mouseup] correct point");
log = logs.shift();
t.eq(log.type, "create", "[mouseup] create called");
t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125),
"[activate] correct point");
t.ok(isNaN(log.args[0].x) && isNaN(log.args[0].y),
"[mouseup] initial point");
// mouse up on same pixel
handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(2, 0)});
t.eq(logs.length, 0, "[mouseup] not called back");
@@ -249,12 +275,12 @@
t.eq(logs.length, 2, "[cancel] called back");
log = logs.shift();
t.eq(log.type, "cancel", "[cancel] canced called");
t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125),
"[cancel] correct point");
t.ok(isNaN(log.args[0].x) && isNaN(log.args[0].y),
"[cancel] initial point");
log = logs.shift();
t.eq(log.type, "create", "[cancel] create called");
t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125),
"[cancel] correct point");
t.ok(isNaN(log.args[0].x) && isNaN(log.args[0].y),
"[] initial point");
map.destroy();
}