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

Merge pull request #1588 from twpayne/event-properties

Browse Source 
Use properties, not get* methods, in events
This commit is contained in:
Tom Payne
2014-01-29 06:23:30 -08:00
parent 73490be2b9 318fc68159
commit d4db171a3c
49 changed files with 228 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/device-orientation.js
+3 -4
View File
@@ -26,11 +26,10 @@ var track = new ol.dom.Input(document.getElementById('track'));
track.bindTo('checked', deviceOrientation, 'tracking');
deviceOrientation.on('propertychange', function(event) {
// event.getKey() is the changed property name
var key = event.getKey();
var element = document.getElementById(key);
// event.key is the changed property name
var element = document.getElementById(event.key);
if (element) {
element.innerHTML = deviceOrientation.get(key);
element.innerHTML = deviceOrientation.get(event.key);
}
});
examples/drag-and-drop-image-vector.js
+3 -4
View File
@@ -115,8 +115,8 @@ var map = new ol.Map({
dragAndDropInteraction.on('addfeatures', function(event) {
var vectorSource = new ol.source.Vector({
features: event.getFeatures(),
projection: event.getProjection()
features: event.features,
projection: event.projection
});
map.getLayers().push(new ol.layer.Image({
source: new ol.source.ImageVector({
@@ -151,6 +151,5 @@ $(map.getViewport()).on('mousemove', function(evt) {
});
map.on('singleclick', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
displayFeatureInfo(evt.pixel);
});
examples/drag-and-drop.js
+3 -4
View File
@@ -114,8 +114,8 @@ var map = new ol.Map({
dragAndDropInteraction.on('addfeatures', function(event) {
var vectorSource = new ol.source.Vector({
features: event.getFeatures(),
projection: event.getProjection()
features: event.features,
projection: event.projection
});
map.getLayers().push(new ol.layer.Vector({
source: vectorSource,
@@ -148,6 +148,5 @@ $(map.getViewport()).on('mousemove', function(evt) {
});
map.on('singleclick', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
displayFeatureInfo(evt.pixel);
});
examples/dynamic-data.js
+2 -2
View File
@@ -35,8 +35,8 @@ var R = 7e6;
var r = 2e6;
var p = 2e6;
map.on('postcompose', function(event) {
var render = event.getRender();
var frameState = event.getFrameState();
var render = event.render;
var frameState = event.frameState;
var theta = 2 * Math.PI * frameState.time / omegaTheta;
var coordinates = [];
var i;
examples/export-map.js
+1 -1
View File
@@ -24,7 +24,7 @@ var exportPNGElement = document.getElementById('export-png');
if ('download' in exportPNGElement) {
exportPNGElement.addEventListener('click', function(e) {
map.once('postcompose', function(event) {
var canvas = event.getContext().canvas;
var canvas = event.context.canvas;
exportPNGElement.href = canvas.toDataURL('image/png');
});
map.render();
examples/gpx.js
+1 -2
View File
@@ -89,6 +89,5 @@ $(map.getViewport()).on('mousemove', function(evt) {
});
map.on('singleclick', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
displayFeatureInfo(evt.pixel);
});
examples/icon.js
+1 -1
View File
@@ -70,7 +70,7 @@ map.addOverlay(popup);
// display popup on click
map.on('singleclick', function(evt) {
var feature = map.forEachFeatureAtPixel(evt.getPixel(),
var feature = map.forEachFeatureAtPixel(evt.pixel,
function(feature, layer) {
return feature;
});
examples/igc.js
+2 -3
View File
@@ -111,8 +111,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
});
map.on('singleclick', function(evt) {
var coordinate = evt.getCoordinate();
displaySnap(coordinate);
displaySnap(evt.coordinate);
});
var imageStyle = new ol.style.Circle({
@@ -128,7 +127,7 @@ var strokeStyle = new ol.style.Stroke({
width: 1
});
map.on('postcompose', function(evt) {
var render = evt.getRender();
var render = evt.render;
if (point !== null) {
render.setImageStyle(imageStyle);
render.drawPointGeometry(point);
examples/image-vector-layer.js
+1 -2
View File
@@ -95,6 +95,5 @@ $(map.getViewport()).on('mousemove', function(evt) {
});
map.on('singleclick', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
displayFeatureInfo(evt.pixel);
});
examples/kml-earthquakes.js
+1 -1
View File
@@ -91,5 +91,5 @@ $(map.getViewport()).on('mousemove', function(evt) {
});
map.on('singleclick', function(evt) {
displayFeatureInfo(evt.getPixel());
displayFeatureInfo(evt.pixel);
});
examples/kml-timezones.js
+1 -1
View File
@@ -97,5 +97,5 @@ $(map.getViewport()).on('mousemove', function(evt) {
});
map.on('singleclick', function(evt) {
displayFeatureInfo(evt.getPixel());
displayFeatureInfo(evt.pixel);
});
examples/kml.js
+1 -2
View File
@@ -55,6 +55,5 @@ $(map.getViewport()).on('mousemove', function(evt) {
});
map.on('singleclick', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
displayFeatureInfo(evt.pixel);
});
examples/layer-clipping-webgl.js
+2 -2
View File
@@ -41,7 +41,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) {
].join('');
osm.on('precompose', function(event) {
var context = event.getGlContext();
var context = event.glContext;
var gl = context.getGL();
var program = gl.createProgram();
@@ -96,7 +96,7 @@ if (!ol.BrowserFeature.HAS_WEBGL) {
});
osm.on('postcompose', function(event) {
var context = event.getGlContext();
var context = event.glContext;
var gl = context.getGL();
gl.disable(gl.STENCIL_TEST);
});
examples/layer-clipping.js
+2 -2
View File
@@ -19,7 +19,7 @@ var map = new ol.Map({
});
osm.on('precompose', function(event) {
var ctx = event.getContext();
var ctx = event.context;
ctx.save();
ctx.translate(ctx.canvas.width / 2, ctx.canvas.height / 2);
ctx.scale(3, 3);
@@ -37,6 +37,6 @@ osm.on('precompose', function(event) {
});
osm.on('postcompose', function(event) {
var ctx = event.getContext();
var ctx = event.context;
ctx.restore();
});
examples/layer-spy.js
+2 -2
View File
@@ -48,7 +48,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
// before rendering the layer, do some clipping
imagery.on('precompose', function(event) {
var ctx = event.getContext();
var ctx = event.context;
ctx.save();
ctx.beginPath();
if (mousePosition) {
@@ -63,6 +63,6 @@ imagery.on('precompose', function(event) {
// after rendering the layer, restore the canvas context
imagery.on('postcompose', function(event) {
var ctx = event.getContext();
var ctx = event.context;
ctx.restore();
});
examples/layer-swipe.js
+2 -2
View File
@@ -28,7 +28,7 @@ var map = new ol.Map({
var swipe = document.getElementById('swipe');
bing.on('precompose', function(event) {
var ctx = event.getContext();
var ctx = event.context;
var width = ctx.canvas.width * (swipe.value / 100);
ctx.save();
@@ -38,7 +38,7 @@ bing.on('precompose', function(event) {
});
bing.on('postcompose', function(event) {
var ctx = event.getContext();
var ctx = event.context;
ctx.restore();
});
examples/overlay.js
+1 -1
View File
@@ -49,7 +49,7 @@ map.addOverlay(popup);
map.on('singleclick', function(evt) {
var element = popup.getElement();
var coordinate = evt.getCoordinate();
var coordinate = evt.coordinate;
var hdms = ol.coordinate.toStringHDMS(ol.proj.transform(
coordinate, 'EPSG:3857', 'EPSG:4326'));
examples/popup.js
+1 -1
View File
@@ -62,7 +62,7 @@ var map = new ol.Map({
* Add a click handler to the map to render the popup.
*/
map.on('singleclick', function(evt) {
var coordinate = evt.getCoordinate();
var coordinate = evt.coordinate;
var hdms = ol.coordinate.toStringHDMS(ol.proj.transform(
coordinate, 'EPSG:3857', 'EPSG:4326'));
examples/synthetic-points.js
+2 -3
View File
@@ -97,8 +97,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
});
map.on('singleclick', function(evt) {
var coordinate = evt.getCoordinate();
displaySnap(coordinate);
displaySnap(evt.coordinate);
});
var imageStyle = new ol.style.Circle({
@@ -114,7 +113,7 @@ var strokeStyle = new ol.style.Stroke({
width: 3
});
map.on('postcompose', function(evt) {
var render = evt.getRender();
var render = evt.render;
if (point !== null) {
render.setImageStyle(imageStyle);
render.drawPointGeometry(point);
examples/vector-layer.js
+1 -2
View File
@@ -94,6 +94,5 @@ $(map.getViewport()).on('mousemove', function(evt) {
});
map.on('singleclick', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
displayFeatureInfo(evt.pixel);
});