Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow functions in array returned by style function #129

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Allow functions in array returned by style function #129

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90bfc82
Pass feature type into styleOptions
tomchadwin Nov 20, 2017
71c7318
Document passing geometry type into style function
tomchadwin Nov 21, 2017
a0af158
Allow array return value of style function to contain functions, not …
tomchadwin Nov 23, 2017
d693744
Tab indents
tomchadwin Nov 23, 2017
f1f3f64
Change terminology (type > geometry dimension"
tomchadwin Nov 23, 2017
02d454c
Use camelCase for geometryDimension
tomchadwin Nov 24, 2017
3803b1f
Revert pass in feat.type
tomchadwin Nov 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/Leaflet.VectorGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,12 @@ L.VectorGrid = L.GridLayer.extend({
var featureLayer = this._createLayer(feat, pxPerExtent);

for (var j = 0; j < styleOptions.length; j++) {
var style = L.extend({}, L.Path.prototype.options, styleOptions[j]);
if (styleOptions[j] instanceof Function) {
var styleOption = styleOptions[j](feat.properties, coords.z, feat.type);
} else {
var styleOption = styleOptions[j];
}
var style = L.extend({}, L.Path.prototype.options, styleOption);
featureLayer.render(renderer, style);
renderer._addPath(featureLayer);
}
Expand Down Expand Up @@ -196,7 +201,10 @@ L.VectorGrid = L.GridLayer.extend({
}

for (var j = 0; j < styleOptions.length; j++) {
var style = L.extend({}, L.Path.prototype.options, styleOptions[j]);
var styleOption = (styleOptions[j] instanceof Function) ?
styleOptions[j](feat.properties, renderer.getCoord().z, feat.type) :
styleOptions[j];
var style = L.extend({}, L.Path.prototype.options, styleOption);
feat.updateStyle(renderer, style);
}
},
Expand Down