Adapt for new ROB server

VERSION

@@ -1 +1 @@
-4.5.6
+4.6.0

changelog.md

@@ -1,8 +1,9 @@
 
 # Revision history for JHelioviewer
 
-## JHelioviewer 4.5.6 (pending)
+## JHelioviewer 4.6 (2024-02-07)
 
+- New ROB server
 
 ## JHelioviewer 4.5.5 (2023-11-20)
 

release/install4j/JHelioviewer-build.install4j

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="10.0.6" transformSequenceNumber="10">
+<install4j version="10.0.7" transformSequenceNumber="10">
   <directoryPresets config="../bin/JHelioviewer.jar" />
-  <application name="JHelioviewer" applicationId="6448-7333-6138-9110" mediaDir="./builds" compression="9" lzmaCompression="true" shortName="JHelioviewer" publisher="ESA JHelioviewer Team" publisherWeb="https://www.jhelioviewer.org" version="4.5.6" allPathsRelative="true" macVolumeId="7ed177551bd348bc" javaMinVersion="17" javaMaxVersion="21" jdkMode="jdk">
+  <application name="JHelioviewer" applicationId="6448-7333-6138-9110" mediaDir="./builds" compression="9" lzmaCompression="true" shortName="JHelioviewer" publisher="ESA JHelioviewer Team" publisherWeb="https://www.jhelioviewer.org" version="4.6.0" allPathsRelative="true" macVolumeId="7ed177551bd348bc" javaMinVersion="17" javaMaxVersion="21" jdkMode="jdk">
     <codeSigning macEnabled="true" macPkcs12File="~/Certificates.p12" macNotarize="true" appleId="bogdan@nicula.net" />
     <jreBundles jdkProviderId="Adoptium" release="21/latest">
       <modules>

src/org/helioviewer/jhv/JHVGlobals.java

