From 487ace2362bddf4dbda7a5ace88e7e247267648f Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 23 Apr 2018 13:44:47 -0600 Subject: [PATCH] Re-export geometry constructors from ol/geom --- examples/custom-interactions.js | 4 +--- examples/dynamic-data.js | 3 +-- examples/igc.js | 3 +-- examples/measure.js | 3 +-- examples/render-geometry.js | 4 +--- examples/synthetic-points.js | 3 +-- examples/topolis.js | 4 +--- src/ol/geom.js | 12 ++++++++++++ 8 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 src/ol/geom.js diff --git a/examples/custom-interactions.js b/examples/custom-interactions.js index 0bffd948ed..8c0e8c5b84 100644 --- a/examples/custom-interactions.js +++ b/examples/custom-interactions.js @@ -2,9 +2,7 @@ import {inherits} from '../src/ol/index.js'; import Feature from '../src/ol/Feature.js'; import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import LineString from '../src/ol/geom/LineString.js'; -import Point from '../src/ol/geom/Point.js'; -import Polygon from '../src/ol/geom/Polygon.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 TileLayer from '../src/ol/layer/Tile.js'; diff --git a/examples/dynamic-data.js b/examples/dynamic-data.js index 09dee9fcab..0b756ef537 100644 --- a/examples/dynamic-data.js +++ b/examples/dynamic-data.js @@ -1,7 +1,6 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import MultiPoint from '../src/ol/geom/MultiPoint.js'; -import Point from '../src/ol/geom/Point.js'; +import {MultiPoint, Point} from '../src/ol/geom.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; import CircleStyle from '../src/ol/style/Circle.js'; diff --git a/examples/igc.js b/examples/igc.js index 253942bcf9..182d97aeda 100644 --- a/examples/igc.js +++ b/examples/igc.js @@ -3,8 +3,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {defaults as defaultControls} from '../src/ol/control.js'; import IGC from '../src/ol/format/IGC.js'; -import LineString from '../src/ol/geom/LineString.js'; -import Point from '../src/ol/geom/Point.js'; +import {LineString, Point} from '../src/ol/geom.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import OSM, {ATTRIBUTION} from '../src/ol/source/OSM.js'; diff --git a/examples/measure.js b/examples/measure.js index 413d146cea..988d05c58b 100644 --- a/examples/measure.js +++ b/examples/measure.js @@ -3,8 +3,7 @@ import {unByKey} from '../src/ol/Observable.js'; import Overlay from '../src/ol/Overlay.js'; import {getArea, getLength} from '../src/ol/sphere.js'; import View from '../src/ol/View.js'; -import LineString from '../src/ol/geom/LineString.js'; -import Polygon from '../src/ol/geom/Polygon.js'; +import {LineString, Polygon} from '../src/ol/geom.js'; import Draw from '../src/ol/interaction/Draw.js'; import TileLayer from '../src/ol/layer/Tile.js'; import VectorLayer from '../src/ol/layer/Vector.js'; diff --git a/examples/render-geometry.js b/examples/render-geometry.js index d165de09f7..edd21bd0ca 100644 --- a/examples/render-geometry.js +++ b/examples/render-geometry.js @@ -1,6 +1,4 @@ -import LineString from '../src/ol/geom/LineString.js'; -import Point from '../src/ol/geom/Point.js'; -import Polygon from '../src/ol/geom/Polygon.js'; +import {LineString, Point, Polygon} from '../src/ol/geom.js'; import {toContext} from '../src/ol/render.js'; import CircleStyle from '../src/ol/style/Circle.js'; import Fill from '../src/ol/style/Fill.js'; diff --git a/examples/synthetic-points.js b/examples/synthetic-points.js index 37705d4b31..523322553d 100644 --- a/examples/synthetic-points.js +++ b/examples/synthetic-points.js @@ -1,8 +1,7 @@ import Feature from '../src/ol/Feature.js'; import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import LineString from '../src/ol/geom/LineString.js'; -import Point from '../src/ol/geom/Point.js'; +import {LineString, Point} from '../src/ol/geom.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/topolis.js b/examples/topolis.js index ee28f75f2e..8560ff7ca1 100644 --- a/examples/topolis.js +++ b/examples/topolis.js @@ -4,9 +4,7 @@ import Feature from '../src/ol/Feature.js'; import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import Point from '../src/ol/geom/Point.js'; -import LineString from '../src/ol/geom/LineString.js'; -import Polygon from '../src/ol/geom/Polygon.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 TileLayer from '../src/ol/layer/Tile.js'; diff --git a/src/ol/geom.js b/src/ol/geom.js new file mode 100644 index 0000000000..87f14370b1 --- /dev/null +++ b/src/ol/geom.js @@ -0,0 +1,12 @@ +/** + * @module ol/geom + */ + +export {default as Circle} from './geom/Circle.js'; +export {default as Geometry} from './geom/Geometry.js'; +export {default as LineString} from './geom/LineString.js'; +export {default as MultiLineString} from './geom/MultiLineString.js'; +export {default as MultiPoint} from './geom/MultiPoint.js'; +export {default as MultiPolygon} from './geom/MultiPolygon.js'; +export {default as Point} from './geom/Point.js'; +export {default as Polygon} from './geom/Polygon.js';