Merge remote-tracking branch 'upstream/master' into vector-api
Conflicts: src/objectliterals.jsdoc src/ol/attribution.js src/ol/geom/geometry.js src/ol/geom/geometrycollection.js src/ol/geom/linestring.js src/ol/layer/vectorlayer.exports src/ol/layer/vectorlayer.js src/ol/map.js src/ol/proj/proj.js src/ol/renderer/canvas/canvasvectorlayerrenderer.js src/ol/source/imagewmssource.js src/ol/source/tilewmssource.js src/ol/source/vectorsource.exports src/ol/source/vectorsource.js src/ol/source/wmssource.js src/ol/style/style.js src/ol/tilegrid/tilegrid.js src/ol/tilegrid/wmtstilegrid.js src/ol/tilegrid/xyztilegrid.js
This commit is contained in:
Éric Lemoine
@@ -1 +1 @@
|
||||
@exportClass ol.interaction.DoubleClickZoom ol.interaction.DoubleClickZoomOptions
|
||||
@exportSymbol ol.interaction.DoubleClickZoom
|
||||
|
||||
@@ -14,7 +14,7 @@ goog.require('ol.interaction.Interaction');
|
||||
*
|
||||
* @constructor
|
||||
* @extends {ol.interaction.Interaction}
|
||||
* @param {ol.interaction.DoubleClickZoomOptions=} opt_options Options.
|
||||
* @param {olx.interaction.DoubleClickZoomOptions=} opt_options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.interaction.DoubleClickZoom = function(opt_options) {
|
||||
|
||||
@@ -1 +1 @@
|
||||
@exportClass ol.interaction.DragPan ol.interaction.DragPanOptions
|
||||
@exportSymbol ol.interaction.DragPan
|
||||
|
||||
@@ -18,7 +18,7 @@ goog.require('ol.interaction.Drag');
|
||||
* Allows the user to pan the map by clickng and dragging.
|
||||
* @constructor
|
||||
* @extends {ol.interaction.Drag}
|
||||
* @param {ol.interaction.DragPanOptions=} opt_options Options.
|
||||
* @param {olx.interaction.DragPanOptions=} opt_options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.interaction.DragPan = function(opt_options) {
|
||||
|
||||
@@ -1 +1 @@
|
||||
@exportClass ol.interaction.DragRotate ol.interaction.DragRotateOptions
|
||||
@exportSymbol ol.interaction.DragRotate
|
||||
|
||||
@@ -1 +1 @@
|
||||
@exportClass ol.interaction.DragRotateAndZoom ol.interaction.DragRotateAndZoomOptions
|
||||
@exportSymbol ol.interaction.DragRotateAndZoom
|
||||
|
||||
@@ -26,7 +26,7 @@ ol.interaction.DRAGROTATEANDZOOM_ANIMATION_DURATION = 400;
|
||||
* This interaction is not included in the default interactions.
|
||||
* @constructor
|
||||
* @extends {ol.interaction.Drag}
|
||||
* @param {ol.interaction.DragRotateAndZoomOptions=} opt_options Options.
|
||||
* @param {olx.interaction.DragRotateAndZoomOptions=} opt_options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.interaction.DragRotateAndZoom = function(opt_options) {
|
||||
|
||||
@@ -21,7 +21,7 @@ ol.interaction.DRAGROTATE_ANIMATION_DURATION = 250;
|
||||
* it to when the alt and shift keys are held down.
|
||||
* @constructor
|
||||
* @extends {ol.interaction.Drag}
|
||||
* @param {ol.interaction.DragRotateOptions=} opt_options Options.
|
||||
* @param {olx.interaction.DragRotateOptions=} opt_options Options.
|
||||
*/
|
||||
ol.interaction.DragRotate = function(opt_options) {
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
@exportClass ol.interaction.DragZoom ol.interaction.DragZoomOptions
|
||||
@exportSymbol ol.interaction.DragZoom
|
||||
|
||||
@@ -34,7 +34,7 @@ ol.SHIFT_DRAG_ZOOM_HYSTERESIS_PIXELS_SQUARED =
|
||||
* it to when the shift key is held down.
|
||||
* @constructor
|
||||
* @extends {ol.interaction.Drag}
|
||||
* @param {ol.interaction.DragZoomOptions=} opt_options Options.
|
||||
* @param {olx.interaction.DragZoomOptions=} opt_options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.interaction.DragZoom = function(opt_options) {
|
||||
|
||||
@@ -1 +1 @@
|
||||
@exportFunction ol.interaction.defaults ol.interaction.DefaultsOptions ol.Collection
|
||||
@exportSymbol ol.interaction.defaults ol.interaction.defaults
|
||||
|
||||
@@ -23,7 +23,7 @@ goog.require('ol.interaction.TouchZoom');
|
||||
* {@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.
|
||||
* @param {olx.interaction.DefaultsOptions=} opt_options Defaults options.
|
||||
* @return {ol.Collection} A collection of interactions to be used with
|
||||
* the ol.Map constructor's interactions option.
|
||||
* @todo stability experimental
|
||||
|
||||
@@ -1 +1 @@
|
||||
@exportClass ol.interaction.KeyboardPan ol.interaction.KeyboardPanOptions
|
||||
@exportSymbol ol.interaction.KeyboardPan
|
||||
|
||||
@@ -24,7 +24,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.
|
||||
* @param {olx.interaction.KeyboardPanOptions=} opt_options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.interaction.KeyboardPan = function(opt_options) {
|
||||
|
||||
@@ -1 +1 @@
|
||||
@exportClass ol.interaction.KeyboardZoom ol.interaction.KeyboardZoomOptions
|
||||
@exportSymbol ol.interaction.KeyboardZoom
|
||||
|
||||
@@ -13,7 +13,7 @@ goog.require('ol.interaction.Interaction');
|
||||
/**
|
||||
* Allows the user to zoom the map using keyboard + and -.
|
||||
* @constructor
|
||||
* @param {ol.interaction.KeyboardZoomOptions=} opt_options Options.
|
||||
* @param {olx.interaction.KeyboardZoomOptions=} opt_options Options.
|
||||
* @extends {ol.interaction.Interaction}
|
||||
* @todo stability experimental
|
||||
*/
|
||||
|
||||
@@ -27,7 +27,7 @@ ol.interaction.MOUSEWHEELZOOM_TIMEOUT_DURATION = 80;
|
||||
* Allows the user to zoom the map by scrolling the mouse wheel.
|
||||
* @constructor
|
||||
* @extends {ol.interaction.Interaction}
|
||||
* @param {ol.interaction.MouseWheelZoomOptions=} opt_options Options.
|
||||
* @param {olx.interaction.MouseWheelZoomOptions=} opt_options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.interaction.MouseWheelZoom = function(opt_options) {
|
||||
|
||||
@@ -1 +1 @@
|
||||
@exportClass ol.interaction.TouchPan ol.interaction.TouchPanOptions
|
||||
@exportSymbol ol.interaction.TouchPan
|
||||
|
||||
@@ -15,7 +15,7 @@ goog.require('ol.interaction.Touch');
|
||||
* on a touch screen.
|
||||
* @constructor
|
||||
* @extends {ol.interaction.Touch}
|
||||
* @param {ol.interaction.TouchPanOptions=} opt_options Options.
|
||||
* @param {olx.interaction.TouchPanOptions=} opt_options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.interaction.TouchPan = function(opt_options) {
|
||||
|
||||
@@ -1 +1 @@
|
||||
@exportClass ol.interaction.TouchRotate ol.interaction.TouchRotateOptions
|
||||
@exportSymbol ol.interaction.TouchRotate
|
||||
|
||||
@@ -21,7 +21,7 @@ ol.interaction.TOUCHROTATE_ANIMATION_DURATION = 250;
|
||||
* on a touch screen.
|
||||
* @constructor
|
||||
* @extends {ol.interaction.Touch}
|
||||
* @param {ol.interaction.TouchRotateOptions=} opt_options Options.
|
||||
* @param {olx.interaction.TouchRotateOptions=} opt_options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.interaction.TouchRotate = function(opt_options) {
|
||||
|
||||
@@ -15,7 +15,7 @@ goog.require('ol.interaction.Touch');
|
||||
* on a touch screen.
|
||||
* @constructor
|
||||
* @extends {ol.interaction.Touch}
|
||||
* @param {ol.interaction.TouchZoomOptions=} opt_options Options.
|
||||
* @param {olx.interaction.TouchZoomOptions=} opt_options Options.
|
||||
* @todo stability experimental
|
||||
*/
|
||||
ol.interaction.TouchZoom = function(opt_options) {
|
||||
|
||||
Reference in New Issue
Block a user