From 0cb1c18778a80a224c06380dc93dc0446d6c5876 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 23 Apr 2018 14:04:11 -0600 Subject: [PATCH] Re-export interaction constructors from ol/interaction --- examples/box-selection.js | 3 +-- examples/custom-interactions.js | 3 +-- examples/drag-and-drop-image-vector.js | 3 +-- examples/drag-and-drop.js | 3 +-- examples/drag-rotate-and-zoom.js | 3 +-- examples/draw-and-modify-features.js | 4 +--- examples/earthquake-clusters.js | 3 +-- examples/full-screen-drag-rotate-and-zoom.js | 3 +-- examples/modify-features.js | 4 +--- examples/modify-test.js | 4 +--- examples/mousewheel-zoom.js | 3 +-- examples/overviewmap-custom.js | 3 +-- examples/pinch-zoom.js | 3 +-- examples/snap.js | 5 +---- examples/topolis.js | 3 +-- examples/translate-features.js | 4 +--- examples/vector-esri-edit.js | 5 +---- src/ol/interaction.js | 21 ++++++++++++++++++++ 18 files changed, 38 insertions(+), 42 deletions(-) diff --git a/examples/box-selection.js b/examples/box-selection.js index 3f03f9e244..8237ef6d11 100644 --- a/examples/box-selection.js +++ b/examples/box-selection.js @@ -2,8 +2,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {platformModifierKeyOnly} from '../src/ol/events/condition.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; -import DragBox from '../src/ol/interaction/DragBox.js'; -import Select from '../src/ol/interaction/Select.js'; +import {DragBox, Select} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {OSM, Vector as VectorSource} from '../src/ol/source.js'; diff --git a/examples/custom-interactions.js b/examples/custom-interactions.js index 7662db35ea..4ff70127bb 100644 --- a/examples/custom-interactions.js +++ b/examples/custom-interactions.js @@ -3,8 +3,7 @@ import Feature from '../src/ol/Feature.js'; import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {LineString, Point, Polygon} from '../src/ol/geom.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import PointerInteraction from '../src/ol/interaction/Pointer.js'; +import {defaults as defaultInteractions, Pointer as PointerInteraction} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {TileJSON, Vector as VectorSource} from '../src/ol/source.js'; diff --git a/examples/drag-and-drop-image-vector.js b/examples/drag-and-drop-image-vector.js index 5c4c781258..2247223442 100644 --- a/examples/drag-and-drop-image-vector.js +++ b/examples/drag-and-drop-image-vector.js @@ -1,8 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {GPX, GeoJSON, IGC, KML, TopoJSON} from '../src/ol/format.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import DragAndDrop from '../src/ol/interaction/DragAndDrop.js'; +import {defaults as defaultInteractions, DragAndDrop} from '../src/ol/interaction.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {BingMaps, Vector as VectorSource} from '../src/ol/source.js'; diff --git a/examples/drag-and-drop.js b/examples/drag-and-drop.js index f3d6d13b8e..f65a9c8096 100644 --- a/examples/drag-and-drop.js +++ b/examples/drag-and-drop.js @@ -1,8 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {GPX, GeoJSON, IGC, KML, TopoJSON} from '../src/ol/format.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import DragAndDrop from '../src/ol/interaction/DragAndDrop.js'; +import {defaults as defaultInteractions, DragAndDrop} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {BingMaps, Vector as VectorSource} from '../src/ol/source.js'; diff --git a/examples/drag-rotate-and-zoom.js b/examples/drag-rotate-and-zoom.js index 22ecf9adfa..88e58a4f8a 100644 --- a/examples/drag-rotate-and-zoom.js +++ b/examples/drag-rotate-and-zoom.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js'; +import {defaults as defaultInteractions, DragRotateAndZoom} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/examples/draw-and-modify-features.js b/examples/draw-and-modify-features.js index 6a53939bff..dc11b91c1b 100644 --- a/examples/draw-and-modify-features.js +++ b/examples/draw-and-modify-features.js @@ -1,8 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import Draw from '../src/ol/interaction/Draw.js'; -import Modify from '../src/ol/interaction/Modify.js'; -import Snap from '../src/ol/interaction/Snap.js'; +import {Draw, Modify, Snap} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {OSM, Vector as VectorSource} from '../src/ol/source.js'; diff --git a/examples/earthquake-clusters.js b/examples/earthquake-clusters.js index 15c03d3f0c..effa62291f 100644 --- a/examples/earthquake-clusters.js +++ b/examples/earthquake-clusters.js @@ -2,8 +2,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {createEmpty, getWidth, getHeight, extend} from '../src/ol/extent.js'; import KML from '../src/ol/format/KML.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import Select from '../src/ol/interaction/Select.js'; +import {defaults as defaultInteractions, Select} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {Cluster, Stamen, Vector as VectorSource} from '../src/ol/source.js'; diff --git a/examples/full-screen-drag-rotate-and-zoom.js b/examples/full-screen-drag-rotate-and-zoom.js index 3fd21bc0b9..4bf64ec10c 100644 --- a/examples/full-screen-drag-rotate-and-zoom.js +++ b/examples/full-screen-drag-rotate-and-zoom.js @@ -1,8 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {defaults as defaultControls, FullScreen} from '../src/ol/control.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js'; +import {defaults as defaultInteractions, DragRotateAndZoom} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import BingMaps from '../src/ol/source/BingMaps.js'; diff --git a/examples/modify-features.js b/examples/modify-features.js index c766db2d91..855e794966 100644 --- a/examples/modify-features.js +++ b/examples/modify-features.js @@ -1,9 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import Modify from '../src/ol/interaction/Modify.js'; -import Select from '../src/ol/interaction/Select.js'; +import {defaults as defaultInteractions, Modify, Select} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {OSM, Vector as VectorSource} from '../src/ol/source.js'; diff --git a/examples/modify-test.js b/examples/modify-test.js index a01d28a87a..56fbe2ac1d 100644 --- a/examples/modify-test.js +++ b/examples/modify-test.js @@ -1,9 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import Modify from '../src/ol/interaction/Modify.js'; -import Select from '../src/ol/interaction/Select.js'; +import {defaults as defaultInteractions, Modify, Select} from '../src/ol/interaction.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.js'; import CircleStyle from '../src/ol/style/Circle.js'; diff --git a/examples/mousewheel-zoom.js b/examples/mousewheel-zoom.js index 2035d9fe49..effe1b8c3f 100644 --- a/examples/mousewheel-zoom.js +++ b/examples/mousewheel-zoom.js @@ -1,8 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; +import {defaults as defaultInteractions, MouseWheelZoom} from '../src/ol/interaction.js'; import {focus} from '../src/ol/events/condition.js'; -import MouseWheelZoom from '../src/ol/interaction/MouseWheelZoom.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/examples/overviewmap-custom.js b/examples/overviewmap-custom.js index 55a4490d83..abf6dae5d1 100644 --- a/examples/overviewmap-custom.js +++ b/examples/overviewmap-custom.js @@ -1,8 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {defaults as defaultControls, OverviewMap} from '../src/ol/control.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import DragRotateAndZoom from '../src/ol/interaction/DragRotateAndZoom.js'; +import {defaults as defaultInteractions, DragRotateAndZoom} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/examples/pinch-zoom.js b/examples/pinch-zoom.js index 54cd14760b..b8f6dd1a2c 100644 --- a/examples/pinch-zoom.js +++ b/examples/pinch-zoom.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import PinchZoom from '../src/ol/interaction/PinchZoom.js'; +import {defaults as defaultInteractions, PinchZoom} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/examples/snap.js b/examples/snap.js index 7a77a31781..7d9df66dd6 100644 --- a/examples/snap.js +++ b/examples/snap.js @@ -1,9 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import Draw from '../src/ol/interaction/Draw.js'; -import Modify from '../src/ol/interaction/Modify.js'; -import Select from '../src/ol/interaction/Select.js'; -import Snap from '../src/ol/interaction/Snap.js'; +import {Draw, Modify, Select, Snap} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {OSM, Vector as VectorSource} from '../src/ol/source.js'; diff --git a/examples/topolis.js b/examples/topolis.js index e70d60c6bf..9dd3c8bd55 100644 --- a/examples/topolis.js +++ b/examples/topolis.js @@ -5,8 +5,7 @@ import Feature from '../src/ol/Feature.js'; import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {Point, LineString, Polygon} from '../src/ol/geom.js'; -import Draw from '../src/ol/interaction/Draw.js'; -import Snap from '../src/ol/interaction/Snap.js'; +import {Draw, Snap} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {OSM, Vector as VectorSource} from '../src/ol/source.js'; diff --git a/examples/translate-features.js b/examples/translate-features.js index f2285bfa26..f4d7d3592e 100644 --- a/examples/translate-features.js +++ b/examples/translate-features.js @@ -1,9 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import GeoJSON from '../src/ol/format/GeoJSON.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import Select from '../src/ol/interaction/Select.js'; -import Translate from '../src/ol/interaction/Translate.js'; +import {defaults as defaultInteractions, Select, Translate} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/examples/vector-esri-edit.js b/examples/vector-esri-edit.js index ed12406102..03b685d71c 100644 --- a/examples/vector-esri-edit.js +++ b/examples/vector-esri-edit.js @@ -1,10 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import EsriJSON from '../src/ol/format/EsriJSON.js'; -import {defaults as defaultInteractions} from '../src/ol/interaction.js'; -import Draw from '../src/ol/interaction/Draw.js'; -import Modify from '../src/ol/interaction/Modify.js'; -import Select from '../src/ol/interaction/Select.js'; +import {defaults as defaultInteractions, Draw, Modify, Select} from '../src/ol/interaction.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import {tile as tileStrategy} from '../src/ol/loadingstrategy.js'; diff --git a/src/ol/interaction.js b/src/ol/interaction.js index b4ea25e409..10e7e91612 100644 --- a/src/ol/interaction.js +++ b/src/ol/interaction.js @@ -13,6 +13,27 @@ import MouseWheelZoom from './interaction/MouseWheelZoom.js'; import PinchRotate from './interaction/PinchRotate.js'; import PinchZoom from './interaction/PinchZoom.js'; +export {default as DoubleClickZoom} from './interaction/DoubleClickZoom.js'; +export {default as DragAndDrop} from './interaction/DragAndDrop.js'; +export {default as DragBox} from './interaction/DragBox.js'; +export {default as DragPan} from './interaction/DragPan.js'; +export {default as DragRotate} from './interaction/DragRotate.js'; +export {default as DragRotateAndZoom} from './interaction/DragRotateAndZoom.js'; +export {default as DragZoom} from './interaction/DragZoom.js'; +export {default as Draw} from './interaction/Draw.js'; +export {default as Extent} from './interaction/Extent.js'; +export {default as Interaction} from './interaction/Interaction.js'; +export {default as KeyboardPan} from './interaction/KeyboardPan.js'; +export {default as KeyboardZoom} from './interaction/KeyboardZoom.js'; +export {default as Modify} from './interaction/Modify.js'; +export {default as MouseWheelZoom} from './interaction/MouseWheelZoom.js'; +export {default as PinchRotate} from './interaction/PinchRotate.js'; +export {default as PinchZoom} from './interaction/PinchZoom.js'; +export {default as Pointer} from './interaction/Pointer.js'; +export {default as Select} from './interaction/Select.js'; +export {default as Snap} from './interaction/Snap.js'; +export {default as Translate} from './interaction/Translate.js'; + /** * @typedef {Object} DefaultsOptions