From 795b4221702b921f902d4d67977d9137ca316a59 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Sat, 22 Mar 2014 01:04:00 +0000 Subject: [PATCH 1/2] DEG_TO_RAD and RAD_TO_DEG removed from L.LatLng in 0.8-dev builds --- src/s2geometry.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/s2geometry.js b/src/s2geometry.js index 68831fd..4f7976e 100644 --- a/src/s2geometry.js +++ b/src/s2geometry.js @@ -28,7 +28,7 @@ window.S2 = {}; var LatLngToXYZ = function(latLng) { - var d2r = L.LatLng.DEG_TO_RAD; + var d2r = Math.PI/180.0; var phi = latLng.lat*d2r; var theta = latLng.lng*d2r; @@ -39,7 +39,7 @@ var LatLngToXYZ = function(latLng) { }; var XYZToLatLng = function(xyz) { - var r2d = L.LatLng.RAD_TO_DEG; + var r2d = 180.0/Math.PI; var lat = Math.atan2(xyz[2], Math.sqrt(xyz[0]*xyz[0]+xyz[1]*xyz[1])); var lng = Math.atan2(xyz[1], xyz[0]); From 31974ee87ef6d1ee1e3210e6da78fac0817cabba Mon Sep 17 00:00:00 2001 From: Michael Dever Date: Mon, 5 Oct 2015 22:26:30 +0100 Subject: [PATCH 2/2] Remove unreachable return statement, fixing #1043 --- src/s2geometry.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/s2geometry.js b/src/s2geometry.js index 4f7976e..d6b6841 100644 --- a/src/s2geometry.js +++ b/src/s2geometry.js @@ -212,8 +212,6 @@ S2.S2Cell.FromLatLng = function(latLng,level) { var ij = STToIJ(st,level); return S2.S2Cell.FromFaceIJ (faceuv[0], ij, level); - - return result; }; S2.S2Cell.FromFaceIJ = function(face,ij,level) {