@@ -18,8 +18,8 @@
 public class JHVGlobals {
 
     public static final String programName = "ESA JHelioviewer";
-    public static final String downloadURL = "http://swhv.oma.be/download/";
-    public static final String documentationURL = "http://swhv.oma.be/user_manual/";
+    public static final String downloadURL = "https://swhv.oma.be/download/";
+    public static final String documentationURL = "https://swhv.oma.be/user_manual/";
     public static final String bugURL = "https://github.com/Helioviewer-Project/JHelioviewer-SWHV/issues";
     public static final String emailAddress = "swhv@oma.be";
     public static String version = "2.-1.-1";

src/org/helioviewer/jhv/astronomy/PositionLoad.java

@@ -28,7 +28,7 @@ private record LoadPosition(SpaceObject observer, SpaceObject target, Frame fram
                                 long end) implements Callable<PositionResponse> {
 
         private static final int MAX_POINTS = 50000;
-        private static final UriTemplate template = new UriTemplate("http://swhv.oma.be/position");
+        private static final UriTemplate template = new UriTemplate("https://swhv.oma.be/position");
 
         @Override
         public PositionResponse call() throws Exception {

src/org/helioviewer/jhv/gui/components/ImageSelectorPanel.java

@@ -52,7 +52,7 @@ public void setupSources(DataSourcesParser parser) {
     @Nullable
     public String getAvailabilityURL() {
         DataSourcesTree.SourceItem item = sourcesTree.getSelectedItem();
-        return item == null ? null : DataSources.getServerSetting(item.server, "availability.images") + "#IID" + item.sourceId;
+        return item == null ? null : DataSources.getServerSetting(item.server, "availability.images") + "ID=" + item.sourceId;
     }
 
     public void setupLayer(APIRequest req) {

src/org/helioviewer/jhv/io/DataSources.java

@@ -17,37 +17,18 @@ public interface Listener {
         void setupSources(DataSourcesParser parser);
     }
 
-    private static final String enabledDatasetsV2 = "[MLSO,TRACE,Hinode,Yohkoh,STEREO_A,STEREO_B,PROBA2,SOLO,GOES-R,IRIS,GONG]";
+    private static final String enabledDatasetsV2 = "[MLSO,TRACE,Hinode,Yohkoh,STEREO_A,STEREO_B,PROBA2,SOLO,GOES-R,IRIS,GONG,ROB,Kanzelhoehe]";
 
     private static final ImmutableMap<String, Map<String, String>> serverSettings = new ImmutableMap.Builder<String, Map<String, String>>().
-/*
-        put("Local", new ImmutableMap.Builder<String, String>().
-        put("API.getDataSources", "http://hv.local/api/docroot/index.php/?action=getDataSources&verbose=true&enable=[SOLO]").
-        put("API.getJP2Image", "http://hv.local/api/docroot/index.php/?action=getJP2Image&").
-        put("API.getJPX", "http://hv.local/api/docroot/index.php/?action=getJPX&").
-        put("label", "Local").
-        put("schema", "/data/sources_v1.0.json").
-        put("availability.images", "http://swhv.oma.be/availability/images/availability/availability.html").
-        build()).
-*/
         put("ROB", new ImmutableMap.Builder<String, String>().
-        put("API.getDataSources", "http://swhv.oma.be/hv/api/?action=getDataSources&verbose=true&enable=[STEREO_A,STEREO_B,PROBA2]").
-        put("API.getJP2Image", "http://swhv.oma.be/hv/api/index.php?action=getJP2Image&").
-        put("API.getJPX", "http://swhv.oma.be/hv/api/index.php?action=getJPX&").
-        put("label", "Royal Observatory of Belgium").
-        put("schema", "/data/sources_v1.0.json").
-        put("availability.images", "http://swhv.oma.be/availability/images/availability/availability.html").
-        build()).
-/*
-        put("ROB Test", new ImmutableMap.Builder<String, String>().
-        put("API.getDataSources", "http://swhv2.oma.be:8083/index.php?action=getDataSources&verbose=true&enable=" + enabledDatasetsV2).
-        put("API.getJP2Image", "http://swhv2.oma.be:8083/index.php?action=getJP2Image&").
-        put("API.getJPX", "http://swhv2.oma.be:8083/index.php?action=getJPX&").
+        put("API.getDataSources", "https://api.swhv.oma.be/hv_docpage/v2/getDataSources/?verbose=true&enable=" + enabledDatasetsV2).
+        put("API.getJP2Image", "https://api.swhv.oma.be/hv_docpage/v2/getJP2Image/?").
+        put("API.getJPX", "https://api.swhv.oma.be/hv_docpage/v2/getJPX/?").
         put("label", "Royal Observatory of Belgium").
         put("schema", "/data/sources_v1.0.json").
-        put("availability.images", "http://swhv2.oma.be/availability/images/availability/availability.html").
+        put("availability.images", "https://swhv.oma.be/availability/?").
         build()).
-*/
+/*    */
         put("IAS", new ImmutableMap.Builder<String, String>().
         put("API.getDataSources", "https://helioviewer-api.ias.u-psud.fr/v2/getDataSources/?verbose=true&enable=" + enabledDatasetsV2).
         put("API.getJP2Image", "https://helioviewer-api.ias.u-psud.fr/v2/getJP2Image/?").

src/org/helioviewer/jhv/io/SampClient.java

@@ -98,7 +98,7 @@ private SampClient(ClientProfile _profile) {
         Map<String, String> meta = new HashMap<>();
         meta.put("samp.name", "JHelioviewer");
         meta.put("samp.description.text", JHVGlobals.userAgent);
-        meta.put("samp.icon.url", "http://swhv.oma.be/user_manual/hvImage_160x160.png");
+        meta.put("samp.icon.url", "https://swhv.oma.be/user_manual/hvImage_160x160.png");
         meta.put("samp.documentation.url", JHVGlobals.documentationURL);
         meta.put("author.mail", JHVGlobals.emailAddress);
         meta.put("author.name", "ESA JHelioviewer Team");

src/org/helioviewer/jhv/plugins/pfss/PfssSettings.java

@@ -7,7 +7,7 @@ class PfssSettings {
     static final int MAX_DETAIL = 8;
     static final double MAX_RADIUS = 2.5;
 
-    static final String BASE_URL = "http://swhv.oma.be/magtest/pfss/";
-    static final String AVAILABILITY_URL = "http://swhv.oma.be/availability/pfss/availability/availability.html";
+    static final String BASE_URL = "https://swhv.oma.be/pfss/";
+    static final String AVAILABILITY_URL = "https://swhv.oma.be/availability/?ID=555";
 
 }

src/org/helioviewer/jhv/timelines/radio/RadioOptionsPanel.java

@@ -33,7 +33,7 @@ class RadioOptionsPanel extends JPanel {
 
         JButton availabilityButton = new JButton("Available data");
         availabilityButton.addActionListener(e -> JHVGlobals.openURL(DataSources.getServerSetting("ROB", "availability.images") +
-                "#IID" + APIRequest.CallistoID));
+                "ID=" + APIRequest.CallistoID));
         c.anchor = GridBagConstraints.LINE_END;
         c.gridx = 1;
         c.gridy = 0;