From 9ca1407fa03da2a19a01d2adebc8c2097462f455 Mon Sep 17 00:00:00 2001 From: cybice Date: Fri, 29 Jan 2016 22:44:34 +0300 Subject: [PATCH] fix lat conversion --- src/utils/utils.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/utils/utils.js b/src/utils/utils.js index 4345dd6..b7efa95 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -6,8 +6,8 @@ function latLng2World({lat, lng}) { const x = (lng / 360 + 0.5); let y = (0.5 - 0.25 * Math.log((1 + sin) / (1 - sin)) / Math.PI); - y = y < -1 // eslint-disable-line - ? -1 + y = y < 0 // eslint-disable-line + ? 0 : y > 1 ? 1 : y; @@ -17,6 +17,8 @@ function latLng2World({lat, lng}) { function world2LatLng({x, y}) { const n = Math.PI - 2 * Math.PI * y; + // TODO test that this is faster + // 360 * Math.atan(Math.exp((180 - y * 360) * Math.PI / 180)) / Math.PI - 90; return { lat: (180 / Math.PI * Math.atan(0.5 * (Math.exp(n) - Math.exp(-n)))), lng: x * 360 - 180,