From deb00f20fe0c3b9bab4768d9cefe48c4de09a9fb Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 28 May 2019 16:06:42 -0600 Subject: [PATCH] Include full filename in import specifier --- examples/d3.js | 2 +- examples/extent-constrained.js | 2 +- examples/filter-points-webgl.js | 16 +++++----- examples/icon-sprite-webgl.js | 16 +++++----- examples/mapbox-layer.js | 4 +-- examples/worker.js | 2 +- package.json | 2 +- rendering/cases/heatmap-layer/main.js | 8 ++--- rendering/cases/layer-image/main.js | 2 +- rendering/cases/layer-tile-extent/main.js | 4 +-- .../cases/layer-tile-none-square/main.js | 2 +- rendering/cases/layer-tile-opacity/main.js | 4 +-- rendering/cases/layer-tile-simple/main.js | 4 +-- rendering/cases/layer-tile-transition/main.js | 4 +-- rendering/cases/layer-tile-two-layers/main.js | 4 +-- .../layer-vectortile-rotate-hidpi/main.js | 8 ++--- .../layer-vectortile-rotate-vector/main.js | 22 +++++++------- .../cases/layer-vectortile-rotate/main.js | 8 ++--- .../cases/layer-vectortile-simple/main.js | 8 ++--- rendering/cases/webgl-points/main.js | 10 +++---- src/ol/View.js | 6 ++-- src/ol/layer/Graticule.js | 30 +++++++++---------- src/ol/layer/Heatmap.js | 2 +- src/ol/renderer/webgl/Layer.js | 2 +- src/ol/renderer/webgl/PointsLayer.js | 20 ++++++------- src/ol/resolutionconstraint.js | 4 +-- src/ol/source/Raster.js | 2 +- src/ol/webgl/Helper.js | 8 ++--- src/ol/worker/version.js | 2 +- test/spec/ol/graticule.test.js | 2 +- test/spec/ol/map.test.js | 2 +- test/spec/ol/render/canvas/labelcache.test.js | 2 +- test/spec/ol/renderer/webgl/layer.test.js | 6 ++-- .../ol/renderer/webgl/pointslayer.test.js | 8 ++--- test/spec/ol/resolutionconstraint.test.js | 2 +- test/spec/ol/webgl/buffer.test.js | 2 +- test/spec/ol/webgl/helper.test.js | 4 +-- 37 files changed, 118 insertions(+), 118 deletions(-) diff --git a/examples/d3.js b/examples/d3.js index 672c4b7719..e15fe1da8d 100644 --- a/examples/d3.js +++ b/examples/d3.js @@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import {getWidth, getCenter} from '../src/ol/extent.js'; import {Layer, Tile as TileLayer} from '../src/ol/layer.js'; -import SourceState from '../src/ol/source/State'; +import SourceState from '../src/ol/source/State.js'; import {fromLonLat, toLonLat} from '../src/ol/proj.js'; import Stamen from '../src/ol/source/Stamen.js'; diff --git a/examples/extent-constrained.js b/examples/extent-constrained.js index 7e274290bc..70613dd536 100644 --- a/examples/extent-constrained.js +++ b/examples/extent-constrained.js @@ -3,7 +3,7 @@ import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; import {defaults as defaultControls} from '../src/ol/control.js'; -import ZoomSlider from '../src/ol/control/ZoomSlider'; +import ZoomSlider from '../src/ol/control/ZoomSlider.js'; const view = new View({ center: [328627.563458, 5921296.662223], diff --git a/examples/filter-points-webgl.js b/examples/filter-points-webgl.js index 76e2deab0a..1006981156 100644 --- a/examples/filter-points-webgl.js +++ b/examples/filter-points-webgl.js @@ -1,14 +1,14 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; -import Feature from '../src/ol/Feature'; -import Point from '../src/ol/geom/Point'; -import VectorLayer from '../src/ol/layer/Vector'; -import {Vector} from '../src/ol/source'; -import {fromLonLat} from '../src/ol/proj'; -import WebGLPointsLayerRenderer from '../src/ol/renderer/webgl/PointsLayer'; -import {clamp, lerp} from '../src/ol/math'; -import Stamen from '../src/ol/source/Stamen'; +import Feature from '../src/ol/Feature.js'; +import Point from '../src/ol/geom/Point.js'; +import VectorLayer from '../src/ol/layer/Vector.js'; +import {Vector} from '../src/ol/source.js'; +import {fromLonLat} from '../src/ol/proj.js'; +import WebGLPointsLayerRenderer from '../src/ol/renderer/webgl/PointsLayer.js'; +import {clamp, lerp} from '../src/ol/math.js'; +import Stamen from '../src/ol/source/Stamen.js'; const vectorSource = new Vector({ attributions: 'NASA' diff --git a/examples/icon-sprite-webgl.js b/examples/icon-sprite-webgl.js index a81e508c4b..4b8be0cb98 100644 --- a/examples/icon-sprite-webgl.js +++ b/examples/icon-sprite-webgl.js @@ -1,14 +1,14 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; -import TileJSON from '../src/ol/source/TileJSON'; -import Feature from '../src/ol/Feature'; -import Point from '../src/ol/geom/Point'; -import VectorLayer from '../src/ol/layer/Vector'; -import {Vector} from '../src/ol/source'; -import {fromLonLat} from '../src/ol/proj'; -import WebGLPointsLayerRenderer from '../src/ol/renderer/webgl/PointsLayer'; -import {lerp} from '../src/ol/math'; +import TileJSON from '../src/ol/source/TileJSON.js'; +import Feature from '../src/ol/Feature.js'; +import Point from '../src/ol/geom/Point.js'; +import VectorLayer from '../src/ol/layer/Vector.js'; +import {Vector} from '../src/ol/source.js'; +import {fromLonLat} from '../src/ol/proj.js'; +import WebGLPointsLayerRenderer from '../src/ol/renderer/webgl/PointsLayer.js'; +import {lerp} from '../src/ol/math.js'; const vectorSource = new Vector({ features: [], diff --git a/examples/mapbox-layer.js b/examples/mapbox-layer.js index 13c21245a6..64bfea6a12 100644 --- a/examples/mapbox-layer.js +++ b/examples/mapbox-layer.js @@ -1,7 +1,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; -import Layer from '../src/ol/layer/Layer'; -import {toLonLat, fromLonLat} from '../src/ol/proj'; +import Layer from '../src/ol/layer/Layer.js'; +import {toLonLat, fromLonLat} from '../src/ol/proj.js'; import {Stroke, Style} from '../src/ol/style.js'; import VectorLayer from '../src/ol/layer/Vector.js'; import VectorSource from '../src/ol/source/Vector.js'; diff --git a/examples/worker.js b/examples/worker.js index 5324c040b4..3a0d212570 100644 --- a/examples/worker.js +++ b/examples/worker.js @@ -4,7 +4,7 @@ import Map from '../src/ol/Map.js'; import View from '../src/ol/View.js'; import TileLayer from '../src/ol/layer/Tile.js'; import OSM from '../src/ol/source/OSM.js'; -import {create as createVersionWorker} from '../src/ol/worker/version'; +import {create as createVersionWorker} from '../src/ol/worker/version.js'; const map = new Map({ diff --git a/package.json b/package.json index d261d4a88a..a8627b8689 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "copy-webpack-plugin": "^5.0.3", "coveralls": "3.0.3", "eslint": "^5.16.0", - "eslint-config-openlayers": "^11.0.0", + "eslint-config-openlayers": "^12.0.0", "expect.js": "0.3.1", "front-matter": "^3.0.2", "fs-extra": "^8.0.0", diff --git a/rendering/cases/heatmap-layer/main.js b/rendering/cases/heatmap-layer/main.js index 5f817e5892..151744432c 100644 --- a/rendering/cases/heatmap-layer/main.js +++ b/rendering/cases/heatmap-layer/main.js @@ -1,10 +1,10 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; import TileLayer from '../../../src/ol/layer/Tile.js'; -import XYZ from '../../../src/ol/source/XYZ'; -import {Heatmap as HeatmapLayer} from '../../../src/ol/layer'; -import VectorSource from '../../../src/ol/source/Vector'; -import KML from '../../../src/ol/format/KML'; +import XYZ from '../../../src/ol/source/XYZ.js'; +import {Heatmap as HeatmapLayer} from '../../../src/ol/layer.js'; +import VectorSource from '../../../src/ol/source/Vector.js'; +import KML from '../../../src/ol/format/KML.js'; const vector = new HeatmapLayer({ source: new VectorSource({ diff --git a/rendering/cases/layer-image/main.js b/rendering/cases/layer-image/main.js index 6f44ba8e53..14de5cd377 100644 --- a/rendering/cases/layer-image/main.js +++ b/rendering/cases/layer-image/main.js @@ -5,7 +5,7 @@ import { get as getProjection, transform, transformExtent -} from '../../../src/ol/proj'; +} from '../../../src/ol/proj.js'; import ImageLayer from '../../../src/ol/layer/Image.js'; const center = transform([-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'); diff --git a/rendering/cases/layer-tile-extent/main.js b/rendering/cases/layer-tile-extent/main.js index a678217834..bb987178aa 100644 --- a/rendering/cases/layer-tile-extent/main.js +++ b/rendering/cases/layer-tile-extent/main.js @@ -5,9 +5,9 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; import TileLayer from '../../../src/ol/layer/Tile.js'; -import {fromLonLat} from '../../../src/ol/proj'; +import {fromLonLat} from '../../../src/ol/proj.js'; import {transformExtent} from '../../../src/ol/proj.js'; -import XYZ from '../../../src/ol/source/XYZ'; +import XYZ from '../../../src/ol/source/XYZ.js'; const center = fromLonLat([7, 50]); const extent = transformExtent([2, 47, 10, 53], 'EPSG:4326', 'EPSG:3857'); diff --git a/rendering/cases/layer-tile-none-square/main.js b/rendering/cases/layer-tile-none-square/main.js index c490ed252a..70a8782eab 100644 --- a/rendering/cases/layer-tile-none-square/main.js +++ b/rendering/cases/layer-tile-none-square/main.js @@ -1,7 +1,7 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; import TileLayer from '../../../src/ol/layer/Tile.js'; -import XYZ from '../../../src/ol/source/XYZ'; +import XYZ from '../../../src/ol/source/XYZ.js'; import {createXYZ} from '../../../src/ol/tilegrid.js'; const center = [-10997148, 4569099]; diff --git a/rendering/cases/layer-tile-opacity/main.js b/rendering/cases/layer-tile-opacity/main.js index c34fc5d55d..9d96801692 100644 --- a/rendering/cases/layer-tile-opacity/main.js +++ b/rendering/cases/layer-tile-opacity/main.js @@ -1,8 +1,8 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; import TileLayer from '../../../src/ol/layer/Tile.js'; -import {fromLonLat} from '../../../src/ol/proj'; -import XYZ from '../../../src/ol/source/XYZ'; +import {fromLonLat} from '../../../src/ol/proj.js'; +import XYZ from '../../../src/ol/source/XYZ.js'; const center = fromLonLat([8.6, 50.1]); diff --git a/rendering/cases/layer-tile-simple/main.js b/rendering/cases/layer-tile-simple/main.js index 16144d3888..02505651d1 100644 --- a/rendering/cases/layer-tile-simple/main.js +++ b/rendering/cases/layer-tile-simple/main.js @@ -1,8 +1,8 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; import TileLayer from '../../../src/ol/layer/Tile.js'; -import {fromLonLat} from '../../../src/ol/proj'; -import XYZ from '../../../src/ol/source/XYZ'; +import {fromLonLat} from '../../../src/ol/proj.js'; +import XYZ from '../../../src/ol/source/XYZ.js'; const center = fromLonLat([8.6, 50.1]); diff --git a/rendering/cases/layer-tile-transition/main.js b/rendering/cases/layer-tile-transition/main.js index 6bf60e35f0..20835bfb23 100644 --- a/rendering/cases/layer-tile-transition/main.js +++ b/rendering/cases/layer-tile-transition/main.js @@ -1,8 +1,8 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; import TileLayer from '../../../src/ol/layer/Tile.js'; -import {fromLonLat} from '../../../src/ol/proj'; -import XYZ from '../../../src/ol/source/XYZ'; +import {fromLonLat} from '../../../src/ol/proj.js'; +import XYZ from '../../../src/ol/source/XYZ.js'; const center = fromLonLat([8.6, 50.1]); diff --git a/rendering/cases/layer-tile-two-layers/main.js b/rendering/cases/layer-tile-two-layers/main.js index 709636fdfd..84da9a005f 100644 --- a/rendering/cases/layer-tile-two-layers/main.js +++ b/rendering/cases/layer-tile-two-layers/main.js @@ -1,8 +1,8 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; import TileLayer from '../../../src/ol/layer/Tile.js'; -import {fromLonLat} from '../../../src/ol/proj'; -import XYZ from '../../../src/ol/source/XYZ'; +import {fromLonLat} from '../../../src/ol/proj.js'; +import XYZ from '../../../src/ol/source/XYZ.js'; const center = fromLonLat([8.6, 50.1]); diff --git a/rendering/cases/layer-vectortile-rotate-hidpi/main.js b/rendering/cases/layer-vectortile-rotate-hidpi/main.js index 2a4061257d..8fee48b26b 100644 --- a/rendering/cases/layer-vectortile-rotate-hidpi/main.js +++ b/rendering/cases/layer-vectortile-rotate-hidpi/main.js @@ -1,9 +1,9 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; -import VectorTileSource from '../../../src/ol/source/VectorTile'; -import MVT from '../../../src/ol/format/MVT'; -import {createXYZ} from '../../../src/ol/tilegrid'; -import VectorTileLayer from '../../../src/ol/layer/VectorTile'; +import VectorTileSource from '../../../src/ol/source/VectorTile.js'; +import MVT from '../../../src/ol/format/MVT.js'; +import {createXYZ} from '../../../src/ol/tilegrid.js'; +import VectorTileLayer from '../../../src/ol/layer/VectorTile.js'; const map = new Map({ pixelRatio: 2, diff --git a/rendering/cases/layer-vectortile-rotate-vector/main.js b/rendering/cases/layer-vectortile-rotate-vector/main.js index 2c4fcc54ec..1b0cb77ee0 100644 --- a/rendering/cases/layer-vectortile-rotate-vector/main.js +++ b/rendering/cases/layer-vectortile-rotate-vector/main.js @@ -1,16 +1,16 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; -import VectorTileSource from '../../../src/ol/source/VectorTile'; -import MVT from '../../../src/ol/format/MVT'; -import {createXYZ} from '../../../src/ol/tilegrid'; -import VectorTileLayer from '../../../src/ol/layer/VectorTile'; -import VectorSource from '../../../src/ol/source/Vector'; -import Feature from '../../../src/ol/Feature'; -import Point from '../../../src/ol/geom/Point'; -import VectorLayer from '../../../src/ol/layer/Vector'; -import Style from '../../../src/ol/style/Style'; -import CircleStyle from '../../../src/ol/style/Circle'; -import Fill from '../../../src/ol/style/Fill'; +import VectorTileSource from '../../../src/ol/source/VectorTile.js'; +import MVT from '../../../src/ol/format/MVT.js'; +import {createXYZ} from '../../../src/ol/tilegrid.js'; +import VectorTileLayer from '../../../src/ol/layer/VectorTile.js'; +import VectorSource from '../../../src/ol/source/Vector.js'; +import Feature from '../../../src/ol/Feature.js'; +import Point from '../../../src/ol/geom/Point.js'; +import VectorLayer from '../../../src/ol/layer/Vector.js'; +import Style from '../../../src/ol/style/Style.js'; +import CircleStyle from '../../../src/ol/style/Circle.js'; +import Fill from '../../../src/ol/style/Fill.js'; const vectorSource = new VectorSource({ features: [ diff --git a/rendering/cases/layer-vectortile-rotate/main.js b/rendering/cases/layer-vectortile-rotate/main.js index 9426e4cefb..3c81eac1f9 100644 --- a/rendering/cases/layer-vectortile-rotate/main.js +++ b/rendering/cases/layer-vectortile-rotate/main.js @@ -1,9 +1,9 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; -import VectorTileSource from '../../../src/ol/source/VectorTile'; -import MVT from '../../../src/ol/format/MVT'; -import {createXYZ} from '../../../src/ol/tilegrid'; -import VectorTileLayer from '../../../src/ol/layer/VectorTile'; +import VectorTileSource from '../../../src/ol/source/VectorTile.js'; +import MVT from '../../../src/ol/format/MVT.js'; +import {createXYZ} from '../../../src/ol/tilegrid.js'; +import VectorTileLayer from '../../../src/ol/layer/VectorTile.js'; const map = new Map({ layers: [ diff --git a/rendering/cases/layer-vectortile-simple/main.js b/rendering/cases/layer-vectortile-simple/main.js index 0a5c9aaaa4..e074fdfd13 100644 --- a/rendering/cases/layer-vectortile-simple/main.js +++ b/rendering/cases/layer-vectortile-simple/main.js @@ -1,9 +1,9 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; -import VectorTileSource from '../../../src/ol/source/VectorTile'; -import MVT from '../../../src/ol/format/MVT'; -import {createXYZ} from '../../../src/ol/tilegrid'; -import VectorTileLayer from '../../../src/ol/layer/VectorTile'; +import VectorTileSource from '../../../src/ol/source/VectorTile.js'; +import MVT from '../../../src/ol/format/MVT.js'; +import {createXYZ} from '../../../src/ol/tilegrid.js'; +import VectorTileLayer from '../../../src/ol/layer/VectorTile.js'; new Map({ layers: [ diff --git a/rendering/cases/webgl-points/main.js b/rendering/cases/webgl-points/main.js index 1635dc4ecc..a86e9aed7f 100644 --- a/rendering/cases/webgl-points/main.js +++ b/rendering/cases/webgl-points/main.js @@ -1,11 +1,11 @@ import Map from '../../../src/ol/Map.js'; import View from '../../../src/ol/View.js'; import TileLayer from '../../../src/ol/layer/Tile.js'; -import XYZ from '../../../src/ol/source/XYZ'; -import {Vector as VectorLayer} from '../../../src/ol/layer'; -import VectorSource from '../../../src/ol/source/Vector'; -import KML from '../../../src/ol/format/KML'; -import WebGLPointsLayerRenderer from '../../../src/ol/renderer/webgl/PointsLayer'; +import XYZ from '../../../src/ol/source/XYZ.js'; +import {Vector as VectorLayer} from '../../../src/ol/layer.js'; +import VectorSource from '../../../src/ol/source/Vector.js'; +import KML from '../../../src/ol/format/KML.js'; +import WebGLPointsLayerRenderer from '../../../src/ol/renderer/webgl/PointsLayer.js'; class CustomLayer extends VectorLayer { createRenderer() { diff --git a/src/ol/View.js b/src/ol/View.js index fd00409b04..620d33e324 100644 --- a/src/ol/View.js +++ b/src/ol/View.js @@ -21,9 +21,9 @@ import {clamp, modulo} from './math.js'; import {assign} from './obj.js'; import {createProjection, METERS_PER_UNIT} from './proj.js'; import Units from './proj/Units.js'; -import {equals} from './coordinate'; -import {easeOut} from './easing'; -import {createMinMaxResolution} from './resolutionconstraint'; +import {equals} from './coordinate.js'; +import {easeOut} from './easing.js'; +import {createMinMaxResolution} from './resolutionconstraint.js'; /** diff --git a/src/ol/layer/Graticule.js b/src/ol/layer/Graticule.js index f679c45ee6..56ea5a5be5 100644 --- a/src/ol/layer/Graticule.js +++ b/src/ol/layer/Graticule.js @@ -3,27 +3,27 @@ */ import VectorLayer from './Vector.js'; import {assign} from '../obj.js'; -import {degreesToStringHDMS} from '../coordinate'; -import Text from '../style/Text'; -import Fill from '../style/Fill'; -import Stroke from '../style/Stroke'; +import {degreesToStringHDMS} from '../coordinate.js'; +import Text from '../style/Text.js'; +import Fill from '../style/Fill.js'; +import Stroke from '../style/Stroke.js'; import LineString from '../geom/LineString.js'; -import VectorSource from '../source/Vector'; +import VectorSource from '../source/Vector.js'; import { equivalent as equivalentProjection, get as getProjection, getTransform, transformExtent -} from '../proj'; -import {getCenter, intersects, equals, getIntersection, isEmpty} from '../extent'; -import {clamp} from '../math'; -import Style from '../style/Style'; -import Feature from '../Feature'; -import {bbox} from '../loadingstrategy'; -import {meridian, parallel} from '../geom/flat/geodesic'; -import GeometryLayout from '../geom/GeometryLayout'; -import Point from '../geom/Point'; -import Collection from '../Collection'; +} from '../proj.js'; +import {getCenter, intersects, equals, getIntersection, isEmpty} from '../extent.js'; +import {clamp} from '../math.js'; +import Style from '../style/Style.js'; +import Feature from '../Feature.js'; +import {bbox} from '../loadingstrategy.js'; +import {meridian, parallel} from '../geom/flat/geodesic.js'; +import GeometryLayout from '../geom/GeometryLayout.js'; +import Point from '../geom/Point.js'; +import Collection from '../Collection.js'; /** diff --git a/src/ol/layer/Heatmap.js b/src/ol/layer/Heatmap.js index 8db0e84beb..f45cf084b9 100644 --- a/src/ol/layer/Heatmap.js +++ b/src/ol/layer/Heatmap.js @@ -6,7 +6,7 @@ import {getChangeEventType} from '../Object.js'; import {createCanvasContext2D} from '../dom.js'; import VectorLayer from './Vector.js'; import {assign} from '../obj.js'; -import WebGLPointsLayerRenderer from '../renderer/webgl/PointsLayer'; +import WebGLPointsLayerRenderer from '../renderer/webgl/PointsLayer.js'; /** diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js index c17dfbb56d..6e2b87d9f9 100644 --- a/src/ol/renderer/webgl/Layer.js +++ b/src/ol/renderer/webgl/Layer.js @@ -2,7 +2,7 @@ * @module ol/renderer/webgl/Layer */ import LayerRenderer from '../Layer.js'; -import WebGLHelper from '../../webgl/Helper'; +import WebGLHelper from '../../webgl/Helper.js'; /** diff --git a/src/ol/renderer/webgl/PointsLayer.js b/src/ol/renderer/webgl/PointsLayer.js index 6d79a7d6ba..65a25a8a9c 100644 --- a/src/ol/renderer/webgl/PointsLayer.js +++ b/src/ol/renderer/webgl/PointsLayer.js @@ -1,21 +1,21 @@ /** * @module ol/renderer/webgl/PointsLayer */ -import WebGLArrayBuffer from '../../webgl/Buffer'; -import {DYNAMIC_DRAW, ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, FLOAT} from '../../webgl'; -import {DefaultAttrib, DefaultUniform} from '../../webgl/Helper'; -import GeometryType from '../../geom/GeometryType'; -import WebGLLayerRenderer, {getBlankTexture, pushFeatureToBuffer} from './Layer'; -import GeoJSON from '../../format/GeoJSON'; -import {getUid} from '../../util'; -import ViewHint from '../../ViewHint'; -import {createEmpty, equals} from '../../extent'; +import WebGLArrayBuffer from '../../webgl/Buffer.js'; +import {DYNAMIC_DRAW, ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, FLOAT} from '../../webgl.js'; +import {DefaultAttrib, DefaultUniform} from '../../webgl/Helper.js'; +import GeometryType from '../../geom/GeometryType.js'; +import WebGLLayerRenderer, {getBlankTexture, pushFeatureToBuffer} from './Layer.js'; +import GeoJSON from '../../format/GeoJSON.js'; +import {getUid} from '../../util.js'; +import ViewHint from '../../ViewHint.js'; +import {createEmpty, equals} from '../../extent.js'; import { create as createTransform, makeInverse as makeInverseTransform, multiply as multiplyTransform, apply as applyTransform -} from '../../transform'; +} from '../../transform.js'; const VERTEX_SHADER = ` precision mediump float; diff --git a/src/ol/resolutionconstraint.js b/src/ol/resolutionconstraint.js index 2e12a1a69d..b0c36d5b6d 100644 --- a/src/ol/resolutionconstraint.js +++ b/src/ol/resolutionconstraint.js @@ -2,8 +2,8 @@ * @module ol/resolutionconstraint */ import {linearFindNearest} from './array.js'; -import {getHeight, getWidth} from './extent'; -import {clamp} from './math'; +import {getHeight, getWidth} from './extent.js'; +import {clamp} from './math.js'; /** diff --git a/src/ol/source/Raster.js b/src/ol/source/Raster.js index 75a81ec633..b4ea890d11 100644 --- a/src/ol/source/Raster.js +++ b/src/ol/source/Raster.js @@ -7,7 +7,7 @@ import {createCanvasContext2D} from '../dom.js'; import {listen} from '../events.js'; import Event from '../events/Event.js'; import EventType from '../events/EventType.js'; -import {Processor} from 'pixelworks/lib/index'; +import {Processor} from 'pixelworks/lib/index.js'; import {equals, getCenter, getHeight, getWidth} from '../extent.js'; import ImageLayer from '../layer/Image.js'; import TileLayer from '../layer/Tile.js'; diff --git a/src/ol/webgl/Helper.js b/src/ol/webgl/Helper.js index b5ec037408..1b03a5fa0d 100644 --- a/src/ol/webgl/Helper.js +++ b/src/ol/webgl/Helper.js @@ -15,10 +15,10 @@ import { rotate as rotateTransform, scale as scaleTransform, translate as translateTransform -} from '../transform'; -import {create, fromTransform} from '../vec/mat4'; -import WebGLPostProcessingPass from './PostProcessingPass'; -import {getContext} from '../webgl'; +} from '../transform.js'; +import {create, fromTransform} from '../vec/mat4.js'; +import WebGLPostProcessingPass from './PostProcessingPass.js'; +import {getContext} from '../webgl.js'; /** diff --git a/src/ol/worker/version.js b/src/ol/worker/version.js index d35110c76a..ef9b86ad0f 100644 --- a/src/ol/worker/version.js +++ b/src/ol/worker/version.js @@ -2,7 +2,7 @@ * A worker that responds to messages by posting a message with the version identifer. * @module ol/worker/version */ -import {VERSION} from '../util'; +import {VERSION} from '../util.js'; onmessage = event => { console.log('version worker received message:', event.data); // eslint-disable-line diff --git a/test/spec/ol/graticule.test.js b/test/spec/ol/graticule.test.js index bff2c5067d..9fddf760df 100644 --- a/test/spec/ol/graticule.test.js +++ b/test/spec/ol/graticule.test.js @@ -3,7 +3,7 @@ import Map from '../../../src/ol/Map.js'; import {get as getProjection} from '../../../src/ol/proj.js'; import Stroke from '../../../src/ol/style/Stroke.js'; import Text from '../../../src/ol/style/Text.js'; -import Feature from '../../../src/ol/Feature'; +import Feature from '../../../src/ol/Feature.js'; describe('ol.layer.Graticule', function() { let graticule; diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js index 9a929bc24e..521891a6a6 100644 --- a/test/spec/ol/map.test.js +++ b/test/spec/ol/map.test.js @@ -4,7 +4,7 @@ import Map from '../../../src/ol/Map.js'; import MapEvent from '../../../src/ol/MapEvent.js'; import Overlay from '../../../src/ol/Overlay.js'; import View from '../../../src/ol/View.js'; -import {LineString, Point} from '../../../src/ol/geom'; +import {LineString, Point} from '../../../src/ol/geom.js'; import {TOUCH} from '../../../src/ol/has.js'; import {focus} from '../../../src/ol/events/condition.js'; import {defaults as defaultInteractions} from '../../../src/ol/interaction.js'; diff --git a/test/spec/ol/render/canvas/labelcache.test.js b/test/spec/ol/render/canvas/labelcache.test.js index 38bfa79a2e..fa2fcd8f79 100644 --- a/test/spec/ol/render/canvas/labelcache.test.js +++ b/test/spec/ol/render/canvas/labelcache.test.js @@ -1,4 +1,4 @@ -import LabelCache from '../../../../../src/ol/render/canvas/LabelCache'; +import LabelCache from '../../../../../src/ol/render/canvas/LabelCache.js'; describe('ol.render.canvas.LabelCache', function() { diff --git a/test/spec/ol/renderer/webgl/layer.test.js b/test/spec/ol/renderer/webgl/layer.test.js index 83c24a6704..4d48e2df0c 100644 --- a/test/spec/ol/renderer/webgl/layer.test.js +++ b/test/spec/ol/renderer/webgl/layer.test.js @@ -1,6 +1,6 @@ -import WebGLLayerRenderer, {getBlankTexture, pushFeatureToBuffer} from '../../../../../src/ol/renderer/webgl/Layer'; -import WebGLArrayBuffer from '../../../../../src/ol/webgl/Buffer'; -import Layer from '../../../../../src/ol/layer/Layer'; +import WebGLLayerRenderer, {getBlankTexture, pushFeatureToBuffer} from '../../../../../src/ol/renderer/webgl/Layer.js'; +import WebGLArrayBuffer from '../../../../../src/ol/webgl/Buffer.js'; +import Layer from '../../../../../src/ol/layer/Layer.js'; describe('ol.renderer.webgl.Layer', function() { diff --git a/test/spec/ol/renderer/webgl/pointslayer.test.js b/test/spec/ol/renderer/webgl/pointslayer.test.js index b85048b789..f0d104a70c 100644 --- a/test/spec/ol/renderer/webgl/pointslayer.test.js +++ b/test/spec/ol/renderer/webgl/pointslayer.test.js @@ -3,10 +3,10 @@ import Point from '../../../../../src/ol/geom/Point.js'; import LineString from '../../../../../src/ol/geom/LineString.js'; import VectorLayer from '../../../../../src/ol/layer/Vector.js'; import VectorSource from '../../../../../src/ol/source/Vector.js'; -import WebGLPointsLayerRenderer from '../../../../../src/ol/renderer/webgl/PointsLayer'; -import {get as getProjection} from '../../../../../src/ol/proj'; -import Polygon from '../../../../../src/ol/geom/Polygon'; -import ViewHint from '../../../../../src/ol/ViewHint'; +import WebGLPointsLayerRenderer from '../../../../../src/ol/renderer/webgl/PointsLayer.js'; +import {get as getProjection} from '../../../../../src/ol/proj.js'; +import Polygon from '../../../../../src/ol/geom/Polygon.js'; +import ViewHint from '../../../../../src/ol/ViewHint.js'; describe('ol.renderer.webgl.PointsLayer', function() { diff --git a/test/spec/ol/resolutionconstraint.test.js b/test/spec/ol/resolutionconstraint.test.js index 2fc2649d77..84a4b17226 100644 --- a/test/spec/ol/resolutionconstraint.test.js +++ b/test/spec/ol/resolutionconstraint.test.js @@ -1,5 +1,5 @@ import {createSnapToResolutions, createSnapToPower} from '../../../src/ol/resolutionconstraint.js'; -import {createMinMaxResolution} from '../../../src/ol/resolutionconstraint'; +import {createMinMaxResolution} from '../../../src/ol/resolutionconstraint.js'; describe('ol.resolutionconstraint', function() { diff --git a/test/spec/ol/webgl/buffer.test.js b/test/spec/ol/webgl/buffer.test.js index 71b64629b3..af590da0e4 100644 --- a/test/spec/ol/webgl/buffer.test.js +++ b/test/spec/ol/webgl/buffer.test.js @@ -1,4 +1,4 @@ -import WebGLArrayBuffer from '../../../../src/ol/webgl/Buffer'; +import WebGLArrayBuffer from '../../../../src/ol/webgl/Buffer.js'; describe('ol.webgl.Buffer', function() { diff --git a/test/spec/ol/webgl/helper.test.js b/test/spec/ol/webgl/helper.test.js index b6a75761bd..39fb1a2d68 100644 --- a/test/spec/ol/webgl/helper.test.js +++ b/test/spec/ol/webgl/helper.test.js @@ -1,9 +1,9 @@ -import WebGLHelper from '../../../../src/ol/webgl/Helper'; +import WebGLHelper from '../../../../src/ol/webgl/Helper.js'; import { create as createTransform, rotate as rotateTransform, scale as scaleTransform, translate as translateTransform -} from '../../../../src/ol/transform'; +} from '../../../../src/ol/transform.js'; const VERTEX_SHADER = `