Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COG export: remove color table workaround #502

Merged
merged 1 commit into from
Feb 23, 2024
Merged

COG export: remove color table workaround #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/actinia_core/processing/actinia_processing/ephemeral/ephemeral_processing_with_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# performance processing of geographical data that uses GRASS GIS for
# computational tasks. For details, see https://actinia.mundialis.de/
#
# Copyright (c) 2016-2022 Sören Gebbert and mundialis GmbH & Co. KG
# Copyright (c) 2016-2024 Sören Gebbert and mundialis GmbH & Co. KG
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -36,7 +36,7 @@
__license__ = "GPLv3"
__author__ = "Sören Gebbert"
__copyright__ = (
"Copyright 2016-2022, Sören Gebbert and mundialis GmbH & Co. KG"
"Copyright 2016-2024, Sören Gebbert and mundialis GmbH & Co. KG"
)
__maintainer__ = "mundialis"
__email__ = "[email protected]"
Expand Down Expand Up @@ -148,11 +148,6 @@ def _export_raster(
create_opts += ",TILED=YES"

args.append(create_opts)
# current workaround due to color table export
# COG bug in GDAL, see https://github.com/OSGeo/gdal/issues/2946
# TODO: DELETE AND TEST ONCE GDAL 3.1.4 HAS BEEN RELEASED
if format == "COG":
args.append("-c")

if additional_options:
args.extend(additional_options)
Expand Down
7 changes: 2 additions & 5 deletions src/actinia_core/processing/actinia_processing/ephemeral_with_export/raster_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# performance processing of geographical data that uses GRASS GIS for
# computational tasks. For details, see https://actinia.mundialis.de/
#
# Copyright (c) 2016-2022 Sören Gebbert and mundialis GmbH & Co. KG
# Copyright (c) 2016-2024 Sören Gebbert and mundialis GmbH & Co. KG
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -35,7 +35,7 @@
__license__ = "GPLv3"
__author__ = "Sören Gebbert"
__copyright__ = (
"Copyright 2016-2022, Sören Gebbert and mundialis GmbH & Co. KG"
"Copyright 2016-2024, Sören Gebbert and mundialis GmbH & Co. KG"
)
__maintainer__ = "mundialis"

Expand Down Expand Up @@ -83,9 +83,6 @@ def _execute(self):
source_mapset_name="PERMANENT"
)

# COG bug in GDAL, see https://github.com/OSGeo/gdal/issues/2946 will
# be fixed in GDAL 3.1.4
# use r.out.gdal -c to avoid the bug
format = "COG"
from osgeo import gdal

Expand Down