cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add GeoJSON rountripping of GeometryCollection and MultiPoint, close #1956

Browse Source
This commit is contained in:
Vladimir Agafonkin 2013-08-28 12:43:04 +03:00
parent 40ef71dc4c
commit 5e30c51f85
2 changed files with 97 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,6 +144,51 @@ describe("L.LayerGroup#toGeoJSON", function () {
});
});
it('roundtrips GeometryCollection features', function () {
var json = {
"type": "FeatureCollection",
"features": [{
"type": "Feature",
"geometry": {
"type": "GeometryCollection",
"geometries": [{
"type": "LineString",
"coordinates": [[-122.4425587930444, 37.80666418607323], [-122.4428379594768, 37.80663578323093]]
}, {
"type": "LineString",
"coordinates": [
[-122.4425509770566, 37.80662588061205],
[-122.4428340530617, 37.8065999493009]
]
}]
},
"properties": {
"name": "SF Marina Harbor Master"
}
}]
};
expect(L.geoJson(json).toGeoJSON()).to.eql(json);
});
it('roundtrips MiltiPoint features', function () {
var json = {
"type": "FeatureCollection",
"features": [{
"type": "Feature",
"geometry": {
"type": "MultiPoint",
"coordinates": [[-122.4425587930444, 37.80666418607323], [-122.4428379594768, 37.80663578323093]]
},
"properties": {
"name": "Test MultiPoints"
}
}]
};
expect(L.geoJson(json).toGeoJSON()).to.eql(json);
});
it("omits layers which do not implement toGeoJSON", function () {
var tileLayer = new L.TileLayer(),
layerGroup = new L.LayerGroup([tileLayer]);

92
src/layer/GeoJSON.js
View File

@ -77,7 +77,7 @@ L.extend(L.GeoJSON, {
var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson,
coords = geometry.coordinates,
layers = [],
latlng, latlngs, i, len, layer;
latlng, latlngs, i, len;
coordsToLatLng = coordsToLatLng || this.coordsToLatLng;
@ -89,8 +89,7 @@ L.extend(L.GeoJSON, {
case 'MultiPoint':
for (i = 0, len = coords.length; i < len; i++) {
latlng = coordsToLatLng(coords[i]);
layer = pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng);
layers.push(layer);
layers.push(pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng));
}
return new L.FeatureGroup(layers);
@ -116,13 +115,11 @@ L.extend(L.GeoJSON, {
case 'GeometryCollection':
for (i = 0, len = geometry.geometries.length; i < len; i++) {
layer = this.geometryToLayer({
layers.push(this.geometryToLayer({
geometry: geometry.geometries[i],
type: 'Feature',
properties: geojson.properties
}, pointToLayer, coordsToLatLng);
layers.push(layer);
}, pointToLayer, coordsToLatLng));
}
return new L.FeatureGroup(layers);
@ -226,43 +223,58 @@ L.Polygon.include({
});
(function () {
function includeMulti(Klass, type) {
Klass.include({
toGeoJSON: function () {
var coords = [];
function multiToGeoJSON(type) {
return function () {
var coords = [];
this.eachLayer(function (layer) {
coords.push(layer.toGeoJSON().geometry.coordinates);
});
this.eachLayer(function (layer) {
coords.push(layer.toGeoJSON().geometry.coordinates);
});
return L.GeoJSON.getFeature(this, {
type: type,
coordinates: coords
});
}
});
}
includeMulti(L.MultiPolyline, 'MultiLineString');
includeMulti(L.MultiPolygon, 'MultiPolygon');
}());
L.LayerGroup.include({
toGeoJSON: function () {
var features = [];
this.eachLayer(function (layer) {
if (layer.toGeoJSON) {
features.push(L.GeoJSON.asFeature(layer.toGeoJSON()));
}
});
return {
type: 'FeatureCollection',
features: features
return L.GeoJSON.getFeature(this, {
type: type,
coordinates: coords
});
};
}
});
L.MultiPolyline.include({toGeoJSON: multiToGeoJSON('MultiLineString')});
L.MultiPolygon.include({toGeoJSON: multiToGeoJSON('MultiPolygon')});
L.LayerGroup.include({
toGeoJSON: function () {
var geometry = this.feature && this.feature.geometry,
jsons = [],
json;
if (geometry && geometry.type === 'MultiPoint') {
return multiToGeoJSON('MultiPoint').call(this);
}
var isGeometryCollection = geometry && geometry.type === 'GeometryCollection';
this.eachLayer(function (layer) {
if (layer.toGeoJSON) {
json = layer.toGeoJSON();
jsons.push(isGeometryCollection ? json.geometry : L.GeoJSON.asFeature(json));
}
});
if (isGeometryCollection) {
return L.GeoJSON.getFeature(this, {
geometries: jsons,
type: 'GeometryCollection'
});
}
return {
type: 'FeatureCollection',
features: jsons
};
}
});
}());
L.geoJson = function (geojson, options) {
return new L.GeoJSON(geojson, options);