From d7eee911953b5c72108079507084e636e9218901 Mon Sep 17 00:00:00 2001
From: Paul Spencer <paul@pagameba.com>
Date: Thu, 12 Sep 2013 13:31:26 -0400
Subject: [PATCH 1/4] Add exports for interactions.

---
 src/objectliterals.jsdoc                      | 44 +++++++++++++------
 src/ol/interaction/condition.exports          |  1 +
 src/ol/interaction/condition.js               |  7 +--
 src/ol/interaction/condition.jsdoc            |  3 ++
 src/ol/interaction/doubleclickzoom.exports    |  1 +
 .../interaction/doubleclickzoominteraction.js |  2 +
 src/ol/interaction/draginteraction.js         |  1 +
 src/ol/interaction/dragpan.exports            |  1 +
 src/ol/interaction/dragpaninteraction.js      |  1 +
 src/ol/interaction/dragrotate.exports         |  1 +
 .../dragrotateandzoominteraction.js           |  5 +++
 src/ol/interaction/dragrotateinteraction.js   |  3 ++
 src/ol/interaction/dragzoom.exports           |  1 +
 src/ol/interaction/dragzoominteraction.js     |  3 ++
 src/ol/interaction/interaction.jsdoc          |  3 ++
 src/ol/interaction/interactiondefaults.js     | 11 ++++-
 src/ol/interaction/keyboardpan.exports        |  1 +
 src/ol/interaction/keyboardpaninteraction.js  |  1 +
 src/ol/interaction/keyboardzoom.exports       |  1 +
 src/ol/interaction/keyboardzoominteraction.js |  1 +
 src/ol/interaction/mousewheelzoom.exports     |  1 +
 .../interaction/mousewheelzoominteraction.js  |  1 +
 src/ol/interaction/selectinteraction.js       |  1 +
 src/ol/interaction/touchinteraction.js        |  1 +
 src/ol/interaction/touchpan.exports           |  1 +
 src/ol/interaction/touchpaninteraction.js     |  2 +
 src/ol/interaction/touchrotate.exports        |  1 +
 src/ol/interaction/touchrotateinteraction.js  |  2 +
 src/ol/interaction/touchzoom.exports          |  1 +
 src/ol/interaction/touchzoominteraction.js    |  2 +
 src/ol/kinetic.exports                        |  1 +
 src/ol/map.js                                 |  5 ++-
 32 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 src/ol/interaction/condition.jsdoc
 create mode 100644 src/ol/interaction/doubleclickzoom.exports
 create mode 100644 src/ol/interaction/dragpan.exports
 create mode 100644 src/ol/interaction/dragrotate.exports
 create mode 100644 src/ol/interaction/dragzoom.exports
 create mode 100644 src/ol/interaction/interaction.jsdoc
 create mode 100644 src/ol/interaction/keyboardpan.exports
 create mode 100644 src/ol/interaction/keyboardzoom.exports
 create mode 100644 src/ol/interaction/mousewheelzoom.exports
 create mode 100644 src/ol/interaction/touchpan.exports
 create mode 100644 src/ol/interaction/touchrotate.exports
 create mode 100644 src/ol/interaction/touchzoom.exports
 create mode 100644 src/ol/kinetic.exports

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 9ce3c92092..ae166e18d1 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -52,7 +52,9 @@
  * @typedef {Object} ol.MapOptions
  * @property {ol.Collection|Array.<ol.control.Control>|undefined} controls
  *     Controls initially added to the map.
- * @property {ol.Collection|undefined} interactions Interactions.
+ * @property {ol.Collection|undefined} interactions A collection of
+ *     {@link ol.interaction} instances that allow the user to interact with
+ *     the map.
  * @property {Array.<ol.layer.Base>|ol.Collection|undefined} layers Layers.
  * @property {ol.Collection|Array.<ol.Overlay>|undefined} overlays
  *     Overlays initially added to the map.
