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

[Feature] Extending replaceExpressionText Request with ALL features and GeoJSON format #72

Merged
merged 2 commits into from
Apr 26, 2024
Merged

[Feature] Extending replaceExpressionText Request with ALL features and GeoJSON format #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bde592f
[Feature] Extending replaceExpressionText Request with ALL features a…
rldhont Apr 26, 2024
715811f
Tests : Expression replaceExpressionText enhancement
rldhont Apr 26, 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
100 changes: 66 additions & 34 deletions lizmap_server/expression_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
QgsExpressionContextUtils,
QgsFeature,
QgsFeatureRequest,
QgsField,
QgsFields,
QgsJsonExporter,
QgsJsonUtils,
QgsProject,
)
from qgis.PyQt.QtCore import QTextCodec
from qgis.PyQt.QtCore import QTextCodec, QVariant
from qgis.server import (
QgsRequestHandler,
QgsServerRequest,
Expand Down Expand Up @@ -343,7 +344,10 @@ def replace_expression_text(
or
FEATURES=[{"type": "Feature", "geometry": {}, "properties": {}}, {"type": "Feature", "geometry": {},
"properties": {}}]
or
FEATURES=ALL to get Replace expression texts for all features of the layer
FORM_SCOPE=boolean to add formScope based on provided features
FORMAT=GeoJSON to get response as GeoJSON
"""
logger = Logger()
layer_name = params.get('LAYER', '')
Expand Down Expand Up @@ -431,39 +435,43 @@ def replace_expression_text(
return

# Check features
try:
geojson = json.loads(features)
except Exception:
logger.critical(
"JSON loads features '{}' exception:\n{}".format(features, traceback.format_exc()))
raise ExpressionServiceError(
"Bad request error",
"Invalid 'Evaluate' REQUEST: FEATURES '{}' are not well formed".format(features),
400)
if features.upper() == 'ALL':
feature_fields = layer.fields()
feature_list = layer.getFeatures()
else:
try:
geojson = json.loads(features)
except Exception:
logger.critical(
"JSON loads features '{}' exception:\n{}".format(features, traceback.format_exc()))
raise ExpressionServiceError(
"Bad request error",
"Invalid 'Evaluate' REQUEST: FEATURES '{}' are not well formed".format(features),
400)

if not geojson or not isinstance(geojson, list) or len(geojson) == 0:
raise ExpressionServiceError(
"Bad request error",
"Invalid 'Evaluate' REQUEST: FEATURES '{}' are not well formed".format(features),
400)
if not geojson or not isinstance(geojson, list) or len(geojson) == 0:
raise ExpressionServiceError(
"Bad request error",
"Invalid 'Evaluate' REQUEST: FEATURES '{}' are not well formed".format(features),
400)

if ('type' not in geojson[0]) or geojson[0]['type'] != 'Feature':
raise ExpressionServiceError(
"Bad request error",
("Invalid 'Evaluate' REQUEST: FEATURES '{}' are not well formed: type not defined or not "
"Feature.").format(features),
400)
if ('type' not in geojson[0]) or geojson[0]['type'] != 'Feature':
raise ExpressionServiceError(
"Bad request error",
("Invalid 'Evaluate' REQUEST: FEATURES '{}' are not well formed: type not defined or not "
"Feature.").format(features),
400)

# try to load features
# read fields
feature_fields = QgsJsonUtils.stringToFields(
'{ "type": "FeatureCollection","features":' + features + '}',
QTextCodec.codecForName("UTF-8"))
# read features
feature_list = QgsJsonUtils.stringToFeatureList(
'{ "type": "FeatureCollection","features":' + features + '}',
feature_fields,
QTextCodec.codecForName("UTF-8"))
# try to load features
# read fields
feature_fields = QgsJsonUtils.stringToFields(
'{ "type": "FeatureCollection","features":' + features + '}',
QTextCodec.codecForName("UTF-8"))
# read features
feature_list = QgsJsonUtils.stringToFeatureList(
'{ "type": "FeatureCollection","features":' + features + '}',
feature_fields,
QTextCodec.codecForName("UTF-8"))

# features not well formed
if not feature_list:
Expand All @@ -480,6 +488,14 @@ def replace_expression_text(
# form scope
add_form_scope = to_bool(params.get('FORM_SCOPE'))

geojson_output = params.get('FORMAT', '').upper() == 'GEOJSON'
if geojson_output:
exporter = QgsJsonExporter()
exporter.setSourceCrs(layer.crs())
geojson_fields = QgsFields()
for k in str_map.keys():
geojson_fields.append(QgsField(k, QVariant.String))

# loop through provided features to replace expression strings
for f in feature_list:
# clone the features with all attributes
Expand All @@ -503,9 +519,25 @@ def replace_expression_text(
for k, s in str_map.items():
value = QgsExpression.replaceExpressionText(s, exp_context, da)
result[k] = json.loads(QgsJsonUtils.encodeValue(value))
body['results'].append(result)

write_json_response(body, response)
if geojson_output:
feature = QgsFeature(geojson_fields, f.id())
feature.setGeometry(f.geometry())
feature.setAttributes(list(result.values()))
body['results'].append(exporter.exportFeature(feature))
else:
body['results'].append(result)

if geojson_output:
response.setStatusCode(200)
response.setHeader("Content-Type", "application/vnd.geo+json; charset=utf-8")
response.write(
',\n'.join([
'{"type": "FeatureCollection"',
'"features": [' + ',\n'.join(body['results']) + ']}'
])
)
else:
write_json_response(body, response)
return

@staticmethod
Expand Down
Loading
Loading