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

Merge pull request #56 from twpayne/interaction-conditions

Browse Source 
Abstract out key conditions for interactions, fixes #51, see also #54
This commit is contained in:
Tom Payne
2012-10-12 11:04:12 -07:00
parent e440c03efb 8df0cfb9d9
commit 0392d898c3
6 changed files with 119 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/map.js
View File

@@ -41,14 +41,15 @@ goog.require('ol.Size');
goog.require('ol.TransformFunction');
goog.require('ol.control.Attribution');
goog.require('ol.control.Zoom');
goog.require('ol.interaction.AltDragRotate');
goog.require('ol.interaction.DblClickZoom');
goog.require('ol.interaction.DragPan');
goog.require('ol.interaction.DragRotate');
goog.require('ol.interaction.DragZoom');
goog.require('ol.interaction.Interaction');
goog.require('ol.interaction.KeyboardPan');
goog.require('ol.interaction.KeyboardZoom');
goog.require('ol.interaction.MouseWheelZoom');
goog.require('ol.interaction.ShiftDragZoom');
goog.require('ol.interaction.condition');
goog.require('ol.renderer.Layer');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.dom');
@@ -1139,7 +1140,8 @@ ol.Map.createInteractions_ = function(mapOptions) {
var rotate = goog.isDef(mapOptions.rotate) ?
mapOptions.rotate : true;
if (rotate) {
interactions.push(new ol.interaction.AltDragRotate());
interactions.push(
new ol.interaction.DragRotate(ol.interaction.condition.altKeyOnly));
}
var doubleClickZoom = goog.isDef(mapOptions.doubleClickZoom) ?
@@ -1153,7 +1155,8 @@ ol.Map.createInteractions_ = function(mapOptions) {
var dragPan = goog.isDef(mapOptions.dragPan) ?
mapOptions.dragPan : true;
if (dragPan) {
interactions.push(new ol.interaction.DragPan());
interactions.push(
new ol.interaction.DragPan(ol.interaction.condition.noModifierKeys));
}
var keyboard = goog.isDef(mapOptions.keyboard) ?
@@ -1177,7 +1180,8 @@ ol.Map.createInteractions_ = function(mapOptions) {
var shiftDragZoom = goog.isDef(mapOptions.shiftDragZoom) ?
mapOptions.shiftDragZoom : true;
if (shiftDragZoom) {
interactions.push(new ol.interaction.ShiftDragZoom());
interactions.push(
new ol.interaction.DragZoom(ol.interaction.condition.shiftKeyOnly));
}
return interactions;