#146: Unstatic

core/src/main/java/org/seamcat/Seamcat.java

@@ -130,7 +130,6 @@ public class Seamcat {
             new BuildersImpl(), new AntennaGainFactoryImpl(), new FunctionFactoryImpl(),
             new CoverageRadiusFactoryImpl(), new EventProcessingFactoryImpl(), new CorrelationModeFactoryImpl(),
             new PluginFactoryImpl(), new ResultFactoryImpl(), new SystemHandlerImpl());
-        ClimateDataImpl.loadITUdata();
 
         // default ui factory with limited capabilities
         Factory.initializeUI(new LoggingUIFactory());

core/src/main/java/org/seamcat/model/propagation/ClimateDataImpl.java

@@ -10,13 +10,13 @@ import org.seamcat.model.plugin.propagation.ClimateData;
 import org.seamcat.model.plugin.propagation.TerrainCoordinate;
 
 public class ClimateDataImpl implements ClimateData {
-    private static List<String> deltaNData;
-    private static List<String> n0Data;
+    private List<String> deltaNData;
+    private List<String> n0Data;
 
     /**
      * loads the data from ITU-R F452-16 additional file (deltaN and N0)
      */
-    public static void loadITUdata() {
+    public ClimateDataImpl() {
         // TODO get deltaN and N0 from ITU data and set to PMP
         deltaNData = new ArrayList<>();
         n0Data = new ArrayList<>();

core/src/test/java/org/seamcat/model/propagation/TerrainHelperTest.java

@@ -210,6 +210,11 @@ public class TerrainHelperTest extends DeterministicWorkspaceLoader {
         testUtil.assertDoubleEquals(IRSSB_EXPECTED, iRssB);
     }
 
+    @Test
+    public void testPMP452() throws Exception {
+        loadWorkspace("/Test_terrain_RadioMet__146.sws");
+    }
+
     // Test of results and PL with Terrain ISL Cellular & Generic -> VSL Generic systems
     // Uses PMPs ITU-r P.452-16, P.452-17, P.2001-4
     @Test