@@ -237,28 +239,36 @@
 /**
  * @typedef {Object} ol.interaction.DoubleClickZoomOptions
  * @property {number|undefined} delta The zoom delta applied on each double
- *    click.
+ *     click, default is 1.
  */
 
 /**
  * @typedef {Object} ol.interaction.DragPanOptions
- * @property {ol.Kinetic|undefined} kinetic Kinetic.
- * @property {ol.interaction.ConditionType|undefined} condition Condition.
+ * @property {ol.Kinetic|undefined} kinetic Kinetic inertia to apply to the pan.
+ * @property {ol.interaction.ConditionType|undefined} condition A conditional
+ *     modifier (i.e. Shift key) that determines if the interaction is active
+ *     or not, default is no modifiers.
  */
 
 /**
  * @typedef {Object} ol.interaction.DragRotateOptions
- * @property {ol.interaction.ConditionType|undefined} condition Condition.
+ * @property {ol.interaction.ConditionType|undefined} condition A conditional
+ *     modifier (i.e. Shift key) that determines if the interaction is active
+ *     or not, default is both shift and alt keys.
  */
 
 /**
  * @typedef {Object} ol.interaction.DragRotateAndZoomOptions
- * @property {ol.interaction.ConditionType|undefined} condition Condition.
+ * @property {ol.interaction.ConditionType|undefined} condition A conditional
+ *     modifier (i.e. Shift key) that determines if the interaction is active
+ *     or not, default is shify key.
  */
 
 /**
  * @typedef {Object} ol.interaction.DragZoomOptions
- * @property {ol.interaction.ConditionType|undefined} condition Condition.
+ * @property {ol.interaction.ConditionType|undefined} condition A conditional
+ *     modifier (i.e. Shift key) that determines if the interaction is active
+ *     or not, default is shift key.
  */
 
 /**
@@ -284,26 +294,34 @@
 
 /**
  * @typedef {Object} ol.interaction.KeyboardPanOptions
- * @property {ol.interaction.ConditionType|undefined} condition Condition.
- * @property {number|undefined} pixelDelta Pixel delta
+ * @property {ol.interaction.ConditionType|undefined} condition A conditional
+ *     modifier (i.e. Shift key) that determines if the interaction is active
+ *     or not, default is no modifiers.
+ * @property {number|undefined} pixelDelta Pixel The amount to pan on each key
+ *     press
  */
 
 /**
  * @typedef {Object} ol.interaction.KeyboardZoomOptions
- * @property {ol.interaction.ConditionType|undefined} condition Condition.
- * @property {number|undefined} delta Delta.
+ * @property {ol.interaction.ConditionType|undefined} condition A conditional
+ *     modifier (i.e. Shift key) that determines if the interaction is active
+ *     or not, default is no modifiers.
+ * @property {number|undefined} delta The amount to zoom on each key press.
  */
 
 /**
  * @typedef {Object} ol.interaction.SelectOptions
- * @property {ol.interaction.ConditionType|undefined} condition Condition.
+ * @property {ol.interaction.ConditionType|undefined} condition A conditional
+ *     modifier (i.e. Shift key) that determines if the interaction is active
+ *     or not, default is on mouse click only.
  * @property {undefined|function(ol.layer.Layer):boolean} layerFilter Filter
  *     function to restrict selection to a subset of layers.
  */
 
 /**
  * @typedef {Object} ol.interaction.TouchPanOptions
- * @property {ol.Kinetic|undefined} kinetic Kinetic.
+ * @property {ol.Kinetic|undefined} kinetic Kinetic inertia to apply to the
+ *     pan.
  */
 
 /**
diff --git a/src/ol/interaction/condition.exports b/src/ol/interaction/condition.exports
index 7d5694ec70..289cfec116 100644
--- a/src/ol/interaction/condition.exports
+++ b/src/ol/interaction/condition.exports
@@ -1,3 +1,4 @@
+@exportSymbol ol.interaction.conditionType
 @exportSymbol ol.interaction.condition.altKeyOnly
 @exportSymbol ol.interaction.condition.altShiftKeysOnly
 @exportSymbol ol.interaction.condition.always
diff --git a/src/ol/interaction/condition.js b/src/ol/interaction/condition.js
index af7349ad52..08bcdd805a 100644
--- a/src/ol/interaction/condition.js
+++ b/src/ol/interaction/condition.js
@@ -39,6 +39,7 @@ ol.interaction.condition.altShiftKeysOnly = function(mapBrowserEvent) {
 
 
 /**
+ * Always true.
  * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
  * @return {boolean} True.
  */
