From 883b61b356f8970a8b91640727c0ed79da421761 Mon Sep 17 00:00:00 2001 From: jarmoruuth Date: Tue, 13 Aug 2024 22:40:12 +0300 Subject: [PATCH] Changes to meridian crossing in graph display - Meridian crossing is marked separately with green dots. The displayed length is also shorter. - Info display includes a Google maps link to show the telescope location. --- AstroMosaic.html | 119 ++++++++++++++++++++++--------------------- AstroMosaicEngine.js | 25 +++++++-- 2 files changed, 82 insertions(+), 62 deletions(-) diff --git a/AstroMosaic.html b/AstroMosaic.html index 6a9534d..e1707c9 100644 --- a/AstroMosaic.html +++ b/AstroMosaic.html @@ -396,11 +396,13 @@

Astro Mosaic Telescope Planner

var astro_mosaic_link = 'Powered by Astro Mosaic'; -var version_number = "1.79"; -var startup_image = "M79"; -var startup_info_text = "v" + version_number + " Switching to Aladin Lite v3 API"; +var version_number = "1.80"; +var startup_image = "M80"; +var startup_info_text = "v" + version_number + " Changes to meridian crossing display"; var version_text = + "Version 1.80\n"+ + "- Changes to meridian crossing display\n" + "Version 1.79\n"+ "- Switching to Aladin Lite v3 API\n" + "- Added Unistellar Equinox and Dwarflab II under Other services\n" + @@ -729,99 +731,99 @@

Astro Mosaic Telescope Planner

