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

fixed polygon and multipolygon from geojson

Browse Source
This commit is contained in:
javi 2013-03-14 13:22:40 +01:00
parent 81221ae4cd
commit 8283346aa1
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/layer/GeoJSON.js
View File

@ -97,6 +97,7 @@ L.extend(L.GeoJSON, {
case 'Polygon': case 'Polygon':
latlngs = this.coordsToLatLngs(coords, 1); latlngs = this.coordsToLatLngs(coords, 1);
latlngs = this.removeLastPoint(latlngs, 0);
return new L.Polygon(latlngs); return new L.Polygon(latlngs);
case 'MultiLineString': case 'MultiLineString':
@ -105,6 +106,9 @@ L.extend(L.GeoJSON, {
case 'MultiPolygon': case 'MultiPolygon':
latlngs = this.coordsToLatLngs(coords, 2); latlngs = this.coordsToLatLngs(coords, 2);
// geojson closes the polygons added the frist
// coordinate at the end
latlngs = this.removeLastPoint(latlngs, 1);
return new L.MultiPolygon(latlngs); return new L.MultiPolygon(latlngs);
case 'GeometryCollection': case 'GeometryCollection':
@ -123,6 +127,21 @@ L.extend(L.GeoJSON, {
} }
}, },
// removes the last point from each array. It allows to remove the
// duplicated point GeoJSON uses to close Polygons
removeLastPoint: function (coords, levelsDeep) {
var latlng,
latlngs = [],
i, len;
for (i = 0, len = coords.length; i < len; i++) {
latlng = levelsDeep ?
this.removeLastPoint(coords[i], levelsDeep - 1) :
coords[i].slice(0, coords[i].length - 1);
latlngs.push(latlng);
}
return latlngs;
},
coordsToLatLng: function (coords, reverse) { // (Array, Boolean) -> LatLng coordsToLatLng: function (coords, reverse) { // (Array, Boolean) -> LatLng
var lat = parseFloat(coords[reverse ? 0 : 1]), var lat = parseFloat(coords[reverse ? 0 : 1]),
lng = parseFloat(coords[reverse ? 1 : 0]); lng = parseFloat(coords[reverse ? 1 : 0]);