Skip to content

fixing sphinx errors and adding cmake policies #891

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.

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

Merged
merged 4 commits into from
Apr 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.x'
python-version: '3.12'

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
if: env.PROCESS == 'true' || env.CHK_LINK == 'true'
uses: actions/setup-python@v5
with:
python-version: '3.x'
python-version: '3.12'


- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/locale-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.x'
python-version: '3.12'

- name: Install dependencies
run: |
Expand Down
14 changes: 13 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} )
message(FATAL_ERROR "In-source builds not allowed.
Please make a new directory (called a build directory) and run CMake from there.
You may need to remove CMakeCache.txt." )
endif()

if(POLICY CMP0144)
cmake_policy(SET CMP0144 OLD)
endif()

if(POLICY CMP0167)
cmake_policy(SET CMP0167 OLD)
endif()

if(POLICY CMP0148)
cmake_policy(SET CMP0148 OLD)
endif()

#---------------------------------------------
#---------------------------------------------
#---------------------------------------------
Expand Down
7 changes: 4 additions & 3 deletions doc/overview/deegree_overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ 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 executing
geospatial processes with a Web Processing 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!
84 changes: 52 additions & 32 deletions doc/quickstart/deegree_quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,81 +17,101 @@
********************************************************************************

*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 visualize.
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.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).
*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**
:local:

Start deegree webservices
===========================
===============================================================================

Choose |menu_deegree-Start|.
The application will take a few moments to start up.

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*.
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* uses configurations conformant to all *deegree* 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 official workspaces which can be imported if you have a internet connection.
#. 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 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.

.. image:: /images/projects/deegree/deegree_workspace.png
:scale: 70 %
:alt: deegree workspaces management

**Tip:**
For additional configuration examples including raster data, you can import the workspace *deegree-workspace-utah* through the workspace management (internet connection is required).
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 *'web services'* to display all the preconfigured web services (WFS and WMS).
#. Click on *'web services'* to display all the preconfigured web services (WFS
and WMS).

.. image:: /images/projects/deegree/deegree_webservices.png
.. 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 *'Capabilities'* button of the preconfigured WMS. The
GetCapabilities document of the WMS will open in a new tab.

.. image:: /images/projects/deegree/deegree_capabilities.png
.. image:: /images/projects/deegree/deegree_capabilities.png
:scale: 70 %
:alt: deegree WMS capabilities

#. 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.
#. Use the GetCapabilities request URL to add the WMS to for example :doc:`QGIS
<../overview/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
.. image:: /images/projects/deegree/deegree_wms_qgis.png
:scale: 70 %
:alt: deegree WMS in QGIS

What next?
==========
===============================================================================

This was a brief introduction to deegree's core features.
Further information and comprehensive documentation of all functionalities are available on the deegree website.
Further information and comprehensive documentation of all functionalities are
available on the deegree website.

* deegree website - Available here: https://www.deegree.org
* deegree website - Available here: https://www.deegree.org
* 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:

* deegree documentation - Available here: https://www.deegree.org/documentation
* deegree webservices - https://hub.docker.com/r/deegree/deegree3-docker
* deegree OGC API - https://hub.docker.com/r/deegree/deegree-ogcapi

* 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:
* deegree webservices - https://hub.docker.com/r/deegree/deegree3-docker
* deegree OGC API - https://hub.docker.com/r/deegree/deegree-ogcapi

4 changes: 1 addition & 3 deletions doc/quickstart/geoserver_quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@ apply various symbolizers to the data.

To get started, lets style the Land and Ocean datasets.
You can create SLD files using a simple text editor, but sometimes a graphical
editor is better. There are several options here but |UG| allows you to open the
shapefiles directly and apply simple styles using a GUI. It also provides a
simple editor to modify the XML if I need to.
editor is better.

Create simple styles
----------------------------------
Expand Down
17 changes: 4 additions & 13 deletions locale/en/LC_MESSAGES/overview/deegree_overview.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: OSGeoLive 17.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-18 16:56+0000\n"
"POT-Creation-Date: 2025-04-29 17:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand All @@ -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.16.0\n"
"Generated-By: Babel 2.17.0\n"

#: ../../build/doc/overview/deegree_overview.rst:21
msgid "deegree"
Expand Down Expand Up @@ -370,20 +370,11 @@ 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
#: ../../build/doc/<rst_epilog>:11
msgid "vmdk"
msgstr ""

#: ../../build/doc/<rst_epilog>:16
#: ../../build/doc/<rst_epilog>:14
msgid "nologo"
msgstr ""

Expand Down
Loading