Update and enhance the deegree quickstart and overview (#885)

* #407 - Update and enhance the deegree quickstart and overview for OSGeoLive 17.0 and deegree 3.6.0-pre2

doc/overview/deegree_overview.rst

@@ -1,10 +1,10 @@
 :Author: Johannes Wilden
 :Author: Markus Schneider
 :Author: Danilo Bretschneider
-:Auhtor: Julian Zilz
+:Author: Julian Zilz
 :Reviewer: Cameron Shorter, Jirotech
 :Reviewer: Angelos Tzotsos, OSGeo
-:Version: osgeolive15.0
+:Version: osgeolive17.0
 :License: Creative Commons Attribution 3.0 Unported (CC BY 3.0)
 
 @LOGO_deegree@
@@ -18,7 +18,7 @@ About
 --------------------------------------------------------------------------------
 
 
-deegree provides geospatial webservices based upon |OGC| and `INSPIRE Network Services <https://inspire.ec.europa.eu>`_
+deegree provides geospatial webservices based upon |OGC| and `INSPIRE Network Services <https://inspire.ec.europa.eu>`__
 specifications. deegree supports:
 
 * |WFS|: Serves vector data from geospatial data
@@ -35,10 +35,10 @@ Core Features
 **WFS**
 
 * Implements WFS standards 1.0.0, 1.1.0 and 2.0.0
-* Official OGC reference implementation for WFS 1.1.0 (Basic and Transactional) and WFS 2.0.0 (Basic)
+* Official OGC reference implementation for WFS 1.0.0 (Transactional), 1.1.0 (Basic and Transactional) and WFS 2.0.0 (Basic)
 * Fully transactional (even for rich data models)
 * Supports KVP, XML and SOAP requests
-* GML 2/3.0/3.1/3.2 output/input
+* Supports GML 2, 3.0, 3.1, and 3.2 for both output and input
 * Support for GetGmlObject requests and XLinks
 * High performance and excellent scalability
 * On-the-fly coordinate transformation
@@ -67,7 +67,7 @@ Core Features
 **WMTS**
 
 * Implements Basic WMTS standard 1.0.0 (KVP)
-* Official OGC reference implementation for WMS 1.0.0
+* Official OGC reference implementation for WMTS 1.0.0
 * High performance and excellent scalability
 * Supports different backends, such as GeoTIFF, remote WMS or file system tile image hierarchies
 * Supports on-the-fly caching (using EHCache)
@@ -80,7 +80,7 @@ Core Features
 * Supports KVP, XML and SOAP requests
 * High performance and excellent scalability
 * ISO Metadata Application Profile 1.0.0
-* Pluggable and modular dataaccess layer allows to add support for new APs and backends
+* Pluggable and modular data access layer allows to add support for new APs and backends
 * Modular inspector architecture allows to validate records to be inserted against various criteria
 * Standard inspectors: schema validity, identifier integrity, INSPIRE requirements
 * Handles all defined queryable properties (for Dublin Core as well as ISO profile)
@@ -105,7 +105,7 @@ Implemented Standards
 
 * |WFS| 1.0.0, 1.1.0 and 2.0.0
 * |WMS| 1.1.1 and 1.3.0
-* |WMTS| 1.1.0
+* |WMTS| 1.0.0
 * |CSW| 2.0.2
 * |WPS| 1.0.0
 * |GML| 2.12, 3.0.1, 3.1.1 and 3.2.1
@@ -130,6 +130,6 @@ Details
 @QUICKSTART_deegree@
 
 .. presentation-note
-    deegree is another robust application which has claimed the title of supporting the most comprehensive set of OGC
-    Web Services in free and open source software, ranging from a transactional Web Feature Service to three-dimensional
-    data display in a Web Terrain Service and many more!
+deegree is another robust application which has claimed the title of supporting the most comprehensive set of OGC
+Web Services in free and open source software, ranging from a transactional Web Feature Service to executing
+geospatial processes with a Web Processing Service and many more!

doc/quickstart/deegree_quickstart.rst

@@ -3,7 +3,7 @@
 :Author: Torsten Friebe
 :Author: Julian Zilz
 :Reviewer: Felicity Brand (Google Season of Docs 2019)
-:Version: osgeolive15.0
+:Version: osgeolive17.0
 :License: Creative Commons Attribution-ShareAlike 3.0 Unported  (CC BY-SA 3.0)
 
 @LOGO_deegree@
@@ -17,65 +17,81 @@
 ********************************************************************************
 
 *deegree* is open source software for spatial data infrastructures and the
-geospatial web. *deegree* is a Java application for serving maps (and vector data) for other clients to show.
+geospatial web. *deegree* is a Java application for serving maps (and vector data) for other clients to visualize.
 
 Available components are:
 
-  * Web-Services: WFS, WMS, WMTS, CSW, WPS
+  * Web services: WFS, WMS, WMTS, CSW, WPS
 
-*deegree 3* is the new generation of the deegree Java framework for GIS
-applications and OGC-service implementations.
+*deegree 3.6.0-pre2* is the newest pre-release version of the deegree Java framework for GIS applications and OGC-service implementations.
 It can be used to build web-based geospatial-data-infrastructures (GDI).
 
-.. contents:: Contents
+.. contents:: **Contents**
    :local:
 
-Start deegree 3 webservices
+Start deegree webservices
 ===========================
 
 Choose |menu_deegree-Start|.
 The application will take a few moments to start up.
 
-Firefox opens the *deegree 3 services console*. (You can also open this manually by pointing your browser to http://localhost:8033).
-This is a simple web-based GUI for editing the configuration files of the *deegree workspace*.
+Firefox opens the *deegree webservices administration console*. Alternatively, you can also open this manually by pointing your browser to http://localhost:8080/deegree.
+The administration console is a simple web-based GUI for editing the configuration files of the activated *deegree workspace*.
 
 Load a workspace
 ================
 
-*deegree 3* uses configurations conformant to all *deegree 3* based webservices. Those configurations are stored in the workspace.
+*deegree* uses configurations conformant to all *deegree* based webservices. Those configurations are stored in the workspace.
 
 #. To manage the included and ready-to-use workspaces, click *'workspaces'* on the left side. You are now in the workspace management of the running *deegree* instance.
-   You can see which workspace is currently active (only one can be active at a time) workspace, inactive locally available workspaces and offical workspaces which can be imported if you have a internet connection.
-#. Press start on the *deegree-workspace-utah-light*.
+   You can see which workspace is currently active (only one can be active at a time) workspace, inactive locally available workspaces and official workspaces which can be imported if you have a internet connection.
+#. Press start on the *deegree-workspace-utah-light* workspace.
 
-The demo workspace contains a web mapping setup based on data from the state of Utah.
-It contains a WMS configuration (1.3.0 and 1.1.1) consisting of vector layers and a variety of render styles.
-Additionally, a WFS (2.0.0, 1.1.0 and 1.0.0) is configured that allows to access the raw vector data, backed by shapefiles, in GML format.
+  * The demo workspace contains a web mapping setup based on data from the state of Utah. It contains a WMS configuration (1.3.0 and 1.1.1) consisting of vector layers and a variety of render styles. Additionally, a WFS (2.0.0, 1.1.0 and 1.0.0) is configured that allows to access the raw vector data, backed by shapefiles, in GML format.
 
-.. tip::
-   For additional configuration examples including raster data,
-   you can import the workspace *deegree-workspace-utah* through the workspace management (internet connection is required).
+    .. image:: /images/projects/deegree/deegree_workspace.png
+      :scale: 70 %
+      :alt: deegree workspaces management
 
-View a map
+**Tip:**
+For additional configuration examples including raster data, you can import the workspace *deegree-workspace-utah* through the workspace management (internet connection is required).
+
+Visualize the data
 ==========
 
-#. Click on *'see layers'* to open a simple map-client. The service is configured to visualize the data and a basemap (rendered by `OpenStreetMap <https://www.openstreetmap.org/>`_).
+#. Click on *'web services'* to display all the preconfigured web services (WFS and WMS).
+
+    .. image:: /images/projects/deegree/deegree_webservices.png
+      :scale: 70 %
+      :alt: deegree web services
+
+#. Click on the *'Capabilities'* button of the preconfigured WMS. The GetCapabilities document of the WMS will open in a new tab.
 
-#. Click on the **+** on the right side to open a layer tree showing all available layers. You can activate the a variety of layers served by the deegree WMS here.
+    .. image:: /images/projects/deegree/deegree_capabilities.png
+      :scale: 70 %
+      :alt: deegree WMS capabilities
 
-.. tip::
-   The map client is based on `OpenLayers <https://openlayers.org/>`_.
-   You can pan through the map holding the left mouse button and drag the map.
-   Zooming is possible via mouse wheel or the navigation elements on the left side.
+#. Use the GetCapabilities request URL to add the WMS to for example :doc:`QGIS <qgis_overview>`. Once added, you can choose of a variety of layers served by the deegree WMS here.
+
+    .. image:: /images/projects/deegree/deegree_wms_qgis.png
+      :scale: 70 %
+      :alt: deegree WMS in QGIS
 
 What next?
 ==========
 
-This was just a short introduction to the features of deegree 3.
-There is more information in the demo installations and on the deegree website.
+This was a brief introduction to deegree's core features.
+Further information and comprehensive documentation of all functionalities are available on the deegree website.
 
   * deegree website - Available here: https://www.deegree.org
 
-  * deegree documentation - Available here: https://www.deegree.org/documentation/
+  * deegree documentation - Available here: https://www.deegree.org/documentation
+
+  * deegree workshop (INSPIRE) - Available here: https://github.com/lat-lon/deegree-workshop
+
+  * deegree Soildata Assimilation Guidance https://ejpsoil.github.io/soildata-assimilation-guidance/cookbook/deegree.html
 
-  * deegree docker images - Available here: https://hub.docker.com/r/deegree/deegree3-docker/
+  * deegree docker images - Available here:
+      * deegree webservices - https://hub.docker.com/r/deegree/deegree3-docker
+      * deegree OGC API - https://hub.docker.com/r/deegree/deegree-ogcapi
+

locale/en/LC_MESSAGES/overview/deegree_overview.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OSGeoLive 17.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-17 15:05-0600\n"
+"POT-Creation-Date: 2024-11-18 16:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.14.0\n"
+"Generated-By: Babel 2.16.0\n"
 
 #: ../../build/doc/overview/deegree_overview.rst:21
 msgid "deegree"
@@ -30,8 +30,8 @@ msgstr ""
 #: ../../build/doc/overview/deegree_overview.rst:27
 msgid ""
 "deegree provides geospatial webservices based upon |OGC| and `INSPIRE "
-"Network Services <https://inspire.ec.europa.eu>`_ specifications. deegree"
-" supports:"
+"Network Services <https://inspire.ec.europa.eu>`__ specifications. "
+"deegree supports:"
 msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:30
@@ -71,8 +71,8 @@ msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:48
 msgid ""
-"Official OGC reference implementation for WFS 1.1.0 (Basic and "
-"Transactional) and WFS 2.0.0 (Basic)"
+"Official OGC reference implementation for WFS 1.0.0 (Transactional), "
+"1.1.0 (Basic and Transactional) and WFS 2.0.0 (Basic)"
 msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:49
@@ -86,7 +86,7 @@ msgid "Supports KVP, XML and SOAP requests"
 msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:51
-msgid "GML 2/3.0/3.1/3.2 output/input"
+msgid "Supports GML 2, 3.0, 3.1, and 3.2 for both output and input"
 msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:52
@@ -199,7 +199,7 @@ msgid "Implements Basic WMTS standard 1.0.0 (KVP)"
 msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:80
-msgid "Official OGC reference implementation for WMS 1.0.0"
+msgid "Official OGC reference implementation for WMTS 1.0.0"
 msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:82
@@ -234,8 +234,8 @@ msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:93
 msgid ""
-"Pluggable and modular dataaccess layer allows to add support for new APs "
-"and backends"
+"Pluggable and modular data access layer allows to add support for new APs"
+" and backends"
 msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:94
@@ -319,7 +319,7 @@ msgid "|WMS| 1.1.1 and 1.3.0"
 msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:118
-msgid "|WMTS| 1.1.0"
+msgid "|WMTS| 1.0.0"
 msgstr ""
 
 #: ../../build/doc/overview/deegree_overview.rst:119
@@ -370,6 +370,15 @@ msgstr ""
 msgid ":doc:`Quickstart documentation <../quickstart/deegree_quickstart>`"
 msgstr ""
 
+#: ../../build/doc/overview/deegree_overview.rst:148
+msgid ""
+"deegree is another robust application which has claimed the title of "
+"supporting the most comprehensive set of OGC Web Services in free and "
+"open source software, ranging from a transactional Web Feature Service to"
+" executing geospatial processes with a Web Processing Service and many "
+"more!"
+msgstr ""
+
 #: ../../build/doc/<rst_epilog>:13
 msgid "vmdk"
 msgstr ""