Skip to content

Update from IITC project #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnd0e wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update from IITC project #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
795b422
DEG_TO_RAD and RAD_TO_DEG removed from L.LatLng in 0.8-dev builds
jonatkins Mar 22, 2014
31974ee
Remove unreachable return statement, fixing #1043
michaeldever Oct 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/s2geometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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]);
Expand Down Expand Up @@ -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) {
Expand Down