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

Remove NoGeometry flag #56

Merged
merged 2 commits into from
Jan 15, 2024
Merged

Remove NoGeometry flag #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59c0ac3
remove NoGeometry flag
ghtmtt Jan 15, 2024
dac5ca3
retrieve getFeatureInfo from project server properties
ghtmtt Jan 15, 2024
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 lizmap_server/get_feature_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
QgsFeatureRequest,
QgsProject,
)
from qgis.server import QgsServerFilter
from qgis.server import QgsServerFilter, QgsServerProjectUtils

from lizmap_server.core import find_vector_layer, server_feature_id_expression
from lizmap_server.logger import Logger, exception_handler
Expand Down Expand Up @@ -200,6 +200,9 @@ def responseComplete(self):
exp_context.appendScope(QgsExpressionContextUtils.globalScope())
exp_context.appendScope(QgsExpressionContextUtils.projectScope(project))

# retrieve geometry from getFeatureInfo project server properties
geometry_result = QgsServerProjectUtils.wmsFeatureInfoAddWktGeometry(project)

# noinspection PyBroadException
try:
for result in features:
Expand All @@ -211,7 +214,8 @@ def responseComplete(self):
expression = server_feature_id_expression(result.feature_id, result.layer.dataProvider())
if expression:
expression_request = QgsFeatureRequest(QgsExpression(expression))
expression_request.setFlags(QgsFeatureRequest.NoGeometry)
if not geometry_result:
expression_request.setFlags(QgsFeatureRequest.NoGeometry)
feature = QgsFeature()
result.layer.getFeatures(expression_request).nextFeature(feature)
else:
Expand Down