Skip to content

Patch/raster results layer #235

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

Open
AlexeyTrekin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Patch/raster results layer #235

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
8 changes: 6 additions & 2 deletions mapflow/entity/processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ def __init__(self,
created,
percent_completed,
raster_layer,
vector_layer,
vector_layer=None,
result_raster_layer=None,
errors=None,
review_status=None,
in_review_until=None,
Expand All @@ -37,6 +38,7 @@ def __init__(self,
self.errors = errors
self.raster_layer = raster_layer
self.vector_layer = vector_layer
self.result_raster_layer = result_raster_layer
self.review_status = ProcessingReviewStatus(review_status)
self.in_review_until = in_review_until
self.params = params
Expand All @@ -61,7 +63,8 @@ def from_response(cls, processing):
messages = processing.get('messages', [])
errors = [ErrorMessage.from_response(message) for message in messages]
raster_layer = processing['rasterLayer']
vector_layer = processing['vectorLayer']
vector_layer = processing.get('vectorLayer', None)
result_raster_layer = processing.get('resultRasterLayer', None)
if processing.get('reviewStatus'):
review_status = processing.get('reviewStatus', {}).get('reviewStatus')
in_review_until_str = processing.get('reviewStatus', {}).get('inReviewUntil')
Expand All @@ -84,6 +87,7 @@ def from_response(cls, processing):
percent_completed,
raster_layer,
vector_layer,
result_raster_layer,
errors,
review_status,
in_review_until,
Expand Down
22 changes: 21 additions & 1 deletion mapflow/functional/layer_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,28 @@ def add_preview_layer(self, preview_layer, preview_dict):
preview_dict[url] = preview_layer.id()

# ======= Load as tile layers ====== #

def load_result_tiles(self, processing):
if processing.result_raster_layer:
self.load_result_raster_tiles(processing)
else:
self.load_result_vector_tiles(processing)

def load_result_raster_tiles(self, processing):
raster_tilejson = processing.raster_layer.get("tileJsonUrl", None)
result_tilejson = processing.result_raster_layer.get("tileJsonUrl", None)
raster_layer = generate_raster_layer(processing.raster_layer.get("tileUrl", None),
name=f"{processing.name} raster")
result_layer = generate_raster_layer(processing.result_raster_layer.get("tileUrl", None),
name=processing.name)
self.request_layer_extent(tilejson_uri=raster_tilejson,
layer=raster_layer,
next_layers = [result_layer],
next_tilejson_uris = [result_tilejson],
processing_id = processing.id_
)


def load_result_vector_tiles(self, processing):
Copy link

Copilot AI Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The load_result_vector_tiles method is incomplete—it only references raster layers. You likely need to generate and request extents for the vector tiles (e.g. using generate_vector_layer and request_layer_extent).

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Member Author

@AlexeyTrekin AlexeyTrekin Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Loading of the vector layer is carried out by callback of request_layer_extent, where it is passed as callback argument. Unfortunately, we did not find better solutions for this in Qt "request-callback/error handler" async approach

raster_tilejson = processing.raster_layer.get("tileJsonUrl", None)
vector_tilejson = processing.vector_layer.get("tileJsonUrl", None)
raster_layer = generate_raster_layer(processing.raster_layer.get("tileUrl", None),
Expand Down