From 39dd029d18f78025bf06ace464bbb371f33d1d8e Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Tue, 1 Dec 2020 19:28:23 +0100 Subject: [PATCH 1/5] Fixes minor formatting issue and and a wrong value for EnableResponseBuffering (default:false) enable also false, should be true - seems to be a left over of deprecated DisableResponseBuffering --- .../src/main/asciidoc/webservices.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/webservices.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/webservices.adoc index eeec62932f..47bd36258f 100644 --- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/webservices.adoc +++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/webservices.adoc @@ -196,7 +196,7 @@ streamed to the client. This is very much recommended and even a requirement for transferring large responses efficiently. The only drawback happens if exceptions occur, after a partial response has already been transferred. In this case, the client will receive part -payload and part exception report. By specifying _false_ here, you can +payload and part exception report. By specifying _true_ here, you can explicitly force buffering of the full response, before it is written to the client. Only if the full response could be generated successfully, it will be transferred. If an exception happens at any time the buffer @@ -228,7 +228,7 @@ parameter is present in a request). * _QueryMaxFeatures_: By default, a maximum number of 15000 features will be returned for a single _GetFeature_ request. Use this option to override this setting. A value of _-1_ means unlimited. -* ''ResolveTimeOutInSeconds'': Use this option to specify a default +* _ResolveTimeOutInSeconds_: Use this option to specify a default value for ResolveTimeOut, used in _GetFeature_ request if the ResolveTimeOut option is not set. * _QueryCheckAreaOfUse_: By default, spatial query constraints are not From 728f1102ce75521824676f7bff460b02f7514404 Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Tue, 1 Dec 2020 19:44:53 +0100 Subject: [PATCH 2/5] fixes formatting errors in filtering section --- .../src/main/asciidoc/filterencoding.adoc | 91 ++++++++----------- 1 file changed, 38 insertions(+), 53 deletions(-) diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/filterencoding.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/filterencoding.adoc index c70f90c1b8..c0a3b76bdc 100644 --- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/filterencoding.adoc +++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/filterencoding.adoc @@ -20,12 +20,11 @@ In the following, FE 1.1.0 syntax is used. FE enables the use of the following arithmetic operators: ----- -* Add: used for addition -* Sub: used for substraction -* Mul: used for multiplication -* Div: used for division ----- +* `Add`: used for addition +* `Sub`: used for substraction +* `Mul`: used for multiplication +* `Div`: used for division + *Example:* @@ -41,11 +40,10 @@ FE enables the use of the following arithmetic operators: FE enables the use of the following logical operators: ----- -* And: Links two conditions with AND -* Or: links two conditions with OR -* Not: negates a condition ----- +* `And`: Links two conditions with AND +* `Or`: links two conditions with OR +* `Not`: negates a condition + *Example:* @@ -62,25 +60,16 @@ FE enables the use of the following logical operators: deegree has implementations for the following list of comparison operators: ----- -* PropertyIsEqualTo: Evaluates if a property value equals to another -value. -* PropertyIsNotEqualTo: Evaluates if a property value differs from -another value. -* PropertyIsLessThan: Evaluates if a property value is smaller than -another value. -* PropertyIsGreaterThan: Evaluates if a property value is greater than -another value. -* PropertyIsLessThanOrEqualTo: Evaluates if a property value is smaller -than or equal to another value. -* PropertyIsGreaterThanOrEqualTo: Evaluates if a property value is -greater than or euqal to another value. -* PropertyIsLike: Evaluates if a property value is like another value. -It compares string values which each other. -* PropertyIsNull: Evaluates if a property value is NULL. -* PropertyIsBetween: Evaluates if a property value is between 2 defined -values. ----- +* `PropertyIsEqualTo`: Evaluates if a property value equals to another value. +* `PropertyIsNotEqualTo`: Evaluates if a property value differs from another value. +* `PropertyIsLessThan`: Evaluates if a property value is smaller than another value. +* `PropertyIsGreaterThan`: Evaluates if a property value is greater than another value. +* `PropertyIsLessThanOrEqualTo`: Evaluates if a property value is smaller than or equal to another value. +* `PropertyIsGreaterThanOrEqualTo`: Evaluates if a property value is greater than or euqal to another value. +* `PropertyIsLike`: Evaluates if a property value is like another value. It compares string values which each other. +* `PropertyIsNull`: Evaluates if a property value is NULL. +* `PropertyIsBetween`: Evaluates if a property value is between 2 defined values. + *Example:* @@ -96,23 +85,19 @@ values. With deegree you can make use of the following spatial operators: ----- -* Equals: Evaluates if geometries are identical -* Disjoin: Evaluates if geometries are spatially disjoined -* Touches: Evaluates if geometries are spatially touching -* Within: Evaluates if a geometry is spatially within another -* Overlaps: Evaluates if geometries are spatially overlapping -* Crosses: Evaluates if geometries are spatially crossing -* Intersects: Evaluates if geometries are spatially intersecting. This -is meant as the opposite of disjoin. -* Contains: Evaluates if a geometry spatially contains another. -* DWithin: Evaluates if a geometry is within a specific distance to -another. -* Beyond: Evaluates if a geometry is beyond a specific distance to -another. -* BBOX: Evaluates if a geometry spatially intersects with a given -bounding box. ----- + +* `Equals`: Evaluates if geometries are identical +* `Disjoin`: Evaluates if geometries are spatially disjoined +* `Touches`: Evaluates if geometries are spatially touching +* `Within`: Evaluates if a geometry is spatially within another +* `Overlaps`: Evaluates if geometries are spatially overlapping +* `Crosses`: Evaluates if geometries are spatially crossing +* `Intersects`: Evaluates if geometries are spatially intersecting. This is meant as the opposite of disjoin. +* `Contains`: Evaluates if a geometry spatially contains another. +* `DWithin`: Evaluates if a geometry is within a specific distance to another. +* `Beyond`: Evaluates if a geometry is beyond a specific distance to another. +* `BBOX`: Evaluates if a geometry spatially intersects with a given bounding box. + *Example:* @@ -130,8 +115,8 @@ bounding box. ---- -TIP: For further reading on spatial operators, please refer to the OGC Simple -Features Specification For SQL. +TIP: For further reading on spatial operators, please refer to the +https://www.ogc.org/standards/sfs[OGC Simple Features Specification For SQL]. === Filter expressions @@ -154,7 +139,7 @@ section gives some examples for the use of such filter expressions. ---- This filter expressions shows, how filter expressions with a comparative -filter are constructed In the concrete example, the property +filter are constructed. In the example above, the property SomeProperty is evaluated, if it equals to the value of "100". ===== Spatial filter expression @@ -176,8 +161,8 @@ SomeProperty is evaluated, if it equals to the value of "100". ---- This filter expressions shows, how filter expressions with a spatial -filter are constructed. In the concrete case, the defined filter looks -up, if the property geometry overlaps with the define polygon of ... +filter are constructed. In this example, the defined filter looks +up, if the property geometry overlaps with the defined polygon of "..." (geometry values removed for better readability). ==== Advanced filter expressions @@ -206,7 +191,7 @@ up, if the property geometry overlaps with the define polygon of ... This more complex filter expressions shows, how to make use of combinations of filter operators. THe given filter expression evaluates -if the value of the property DEPTH is smaller than "30" AND if the +if the value of the property DEPTH is smaller than "30" *and* if the geometry property named Geometry is spatially disjoint with the given envelope. From 261394045bd4a0557c7679e25671b3a2f0b87fe3 Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Tue, 1 Dec 2020 20:07:18 +0100 Subject: [PATCH 3/5] fixes formatting issues in lists --- .../src/main/asciidoc/basics.adoc | 4 +- .../src/main/asciidoc/featurestores.adoc | 3 +- .../src/main/asciidoc/renderstyles.adoc | 38 ++++++++----------- .../src/main/asciidoc/webservices.adoc | 4 +- 4 files changed, 21 insertions(+), 28 deletions(-) diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/basics.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/basics.adoc index da191967fa..0dd7265265 100644 --- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/basics.adoc +++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/basics.adoc @@ -67,12 +67,12 @@ The following diagram shows the different types of resources and their dependencies. The deegree configuration can be divided into several sections: ----- + * web sevrices * data stores * map layers * server connections ----- + For example, to offer a Web Feature Service, a feature store (based on a shapefile, database, etc) must be configured. With a rasterfile, like a diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/featurestores.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/featurestores.adoc index 16af5e46c3..1e7ae7e8cf 100644 --- a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/featurestores.adoc +++ b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/featurestores.adoc @@ -673,7 +673,8 @@ _cities_. *SQL feature store: Mapping two tables* [source,xml] -----* has only one dimension: the -element (to style the stroke). * ** has two dimensions: the (to sytle the @@ -132,26 +128,25 @@ inside of the point). * ** has three dimensions: the