SAMP

examples/al-gw.html

@@ -8,7 +8,7 @@
     import A from '../src/js/A.js';
     let aladin;
     A.init.then(() => {
-        aladin = A.aladin('#aladin-lite-div', {projection: "TAN", target: '15 16 57.636 -60 55 7.49', showCooGrid: true, fov: 90, fullScreen: true});
+        aladin = A.aladin('#aladin-lite-div', {projection: "TAN", target: '15 16 57.636 -60 55 7.49', samp: true, showCooGrid: true, fov: 90, fullScreen: true});
 
         var moc_0_99 = A.MOCFromURL("./gw/gw_0.9.fits",{ name: "GW 90%", color: "#ff0000", opacity: 0.7, lineWidth: 5, perimeter: true});
         var moc_0_95 = A.MOCFromURL("./gw/gw_0.6.fits",{ name: "GW 60%", color: "#00ff00", opacity: 0.8, lineWidth: 5, perimeter: true});

src/js/A.js

@@ -165,8 +165,6 @@ A.MOCFromJSON = function (jsonMOC, options) {
 };
 
 
-// TODO: try first without proxy, and then with, if param useProxy not set
-// API
 A.catalogFromURL = function (url, options, successCallback, errorCallback, useProxy) {
     var catalog = A.catalog(options);
 

src/js/Aladin.js

@@ -51,6 +51,7 @@ import { ALEvent } from "./events/ALEvent.js";
 import { Color } from './Color.js';
 import { ImageFITS } from "./ImageFITS.js";
 import { DefaultActionsForContextMenu } from "./DefaultActionsForContextMenu.js";
+import { SAMPConnector } from "./vo/samp.js";
 import A from "./A.js";
 
 import $ from 'jquery';
@@ -471,6 +472,13 @@ export let Aladin = (function () {
             this.contextMenu = new ContextMenu(this);
             this.contextMenu.attachTo(this.view.catalogCanvas, DefaultActionsForContextMenu.getDefaultActions(this));
         }
+
+        if (options.samp) {
+            this.samp = new SAMPConnector(this);
+            ALEvent.SAMP_AVAILABILITY.listenedBy(this.aladinDiv, function (e) {
+                console.log('is hub running samp', e.detail.isHubRunning)
+            });
+        }
     };
 
     /**** CONSTANTS ****/
@@ -504,6 +512,7 @@ export let Aladin = (function () {
         reticleColor: "rgb(178, 50, 178)",
         reticleSize: 22,
         log: true,
+        samp: true,
         allowFullZoomout: false,
         realFullscreen: false,
         showAllskyRing: false,

src/js/View.js

@@ -370,7 +370,6 @@ export let View = (function () {
         }
 
         this.computeNorder();
-        this.redraw();
     };
 
     var pixelateCanvasContext = function (ctx, pixelateFlag) {

src/js/events/ALEvent.js

@@ -55,6 +55,8 @@ export class ALEvent {
 
   static GRAPHIC_OVERLAY_LAYER_CHANGED  = new ALEvent("AL:GraphicOverlayLayer.changed");
 
+  static SAMP_AVAILABILITY  = new ALEvent("AL:samp.started");
+
   constructor(name) {
     this.name = name;
   }