From 14552fec7d3c63f5263c6766b72f5a1fff7c7a43 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Thu, 16 Jan 2025 15:30:54 -0500 Subject: [PATCH] ipyleaflet 0.19 fixes an issue with inverting bounds coordinates This fixes the issue on map coordinates. Layers appear to still be inverted. Note that this will break map bounds in ipyleaflet < 0.19. --- CHANGELOG.md | 1 + large_image/tilesource/jupyter.py | 13 ++----------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76851ae75..eecd6f558 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ### Bug Fixes - Fix scaling tiles from stripped tiffs in some instances ([#1773](../../pull/1773)) +- Updated jupyter support for ipyleaflet ([#1775](../../pull/1775)) ## 1.30.6 diff --git a/large_image/tilesource/jupyter.py b/large_image/tilesource/jupyter.py index fd5276fc5..eaca8a83d 100644 --- a/large_image/tilesource/jupyter.py +++ b/large_image/tilesource/jupyter.py @@ -14,6 +14,7 @@ likely lead to crashes. This is only for use in JupyterLab. """ +import importlib.metadata import importlib.util import json import os @@ -276,21 +277,11 @@ def make_map( crs = dict( name='PixelSpace', custom=True, - # Why does this need to be 256? resolutions=[2 ** (metadata['levels'] - 1 - l) for l in range(20)], - # This works but has x and y reversed proj4def='+proj=longlat +axis=esu', - bounds=[[0, 0], [metadata['sizeY'], metadata['sizeX']]], - # Why is origin X, Y but bounds Y, X? + bounds=[[0, 0], [metadata['sizeX'], metadata['sizeY']]], origin=[0, metadata['sizeY']], - - # This almost works to fix the x, y reversal, but - # - bounds are weird and other issues occur - # proj4def='+proj=longlat +axis=seu', - # bounds=[[-metadata['sizeX'],-metadata['sizeY']], - # [metadata['sizeX'],metadata['sizeY']]], - # origin=[0,0], ) layer = layer or self._layer