VladPolskiy/leaflet
1
0
Fork 0
mirror of https://github.com/Leaflet/Leaflet.git synced 2025-08-16 16:45:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add FeatureCollection to geometryToLayer (#8163)

Browse Source
This commit is contained in:
Florian Bischof
2022-04-20 18:12:34 +02:00
committed by GitHub
parent 118ca44350
commit 8a2e9c074b
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spec/suites/layer/GeoJSONSpec.js
View File

@ -571,6 +571,19 @@ describe("L.GeoJSON functions", function () {
]
};
var featureCollection = {
type: "FeatureCollection",
features: [
{
type: "Feature",
geometry: {
type: "Point",
coordinates: [0, 0]
}
},
]
};
function customPointToLayer(geojsonPoint, latLng) {
return L.circle(latLng, {
radius: geojsonPoint.properties.radius
@ -588,7 +601,8 @@ describe("L.GeoJSON functions", function () {
[multiPoint, L.FeatureGroup],
[multiLine, L.Polyline],
[multiPolygon, L.Polygon],
[geometryCollection, L.FeatureGroup]
[geometryCollection, L.FeatureGroup],
[featureCollection, L.FeatureGroup]
].forEach(function (item) {
var geometry = item[0], expectedType = item[1];

16
src/layer/GeoJSON.js
View File

@ -206,14 +206,24 @@ export function geometryToLayer(geojson, options) {
case 'GeometryCollection':
for (i = 0, len = geometry.geometries.length; i < len; i++) {
var layer = geometryToLayer({
var geoLayer = geometryToLayer({
geometry: geometry.geometries[i],
type: 'Feature',
properties: geojson.properties
}, options);
if (layer) {
layers.push(layer);
if (geoLayer) {
layers.push(geoLayer);
}
}
return new FeatureGroup(layers);
case 'FeatureCollection':
for (i = 0, len = geometry.features.length; i < len; i++) {
var featureLayer = geometryToLayer(geometry.features[i], options);
if (featureLayer) {
layers.push(featureLayer);
}
}
return new FeatureGroup(layers);