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

proper EPSG:4326 with 2x1 root, fixes #1207

Browse Source
This commit is contained in:
Vladimir Agafonkin 2013-11-28 00:59:39 +02:00
parent ce79ea1e81
commit 00166b9c4f
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debug/map/wms-marble.html
View File

@ -20,7 +20,7 @@
var bluemarble = new L.TileLayer.WMS("http://maps.opengeo.org/geowebcache/service/wms", { var bluemarble = new L.TileLayer.WMS("http://maps.opengeo.org/geowebcache/service/wms", {
layers: 'bluemarble', layers: 'bluemarble',
attribution: "Data © NASA Blue Marble, image service by OpenGeo", attribution: "Data © NASA Blue Marble, image service by OpenGeo",
minZoom: 2, minZoom: 0,
maxZoom: 5 maxZoom: 5
}); });

4
spec/suites/geo/CRSSpec.js
View File

@ -70,9 +70,9 @@ describe("CRS.EPSG4326", function () {
crsSize; crsSize;
for (i = 0; i <= 22; i++) { for (i = 0; i <= 22; i++) {
crsSize = crs.getSize(i); crsSize = crs.getSize(i);
expect(crsSize.x).equal(worldSize); expect(crsSize.x).equal(worldSize * 2);
// Lat bounds are half as high (-90/+90 compared to -180/+180) // Lat bounds are half as high (-90/+90 compared to -180/+180)
expect(crsSize.y).equal(worldSize / 2); expect(crsSize.y).equal(worldSize);
worldSize *= 2; worldSize *= 2;
} }
}); });

4
src/geo/crs/CRS.EPSG3395.js
View File

@ -10,5 +10,7 @@ L.CRS.EPSG3395 = L.extend({}, L.CRS, {
scale = 0.5 / (Math.PI * r); scale = 0.5 / (Math.PI * r);
return new L.Transformation(scale, 0.5, -scale, 0.5); return new L.Transformation(scale, 0.5, -scale, 0.5);
}()) }()),
wrapLng: true
}); });

4
src/geo/crs/CRS.EPSG4326.js
View File

@ -6,5 +6,7 @@ L.CRS.EPSG4326 = L.extend({}, L.CRS, {
code: 'EPSG:4326', code: 'EPSG:4326',
projection: L.Projection.LonLat, projection: L.Projection.LonLat,
transformation: new L.Transformation(1 / 360, 0.5, -1 / 360, 0.5) transformation: new L.Transformation(1 / 180, 1, -1 / 180, 0.5),
wrapLng: true
}); });