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

Giving vector layers the style they deserve

Browse Source 
Now vector layers can have a style. ol.Style instances have an
apply method to get the symbolizer literals for a feature. If the
layer does not have a style defined, there is also a static
applyDefaultStyle function on ol.Style to get the default
symbolizer literals for a feature. The vector layer also got a
groupFeaturesBySymbolizerLiteral method, which returns an array
with features grouped by symbolizer, as needed by the canvas
renderer.
This commit is contained in:
ahocevar
2013-03-02 17:38:01 +01:00
parent fcd5804d2d
commit f4a4522eb4
8 changed files with 162 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
View File

@@ -14,10 +14,6 @@ goog.require('ol.geom.GeometryType');
goog.require('ol.layer.Vector');
goog.require('ol.renderer.canvas.Layer');
goog.require('ol.renderer.canvas.Renderer');
goog.require('ol.style.LineLiteral');
goog.require('ol.style.PolygonLiteral');
goog.require('ol.style.ShapeLiteral');
goog.require('ol.style.ShapeType');
goog.require('ol.tilegrid.TileGrid');
@@ -115,31 +111,6 @@ ol.renderer.canvas.VectorLayer = function(mapRenderer, layer) {
this.dirty_ = false;
// TODO: implement layer.setStyle(style) where style is a set of rules
// and a rule has a filter and array of symbolizers
var symbolizers = {};
symbolizers[ol.geom.GeometryType.POINT] = new ol.style.ShapeLiteral({
type: ol.style.ShapeType.CIRCLE,
size: 10,
fillStyle: '#ffcc99',
strokeStyle: '#ff9933',
strokeWidth: 2,
opacity: 0.75
});
symbolizers[ol.geom.GeometryType.LINESTRING] = new ol.style.LineLiteral({
strokeStyle: '#ff9933',
strokeWidth: 2,
opacity: 1
});
symbolizers[ol.geom.GeometryType.POLYGON] = new ol.style.PolygonLiteral({
fillStyle: '#ffcc99',
strokeStyle: '#ff9933',
strokeWidth: 2,
opacity: 0.5
});
// TODO: remove this
this.symbolizers_ = symbolizers;
/**
* @private
* @type {boolean}
@@ -195,7 +166,8 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
var view2DState = frameState.view2DState,
resolution = view2DState.resolution,
extent = frameState.extent,
source = this.getVectorLayer().getVectorSource(),
layer = this.getVectorLayer(),
source = layer.getVectorSource(),
tileGrid = this.tileGrid_;
if (goog.isNull(tileGrid)) {
@@ -295,7 +267,8 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
// render features by geometry type
var filters = this.geometryFilters_,
numFilters = filters.length,
i, geomFilter, extentFilter, type, features, symbolizer;
i, geomFilter, extentFilter, type, features,
groups, group, j, numGroups;
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
for (y = tileRange.minY; y <= tileRange.maxY; ++y) {
tileCoord = new ol.TileCoord(z, x, y);
@@ -312,10 +285,13 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
features = source.getFeatures(new ol.filter.Logical(
[geomFilter, extentFilter], ol.filter.LogicalOperator.AND));
if (features.length) {
// TODO: layer.getSymbolizerLiterals(features) or similar
symbolizer = this.symbolizers_[type];
sketchCanvasRenderer.renderFeaturesByGeometryType(
type, features, symbolizer);
groups = layer.groupFeaturesBySymbolizerLiteral(features);
numGroups = groups.length;
for (j = 0; j < numGroups; ++j) {
group = groups[j];
sketchCanvasRenderer.renderFeaturesByGeometryType(type,
group[0], group[1]);
}
}
}
}