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

merge GeoJSON altitude pull with some tweaks #1822

Browse Source
This commit is contained in:
Vladimir Agafonkin 2013-11-06 23:17:14 +02:00
commit 5d6641360b
4 changed files with 123 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spec/suites/geo/LatLngSpec.js
View File

@ -15,6 +15,20 @@ describe('LatLng', function() {
var a = new L.LatLng(NaN, NaN);
}).to.throwError();
});
it ('does not set altitude if undefined', function () {
var a = new L.LatLng(25, 74);
expect(typeof a.alt).to.eql('undefined');
});
it ('sets altitude', function () {
var a = new L.LatLng(25, 74, 50);
expect(a.alt).to.eql(50);
var b = new L.LatLng(-25, -74, -50);
expect(b.alt).to.eql(-50);
});
});
describe('#equals', function() {

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

@ -5,7 +5,7 @@ describe("L.GeoJSON", function () {
properties: {},
geometry: {
type: 'Point',
coordinates: [20, 10]
coordinates: [20, 10, 5]
}
};
@ -24,47 +24,79 @@ describe("L.GeoJSON", function () {
});
describe("L.Marker#toGeoJSON", function () {
it("returns a Point object", function () {
it("returns a 2D Point object", function () {
var marker = new L.Marker([10, 20]);
expect(marker.toGeoJSON().geometry).to.eql({
type: 'Point',
coordinates: [20, 10]
});
});
it("returns a 3D Point object", function () {
var marker = new L.Marker([10, 20, 30]);
expect(marker.toGeoJSON().geometry).to.eql({
type: 'Point',
coordinates: [20, 10, 30]
});
});
});
describe("L.Circle#toGeoJSON", function () {
it("returns a Point object", function () {
it("returns a 2D Point object", function () {
var circle = new L.Circle([10, 20], 100);
expect(circle.toGeoJSON().geometry).to.eql({
type: 'Point',
coordinates: [20, 10]
});
});
it("returns a 3D Point object", function () {
var circle = new L.Circle([10, 20, 30], 100);
expect(circle.toGeoJSON().geometry).to.eql({
type: 'Point',
coordinates: [20, 10, 30]
});
});
});
describe("L.CircleMarker#toGeoJSON", function () {
it("returns a Point object", function () {
it("returns a 2D Point object", function () {
var marker = new L.CircleMarker([10, 20]);
expect(marker.toGeoJSON().geometry).to.eql({
type: 'Point',
coordinates: [20, 10]
});
});
it("returns a 3D Point object", function () {
var marker = new L.CircleMarker([10, 20, 30]);
expect(marker.toGeoJSON().geometry).to.eql({
type: 'Point',
coordinates: [20, 10, 30]
});
});
});
describe("L.Polyline#toGeoJSON", function () {
it("returns a LineString object", function () {
it("returns a 2D LineString object", function () {
var polyline = new L.Polyline([[10, 20], [2, 5]]);
expect(polyline.toGeoJSON().geometry).to.eql({
type: 'LineString',
coordinates: [[20, 10], [5, 2]]
});
});
it("returns a 3D LineString object", function () {
var polyline = new L.Polyline([[10, 20, 30], [2, 5, 10]]);
expect(polyline.toGeoJSON().geometry).to.eql({
type: 'LineString',
coordinates: [[20, 10, 30], [5, 2, 10]]
});
});
});
describe("L.MultiPolyline#toGeoJSON", function () {
it("returns a MultiLineString object", function () {
it("returns a 2D MultiLineString object", function () {
var multiPolyline = new L.MultiPolyline([[[10, 20], [2, 5]], [[1, 2], [3, 4]]]);
expect(multiPolyline.toGeoJSON().geometry).to.eql({
type: 'MultiLineString',
@ -74,10 +106,21 @@ describe("L.MultiPolyline#toGeoJSON", function () {
]
});
});
it("returns a 3D MultiLineString object", function () {
var multiPolyline = new L.MultiPolyline([[[10, 20, 30], [2, 5, 10]], [[1, 2, 3], [4, 5, 6]]]);
expect(multiPolyline.toGeoJSON().geometry).to.eql({
type: 'MultiLineString',
coordinates: [
[[20, 10, 30], [5, 2, 10]],
[[2, 1, 3], [5, 4, 6]]
]
});
});
});
describe("L.Polygon#toGeoJSON", function () {
it("returns a Polygon object (no holes)", function () {
it("returns a 2D Polygon object (no holes)", function () {
var polygon = new L.Polygon([[1, 2], [3, 4], [5, 6]]);
expect(polygon.toGeoJSON().geometry).to.eql({
type: 'Polygon',
@ -85,7 +128,15 @@ describe("L.Polygon#toGeoJSON", function () {
});
});
it("returns a Polygon object (with holes)", function () {
it("returns a 3D Polygon object (no holes)", function () {
var polygon = new L.Polygon([[1, 2, 3], [4, 5, 6], [7, 8, 9]]);
expect(polygon.toGeoJSON().geometry).to.eql({
type: 'Polygon',
coordinates: [[[2, 1, 3], [5, 4, 6], [8, 7, 9], [2, 1, 3]]]
});
});
it("returns a 2D Polygon object (with holes)", function () {
var polygon = new L.Polygon([[[1, 2], [3, 4], [5, 6]], [[7, 8], [9, 10], [11, 12]]]);
expect(polygon.toGeoJSON().geometry).to.eql({
type: 'Polygon',
@ -95,10 +146,21 @@ describe("L.Polygon#toGeoJSON", function () {
]
});
});
it("returns a 3D Polygon object (with holes)", function () {
var polygon = new L.Polygon([[[1, 2, 3], [4, 5, 6], [7, 8, 9]], [[10, 11, 12], [13, 14, 15], [16, 17, 18]]]);
expect(polygon.toGeoJSON().geometry).to.eql({
type: 'Polygon',
coordinates: [
[[2, 1, 3], [5, 4, 6], [8, 7, 9], [2, 1, 3]],
[[11, 10, 12], [14, 13, 15], [17, 16, 18], [11, 10, 12]]
]
});
});
});
describe("L.MultiPolygon#toGeoJSON", function () {
it("returns a MultiPolygon object", function () {
it("returns a 2D MultiPolygon object", function () {
var multiPolygon = new L.MultiPolygon([[[1, 2], [3, 4], [5, 6]]]);
expect(multiPolygon.toGeoJSON().geometry).to.eql({
type: 'MultiPolygon',
@ -107,10 +169,20 @@ describe("L.MultiPolygon#toGeoJSON", function () {
]
});
});
it("returns a 3D MultiPolygon object", function () {
var multiPolygon = new L.MultiPolygon([[[1, 2, 3], [4, 5, 6], [7, 8, 9]]]);
expect(multiPolygon.toGeoJSON().geometry).to.eql({
type: 'MultiPolygon',
coordinates: [
[[[2, 1, 3], [5, 4, 6], [8, 7, 9], [2, 1, 3]]]
]
});
});
});
describe("L.LayerGroup#toGeoJSON", function () {
it("returns a FeatureCollection object", function () {
it("returns a 2D FeatureCollection object", function () {
var marker = new L.Marker([10, 20]),
polyline = new L.Polyline([[10, 20], [2, 5]]),
layerGroup = new L.LayerGroup([marker, polyline]);
@ -120,6 +192,16 @@ describe("L.LayerGroup#toGeoJSON", function () {
});
});
it("returns a 3D FeatureCollection object", function () {
var marker = new L.Marker([10, 20, 30]),
polyline = new L.Polyline([[10, 20, 30], [2, 5, 10]]),
layerGroup = new L.LayerGroup([marker, polyline]);
expect(layerGroup.toGeoJSON()).to.eql({
type: 'FeatureCollection',
features: [marker.toGeoJSON(), polyline.toGeoJSON()]
});
});
it("ensures that every member is a Feature", function () {
var tileLayer = new L.TileLayer(),
layerGroup = new L.LayerGroup([tileLayer]);

14
src/geo/LatLng.js
View File

@ -2,16 +2,20 @@
* L.LatLng represents a geographical point with latitude and longitude coordinates.
*/
L.LatLng = function (rawLat, rawLng) { // (Number, Number)
var lat = parseFloat(rawLat),
lng = parseFloat(rawLng);
L.LatLng = function (lat, lng, alt) { // (Number, Number, Number)
var lat = parseFloat(lat),
lng = parseFloat(lng);
if (isNaN(lat) || isNaN(lng)) {
throw new Error('Invalid LatLng object: (' + rawLat + ', ' + rawLng + ')');
throw new Error('Invalid LatLng object: (' + lat + ', ' + lng + ')');
}
this.lat = lat;
this.lng = lng;
if (alt !== undefined) {
this.alt = parseFloat(alt);
}
};
L.extend(L.LatLng, {
@ -76,7 +80,7 @@ L.latLng = function (a, b) { // (LatLng) or ([Number, Number]) or (Number, Numbe
}
if (L.Util.isArray(a)) {
if (typeof a[0] === 'number' || typeof a[0] === 'string') {
return new L.LatLng(a[0], a[1]);
return new L.LatLng(a[0], a[1], a[2]);
} else {
return null;
}

11
src/layer/GeoJSON.js
View File

@ -129,7 +129,7 @@ L.extend(L.GeoJSON, {
},
coordsToLatLng: function (coords) { // (Array[, Boolean]) -> LatLng
return new L.LatLng(coords[1], coords[0]);
return new L.LatLng(coords[1], coords[0], coords[2]);
},
coordsToLatLngs: function (coords, levelsDeep, coordsToLatLng) { // (Array[, Number, Function]) -> Array
@ -147,8 +147,13 @@ L.extend(L.GeoJSON, {
return latlngs;
},
latLngToCoords: function (latLng) {
return [latLng.lng, latLng.lat];
latLngToCoords: function (latlng) {
var coords = [latlng.lng, latlng.lat];
if (latlng.alt === undefined) {
coords.push(latlng.alt);
}
return coords;
},
latLngsToCoords: function (latLngs) {