radec_format: 1, default_telescope: 4, telescopes: [ - { name: "AUS-2-CMOS", fov_x: 233, fov_y: 155, lat: -34.8285, lng: 148.8413, timezoneOffset: null, alt: 530, seeing: "tl-aus", horizon_limits: [20], meridian_transit: 60 }, - { name: "SPA-1-CMOS", fov_x: 321, fov_y: 214, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 60 }, - { name: "SPA-2-CMOS", fov_x: 22, fov_y: 15, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 60 }, - { name: "SPA-3-CMOS", fov_x: 320, fov_y: 213, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 60 }, - { name: "CHI-1-CMOS", fov_x: 31, fov_y: 21, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 60 }, - // { name: "CHI-7-CMOS", fov_x: 118, fov_y: 79, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 60 }, - // { name: "USA-NM-1-CMOS", fov_x: 100, fov_y: 100, lat: 31.94653, lng: -108.89821, timezoneOffset: null, alt: 1000, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 60 }, + { name: "AUS-2-CMOS", fov_x: 233, fov_y: 155, lat: -34.8285, lng: 148.8413, timezoneOffset: null, alt: 530, seeing: "tl-aus", horizon_limits: [20], meridian_transit: 10 }, + { name: "SPA-1-CMOS", fov_x: 321, fov_y: 214, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 10 }, + { name: "SPA-2-CMOS", fov_x: 22, fov_y: 15, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 10 }, + { name: "SPA-3-CMOS", fov_x: 320, fov_y: 213, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 10 }, + { name: "CHI-1-CMOS", fov_x: 31, fov_y: 21, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 10 }, + // { name: "CHI-7-CMOS", fov_x: 118, fov_y: 79, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 10 }, + // { name: "USA-NM-1-CMOS", fov_x: 100, fov_y: 100, lat: 31.94653, lng: -108.89821, timezoneOffset: null, alt: 1000, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 10 }, - { name: "AUS-2", fov_x: 324, fov_y: 324, lat: -34.8285, lng: 148.8413, timezoneOffset: null, alt: 530, seeing: "tl-aus", horizon_limits: [20], meridian_transit: 60 }, - { name: "SPA-1", fov_x: 324, fov_y: 324, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 60 }, - { name: "SPA-2", fov_x: 23, fov_y: 23, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 60 }, - { name: "SPA-3", fov_x: 324, fov_y: 324, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 60 }, - { name: "CHI-1", fov_x: 32, fov_y: 32, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 60 }, - { name: "CHI-2", fov_x: 67, fov_y: 67, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 60 }, - { name: "CHI-3", fov_x: 19, fov_y: 19, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 60 }, - { name: "CHI-4", fov_x: 67, fov_y: 67, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 60 }, - { name: "CHI-5", fov_x: 473, fov_y: 378, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 60 }, - { name: "CHI-6", fov_x: 124, fov_y: 155, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 60 } + { name: "AUS-2", fov_x: 324, fov_y: 324, lat: -34.8285, lng: 148.8413, timezoneOffset: null, alt: 530, seeing: "tl-aus", horizon_limits: [20], meridian_transit: 10 }, + { name: "SPA-1", fov_x: 324, fov_y: 324, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 10 }, + { name: "SPA-2", fov_x: 23, fov_y: 23, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 10 }, + { name: "SPA-3", fov_x: 324, fov_y: 324, lat: 37.4988, lng: -2.42178, timezoneOffset: null, alt: 1250, seeing: "tl-spa", horizon_limits: [30], meridian_transit: 10 }, + { name: "CHI-1", fov_x: 32, fov_y: 32, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 10 }, + { name: "CHI-2", fov_x: 67, fov_y: 67, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 10 }, + { name: "CHI-3", fov_x: 19, fov_y: 19, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 10 }, + { name: "CHI-4", fov_x: 67, fov_y: 67, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 10 }, + { name: "CHI-5", fov_x: 473, fov_y: 378, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 10 }, + { name: "CHI-6", fov_x: 124, fov_y: 155, lat: -30.472529, lng: -70.762999, timezoneOffset: null, alt: 1252, seeing: "tl-chi", horizon_limits: [30], meridian_transit: 10 } ] }, { name: "Slooh", radec_format: 0, telescopes: [ - { name: "A1", fov_x: 37, fov_y: 37, lat: -31.2816709, lng: 149.0801825, alt: 805, timezoneOffset: null, seeing: "slooh-aus", horizon_limits: [30], meridian_transit: 60 }, - - { name: "T1", fov_x: 37, fov_y: 37, lat: 28.29970, lng: -16.50826, alt: 2372, timezoneOffset: null, seeing: "slooh-teide", horizon_limits: "slooh-teide1", meridian_transit: 60 }, - { name: "T2", fov_x: 43, fov_y: 43, lat: 28.29970, lng: -16.50826, alt: 2372, timezoneOffset: null, seeing: "slooh-teide", horizon_limits: "slooh-teide2", meridian_transit: 60 }, - { name: "T2UWF", fov_x: 107.6, fov_y: 72.12, lat: 28.29970, lng: -16.50826, timezoneOffset: null, alt: 2372, seeing: "slooh-teide", horizon_limits: "slooh-teide2", meridian_transit: 60 }, - { name: "T3", fov_x: 99.14, fov_y: 74.56, lat: 28.29970, lng: -16.50826, timezoneOffset: null, alt: 2372, seeing: "slooh-teide", horizon_limits: "slooh-teide3", meridian_transit: 60 }, - { name: "T4", fov_x: 15.57, fov_y: 12.03, lat: 28.29970, lng: -16.50826, timezoneOffset: null, alt: 2372, seeing: "slooh-teide", horizon_limits: "slooh-teide4", meridian_transit: 60 }, - - { name: "C1", fov_x: 31.18, fov_y: 20.51, lat: -33.269, lng: -70.534, timezoneOffset: null, alt: 1450, seeing: "slooh-chile", horizon_limits: "slooh-chile", meridian_transit: 60 }, - { name: "C1UWF", fov_x: 81.49, fov_y: 82, lat: -33.269, lng: -70.534, timezoneOffset: null, alt: 1450, seeing: "slooh-chile", horizon_limits: "slooh-chile", meridian_transit: 60 }, - { name: "C2", fov_x: 43, fov_y: 43, lat: -33.269, lng: -70.534, timezoneOffset: null, alt: 1450, seeing: "slooh-chile", horizon_limits: "slooh-chile", meridian_transit: 60 }, - { name: "C2FR", fov_x: 65, fov_y: 65, lat: -33.269, lng: -70.534, timezoneOffset: null, alt: 1450, seeing: "slooh-chile", horizon_limits: "slooh-chile", meridian_transit: 60 }, - { name: "C2LPT", fov_x: 8.24, fov_y: 5.18, lat: -33.269, lng: -70.534, timezoneOffset: null, alt: 1450, seeing: "slooh-chile", horizon_limits: "slooh-chile", meridian_transit: 60 } + { name: "A1", fov_x: 37, fov_y: 37, lat: -31.28175929756588, lng: 149.08134405064982, alt: 805, timezoneOffset: null, seeing: "slooh-aus", horizon_limits: [30], meridian_transit: 10 }, + + { name: "T1", fov_x: 37, fov_y: 37, lat: 28.299701833669065, lng: -16.508264883091755, alt: 2372, timezoneOffset: null, seeing: "slooh-teide", horizon_limits: "slooh-teide1", meridian_transit: 10 }, + { name: "T2", fov_x: 43, fov_y: 43, lat: 28.299701833669065, lng: -16.508264883091755, alt: 2372, timezoneOffset: null, seeing: "slooh-teide", horizon_limits: "slooh-teide2", meridian_transit: 10 }, + { name: "T2UWF", fov_x: 107.6, fov_y: 72.12, lat: 28.299701833669065, lng: -16.508264883091755, timezoneOffset: null, alt: 2372, seeing: "slooh-teide", horizon_limits: "slooh-teide2", meridian_transit: 10 }, + { name: "T3", fov_x: 99.14, fov_y: 74.56, lat: 28.299701833669065, lng: -16.508264883091755, timezoneOffset: null, alt: 2372, seeing: "slooh-teide", horizon_limits: "slooh-teide3", meridian_transit: 10 }, + { name: "T4", fov_x: 15.57, fov_y: 12.03, lat: 28.299701833669065, lng: -16.508264883091755, timezoneOffset: null, alt: 2372, seeing: "slooh-teide", horizon_limits: "slooh-teide4", meridian_transit: 10 }, + + { name: "C1", fov_x: 31.18, fov_y: 20.51, lat: -33.26916332616847, lng: -70.53440616331142, timezoneOffset: null, alt: 1450, seeing: "slooh-chile", horizon_limits: "slooh-chile", meridian_transit: 10 }, + { name: "C1UWF", fov_x: 81.49, fov_y: 82, lat: -33.26916332616847, lng: -70.53440616331142, timezoneOffset: null, alt: 1450, seeing: "slooh-chile", horizon_limits: "slooh-chile", meridian_transit: 10 }, + { name: "C2", fov_x: 43, fov_y: 43, lat: -33.26916332616847, lng: -70.53440616331142, timezoneOffset: null, alt: 1450, seeing: "slooh-chile", horizon_limits: "slooh-chile", meridian_transit: 10 }, + { name: "C2FR", fov_x: 65, fov_y: 65, lat: -33.26916332616847, lng: -70.53440616331142, timezoneOffset: null, alt: 1450, seeing: "slooh-chile", horizon_limits: "slooh-chile", meridian_transit: 10 }, + { name: "C2LPT", fov_x: 8.24, fov_y: 5.18, lat: -33.26916332616847, lng: -70.53440616331142, timezoneOffset: null, alt: 1450, seeing: "slooh-chile", horizon_limits: "slooh-chile", meridian_transit: 10 } ] }, { name: "RoboScopes", radec_format: 1, telescopes: [ - { name: "Pier 4", fov_x: 796, fov_y: 514, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [20], meridian_transit: 60 }, - { name: "Pier 6", fov_x: 324, fov_y: 324, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [25], meridian_transit: 60 }, - { name: "Pier 7", fov_x: 79, fov_y: 60, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [25], meridian_transit: 60 }, - { name: "Pier 8", fov_x: 43, fov_y: 43, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [30], meridian_transit: 60 }, - { name: "Pier 9", fov_x: 29, fov_y: 19, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [35], meridian_transit: 60 }, - { name: "Pier 10", fov_x: 105, fov_y: 70, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [30], meridian_transit: 60 }, - { name: "Pier 11", fov_x: 336, fov_y: 256, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [25], meridian_transit: 60 }, - { name: "Pier 12", fov_x: 43, fov_y: 43, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [30], meridian_transit: 60 } + { name: "Pier 4", fov_x: 796, fov_y: 514, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [20], meridian_transit: 10 }, + { name: "Pier 6", fov_x: 324, fov_y: 324, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [25], meridian_transit: 10 }, + { name: "Pier 7", fov_x: 79, fov_y: 60, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [25], meridian_transit: 10 }, + { name: "Pier 8", fov_x: 43, fov_y: 43, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [30], meridian_transit: 10 }, + { name: "Pier 9", fov_x: 29, fov_y: 19, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [35], meridian_transit: 10 }, + { name: "Pier 10", fov_x: 105, fov_y: 70, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [30], meridian_transit: 10 }, + { name: "Pier 11", fov_x: 336, fov_y: 256, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [25], meridian_transit: 10 }, + { name: "Pier 12", fov_x: 43, fov_y: 43, lat: 38.2182225, lng: -6.632443, timezoneOffset: null, alt: 535, seeing: "rs-spa", horizon_limits: [30], meridian_transit: 10 } ] }, { name: "SkyGems", radec_format: 1, telescopes: [ - { name: "Hakos iDK 20", fov_x: 37, fov_y: 37, lat: -23.236384, lng: 16.3594727, timezoneOffset: null, alt: 1835, seeing: null, horizon_limits: [22], meridian_transit: 60 }, - { name: "Hakos H8 2.8", fov_x: 205, fov_y: 137, lat: -23.236384, lng: 16.3594727, timezoneOffset: null, alt: 1835, seeing: null, horizon_limits: [22], meridian_transit: 60 }, - { name: "Hakos RC360", fov_x: 40, fov_y: 40, lat: -23.236384, lng: 16.3594727, timezoneOffset: null, alt: 1835, seeing: null, horizon_limits: [22], meridian_transit: 60 }, - { name: "FSQ106 Namibia", fov_x: 116, fov_y: 87, lat: -23.236384, lng: 16.3594727, timezoneOffset: null, alt: 1835, seeing: null, horizon_limits: [22], meridian_transit: 60 }, + { name: "Hakos iDK 20", fov_x: 37, fov_y: 37, lat: -23.236384, lng: 16.3594727, timezoneOffset: null, alt: 1835, seeing: null, horizon_limits: [22], meridian_transit: 10 }, + { name: "Hakos H8 2.8", fov_x: 205, fov_y: 137, lat: -23.236384, lng: 16.3594727, timezoneOffset: null, alt: 1835, seeing: null, horizon_limits: [22], meridian_transit: 10 }, + { name: "Hakos RC360", fov_x: 40, fov_y: 40, lat: -23.236384, lng: 16.3594727, timezoneOffset: null, alt: 1835, seeing: null, horizon_limits: [22], meridian_transit: 10 }, + { name: "FSQ106 Namibia", fov_x: 116, fov_y: 87, lat: -23.236384, lng: 16.3594727, timezoneOffset: null, alt: 1835, seeing: null, horizon_limits: [22], meridian_transit: 10 }, - { name: "Spain Veloce 200 RH", fov_x: 102, fov_y: 77, lat: 38.2, lng: -6.6, timezoneOffset: null, alt: 1025, seeing: "rs-spa", horizon_limits: [36], meridian_transit: 60 }, - { name: "Spain CDK500", fov_x: 37, fov_y: 37, lat: 38.2, lng: -6.6, timezoneOffset: null, alt: 1025, seeing: "rs-spa", horizon_limits: [12], meridian_transit: 60 }, + { name: "Spain Veloce 200 RH", fov_x: 102, fov_y: 77, lat: 38.2, lng: -6.6, timezoneOffset: null, alt: 1025, seeing: "rs-spa", horizon_limits: [36], meridian_transit: 10 }, + { name: "Spain CDK500", fov_x: 37, fov_y: 37, lat: 38.2, lng: -6.6, timezoneOffset: null, alt: 1025, seeing: "rs-spa", horizon_limits: [12], meridian_transit: 10 }, - { name: "Dream Astrograph New Mexico", fov_x: 101, fov_y: 101, lat: 34.2, lng: -108.1, timezoneOffset: null, alt: 2371, seeing: "sg-newmex", horizon_limits: [35], meridian_transit: 60 } + { name: "Dream Astrograph New Mexico", fov_x: 101, fov_y: 101, lat: 34.2, lng: -108.1, timezoneOffset: null, alt: 2371, seeing: "sg-newmex", horizon_limits: [35], meridian_transit: 10 } ] }, { name: "Seestar", radec_format: 1, telescopes: [ - { name: "S50", fov_x: 0.73*60, fov_y: 1.29*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 60 } + { name: "S50", fov_x: 0.73*60, fov_y: 1.29*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 10 } ] }, { name: "Vaonis", radec_format: 1, telescopes: [ - { name: "Stellina", fov_x: 1.0*60, fov_y: 0.7*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 60 }, - { name: "Hestia", fov_x: 1.8*60, fov_y: 1.8*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 60 }, - { name: "Vespera", fov_x: 1.6*60, fov_y: 0.9*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 60 }, - { name: "Vespera II", fov_x: 2.5*60, fov_y: 1.4*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 60 }, - { name: "Vespera Pro", fov_x: 1.6*60, fov_y: 1.6*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 60 }, - { name: "Hyperia", fov_x: 1.97*60, fov_y: 1.3*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 60 } + { name: "Stellina", fov_x: 1.0*60, fov_y: 0.7*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 10 }, + { name: "Hestia", fov_x: 1.8*60, fov_y: 1.8*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 10 }, + { name: "Vespera", fov_x: 1.6*60, fov_y: 0.9*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 10 }, + { name: "Vespera II", fov_x: 2.5*60, fov_y: 1.4*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 10 }, + { name: "Vespera Pro", fov_x: 1.6*60, fov_y: 1.6*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 10 }, + { name: "Hyperia", fov_x: 1.97*60, fov_y: 1.3*60, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 10 } ] }, { name: "Other", radec_format: 1, telescopes: [ - { name: "Unistellar Equinox", fov_x: 37.43, fov_y: 28.27, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 60 }, - { name: "Dwarflab II", fov_x: 192, fov_y: 110, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 60 } + { name: "Unistellar Equinox", fov_x: 37.43, fov_y: 28.27, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 10 }, + { name: "Dwarflab II", fov_x: 192, fov_y: 110, lat: null, lng: null, timezoneOffset: "detect_timezone", alt: 100, seeing: "detect_location", horizon_limits: [20], meridian_transit: 10 } ] }, { @@ -3032,7 +3034,8 @@

Astro Mosaic Telescope Planner

"FoV x: " + current_telescope.fov_x + ", " + "FoV y: " + current_telescope.fov_y + ", " + "Lat: " + current_telescope.lat + ", " + - "Lng: " + current_telescope.lng; + "Lng: " + current_telescope.lng + + " (Google Maps)"; if (current_telescope.timezoneOffset) { info_text = info_text + ", Tz: " + current_telescope.timezoneOffset; } else { diff --git a/AstroMosaicEngine.js b/AstroMosaicEngine.js index d108df0..0f28eb2 100644 --- a/AstroMosaicEngine.js +++ b/AstroMosaicEngine.js @@ -1081,8 +1081,11 @@ function StartAstroMosaicViewerEngine( // All rows added // Check meridian crossing + var meridian_crossing = false; if (meridian_index != null && engine_params.meridian_transit > 0) { - // Mark Meridian crossing as not visible. We use literal 30 minutes clock time here. + // Add meridian crossing to the chart + var meridian_crossing_index = rowdata[0].length; + // Mark Meridian crossing. We use engine_params.meridian_transit time here. // Maybe it could be done some other way... var timer = Math.round(((engine_params.meridian_transit / 2) * 60 * 1000) / interval); var begin = Math.max(meridian_index - timer, 0); @@ -1090,18 +1093,29 @@ function StartAstroMosaicViewerEngine( if (engine_params.horizonSoft != null) { for (var i = begin; i < end; i++) { if (rowdata[i][1] != null) { // visiblealt != null - rowdata[i][3] = rowdata[i][1]; // hardalt = visiblealt + rowdata[i][meridian_crossing_index] = rowdata[i][1]; rowdata[i][1] = null; // visible = null + meridian_crossing = true; } else if (rowdata[i][2] != null) { // softalt != null - rowdata[i][3] = rowdata[i][2]; // hardalt = softalt + rowdata[i][meridian_crossing_index] = rowdata[i][2]; rowdata[i][2] = null; // softalt = null + meridian_crossing = true; } } } else { for (var i = begin; i < end; i++) { if (rowdata[i][1] != null) { // visiblealt != null - rowdata[i][2] = rowdata[i][1]; // hardalt = visiblealt + rowdata[i][meridian_crossing_index] = rowdata[i][1]; rowdata[i][1] = null; // visible = null + meridian_crossing = true; + } + } + } + if (meridian_crossing) { + engine_data.daydata.addColumn('number', 'Meridian crossing'); // Meridian crossing + for (var i = 0; i < rowdata.length; i++) { + if (rowdata[i].length <= meridian_crossing_index) { + rowdata[i].push(null); } } } @@ -1131,6 +1145,9 @@ function StartAstroMosaicViewerEngine( if (engine_params.showAz) { seriesStyle.push({ color: 'gray', lineDashStyle: [2, 2], targetAxisIndex: 1 }); // Azimuth } + if (meridian_crossing) { + seriesStyle.push({ color: 'green', lineDashStyle: [4, 2], lineWidth: 1 }); // Meridian crossing + } var options = setChartOptions('Target visibility', hAxisTitle, seriesStyle, 'HH:mm', engine_params.showAz);