This commit is contained in:
Matthieu Baumann
2025-09-09 17:00:41 +02:00
parent 91192f44f4
commit 4d69014c90
6 changed files with 29 additions and 10 deletions

View File

@@ -82,7 +82,11 @@ use crate::renderable::CreatorDid;
use crate::tile_fetcher::HiPSLocalFiles; use crate::tile_fetcher::HiPSLocalFiles;
use web_sys::{RequestCredentials, RequestMode}; use web_sys::{RequestCredentials, RequestMode};
impl Tile { impl Tile {
pub fn new(cell: &HEALPixCell, cfg: &HiPSConfig, browser_support: &BrowserFeaturesSupport) -> Self { pub fn new(
cell: &HEALPixCell,
cfg: &HiPSConfig,
browser_support: &BrowserFeaturesSupport,
) -> Self {
let hips_cdid = cfg.get_creator_did(); let hips_cdid = cfg.get_creator_did();
let hips_url = cfg.get_root_url(); let hips_url = cfg.get_root_url();
let format = cfg.get_format(); let format = cfg.get_format();
@@ -115,7 +119,12 @@ impl Tile {
} }
} }
pub fn new_with_channel(cell: &HEALPixCell, channel: u32, cfg: &HiPSConfig, browser_support: &BrowserFeaturesSupport) -> Self { pub fn new_with_channel(
cell: &HEALPixCell,
channel: u32,
cfg: &HiPSConfig,
browser_support: &BrowserFeaturesSupport,
) -> Self {
let hips_cdid = cfg.get_creator_did(); let hips_cdid = cfg.get_creator_did();
let hips_url = cfg.get_root_url(); let hips_url = cfg.get_root_url();
let format = cfg.get_format(); let format = cfg.get_format();
@@ -149,7 +158,11 @@ impl Tile {
} }
} }
pub fn new_cubic(hpx_f_cell: &HEALPixFreqCell, cfg: &HiPSConfig, browser_support: &BrowserFeaturesSupport) -> Self { pub fn new_cubic(
hpx_f_cell: &HEALPixFreqCell,
cfg: &HiPSConfig,
browser_support: &BrowserFeaturesSupport,
) -> Self {
let hips_cdid = cfg.get_creator_did(); let hips_cdid = cfg.get_creator_did();
let hips_url = cfg.get_root_url(); let hips_url = cfg.get_root_url();
let format = cfg.get_format(); let format = cfg.get_format();

View File

@@ -320,5 +320,4 @@ fn handle_allsky_fits<F: TextureFormat>(
use al_core::texture::format::RGBA8U; use al_core::texture::format::RGBA8U;
use crate::Abort; use crate::Abort;

View File

@@ -80,4 +80,3 @@ impl From<query::Moc> for MOCRequest {
} }
} }
} }

View File

@@ -1,6 +1,6 @@
use crate::math::lonlat::LonLat;
use crate::math::lonlat::LonLatT; use crate::math::lonlat::LonLatT;
use crate::math::PI; use crate::math::PI;
use crate::math::{lonlat::LonLat};
use moclib::moc::RangeMOCIntoIterator; use moclib::moc::RangeMOCIntoIterator;
use moclib::{ use moclib::{

View File

@@ -332,7 +332,7 @@ impl HiPS2D {
&mut self, &mut self,
tile_fetcher: &mut TileFetcherQueue, tile_fetcher: &mut TileFetcherQueue,
camera: &CameraViewPort, camera: &CameraViewPort,
browser_features_support: &BrowserFeaturesSupport browser_features_support: &BrowserFeaturesSupport,
) { ) {
// do not add tiles if the view is already at depth 0 // do not add tiles if the view is already at depth 0
let cfg = self.get_config(); let cfg = self.get_config();
@@ -355,7 +355,11 @@ impl HiPS2D {
}; };
if make_query { if make_query {
Some(query::Tile::new(&tile_cell, self.get_config(), browser_features_support)) Some(query::Tile::new(
&tile_cell,
self.get_config(),
browser_features_support,
))
} else { } else {
None None
} }
@@ -385,7 +389,11 @@ impl HiPS2D {
for ancestor in ancestors { for ancestor in ancestors {
if !self.update_priority_tile(&ancestor) { if !self.update_priority_tile(&ancestor) {
tile_fetcher.append(query::Tile::new(&ancestor, self.get_config(), browser_features_support)); tile_fetcher.append(query::Tile::new(
&ancestor,
self.get_config(),
browser_features_support,
));
} }
} }
} }

View File

@@ -67,7 +67,7 @@ impl HiPS {
&mut self, &mut self,
tile_fetcher: &mut TileFetcherQueue, tile_fetcher: &mut TileFetcherQueue,
camera: &CameraViewPort, camera: &CameraViewPort,
browser_features_support: &BrowserFeaturesSupport browser_features_support: &BrowserFeaturesSupport,
) { ) {
match self { match self {
D2(hips) => hips.look_for_new_tiles(tile_fetcher, camera, browser_features_support), D2(hips) => hips.look_for_new_tiles(tile_fetcher, camera, browser_features_support),