From 3cf4dbfcc6b3699f923bee49479341aa20185d0b Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Fri, 12 Oct 2018 14:53:18 +0200 Subject: [PATCH] Simplify import path in ol/renderer/ --- src/ol/renderer/canvas/IntermediateCanvas.js | 2 +- src/ol/renderer/canvas/TileLayer.js | 2 +- src/ol/renderer/canvas/VectorLayer.js | 2 +- src/ol/renderer/canvas/VectorTileLayer.js | 2 +- src/ol/renderer/webgl/ImageLayer.js | 2 +- src/ol/renderer/webgl/Layer.js | 4 ++-- src/ol/renderer/webgl/TileLayer.js | 6 +++--- src/ol/renderer/webgl/VectorLayer.js | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ol/renderer/canvas/IntermediateCanvas.js b/src/ol/renderer/canvas/IntermediateCanvas.js index a4ca6bf514..2ce3c0c259 100644 --- a/src/ol/renderer/canvas/IntermediateCanvas.js +++ b/src/ol/renderer/canvas/IntermediateCanvas.js @@ -5,7 +5,7 @@ import {abstract} from '../../util.js'; import {scale as scaleCoordinate} from '../../coordinate.js'; import {createCanvasContext2D} from '../../dom.js'; import {containsExtent, intersects} from '../../extent.js'; -import CanvasLayerRenderer from '../canvas/Layer.js'; +import CanvasLayerRenderer from './Layer.js'; import {create as createTransform, apply as applyTransform} from '../../transform.js'; /** diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index 467fb52b33..4299e4d39f 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -8,7 +8,7 @@ import TileState from '../../TileState.js'; import ViewHint from '../../ViewHint.js'; import {createCanvasContext2D} from '../../dom.js'; import {containsExtent, createEmpty, equals, getIntersection, isEmpty} from '../../extent.js'; -import IntermediateCanvasRenderer from '../canvas/IntermediateCanvas.js'; +import IntermediateCanvasRenderer from './IntermediateCanvas.js'; import {create as createTransform, compose as composeTransform} from '../../transform.js'; /** diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index 6af4ca10d4..5ecc53a56d 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -12,7 +12,7 @@ import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js'; import RenderEventType from '../../render/EventType.js'; import {labelCache, rotateAtOffset} from '../../render/canvas.js'; import CanvasReplayGroup from '../../render/canvas/ReplayGroup.js'; -import CanvasLayerRenderer from '../canvas/Layer.js'; +import CanvasLayerRenderer from './Layer.js'; import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js'; /** diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index f34afedfac..aa3c3ccf60 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -17,7 +17,7 @@ import ReplayType from '../../render/ReplayType.js'; import {labelCache, rotateAtOffset} from '../../render/canvas.js'; import CanvasReplayGroup, {replayDeclutter} from '../../render/canvas/ReplayGroup.js'; import {ORDER} from '../../render/replay.js'; -import CanvasTileLayerRenderer from '../canvas/TileLayer.js'; +import CanvasTileLayerRenderer from './TileLayer.js'; import {getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js'; import { create as createTransform, diff --git a/src/ol/renderer/webgl/ImageLayer.js b/src/ol/renderer/webgl/ImageLayer.js index 123a6c1872..cbd4378773 100644 --- a/src/ol/renderer/webgl/ImageLayer.js +++ b/src/ol/renderer/webgl/ImageLayer.js @@ -6,7 +6,7 @@ import LayerType from '../../LayerType.js'; import ViewHint from '../../ViewHint.js'; import {createCanvasContext2D} from '../../dom.js'; import {getIntersection, isEmpty} from '../../extent.js'; -import WebGLLayerRenderer from '../webgl/Layer.js'; +import WebGLLayerRenderer from './Layer.js'; import { create as createTransform, rotate as rotateTransform, diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js index 457d6fb79e..3d26262a55 100644 --- a/src/ol/renderer/webgl/Layer.js +++ b/src/ol/renderer/webgl/Layer.js @@ -6,8 +6,8 @@ import RenderEvent from '../../render/Event.js'; import RenderEventType from '../../render/EventType.js'; import WebGLImmediateRenderer from '../../render/webgl/Immediate.js'; import LayerRenderer from '../Layer.js'; -import {fragment, vertex} from '../webgl/defaultmapshader.js'; -import Locations from '../webgl/defaultmapshader/Locations.js'; +import {fragment, vertex} from './defaultmapshader.js'; +import Locations from './defaultmapshader/Locations.js'; import {create as createTransform} from '../../transform.js'; import {create, fromTransform} from '../../vec/mat4.js'; import {ARRAY_BUFFER, FRAMEBUFFER, FLOAT, TEXTURE_2D, diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index 9c72597c9f..d59e263a99 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -12,9 +12,9 @@ import TileSource from '../../source/Tile.js'; import {numberSafeCompareFunction} from '../../array.js'; import {createEmpty, intersects} from '../../extent.js'; import {roundUpToPowerOfTwo} from '../../math.js'; -import WebGLLayerRenderer from '../webgl/Layer.js'; -import {fragment, vertex} from '../webgl/tilelayershader.js'; -import Locations from '../webgl/tilelayershader/Locations.js'; +import WebGLLayerRenderer from './Layer.js'; +import {fragment, vertex} from './tilelayershader.js'; +import Locations from './tilelayershader/Locations.js'; import {toSize} from '../../size.js'; import { reset as resetTransform, diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js index 2f8c96b5a8..1edba3559f 100644 --- a/src/ol/renderer/webgl/VectorLayer.js +++ b/src/ol/renderer/webgl/VectorLayer.js @@ -7,7 +7,7 @@ import ViewHint from '../../ViewHint.js'; import {buffer, containsExtent, createEmpty} from '../../extent.js'; import WebGLReplayGroup from '../../render/webgl/ReplayGroup.js'; import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js'; -import WebGLLayerRenderer from '../webgl/Layer.js'; +import WebGLLayerRenderer from './Layer.js'; import {apply as applyTransform} from '../../transform.js';