iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mercator]: Code review changes.

This commit is contained in:
Grigorios Dimopoulos 2018-10-29 12:45:14 +02:00
parent 0187c74f79
commit 3f187e0deb
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-java/src/main/java/com/baeldung/mercator/EllipticalMercator.java → algorithms/src/main/java/com/baeldung/algorithms/mercator/EllipticalMercator.java
View File

@ -1,4 +1,4 @@
package com.baeldung.mercator; package com.baeldung.algorithms.mercator;
class EllipticalMercator extends Mercator { class EllipticalMercator extends Mercator {
@Override @Override

2
core-java/src/main/java/com/baeldung/mercator/Mercator.java → algorithms/src/main/java/com/baeldung/algorithms/mercator/Mercator.java
View File

@ -1,4 +1,4 @@
package com.baeldung.mercator; package com.baeldung.algorithms.mercator;
abstract class Mercator { abstract class Mercator {
final static double RADIUS_MAJOR = 6378137.0; final static double RADIUS_MAJOR = 6378137.0;

6
core-java/src/main/java/com/baeldung/mercator/SphericalMercator.java → algorithms/src/main/java/com/baeldung/algorithms/mercator/SphericalMercator.java
View File

@ -1,14 +1,14 @@
package com.baeldung.mercator; package com.baeldung.algorithms.mercator;
public class SphericalMercator extends Mercator { public class SphericalMercator extends Mercator {
@Override @Override
double yAxisProjection(double input) { double xAxisProjection(double input) {
return Math.toRadians(input) * RADIUS_MAJOR; return Math.toRadians(input) * RADIUS_MAJOR;
} }
@Override @Override
double xAxisProjection(double input) { double yAxisProjection(double input) {
return Math.log(Math.tan(Math.PI / 4 + Math.toRadians(input) / 2)) * RADIUS_MAJOR; return Math.log(Math.tan(Math.PI / 4 + Math.toRadians(input) / 2)) * RADIUS_MAJOR;
} }
} }

2
core-java/src/test/java/com/baeldung/mercator/EllipticalMercatorUnitTest.java → algorithms/src/test/java/com/baeldung/algorithms/mercator/EllipticalMercatorUnitTest.java
View File

@ -1,4 +1,4 @@
package com.baeldung.mercator; package com.baeldung.algorithms.mercator;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

6
core-java/src/test/java/com/baeldung/mercator/SphericalMercatorUnitTest.java → algorithms/src/test/java/com/baeldung/algorithms/mercator/SphericalMercatorUnitTest.java
View File

@ -1,4 +1,4 @@
package com.baeldung.mercator; package com.baeldung.algorithms.mercator;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -13,13 +13,13 @@ public class SphericalMercatorUnitTest {
public void giventThatTheInputIs22_whenXAxisProjectionIsCalled_thenTheResultIsTheCorrectOne() { public void giventThatTheInputIs22_whenXAxisProjectionIsCalled_thenTheResultIsTheCorrectOne() {
Mercator mercator = new SphericalMercator(); Mercator mercator = new SphericalMercator();
double result = mercator.xAxisProjection(22); double result = mercator.xAxisProjection(22);
assertEquals(result, 2511525.234845713); assertEquals(result, 2449028.7974520186);
} }
@Test @Test
public void giventThatTheInputIs44_whenYAxisProjectionIsCalled_thenTheResultIsTheCorrectOne() { public void giventThatTheInputIs44_whenYAxisProjectionIsCalled_thenTheResultIsTheCorrectOne() {
Mercator mercator = new SphericalMercator(); Mercator mercator = new SphericalMercator();
double result = mercator.yAxisProjection(44); double result = mercator.yAxisProjection(44);
assertEquals(result, 4898057.594904037); assertEquals(result, 5465442.183322753);
} }
} }