From fe5239d117bbe64c085e8362abcaf335038ad4bb Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Thu, 9 Apr 2020 14:48:41 +0200 Subject: [PATCH] NOAA declination service back up and running; switched back to NOAA as default implementation --- .../sailing/declination/test/NOAADeclinationImportTest.java | 2 -- .../sailing/declination/test/NOAASimpleDeclinationTest.java | 2 -- .../src/com/sap/sailing/declination/DeclinationService.java | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationImportTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationImportTest.java index 87ff1cff1ee..4f790216326 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationImportTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAADeclinationImportTest.java @@ -1,11 +1,9 @@ package com.sap.sailing.declination.test; import org.junit.Before; -import org.junit.Ignore; import com.sap.sailing.declination.impl.NOAAImporterForTesting; -@Ignore("Currently (2020-04-09) the NOAA website seems down") public class NOAADeclinationImportTest extends DeclinationImportTest { @Before public void setUp() { diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAASimpleDeclinationTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAASimpleDeclinationTest.java index 6883630b8be..d712850ffbd 100644 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAASimpleDeclinationTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/NOAASimpleDeclinationTest.java @@ -1,11 +1,9 @@ package com.sap.sailing.declination.test; import org.junit.Before; -import org.junit.Ignore; import com.sap.sailing.declination.impl.NOAAImporter; -@Ignore("Currently (2020-04-09) the NOAA website seems down") public class NOAASimpleDeclinationTest extends SimpleDeclinationTest { @Before public void setUp() { diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java index 6308fb2b258..90e3705b999 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java @@ -3,9 +3,9 @@ package com.sap.sailing.declination; import java.io.IOException; import java.text.ParseException; -import com.sap.sailing.declination.impl.BGSImporter; import com.sap.sailing.declination.impl.DeclinationImporter; import com.sap.sailing.declination.impl.DeclinationServiceImpl; +import com.sap.sailing.declination.impl.NOAAImporter; import com.sap.sailing.domain.common.Mile; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.CentralAngleDistance; @@ -17,7 +17,7 @@ public interface DeclinationService { * A default implementation with a spatial default precision of 60 {@link Mile#METERS_PER_GEOGRAPHICAL_MILE * nautical miles} which equals the length of an arc with one degree on a meridian. */ - DeclinationService INSTANCE = new DeclinationServiceImpl(new CentralAngleDistance(1./180.*Math.PI), new BGSImporter()); + DeclinationService INSTANCE = new DeclinationServiceImpl(new CentralAngleDistance(1./180.*Math.PI), new NOAAImporter()); /** * Obtains declination information with the default precision of this declination service in time and space