@@ -47,7 +48,7 @@ ol.interaction.condition.always = goog.functions.TRUE;
 
 /**
  * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
- * @return {boolean} True only the event is a click event.
+ * @return {boolean} True if the event is a click event.
  */
 ol.interaction.condition.clickOnly = function(mapBrowserEvent) {
   var browserEvent = mapBrowserEvent.browserEvent;
@@ -57,7 +58,7 @@ ol.interaction.condition.clickOnly = function(mapBrowserEvent) {
 
 /**
  * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
- * @return {boolean} True if only the no modifier keys are pressed.
+ * @return {boolean} True only if there no modifier keys are pressed.
  */
 ol.interaction.condition.noModifierKeys = function(mapBrowserEvent) {
   var browserEvent = mapBrowserEvent.browserEvent;
@@ -96,7 +97,7 @@ ol.interaction.condition.shiftKeyOnly = function(mapBrowserEvent) {
 
 /**
  * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
- * @return {boolean} True if the target element is not editable.
+ * @return {boolean} True only if the target element is not editable.
  */
 ol.interaction.condition.targetNotEditable = function(mapBrowserEvent) {
   var browserEvent = mapBrowserEvent.browserEvent;
diff --git a/src/ol/interaction/condition.jsdoc b/src/ol/interaction/condition.jsdoc
new file mode 100644
index 0000000000..0d1b51710a
--- /dev/null
+++ b/src/ol/interaction/condition.jsdoc
@@ -0,0 +1,3 @@
+/**
+ * @namespace ol.interaction.condition
+ */
diff --git a/src/ol/interaction/doubleclickzoom.exports b/src/ol/interaction/doubleclickzoom.exports
new file mode 100644
index 0000000000..43824d9543
--- /dev/null
+++ b/src/ol/interaction/doubleclickzoom.exports
@@ -0,0 +1 @@
+@exportClass ol.interaction.DoubleClickZoom ol.interaction.DoubleClickZoomOptions
diff --git a/src/ol/interaction/doubleclickzoominteraction.js b/src/ol/interaction/doubleclickzoominteraction.js
index 53a70ae951..38c1427db5 100644
--- a/src/ol/interaction/doubleclickzoominteraction.js
+++ b/src/ol/interaction/doubleclickzoominteraction.js
@@ -16,6 +16,8 @@ ol.interaction.DOUBLECLICKZOOM_ANIMATION_DURATION = 250;
 
 
 /**
+ * Allows the user to zoom by double-clicking on the map.
+ *
  * @constructor
  * @extends {ol.interaction.Interaction}
  * @param {ol.interaction.DoubleClickZoomOptions=} opt_options Options.
diff --git a/src/ol/interaction/draginteraction.js b/src/ol/interaction/draginteraction.js
index 3bcbc3ac93..9d81f7a2bb 100644
--- a/src/ol/interaction/draginteraction.js
+++ b/src/ol/interaction/draginteraction.js
@@ -12,6 +12,7 @@ goog.require('ol.interaction.Interaction');
 
 
 /**
+ * Base class for interactions that drag the map.
  * @constructor
  * @extends {ol.interaction.Interaction}
  */
diff --git a/src/ol/interaction/dragpan.exports b/src/ol/interaction/dragpan.exports
new file mode 100644
index 0000000000..6c68510100
--- /dev/null
+++ b/src/ol/interaction/dragpan.exports
@@ -0,0 +1 @@
+@exportClass ol.interaction.DragPan ol.interaction.DragPanOptions
diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js
index 4d898c5b74..8d303ce846 100644
--- a/src/ol/interaction/dragpaninteraction.js
+++ b/src/ol/interaction/dragpaninteraction.js
@@ -14,6 +14,7 @@ goog.require('ol.interaction.condition');
 
 
 /**
+ * Allows the user to pan the map by clickng and dragging.
  * @constructor
  * @extends {ol.interaction.Drag}
  * @param {ol.interaction.DragPanOptions=} opt_options Options.
diff --git a/src/ol/interaction/dragrotate.exports b/src/ol/interaction/dragrotate.exports
new file mode 100644
index 0000000000..1ca795259f
--- /dev/null
+++ b/src/ol/interaction/dragrotate.exports
@@ -0,0 +1 @@
+@exportClass ol.interaction.DragRotate ol.interaction.DragRotateOptions
diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js
index fe073aeca4..21b400e891 100644
--- a/src/ol/interaction/dragrotateandzoominteraction.js
+++ b/src/ol/interaction/dragrotateandzoominteraction.js
@@ -18,6 +18,11 @@ ol.interaction.DRAGROTATEANDZOOM_ANIMATION_DURATION = 400;
 
 
 /**
+ * Allows the user to zoom and rotate the map by clicking and dragging
+ * on the map.  By default, this interaction is limited to when the shift
+ * key is held down.
+ *
+ * This interaction is not included in the default interactions.
  * @constructor
  * @extends {ol.interaction.Drag}
  * @param {ol.interaction.DragRotateAndZoomOptions=} opt_options Options.
diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js
index 8e02d33402..8c90e81323 100644
--- a/src/ol/interaction/dragrotateinteraction.js
+++ b/src/ol/interaction/dragrotateinteraction.js
@@ -15,6 +15,9 @@ ol.interaction.DRAGROTATE_ANIMATION_DURATION = 250;
 
 
 /**
+ * Allows the user to rotate the map by clicking and dragging on the map,
+ * normally combined with an {@link ol.interaction.condition} that limits
+ * it to when the alt and shift keys are held down.
  * @constructor
  * @extends {ol.interaction.Drag}
  * @param {ol.interaction.DragRotateOptions=} opt_options Options.
diff --git a/src/ol/interaction/dragzoom.exports b/src/ol/interaction/dragzoom.exports
new file mode 100644
index 0000000000..e9f5fb88fb
--- /dev/null
+++ b/src/ol/interaction/dragzoom.exports
@@ -0,0 +1 @@
+@exportClass ol.interaction.DragZoom ol.interaction.DragZoomOptions
diff --git a/src/ol/interaction/dragzoominteraction.js b/src/ol/interaction/dragzoominteraction.js
index d68a2a8c2c..9481af6ff2 100644
--- a/src/ol/interaction/dragzoominteraction.js
+++ b/src/ol/interaction/dragzoominteraction.js
@@ -29,6 +29,9 @@ ol.SHIFT_DRAG_ZOOM_HYSTERESIS_PIXELS_SQUARED =
 
 
 /**
+ * Allows the user to zoom the map by clicking and dragging on the map,
+ * normally combined with an {@link ol.interaction.condition} that limits
+ * it to when the shift key is held down.
  * @constructor
  * @extends {ol.interaction.Drag}
  * @param {ol.interaction.DragZoomOptions=} opt_options Options.
diff --git a/src/ol/interaction/interaction.jsdoc b/src/ol/interaction/interaction.jsdoc
new file mode 100644
index 0000000000..6da0d140d4
--- /dev/null
+++ b/src/ol/interaction/interaction.jsdoc
@@ -0,0 +1,3 @@
+/**
+ * @namespace ol.interaction
+ */
diff --git a/src/ol/interaction/interactiondefaults.js b/src/ol/interaction/interactiondefaults.js
index ab0ecc0232..541d378459 100644
--- a/src/ol/interaction/interactiondefaults.js
+++ b/src/ol/interaction/interactiondefaults.js
@@ -15,8 +15,17 @@ goog.require('ol.interaction.TouchZoom');
 
 
 /**
+ * This method is a convenience method to create a set of interactions
+ * to be used with an {@link ol.Map}.  Specific interactions can be excluded by
+ * setting the appropriate option to false in the constructor options,
+ * but the order of the interactions is fixed.  If you want to specify a
+ * different order for interactions, you will need to create your own
+ * {@link ol.interaction} instances and insert them into an
+ * {@link ol.Collection} in the order you want before creating your ol.Map
+ * instance.
  * @param {ol.interaction.DefaultsOptions=} opt_options Defaults options.
- * @return {ol.Collection} Interactions.
+ * @return {ol.Collection} A collection of interactions to be used with
+ * the ol.Map constructor's interactions option.
  */
 ol.interaction.defaults = function(opt_options) {
 
diff --git a/src/ol/interaction/keyboardpan.exports b/src/ol/interaction/keyboardpan.exports
new file mode 100644
index 0000000000..ee8f69fbf0
--- /dev/null
+++ b/src/ol/interaction/keyboardpan.exports
@@ -0,0 +1 @@
+@exportClass ol.interaction.KeyboardPan ol.interaction.KeyboardPanOptions
diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js
index 7293c4ea37..980f9afd5e 100644
--- a/src/ol/interaction/keyboardpaninteraction.js
+++ b/src/ol/interaction/keyboardpaninteraction.js
@@ -21,6 +21,7 @@ ol.interaction.KEYBOARD_PAN_DURATION = 100;
 
 
 /**
+ * Allows the user to pan the map using keyboard arrows.
  * @constructor
  * @extends {ol.interaction.Interaction}
  * @param {ol.interaction.KeyboardPanOptions=} opt_options Options.
diff --git a/src/ol/interaction/keyboardzoom.exports b/src/ol/interaction/keyboardzoom.exports
new file mode 100644
index 0000000000..e344610661
--- /dev/null
+++ b/src/ol/interaction/keyboardzoom.exports
@@ -0,0 +1 @@
+@exportClass ol.interaction.KeyboardZoom ol.interaction.KeyboardZoomOptions
diff --git a/src/ol/interaction/keyboardzoominteraction.js b/src/ol/interaction/keyboardzoominteraction.js
index 59efe8d761..fce0f55ce1 100644
--- a/src/ol/interaction/keyboardzoominteraction.js
+++ b/src/ol/interaction/keyboardzoominteraction.js
@@ -18,6 +18,7 @@ ol.interaction.KEYBOARD_ZOOM_DURATION = 100;
 
 
 /**
+ * Allows the user to zoom the map using keyboard + and -.
  * @constructor
  * @param {ol.interaction.KeyboardZoomOptions=} opt_options Options.
  * @extends {ol.interaction.Interaction}
diff --git a/src/ol/interaction/mousewheelzoom.exports b/src/ol/interaction/mousewheelzoom.exports
new file mode 100644
index 0000000000..bd6f492da3
--- /dev/null
+++ b/src/ol/interaction/mousewheelzoom.exports
@@ -0,0 +1 @@
+@exportSymbol ol.interaction.MouseWheelZoom
diff --git a/src/ol/interaction/mousewheelzoominteraction.js b/src/ol/interaction/mousewheelzoominteraction.js
index cb21af1dd0..1e138a8233 100644
--- a/src/ol/interaction/mousewheelzoominteraction.js
+++ b/src/ol/interaction/mousewheelzoominteraction.js
@@ -30,6 +30,7 @@ ol.interaction.MOUSEWHEELZOOM_TIMEOUT_DURATION = 80;
 
 
 /**
+ * Allows the user to zoom the map by scrolling the mouse wheel.
  * @constructor
  * @extends {ol.interaction.Interaction}
  */
diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js
index 7de08bc057..58c98dc76e 100644
--- a/src/ol/interaction/selectinteraction.js
+++ b/src/ol/interaction/selectinteraction.js
@@ -13,6 +13,7 @@ goog.require('ol.source.Vector');
 
 
 /**
+ * Allows the user to select features on the map.
  * @constructor
  * @extends {ol.interaction.Interaction}
  * @param {ol.interaction.SelectOptions=} opt_options Options.
diff --git a/src/ol/interaction/touchinteraction.js b/src/ol/interaction/touchinteraction.js
index 814c742593..5ea3efab7f 100644
--- a/src/ol/interaction/touchinteraction.js
+++ b/src/ol/interaction/touchinteraction.js
@@ -13,6 +13,7 @@ goog.require('ol.interaction.Interaction');
 
 
 /**
+ * Base class for touch interactions.
  * @constructor
  * @extends {ol.interaction.Interaction}
  */
diff --git a/src/ol/interaction/touchpan.exports b/src/ol/interaction/touchpan.exports
new file mode 100644
index 0000000000..daf3f02096
--- /dev/null
+++ b/src/ol/interaction/touchpan.exports
@@ -0,0 +1 @@
+@exportClass ol.interaction.TouchPan ol.interaction.TouchPanOptions
diff --git a/src/ol/interaction/touchpaninteraction.js b/src/ol/interaction/touchpaninteraction.js
index 5fbfe17045..c8c1dee132 100644
--- a/src/ol/interaction/touchpaninteraction.js
+++ b/src/ol/interaction/touchpaninteraction.js
@@ -11,6 +11,8 @@ goog.require('ol.interaction.Touch');
 
 
 /**
+ * Allows the user to pan the map by touching and dragging
+ * on a touch screen.
  * @constructor
  * @extends {ol.interaction.Touch}
  * @param {ol.interaction.TouchPanOptions=} opt_options Options.
diff --git a/src/ol/interaction/touchrotate.exports b/src/ol/interaction/touchrotate.exports
new file mode 100644
index 0000000000..9f00bf6c56
--- /dev/null
+++ b/src/ol/interaction/touchrotate.exports
@@ -0,0 +1 @@
+@exportClass ol.interaction.TouchRotate ol.interaction.TouchRotateOptions
diff --git a/src/ol/interaction/touchrotateinteraction.js b/src/ol/interaction/touchrotateinteraction.js
index 4eb71177f8..db0f1a7615 100644
--- a/src/ol/interaction/touchrotateinteraction.js
+++ b/src/ol/interaction/touchrotateinteraction.js
@@ -17,6 +17,8 @@ ol.interaction.TOUCHROTATE_ANIMATION_DURATION = 250;
 
 
 /**
+ * Allows the user to rotate the map by twisting with two fingers
+ * on a touch screen.
  * @constructor
  * @extends {ol.interaction.Touch}
  * @param {ol.interaction.TouchRotateOptions=} opt_options Options.
diff --git a/src/ol/interaction/touchzoom.exports b/src/ol/interaction/touchzoom.exports
new file mode 100644
index 0000000000..0e62f50746
--- /dev/null
+++ b/src/ol/interaction/touchzoom.exports
@@ -0,0 +1 @@
+@exportSymbol ol.interaction.TouchZoom
diff --git a/src/ol/interaction/touchzoominteraction.js b/src/ol/interaction/touchzoominteraction.js
index 5d9053aa26..2591f0b0d4 100644
--- a/src/ol/interaction/touchzoominteraction.js
+++ b/src/ol/interaction/touchzoominteraction.js
@@ -17,6 +17,8 @@ ol.interaction.TOUCHZOOM_ANIMATION_DURATION = 400;
 
 
 /**
+ * Allows the user to zoom the map by pinching with two fingers
+ * on a touch screen.
  * @constructor
  * @extends {ol.interaction.Touch}
  */
diff --git a/src/ol/kinetic.exports b/src/ol/kinetic.exports
new file mode 100644
index 0000000000..aa3f543286
--- /dev/null
+++ b/src/ol/kinetic.exports
@@ -0,0 +1 @@
+@exportSymbol ol.Kinetic
diff --git a/src/ol/map.js b/src/ol/map.js
index f5ac50a136..79c1aaa73a 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -508,7 +508,10 @@ ol.Map.prototype.getFeatures = function(options) {
 
 
 /**
- * Gets the collection on interactions associated with this map.
+ * Gets the collection of {@link ol.interaction} instances
+ * associated with this map.  Modifying this collection
+ * changes the interactions associated with the map.
+ *
  * Interactions are used for e.g. pan, zoom and rotate.
  * @return {ol.Collection} Interactions.
  */

From 28ee9bcd9bbdeb46b04a886dff18afa9193f60e7 Mon Sep 17 00:00:00 2001
From: Paul Spencer <paul@pagameba.com>
Date: Fri, 13 Sep 2013 07:42:21 -0400
Subject: [PATCH 2/4] remove export for conditionType as it breaks the build to
 have it in there.

---
 src/ol/interaction/condition.exports | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ol/interaction/condition.exports b/src/ol/interaction/condition.exports
index 289cfec116..7d5694ec70 100644
--- a/src/ol/interaction/condition.exports
+++ b/src/ol/interaction/condition.exports
@@ -1,4 +1,3 @@
-@exportSymbol ol.interaction.conditionType
 @exportSymbol ol.interaction.condition.altKeyOnly
 @exportSymbol ol.interaction.condition.altShiftKeysOnly
 @exportSymbol ol.interaction.condition.always

From 3ab50facc70f164dc5dbd1b77abf9f9344751d86 Mon Sep 17 00:00:00 2001
From: Paul Spencer <paul@pagameba.com>
Date: Fri, 13 Sep 2013 09:04:19 -0400
Subject: [PATCH 3/4] Label the link to ol.interaction as
 ol.interaction.Interaction The documentation is really talking about instance
 of Interaction, not the namespace.  This is more clear for users.

---
 src/objectliterals.jsdoc | 2 +-
 src/ol/map.js            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index ae166e18d1..b4c68eb4b3 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -53,7 +53,7 @@
  * @property {ol.Collection|Array.<ol.control.Control>|undefined} controls
  *     Controls initially added to the map.
  * @property {ol.Collection|undefined} interactions A collection of
- *     {@link ol.interaction} instances that allow the user to interact with
+ *     {@link ol.interaction|ol.interaction.Interaction} instances that allow the user to interact with
  *     the map.
  * @property {Array.<ol.layer.Base>|ol.Collection|undefined} layers Layers.
  * @property {ol.Collection|Array.<ol.Overlay>|undefined} overlays
diff --git a/src/ol/map.js b/src/ol/map.js
index 79c1aaa73a..df2142fdc4 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -508,7 +508,8 @@ ol.Map.prototype.getFeatures = function(options) {
 
 
 /**
- * Gets the collection of {@link ol.interaction} instances
+ * Gets the collection of 
+ * {@link ol.interaction|ol.interaction.Interaction} instances
  * associated with this map.  Modifying this collection
  * changes the interactions associated with the map.
  *

From 3a91aa3d360de0a3745015be507969b97c43a522 Mon Sep 17 00:00:00 2001
From: Paul Spencer <paul@pagameba.com>
Date: Fri, 13 Sep 2013 11:14:00 -0400
Subject: [PATCH 4/4] fix lint issue

---
 src/ol/map.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ol/map.js b/src/ol/map.js
index df2142fdc4..9a850179ef 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -508,7 +508,7 @@ ol.Map.prototype.getFeatures = function(options) {
 
 
 /**
- * Gets the collection of 
+ * Gets the collection of
  * {@link ol.interaction|ol.interaction.Interaction} instances
  * associated with this map.  Modifying this collection
  * changes the interactions associated with the map.