From 497cb1dc44ca91dedf993f152457a88c2cc2588e Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 23 Apr 2018 10:42:21 -0600 Subject: [PATCH] Re-export controls from ol/controls --- examples/attributions.js | 3 +-- examples/custom-controls.js | 3 +-- examples/epsg-4326.js | 3 +-- examples/full-screen-drag-rotate-and-zoom.js | 3 +-- examples/full-screen-source.js | 3 +-- examples/full-screen.js | 3 +-- examples/navigation-controls.js | 3 +-- examples/overviewmap-custom.js | 3 +-- examples/overviewmap.js | 3 +-- examples/scale-line.js | 3 +-- examples/scaleline-indiana-east.js | 2 +- examples/wms-custom-proj.js | 3 +-- examples/wms-image-custom-proj.js | 3 +-- examples/zoomslider.js | 2 +- package.json | 3 ++- src/ol/control.js | 10 ++++++++++ 16 files changed, 26 insertions(+), 27 deletions(-) diff --git a/examples/attributions.js b/examples/attributions.js index 731eabbbab..360a918917 100644 --- a/examples/attributions.js +++ b/examples/attributions.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import Attribution from '../src/ol/control/Attribution.js'; +import {defaults as defaultControls, Attribution} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/examples/custom-controls.js b/examples/custom-controls.js index 2516619362..3d0e9eb2de 100644 --- a/examples/custom-controls.js +++ b/examples/custom-controls.js @@ -1,8 +1,7 @@ import {inherits} from '../src/ol/index.js'; import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import Control from '../src/ol/control/Control.js'; +import {defaults as defaultControls, Control} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/examples/epsg-4326.js b/examples/epsg-4326.js index 02d58dbf8f..86cf815629 100644 --- a/examples/epsg-4326.js +++ b/examples/epsg-4326.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import ScaleLine from '../src/ol/control/ScaleLine.js'; +import {defaults as defaultControls, ScaleLine} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import TileWMS from '../src/ol/source/TileWMS.js'; diff --git a/examples/full-screen-drag-rotate-and-zoom.js b/examples/full-screen-drag-rotate-and-zoom.js index ff83c11a19..3fd21bc0b9 100644 --- a/examples/full-screen-drag-rotate-and-zoom.js +++ b/examples/full-screen-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 defaultControls} from '../src/ol/control.js'; -import FullScreen from '../src/ol/control/FullScreen.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 TileLayer from '../src/ol/layer/Tile.js'; diff --git a/examples/full-screen-source.js b/examples/full-screen-source.js index 639690a167..ef2f46b068 100644 --- a/examples/full-screen-source.js +++ b/examples/full-screen-source.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import FullScreen from '../src/ol/control/FullScreen.js'; +import {defaults as defaultControls, FullScreen} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/examples/full-screen.js b/examples/full-screen.js index 34b8ef862c..0cea3790b3 100644 --- a/examples/full-screen.js +++ b/examples/full-screen.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import FullScreen from '../src/ol/control/FullScreen.js'; +import {defaults as defaultControls, FullScreen} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import BingMaps from '../src/ol/source/BingMaps.js'; diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js index 2cacb2f0d9..30697b5058 100644 --- a/examples/navigation-controls.js +++ b/examples/navigation-controls.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import ZoomToExtent from '../src/ol/control/ZoomToExtent.js'; +import {defaults as defaultControls, ZoomToExtent} from '../src/ol/control.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 bf525d8059..55a4490d83 100644 --- a/examples/overviewmap-custom.js +++ b/examples/overviewmap-custom.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import OverviewMap from '../src/ol/control/OverviewMap.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 TileLayer from '../src/ol/layer/Tile.js'; diff --git a/examples/overviewmap.js b/examples/overviewmap.js index 936bb90c06..5aad00acaf 100644 --- a/examples/overviewmap.js +++ b/examples/overviewmap.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import OverviewMap from '../src/ol/control/OverviewMap.js'; +import {defaults as defaultControls, OverviewMap} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/examples/scale-line.js b/examples/scale-line.js index 8a124641be..8fb8407153 100644 --- a/examples/scale-line.js +++ b/examples/scale-line.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import ScaleLine from '../src/ol/control/ScaleLine.js'; +import {defaults as defaultControls, ScaleLine} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/examples/scaleline-indiana-east.js b/examples/scaleline-indiana-east.js index d5a525baaa..b0c2aa3f07 100644 --- a/examples/scaleline-indiana-east.js +++ b/examples/scaleline-indiana-east.js @@ -1,6 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import ScaleLine from '../src/ol/control/ScaleLine.js'; +import {ScaleLine} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {fromLonLat, transformExtent} from '../src/ol/proj.js'; import {register} from '../src/ol/proj/proj4.js'; diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index 8f80e487de..7b5d09c134 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import ScaleLine from '../src/ol/control/ScaleLine.js'; +import {defaults as defaultControls, ScaleLine} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import {addProjection, addCoordinateTransforms, transform} from '../src/ol/proj.js'; import Projection from '../src/ol/proj/Projection.js'; diff --git a/examples/wms-image-custom-proj.js b/examples/wms-image-custom-proj.js index 680deb20a3..9637b5d357 100644 --- a/examples/wms-image-custom-proj.js +++ b/examples/wms-image-custom-proj.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import {defaults as defaultControls} from '../src/ol/control.js'; -import ScaleLine from '../src/ol/control/ScaleLine.js'; +import {defaults as defaultControls, ScaleLine} from '../src/ol/control.js'; import ImageLayer from '../src/ol/layer/Image.js'; import {fromLonLat} from '../src/ol/proj.js'; import Projection from '../src/ol/proj/Projection.js'; diff --git a/examples/zoomslider.js b/examples/zoomslider.js index 0bfe6ded26..3505ba58a0 100644 --- a/examples/zoomslider.js +++ b/examples/zoomslider.js @@ -1,6 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import ZoomSlider from '../src/ol/control/ZoomSlider.js'; +import {ZoomSlider} from '../src/ol/control.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; diff --git a/package.json b/package.json index ef417cad92..0e26704ba5 100644 --- a/package.json +++ b/package.json @@ -84,5 +84,6 @@ }, "eslintConfig": { "extends": "openlayers" - } + }, + "sideEffects": false } diff --git a/src/ol/control.js b/src/ol/control.js index 4d57331f29..30c7edd78b 100644 --- a/src/ol/control.js +++ b/src/ol/control.js @@ -6,6 +6,16 @@ import Attribution from './control/Attribution.js'; import Rotate from './control/Rotate.js'; import Zoom from './control/Zoom.js'; +export {default as Attribution} from './control/Attribution.js'; +export {default as Control} from './control/Control.js'; +export {default as FullScreen} from './control/FullScreen.js'; +export {default as OverviewMap} from './control/OverviewMap.js'; +export {default as Rotate} from './control/Rotate.js'; +export {default as ScaleLine} from './control/ScaleLine.js'; +export {default as Zoom} from './control/Zoom.js'; +export {default as ZoomSlider} from './control/ZoomSlider.js'; +export {default as ZoomToExtent} from './control/ZoomToExtent.js'; + /** * @typedef {Object} DefaultsOptions