fix regions satellite images, reset default range (#523)

ResonantGeoData · Oct 23, 2024 · 92b01e5 · 92b01e5
1 parent cbc8c19
commit 92b01e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/rdwatch/core/utils/raster_tile.py b/rdwatch/core/utils/raster_tile.py
@@ -9,7 +9,7 @@
 
 logger = logging.getLogger(__name__)
 
-DEFAULT_RESCALE_RANGE = (1, 10000)
+DEFAULT_RESCALE_RANGE = (0, 255)
 
 
 def get_asset_num_bands(asset: Asset) -> int:
@@ -61,9 +61,9 @@ def get_raster_tile_from_reader(
     y: int,
     scale: Literal['default', 'bits'] | list[int] = 'default',
 ) -> bytes:
-    img = reader.tile(x, y, z, tilesize=512)
+    img = reader.tile(x, y, z, **get_read_kwargs_for_reader(reader))
     if scale == 'default':
-        img.rescale(in_range=((0, 10000),))
+        img.rescale(in_range=((0, 255),))
     elif scale == 'bits':
         low, high = get_rescale_range_from_reader(reader)
         img.rescale(in_range=((low, high),))
@@ -94,7 +94,7 @@ def get_raster_bbox_from_reader(
 ) -> bytes:
     img = reader.part(bbox, **get_read_kwargs_for_reader(reader))
     if scale == 'default':
-        img.rescale(in_range=((0, 10000),))
+        img.rescale(in_range=((0, 255),))
     elif scale == 'bits':
         low, high = get_rescale_range_from_reader(reader)
         img.rescale(in_range=((low, high),))

diff --git a/rdwatch/core/utils/worldview_nitf/raster_tile.py b/rdwatch/core/utils/worldview_nitf/raster_tile.py
@@ -74,7 +74,7 @@ def get_worldview_nitf_bbox(
                 rgb = img.part(bbox)
 
         if scale == 'default':
-            rgb.rescale(in_range=((0, 10000),))
+            rgb.rescale(in_range=((0, 255),))
         elif scale == 'bits':
             if capture.bits_per_pixel != 8:
                 max_bits = 2**capture.bits_per_pixel - 1

diff --git a/rdwatch/core/utils/worldview_processed/raster_tile.py b/rdwatch/core/utils/worldview_processed/raster_tile.py
@@ -44,7 +44,7 @@ def get_worldview_processed_visual_tile(
                     rgb = rgb.from_array(
                         pansharpening_brovey(rgb.data, pan.data, 0.2, 'uint16')
                     )
-            rgb.rescale(in_range=((0, 10000),))
+            rgb.rescale(in_range=((0, 255),))
         return rgb.render(img_format='WEBP')
 
 
@@ -93,7 +93,7 @@ def get_worldview_processed_visual_bbox(
                     logger.info(f'Pan Sharpening Time: {time.time() - startTime}')
 
         if scale == 'default':
-            rgb.rescale(in_range=((0, 10000),))
+            rgb.rescale(in_range=((0, 255),))
         elif scale == 'bits':
             if capture.bits_per_pixel != 8:
                 max_bits = 2**capture.bits_per_pixel - 1

diff --git a/vue/src/components/ImagesDownloadDialog.vue b/vue/src/components/ImagesDownloadDialog.vue
@@ -33,7 +33,7 @@ const force =ref(false);
 const customDateRange = ref(false);
 const scaleOptions = ref(['default', 'bits', 'custom']);
 const scale: Ref<'default' | 'bits' | 'custom'> = ref('bits');
-const scaleNums: Ref<[number, number]> = ref([0, 10000])
+const scaleNums: Ref<[number, number]> = ref([0, 255])
 const bboxScale: Ref<number> = ref(1.2);
 const validForm = ref(true);
 const dateAdpter = useDate();