✨ wo #527: prepare release of first beta version

cismet · Nov 8, 2019 · ef52e81 · ef52e81
1 parent cb066b1
commit ef52e81
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/de/cismet/cids/custom/orbit/OrbitControlFeature.java b/src/main/java/de/cismet/cids/custom/orbit/OrbitControlFeature.java
@@ -102,8 +102,6 @@ public class OrbitControlFeature extends DefaultStyledFeature implements XStyled
 
     private static final int ARCSIZE = 200;
 
-    public static final String ORBIT_LAUNCHER_URI = "http://localhost:3000";
-
     //~ Instance fields --------------------------------------------------------
 
     ArrayList<PNode> children = new ArrayList<>();
@@ -116,6 +114,7 @@ public class OrbitControlFeature extends DefaultStyledFeature implements XStyled
     private CamState camState = new CamState();
 
     private String socketChannelId;
+    private String launcherUrl;
     private StacResult stacInfo;
     private Socket socket;
 
@@ -129,8 +128,12 @@ public class OrbitControlFeature extends DefaultStyledFeature implements XStyled
      * @param  connectionContext  DOCUMENT ME!
      * @param  stac               stacResult
      * @param  socket             DOCUMENT ME!
+     * @param  launcherUrl        DOCUMENT ME!
      */
-    public OrbitControlFeature(final ConnectionContext connectionContext, final StacResult stac, final Socket socket) {
+    public OrbitControlFeature(final ConnectionContext connectionContext,
+            final StacResult stac,
+            final Socket socket,
+            final String launcherUrl) {
         this.connectionContext = connectionContext;
         setEditable(true);
         setCanBeSelected(true);
@@ -140,6 +143,7 @@ public OrbitControlFeature(final ConnectionContext connectionContext, final Stac
 
         this.stacInfo = stac;
         this.socket = socket;
+        this.launcherUrl = launcherUrl;
         this.camState.setFov(100);
         this.camState.setTilt(0);
         this.camState.setPan(0);
@@ -376,7 +380,7 @@ public void updateCamStatePosition() {
      */
     public String getLaunchUrl() {
         updateCamStatePosition();
-        return ORBIT_LAUNCHER_URI + "/?cidsOrbitSTAC="
+        return launcherUrl + "/?cidsOrbitSTAC="
                     + stacInfo.getStac()
                     + "&initialx="
                     + camState.getX()

diff --git a/src/main/java/de/cismet/cids/custom/orbit/OrbitViewerToolbarComponentProvider.java b/src/main/java/de/cismet/cids/custom/orbit/OrbitViewerToolbarComponentProvider.java
@@ -257,7 +257,8 @@ public void run() {
                                     final OrbitControlFeature vcmf = new OrbitControlFeature(
                                             connectionContext,
                                             stacResult,
-                                            socket);
+                                            socket,
+                                            orbitSettings.getProperty("launcherUrl"));
 
                                     if (currentOrbitControlFeature != null) {
                                         CismapBroker.getInstance()