Merge pull request deegree#1629 from lat-lon/feature/srsNameStoredQue…

…ry-X-2307 Add support of srsName in StoredQueries
tfr42 · Apr 10, 2024 · 775c34f · 775c34f
2 parents 6abc0e8 + 5fa5ddf
commit 775c34f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/...ices/deegree-services-wfs/src/main/java/org/deegree/services/wfs/query/QueryAnalyzer.java b/...ices/deegree-services-wfs/src/main/java/org/deegree/services/wfs/query/QueryAnalyzer.java
@@ -42,7 +42,6 @@
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.math.BigInteger;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -260,10 +259,11 @@ private List<Pair<AdHocQuery, org.deegree.protocol.wfs.query.Query>> convertTemp
 		try {
 			String templ = IOUtils.toString(u.openStream());
 			for (Entry<String, OMElement> e : query.getParams().entrySet()) {
-				String val = e.getValue().getText();
-				Pattern p = Pattern.compile("[$][{]" + e.getKey() + "[}]", Pattern.CASE_INSENSITIVE);
-				templ = p.matcher(templ).replaceAll(val);
+				String key = e.getKey();
+				templ = replaceParam(key, e.getValue().getText(), templ);
 			}
+			String defaultSrsName = controller.getDefaultQueryCrs().getAlias();
+			templ = replaceParam("srsName", defaultSrsName, templ);
 
 			LOG.debug("Stored query template after replacement: {}", templ);
 
@@ -287,6 +287,11 @@ private List<Pair<AdHocQuery, org.deegree.protocol.wfs.query.Query>> convertTemp
 		}
 	}
 
+	private static String replaceParam(String key, String val, String templ) {
+		Pattern p = Pattern.compile("[$][{]" + key + "[}]", Pattern.CASE_INSENSITIVE);
+		return p.matcher(templ).replaceAll(val);
+	}
+
 	private List<Pair<AdHocQuery, org.deegree.protocol.wfs.query.Query>> convertStoredQueries(
 			List<org.deegree.protocol.wfs.query.Query> wfsQueries) throws OWSException {
 		List<Pair<AdHocQuery, org.deegree.protocol.wfs.query.Query>> adHocQueries = new ArrayList<Pair<AdHocQuery, org.deegree.protocol.wfs.query.Query>>();

diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/webservices.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/webservices.adoc
@@ -832,7 +832,7 @@ StoredQueryDefinition file. Here's an example:
   </Parameter>
   <QueryExpressionText returnFeatureTypes="ad:Address"
    language="urn:ogc:def:queryLanguage:OGC-:WFSQueryExpression">
-    <Query typeNames="ad:Address">
+    <Query srsName="${srsName}" typeNames="ad:Address">
       <Filter xmlns="http://www.opengis.net/fes/2.0">
         <PropertyIsEqualTo>
           <ValueReference>
@@ -866,6 +866,8 @@ Query-Elements should be used. An exception is thrown as
 DescribeStoredQueries response, if the configured feature type is not
 served by the WFS.
 
+The optional attribute _srsName="${srsName}"_ can be set to support the parameter _srsName_ in the GetFeature request to determine the CRS of the returned geometries. If the paramater is missing in the request, the default CRS of the WFS is returned.
+
 To enable support for the Manage Stored Queries conformance class for WFS 2.0.0 it is required to create a directory storedqueries/managed in your workspace. The stored queries created with _CreateStoredQuery_ requests are stored in this directory. They are loaded during startup of deegree automatically. It is not recommend to put the StoredQueries configured in the WFS configuration with the StoredQuery element into this folder. If the directory is missing the _CreateStoredQuery_ request returns an exception.
 
 TIP: deegree WFS supports the execution of stored queries using