ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Named exports from ol/renderer/vector

Browse Source
This commit is contained in:
Tim Schaub
2018-02-09 10:03:00 -07:00
parent 9c1db1f904
commit ce12dc1253
7 changed files with 150 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ol/renderer/canvas/VectorLayer.js
View File

@@ -14,7 +14,7 @@ import _ol_render_canvas_ from '../../render/canvas.js';
import CanvasReplayGroup from '../../render/canvas/ReplayGroup.js';
import RendererType from '../Type.js';
import CanvasLayerRenderer from '../canvas/Layer.js';
import _ol_renderer_vector_ from '../vector.js';
import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
/**
* @constructor
@@ -321,7 +321,7 @@ CanvasVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerSta
let vectorLayerRenderOrder = vectorLayer.getRenderOrder();
if (vectorLayerRenderOrder === undefined) {
vectorLayerRenderOrder = _ol_renderer_vector_.defaultOrder;
vectorLayerRenderOrder = defaultRenderOrder;
}
const extent = buffer(frameStateExtent,
@@ -355,14 +355,14 @@ CanvasVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerSta
this.dirty_ = false;
const replayGroup = new CanvasReplayGroup(
_ol_renderer_vector_.getTolerance(resolution, pixelRatio), extent, resolution,
getRenderTolerance(resolution, pixelRatio), extent, resolution,
pixelRatio, vectorSource.getOverlaps(), this.declutterTree_, vectorLayer.getRenderBuffer());
vectorSource.loadFeatures(extent, resolution, projection);
/**
* @param {ol.Feature} feature Feature.
* @this {ol.renderer.canvas.VectorLayer}
*/
const renderFeature = function(feature) {
const render = function(feature) {
let styles;
let styleFunction = feature.getStyleFunction();
if (styleFunction) {
@@ -391,10 +391,10 @@ CanvasVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerSta
}, this);
features.sort(vectorLayerRenderOrder);
for (let i = 0, ii = features.length; i < ii; ++i) {
renderFeature(features[i]);
render(features[i]);
}
} else {
vectorSource.forEachFeatureInExtent(extent, renderFeature, this);
vectorSource.forEachFeatureInExtent(extent, render, this);
}
replayGroup.finish();
@@ -425,15 +425,15 @@ CanvasVectorLayerRenderer.prototype.renderFeature = function(feature, resolution
let loading = false;
if (Array.isArray(styles)) {
for (let i = 0, ii = styles.length; i < ii; ++i) {
loading = _ol_renderer_vector_.renderFeature(
loading = renderFeature(
replayGroup, feature, styles[i],
_ol_renderer_vector_.getSquaredTolerance(resolution, pixelRatio),
getSquaredRenderTolerance(resolution, pixelRatio),
this.handleStyleImageChange_, this) || loading;
}
} else {
loading = _ol_renderer_vector_.renderFeature(
loading = renderFeature(
replayGroup, feature, styles,
_ol_renderer_vector_.getSquaredTolerance(resolution, pixelRatio),
getSquaredRenderTolerance(resolution, pixelRatio),
this.handleStyleImageChange_, this);
}
return loading;

12
src/ol/renderer/canvas/VectorTileLayer.js
View File

@@ -18,7 +18,7 @@ import CanvasReplayGroup from '../../render/canvas/ReplayGroup.js';
import _ol_render_replay_ from '../../render/replay.js';
import RendererType from '../Type.js';
import CanvasTileLayerRenderer from '../canvas/TileLayer.js';
import _ol_renderer_vector_ from '../vector.js';
import {getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
import _ol_transform_ from '../../transform.js';
/**
@@ -192,14 +192,14 @@ CanvasVectorTileLayerRenderer.prototype.createReplayGroup_ = function(
replayState.dirty = false;
const replayGroup = new CanvasReplayGroup(0, sharedExtent, resolution,
pixelRatio, source.getOverlaps(), this.declutterTree_, layer.getRenderBuffer());
const squaredTolerance = _ol_renderer_vector_.getSquaredTolerance(
const squaredTolerance = getSquaredRenderTolerance(
resolution, pixelRatio);
/**
* @param {ol.Feature|ol.render.Feature} feature Feature.
* @this {ol.renderer.canvas.VectorTileLayer}
*/
const renderFeature = function(feature) {
const render = function(feature) {
let styles;
let styleFunction = feature.getStyleFunction();
if (styleFunction) {
@@ -234,7 +234,7 @@ CanvasVectorTileLayerRenderer.prototype.createReplayGroup_ = function(
feature.getGeometry().transform(tileProjection, projection);
}
if (!bufferedExtent || intersects(bufferedExtent, feature.getGeometry().getExtent())) {
renderFeature.call(this, feature);
render.call(this, feature);
}
}
replayGroup.finish();
@@ -466,12 +466,12 @@ CanvasVectorTileLayerRenderer.prototype.renderFeature = function(feature, square
let loading = false;
if (Array.isArray(styles)) {
for (let i = 0, ii = styles.length; i < ii; ++i) {
loading = _ol_renderer_vector_.renderFeature(
loading = renderFeature(
replayGroup, feature, styles[i], squaredTolerance,
this.handleStyleImageChange_, this) || loading;
}
} else {
loading = _ol_renderer_vector_.renderFeature(
loading = renderFeature(
replayGroup, feature, styles, squaredTolerance,
this.handleStyleImageChange_, this);
}

121
src/ol/renderer/vector.js
View File

@@ -5,7 +5,6 @@ import {getUid} from '../index.js';
import ImageState from '../ImageState.js';
import GeometryType from '../geom/GeometryType.js';
import ReplayType from '../render/ReplayType.js';
const _ol_renderer_vector_ = {};
/**
@@ -14,14 +13,32 @@ const _ol_renderer_vector_ = {};
const SIMPLIFY_TOLERANCE = 0.5;
/**
* @const
* @type {Object.<ol.geom.GeometryType,
* function(ol.render.ReplayGroup, ol.geom.Geometry,
* ol.style.Style, Object)>}
*/
const GEOMETRY_RENDERERS = {
'Point': renderPointGeometry,
'LineString': renderLineStringGeometry,
'Polygon': renderPolygonGeometry,
'MultiPoint': renderMultiPointGeometry,
'MultiLineString': renderMultiLineStringGeometry,
'MultiPolygon': renderMultiPolygonGeometry,
'GeometryCollection': renderGeometryCollectionGeometry,
'Circle': renderCircleGeometry
};
/**
* @param {ol.Feature|ol.render.Feature} feature1 Feature 1.
* @param {ol.Feature|ol.render.Feature} feature2 Feature 2.
* @return {number} Order.
*/
_ol_renderer_vector_.defaultOrder = function(feature1, feature2) {
export function defaultOrder(feature1, feature2) {
return getUid(feature1) - getUid(feature2);
};
}
/**
@@ -29,10 +46,10 @@ _ol_renderer_vector_.defaultOrder = function(feature1, feature2) {
* @param {number} pixelRatio Pixel ratio.
* @return {number} Squared pixel tolerance.
*/
_ol_renderer_vector_.getSquaredTolerance = function(resolution, pixelRatio) {
const tolerance = _ol_renderer_vector_.getTolerance(resolution, pixelRatio);
export function getSquaredTolerance(resolution, pixelRatio) {
const tolerance = getTolerance(resolution, pixelRatio);
return tolerance * tolerance;
};
}
/**
@@ -40,9 +57,9 @@ _ol_renderer_vector_.getSquaredTolerance = function(resolution, pixelRatio) {
* @param {number} pixelRatio Pixel ratio.
* @return {number} Pixel tolerance.
*/
_ol_renderer_vector_.getTolerance = function(resolution, pixelRatio) {
export function getTolerance(resolution, pixelRatio) {
return SIMPLIFY_TOLERANCE * resolution / pixelRatio;
};
}
/**
@@ -50,9 +67,8 @@ _ol_renderer_vector_.getTolerance = function(resolution, pixelRatio) {
* @param {ol.geom.Circle} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {ol.Feature} feature Feature.
* @private
*/
_ol_renderer_vector_.renderCircleGeometry_ = function(replayGroup, geometry, style, feature) {
function renderCircleGeometry(replayGroup, geometry, style, feature) {
const fillStyle = style.getFill();
const strokeStyle = style.getStroke();
if (fillStyle || strokeStyle) {
@@ -66,7 +82,7 @@ _ol_renderer_vector_.renderCircleGeometry_ = function(replayGroup, geometry, sty
textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
textReplay.drawText(geometry, feature);
}
};
}
/**
@@ -79,8 +95,7 @@ _ol_renderer_vector_.renderCircleGeometry_ = function(replayGroup, geometry, sty
* @return {boolean} `true` if style is loading.
* @template T
*/
_ol_renderer_vector_.renderFeature = function(
replayGroup, feature, style, squaredTolerance, listener, thisArg) {
export function renderFeature(replayGroup, feature, style, squaredTolerance, listener, thisArg) {
let loading = false;
const imageStyle = style.getImage();
if (imageStyle) {
@@ -96,11 +111,10 @@ _ol_renderer_vector_.renderFeature = function(
loading = true;
}
}
_ol_renderer_vector_.renderFeature_(replayGroup, feature, style,
squaredTolerance);
renderFeatureInternal(replayGroup, feature, style, squaredTolerance);
return loading;
};
}
/**
@@ -108,10 +122,8 @@ _ol_renderer_vector_.renderFeature = function(
* @param {ol.Feature|ol.render.Feature} feature Feature.
* @param {ol.style.Style} style Style.
* @param {number} squaredTolerance Squared tolerance.
* @private
*/
_ol_renderer_vector_.renderFeature_ = function(
replayGroup, feature, style, squaredTolerance) {
function renderFeatureInternal(replayGroup, feature, style, squaredTolerance) {
const geometry = style.getGeometryFunction()(feature);
if (!geometry) {
return;
@@ -119,13 +131,12 @@ _ol_renderer_vector_.renderFeature_ = function(
const simplifiedGeometry = geometry.getSimplifiedGeometry(squaredTolerance);
const renderer = style.getRenderer();
if (renderer) {
_ol_renderer_vector_.renderGeometry_(replayGroup, simplifiedGeometry, style, feature);
renderGeometry(replayGroup, simplifiedGeometry, style, feature);
} else {
const geometryRenderer =
_ol_renderer_vector_.GEOMETRY_RENDERERS_[simplifiedGeometry.getType()];
const geometryRenderer = GEOMETRY_RENDERERS[simplifiedGeometry.getType()];
geometryRenderer(replayGroup, simplifiedGeometry, style, feature);
}
};
}
/**
@@ -133,19 +144,18 @@ _ol_renderer_vector_.renderFeature_ = function(
* @param {ol.geom.Geometry} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {ol.Feature|ol.render.Feature} feature Feature.
* @private
*/
_ol_renderer_vector_.renderGeometry_ = function(replayGroup, geometry, style, feature) {
function renderGeometry(replayGroup, geometry, style, feature) {
if (geometry.getType() == GeometryType.GEOMETRY_COLLECTION) {
const geometries = /** @type {ol.geom.GeometryCollection} */ (geometry).getGeometries();
for (let i = 0, ii = geometries.length; i < ii; ++i) {
_ol_renderer_vector_.renderGeometry_(replayGroup, geometries[i], style, feature);
renderGeometry(replayGroup, geometries[i], style, feature);
}
return;
}
const replay = replayGroup.getReplay(style.getZIndex(), ReplayType.DEFAULT);
replay.drawCustom(/** @type {ol.geom.SimpleGeometry} */ (geometry), feature, style.getRenderer());
};
}
/**
@@ -153,17 +163,16 @@ _ol_renderer_vector_.renderGeometry_ = function(replayGroup, geometry, style, fe
* @param {ol.geom.GeometryCollection} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {ol.Feature} feature Feature.
* @private
*/
_ol_renderer_vector_.renderGeometryCollectionGeometry_ = function(replayGroup, geometry, style, feature) {
function renderGeometryCollectionGeometry(replayGroup, geometry, style, feature) {
const geometries = geometry.getGeometriesArray();
let i, ii;
for (i = 0, ii = geometries.length; i < ii; ++i) {
const geometryRenderer =
_ol_renderer_vector_.GEOMETRY_RENDERERS_[geometries[i].getType()];
GEOMETRY_RENDERERS[geometries[i].getType()];
geometryRenderer(replayGroup, geometries[i], style, feature);
}
};
}
/**
@@ -171,9 +180,8 @@ _ol_renderer_vector_.renderGeometryCollectionGeometry_ = function(replayGroup, g
* @param {ol.geom.LineString|ol.render.Feature} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {ol.Feature|ol.render.Feature} feature Feature.
* @private
*/
_ol_renderer_vector_.renderLineStringGeometry_ = function(replayGroup, geometry, style, feature) {
function renderLineStringGeometry(replayGroup, geometry, style, feature) {
const strokeStyle = style.getStroke();
if (strokeStyle) {
const lineStringReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.LINE_STRING);
@@ -186,7 +194,7 @@ _ol_renderer_vector_.renderLineStringGeometry_ = function(replayGroup, geometry,
textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
textReplay.drawText(geometry, feature);
}
};
}
/**
@@ -194,9 +202,8 @@ _ol_renderer_vector_.renderLineStringGeometry_ = function(replayGroup, geometry,
* @param {ol.geom.MultiLineString|ol.render.Feature} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {ol.Feature|ol.render.Feature} feature Feature.
* @private
*/
_ol_renderer_vector_.renderMultiLineStringGeometry_ = function(replayGroup, geometry, style, feature) {
function renderMultiLineStringGeometry(replayGroup, geometry, style, feature) {
const strokeStyle = style.getStroke();
if (strokeStyle) {
const lineStringReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.LINE_STRING);
@@ -209,7 +216,7 @@ _ol_renderer_vector_.renderMultiLineStringGeometry_ = function(replayGroup, geom
textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
textReplay.drawText(geometry, feature);
}
};
}
/**
@@ -217,9 +224,8 @@ _ol_renderer_vector_.renderMultiLineStringGeometry_ = function(replayGroup, geom
* @param {ol.geom.MultiPolygon} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {ol.Feature} feature Feature.
* @private
*/
_ol_renderer_vector_.renderMultiPolygonGeometry_ = function(replayGroup, geometry, style, feature) {
function renderMultiPolygonGeometry(replayGroup, geometry, style, feature) {
const fillStyle = style.getFill();
const strokeStyle = style.getStroke();
if (strokeStyle || fillStyle) {
@@ -233,7 +239,7 @@ _ol_renderer_vector_.renderMultiPolygonGeometry_ = function(replayGroup, geometr
textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
textReplay.drawText(geometry, feature);
}
};
}
/**
@@ -241,9 +247,8 @@ _ol_renderer_vector_.renderMultiPolygonGeometry_ = function(replayGroup, geometr
* @param {ol.geom.Point|ol.render.Feature} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {ol.Feature|ol.render.Feature} feature Feature.
* @private
*/
_ol_renderer_vector_.renderPointGeometry_ = function(replayGroup, geometry, style, feature) {
function renderPointGeometry(replayGroup, geometry, style, feature) {
const imageStyle = style.getImage();
if (imageStyle) {
if (imageStyle.getImageState() != ImageState.LOADED) {
@@ -259,7 +264,7 @@ _ol_renderer_vector_.renderPointGeometry_ = function(replayGroup, geometry, styl
textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(!!imageStyle));
textReplay.drawText(geometry, feature);
}
};
}
/**
@@ -267,9 +272,8 @@ _ol_renderer_vector_.renderPointGeometry_ = function(replayGroup, geometry, styl
* @param {ol.geom.MultiPoint|ol.render.Feature} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {ol.Feature|ol.render.Feature} feature Feature.
* @private
*/
_ol_renderer_vector_.renderMultiPointGeometry_ = function(replayGroup, geometry, style, feature) {
function renderMultiPointGeometry(replayGroup, geometry, style, feature) {
const imageStyle = style.getImage();
if (imageStyle) {
if (imageStyle.getImageState() != ImageState.LOADED) {
@@ -285,7 +289,7 @@ _ol_renderer_vector_.renderMultiPointGeometry_ = function(replayGroup, geometry,
textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(!!imageStyle));
textReplay.drawText(geometry, feature);
}
};
}
/**
@@ -293,9 +297,8 @@ _ol_renderer_vector_.renderMultiPointGeometry_ = function(replayGroup, geometry,
* @param {ol.geom.Polygon|ol.render.Feature} geometry Geometry.
* @param {ol.style.Style} style Style.
* @param {ol.Feature|ol.render.Feature} feature Feature.
* @private
*/
_ol_renderer_vector_.renderPolygonGeometry_ = function(replayGroup, geometry, style, feature) {
function renderPolygonGeometry(replayGroup, geometry, style, feature) {
const fillStyle = style.getFill();
const strokeStyle = style.getStroke();
if (fillStyle || strokeStyle) {
@@ -309,24 +312,4 @@ _ol_renderer_vector_.renderPolygonGeometry_ = function(replayGroup, geometry, st
textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
textReplay.drawText(geometry, feature);
}
};
/**
* @const
* @private
* @type {Object.<ol.geom.GeometryType,
* function(ol.render.ReplayGroup, ol.geom.Geometry,
* ol.style.Style, Object)>}
*/
_ol_renderer_vector_.GEOMETRY_RENDERERS_ = {
'Point': _ol_renderer_vector_.renderPointGeometry_,
'LineString': _ol_renderer_vector_.renderLineStringGeometry_,
'Polygon': _ol_renderer_vector_.renderPolygonGeometry_,
'MultiPoint': _ol_renderer_vector_.renderMultiPointGeometry_,
'MultiLineString': _ol_renderer_vector_.renderMultiLineStringGeometry_,
'MultiPolygon': _ol_renderer_vector_.renderMultiPolygonGeometry_,
'GeometryCollection': _ol_renderer_vector_.renderGeometryCollectionGeometry_,
'Circle': _ol_renderer_vector_.renderCircleGeometry_
};
export default _ol_renderer_vector_;
}

20
src/ol/renderer/webgl/VectorLayer.js
View File

@@ -7,7 +7,7 @@ import ViewHint from '../../ViewHint.js';
import {buffer, containsExtent, createEmpty} from '../../extent.js';
import WebGLReplayGroup from '../../render/webgl/ReplayGroup.js';
import RendererType from '../Type.js';
import _ol_renderer_vector_ from '../vector.js';
import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js';
import WebGLLayerRenderer from '../webgl/Layer.js';
import _ol_transform_ from '../../transform.js';
@@ -235,7 +235,7 @@ WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
let vectorLayerRenderOrder = vectorLayer.getRenderOrder();
if (vectorLayerRenderOrder === undefined) {
vectorLayerRenderOrder = _ol_renderer_vector_.defaultOrder;
vectorLayerRenderOrder = defaultRenderOrder;
}
const extent = buffer(frameStateExtent,
@@ -257,14 +257,14 @@ WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
this.dirty_ = false;
const replayGroup = new WebGLReplayGroup(
_ol_renderer_vector_.getTolerance(resolution, pixelRatio),
getRenderTolerance(resolution, pixelRatio),
extent, vectorLayer.getRenderBuffer());
vectorSource.loadFeatures(extent, resolution, projection);
/**
* @param {ol.Feature} feature Feature.
* @this {ol.renderer.webgl.VectorLayer}
*/
const renderFeature = function(feature) {
const render = function(feature) {
let styles;
let styleFunction = feature.getStyleFunction();
if (styleFunction) {
@@ -292,9 +292,9 @@ WebGLVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerStat
features.push(feature);
}, this);
features.sort(vectorLayerRenderOrder);
features.forEach(renderFeature.bind(this));
features.forEach(render.bind(this));
} else {
vectorSource.forEachFeatureInExtent(extent, renderFeature, this);
vectorSource.forEachFeatureInExtent(extent, render, this);
}
replayGroup.finish(context);
@@ -324,15 +324,15 @@ WebGLVectorLayerRenderer.prototype.renderFeature = function(feature, resolution,
let loading = false;
if (Array.isArray(styles)) {
for (let i = styles.length - 1, ii = 0; i >= ii; --i) {
loading = _ol_renderer_vector_.renderFeature(
loading = renderFeature(
replayGroup, feature, styles[i],
_ol_renderer_vector_.getSquaredTolerance(resolution, pixelRatio),
getSquaredRenderTolerance(resolution, pixelRatio),
this.handleStyleImageChange_, this) || loading;
}
} else {
loading = _ol_renderer_vector_.renderFeature(
loading = renderFeature(
replayGroup, feature, styles,
_ol_renderer_vector_.getSquaredTolerance(resolution, pixelRatio),
getSquaredRenderTolerance(resolution, pixelRatio),
this.handleStyleImageChange_, this) || loading;
}
return loading;