phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion

Browse Source
This commit is contained in:
Jon Atkins 2014-01-28 02:08:26 +00:00
commit 9cd526771c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/leaflet.filelayer.js vendored
View File

@ -44,11 +44,11 @@ var FileLoader = L.Class.extend({
if (typeof content == 'string') {
content = JSON.parse(content);
}
return L.geoJson(content, {
return L.geoJson(content, L.Util.extend({}, this.options.layerOptions, {
style: function (feature) {
return feature.properties && feature.properties.style;
}
}).addTo(this._map);
})).addTo(this._map);
},
_convertToGeoJSON: function (content, format) {
@ -169,4 +169,4 @@ L.Control.FileLayerLoad = L.Control.extend({
L.Control.fileLayerLoad = function (options) {
return new L.Control.FileLayerLoad(options);
};
};