Skip to content

Commit

Permalink
Merge branch 'main' into feature-db-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaraphael committed Oct 20, 2023
2 parents 73609a8 + 44bc0fb commit f0534fd
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion test/test_cerulean_cloud/test_cloud_run_offset_tiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ async def test_create_fixture_tile(
tile = TMS.tile(-74.47852171444801, 36.09607988649725, 9)
print(tile)
array = await titiler_client.get_base_tile(
S1_ID, tile=tile, scale=2, rescale=(17.0, 608.0)
S1_ID, tile=tile, scale=2, rescale=(0, 255)
)
print(array)
with rasterio.open(
Expand Down
6 changes: 3 additions & 3 deletions test/test_cerulean_cloud/test_database_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ async def test_create_s1l(setup_database, engine):
sentinel1_grd = await db_client.get_sentinel1_grd(
info["id"],
info,
titiler_client.get_base_tile_url(info["id"], rescale=(0, 100)),
titiler_client.get_base_tile_url(info["id"], rescale=(0, 255)),
)
assert sentinel1_grd.scene_id == info["id"]

Expand Down Expand Up @@ -113,7 +113,7 @@ async def test_create_slick(setup_database, engine):
sentinel1_grd = await db_client.get_sentinel1_grd(
info["id"],
info,
titiler_client.get_base_tile_url(info["id"], rescale=(0, 100)),
titiler_client.get_base_tile_url(info["id"], rescale=(0, 255)),
)
trigger = await db_client.get_trigger(1)
model = await db_client.get_model("model_path")
Expand Down Expand Up @@ -166,7 +166,7 @@ async def test_update_orchestrator(setup_database, engine):
sentinel1_grd = await db_client.get_sentinel1_grd(
info["id"],
info,
titiler_client.get_base_tile_url(info["id"], rescale=(0, 100)),
titiler_client.get_base_tile_url(info["id"], rescale=(0, 255)),
)
trigger = await db_client.get_trigger()
model = await db_client.get_model("model_path")
Expand Down
8 changes: 4 additions & 4 deletions test/test_cerulean_cloud/test_inference_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ async def test_get_base_tile_inference(fixture_cloud_inference_tile, httpx_mock)
semaphore = asyncio.Semaphore(20)
tasks = [
fixture_cloud_inference_tile.get_base_tile_inference(
tile=TMS._tile(0, 0, 0), semaphore=semaphore, rescale=(0, 100)
tile=TMS._tile(0, 0, 0), semaphore=semaphore, rescale=(0, 255)
),
fixture_cloud_inference_tile.get_base_tile_inference(
tile=TMS._tile(0, 0, 0), semaphore=semaphore, rescale=(0, 100)
tile=TMS._tile(0, 0, 0), semaphore=semaphore, rescale=(0, 255)
),
]
res = await asyncio.gather(*tasks, return_exceptions=True)
Expand Down Expand Up @@ -159,12 +159,12 @@ async def test_get_offset_tile_inference(fixture_cloud_inference_tile, httpx_moc
tasks = [
fixture_cloud_inference_tile.get_offset_tile_inference(
bounds=list(TMS.bounds(TMS._tile(0, 0, 0))),
rescale=(0, 100),
rescale=(0, 255),
semaphore=semaphore,
),
fixture_cloud_inference_tile.get_offset_tile_inference(
bounds=list(TMS.bounds(TMS._tile(0, 0, 0))),
rescale=(0, 100),
rescale=(0, 255),
semaphore=semaphore,
),
]
Expand Down
6 changes: 3 additions & 3 deletions test/test_cerulean_cloud/test_titiler_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ async def test_base_tile(titiler_client, tiles_s1_scene, httpx_mock):
httpx_mock.add_response(
method="GET",
url=titiler_client.url
+ f"tiles/{TMS_TITLE}/{tile.z}/{tile.x}/{tile.y}?sceneid={sceneid}&bands=vv&format=png&scale=1&rescale=0,1000",
+ f"tiles/{TMS_TITLE}/{tile.z}/{tile.x}/{tile.y}?sceneid={sceneid}&bands=vv&format=png&scale=1&rescale=0,255",
content=img_bytes,
)
array = await titiler_client.get_base_tile(S1_IDS[0], tile=tile)
Expand All @@ -116,7 +116,7 @@ async def test_offset_tile(titiler_client, tiles_s1_scene, httpx_mock):
httpx_mock.add_response(
method="GET",
url=titiler_client.url
+ f"crop/{minx},{miny},{maxx},{maxy}/256x256.png?sceneid={sceneid}&bands=vv&rescale=0,1000",
+ f"crop/{minx},{miny},{maxx},{maxy}/256x256.png?sceneid={sceneid}&bands=vv&rescale=0,255",
content=img_bytes,
)

Expand All @@ -129,5 +129,5 @@ def test_get_base_tile_url(titiler_client):
res = titiler_client.get_base_tile_url("ABC")
assert (
res
== "https://titiler.url/tiles/{z}/{x}/{y}?sceneid=ABC&bands=vv&scale=1&rescale=0,1000"
== "https://titiler.url/tiles/{z}/{x}/{y}?sceneid=ABC&bands=vv&scale=1&rescale=0,255"
)

0 comments on commit f0534fd

Please sign in to comment.