diff --git a/core-java/src/main/java/com/baeldung/mercator/EllipticalMercator.java b/algorithms/src/main/java/com/baeldung/algorithms/mercator/EllipticalMercator.java similarity index 95% rename from core-java/src/main/java/com/baeldung/mercator/EllipticalMercator.java rename to algorithms/src/main/java/com/baeldung/algorithms/mercator/EllipticalMercator.java index bb9ebb0e58..8c3e4c554f 100644 --- a/core-java/src/main/java/com/baeldung/mercator/EllipticalMercator.java +++ b/algorithms/src/main/java/com/baeldung/algorithms/mercator/EllipticalMercator.java @@ -1,4 +1,4 @@ -package com.baeldung.mercator; +package com.baeldung.algorithms.mercator; class EllipticalMercator extends Mercator { @Override diff --git a/core-java/src/main/java/com/baeldung/mercator/Mercator.java b/algorithms/src/main/java/com/baeldung/algorithms/mercator/Mercator.java similarity index 84% rename from core-java/src/main/java/com/baeldung/mercator/Mercator.java rename to algorithms/src/main/java/com/baeldung/algorithms/mercator/Mercator.java index 3f50884f6b..b289b1839d 100644 --- a/core-java/src/main/java/com/baeldung/mercator/Mercator.java +++ b/algorithms/src/main/java/com/baeldung/algorithms/mercator/Mercator.java @@ -1,4 +1,4 @@ -package com.baeldung.mercator; +package com.baeldung.algorithms.mercator; abstract class Mercator { final static double RADIUS_MAJOR = 6378137.0; diff --git a/core-java/src/main/java/com/baeldung/mercator/SphericalMercator.java b/algorithms/src/main/java/com/baeldung/algorithms/mercator/SphericalMercator.java similarity index 88% rename from core-java/src/main/java/com/baeldung/mercator/SphericalMercator.java rename to algorithms/src/main/java/com/baeldung/algorithms/mercator/SphericalMercator.java index 6cc405b3b0..1be976d82e 100644 --- a/core-java/src/main/java/com/baeldung/mercator/SphericalMercator.java +++ b/algorithms/src/main/java/com/baeldung/algorithms/mercator/SphericalMercator.java @@ -1,14 +1,14 @@ -package com.baeldung.mercator; +package com.baeldung.algorithms.mercator; public class SphericalMercator extends Mercator { @Override - double yAxisProjection(double input) { + double xAxisProjection(double input) { return Math.toRadians(input) * RADIUS_MAJOR; } @Override - double xAxisProjection(double input) { + double yAxisProjection(double input) { return Math.log(Math.tan(Math.PI / 4 + Math.toRadians(input) / 2)) * RADIUS_MAJOR; } } diff --git a/core-java/src/test/java/com/baeldung/mercator/EllipticalMercatorUnitTest.java b/algorithms/src/test/java/com/baeldung/algorithms/mercator/EllipticalMercatorUnitTest.java similarity index 94% rename from core-java/src/test/java/com/baeldung/mercator/EllipticalMercatorUnitTest.java rename to algorithms/src/test/java/com/baeldung/algorithms/mercator/EllipticalMercatorUnitTest.java index 0088cc451c..13618e80a7 100644 --- a/core-java/src/test/java/com/baeldung/mercator/EllipticalMercatorUnitTest.java +++ b/algorithms/src/test/java/com/baeldung/algorithms/mercator/EllipticalMercatorUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.mercator; +package com.baeldung.algorithms.mercator; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core-java/src/test/java/com/baeldung/mercator/SphericalMercatorUnitTest.java b/algorithms/src/test/java/com/baeldung/algorithms/mercator/SphericalMercatorUnitTest.java similarity index 82% rename from core-java/src/test/java/com/baeldung/mercator/SphericalMercatorUnitTest.java rename to algorithms/src/test/java/com/baeldung/algorithms/mercator/SphericalMercatorUnitTest.java index 2e5ebe53cb..f1152441b8 100644 --- a/core-java/src/test/java/com/baeldung/mercator/SphericalMercatorUnitTest.java +++ b/algorithms/src/test/java/com/baeldung/algorithms/mercator/SphericalMercatorUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.mercator; +package com.baeldung.algorithms.mercator; import org.junit.Test; import org.junit.runner.RunWith; @@ -13,13 +13,13 @@ public class SphericalMercatorUnitTest { public void giventThatTheInputIs22_whenXAxisProjectionIsCalled_thenTheResultIsTheCorrectOne() { Mercator mercator = new SphericalMercator(); double result = mercator.xAxisProjection(22); - assertEquals(result, 2511525.234845713); + assertEquals(result, 2449028.7974520186); } @Test public void giventThatTheInputIs44_whenYAxisProjectionIsCalled_thenTheResultIsTheCorrectOne() { Mercator mercator = new SphericalMercator(); double result = mercator.yAxisProjection(44); - assertEquals(result, 4898057.594904037); + assertEquals(result, 5465442.183322753); } }