Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-02-22 15:38:05 +01:00
commit cf4155aff8
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
OsmAnd-java/src/net/osmand/util/MapUtils.java
View file

@ -447,17 +447,30 @@ public class MapUtils {
private static double[] coefficientsY = new double[1024]; private static double[] coefficientsY = new double[1024];
private static boolean initializeYArray = false;
public static double convert31YToMeters(int y1, int y2, int x) { public static double convert31YToMeters(int y1, int y2, int x) {
int ind = x >> (31 - 10); int power = 10;
if(coefficientsY[ind] == 0) { int pw = 1 << power;
double md = MapUtils.measuredDist31(x, y1, x, y2); if (!initializeYArray) {
if(md < 10) { coefficientsY[0] = 0;
return md; for (int i = 0; i < pw - 1; i++) {
coefficientsY[i + 1] = coefficientsY[i]
+ measuredDist31(0, i << (31 - power), 0, ((i + 1) << (31 - power)));
} }
coefficientsY[ind] = md / Math.abs(y1 - y2); initializeYArray = true;
} }
// translate into meters int div = 1 << (31 - power);
return (y1 - y2) * coefficientsY[ind]; int div1 = y1 / div;
int mod1 = y1 % div;
int div2 = y2 / div;
int mod2 = y2 % div;
double h1 = coefficientsY[div1] + mod1 / (double)div *
(coefficientsY[div1 + 1] - coefficientsY[div1]);
double h2 = coefficientsY[div2] + mod2 / (double)div *
(coefficientsY[div2 + 1] - coefficientsY[div2]);
double res = h1 - h2;
return res;
} }
private static double[] coefficientsX = new double[1024]; private static double[] coefficientsX = new double[1024];