Skip to content

Commit 1f58c8c

Browse files
authored
Merge pull request #891 from cvvergara/fixing-some-sphinx-errors
fixing sphinx errors and adding cmake policies
2 parents cc61f43 + 0d84e6c commit 1f58c8c

14 files changed

+234
-218
lines changed

.github/workflows/deploy-pages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Python
2828
uses: actions/setup-python@v5
2929
with:
30-
python-version: '3.x'
30+
python-version: '3.12'
3131

3232
- name: Install dependencies
3333
run: |

.github/workflows/linkcheck.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
if: env.PROCESS == 'true' || env.CHK_LINK == 'true'
6060
uses: actions/setup-python@v5
6161
with:
62-
python-version: '3.x'
62+
python-version: '3.12'
6363

6464

6565
- name: Install dependencies

.github/workflows/locale-update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Python
3737
uses: actions/setup-python@v5
3838
with:
39-
python-version: '3.x'
39+
python-version: '3.12'
4040

4141
- name: Install dependencies
4242
run: |

CMakeLists.txt

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
1-
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
22
if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} )
33
message(FATAL_ERROR "In-source builds not allowed.
44
Please make a new directory (called a build directory) and run CMake from there.
55
You may need to remove CMakeCache.txt." )
66
endif()
77

8+
if(POLICY CMP0144)
9+
cmake_policy(SET CMP0144 OLD)
10+
endif()
11+
12+
if(POLICY CMP0167)
13+
cmake_policy(SET CMP0167 OLD)
14+
endif()
15+
16+
if(POLICY CMP0148)
17+
cmake_policy(SET CMP0148 OLD)
18+
endif()
19+
820
#---------------------------------------------
921
#---------------------------------------------
1022
#---------------------------------------------

doc/overview/deegree_overview.rst

+4-3
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ Details
130130
@QUICKSTART_deegree@
131131

132132
.. presentation-note
133-
deegree is another robust application which has claimed the title of supporting the most comprehensive set of OGC
134-
Web Services in free and open source software, ranging from a transactional Web Feature Service to executing
135-
geospatial processes with a Web Processing Service and many more!
133+
deegree is another robust application which has claimed the title of
134+
supporting the most comprehensive set of OGC Web Services in free and open
135+
source software, ranging from a transactional Web Feature Service to
136+
executing geospatial processes with a Web Processing Service and many more!

doc/quickstart/deegree_quickstart.rst

+52-32
Original file line numberDiff line numberDiff line change
@@ -17,81 +17,101 @@
1717
********************************************************************************
1818

1919
*deegree* is open source software for spatial data infrastructures and the
20-
geospatial web. *deegree* is a Java application for serving maps (and vector data) for other clients to visualize.
20+
geospatial web. *deegree* is a Java application for serving maps (and vector
21+
data) for other clients to visualize.
2122

2223
Available components are:
2324

24-
* Web services: WFS, WMS, WMTS, CSW, WPS
25+
* Web services: WFS, WMS, WMTS, CSW, WPS
2526

26-
*deegree 3.6.0-pre2* is the newest pre-release version of the deegree Java framework for GIS applications and OGC-service implementations.
27-
It can be used to build web-based geospatial-data-infrastructures (GDI).
27+
*deegree 3.6.0-pre2* is the newest pre-release version of the deegree Java
28+
framework for GIS applications and OGC-service implementations. It can be used
29+
to build web-based geospatial-data-infrastructures (GDI).
2830

2931
.. contents:: **Contents**
3032
:local:
3133

3234
Start deegree webservices
33-
===========================
35+
===============================================================================
3436

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

38-
Firefox opens the *deegree webservices administration console*. Alternatively, you can also open this manually by pointing your browser to http://localhost:8080/deegree.
39-
The administration console is a simple web-based GUI for editing the configuration files of the activated *deegree workspace*.
40+
Firefox opens the *deegree webservices administration console*. Alternatively,
41+
you can also open this manually by pointing your browser to
42+
http://localhost:8080/deegree.
43+
The administration console is a simple web-based GUI for editing the
44+
configuration files of the activated *deegree workspace*.
4045

4146
Load a workspace
42-
================
47+
===============================================================================
4348

44-
*deegree* uses configurations conformant to all *deegree* based webservices. Those configurations are stored in the workspace.
49+
*deegree* uses configurations conformant to all *deegree* based webservices.
50+
Those configurations are stored in the workspace.
4551

46-
#. 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.
47-
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.
52+
#. To manage the included and ready-to-use workspaces, click *'workspaces'* on
53+
the left side. You are now in the workspace management of the running
54+
*deegree* instance.
55+
You can see which workspace is currently active (only one can be active at a
56+
time) workspace, inactive locally available workspaces and official
57+
workspaces which can be imported if you have a internet connection.
4858
#. Press start on the *deegree-workspace-utah-light* workspace.
4959

50-
* 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.
60+
* The demo workspace contains a web mapping setup based on data from the state
61+
of Utah. It contains a WMS configuration (1.3.0 and 1.1.1) consisting of
62+
vector layers and a variety of render styles. Additionally, a WFS (2.0.0,
63+
1.1.0 and 1.0.0) is configured that allows to access the raw vector data,
64+
backed by shapefiles, in GML format.
5165

5266
.. image:: /images/projects/deegree/deegree_workspace.png
5367
:scale: 70 %
5468
:alt: deegree workspaces management
5569

5670
**Tip:**
57-
For additional configuration examples including raster data, you can import the workspace *deegree-workspace-utah* through the workspace management (internet connection is required).
71+
For additional configuration examples including raster data, you can import the
72+
workspace *deegree-workspace-utah* through the workspace management (internet
73+
connection is required).
5874

5975
Visualize the data
60-
==========
76+
================================================================================
6177

62-
#. Click on *'web services'* to display all the preconfigured web services (WFS and WMS).
78+
#. Click on *'web services'* to display all the preconfigured web services (WFS
79+
and WMS).
6380

64-
.. image:: /images/projects/deegree/deegree_webservices.png
81+
.. image:: /images/projects/deegree/deegree_webservices.png
6582
:scale: 70 %
6683
:alt: deegree web services
6784

68-
#. Click on the *'Capabilities'* button of the preconfigured WMS. The GetCapabilities document of the WMS will open in a new tab.
85+
#. Click on the *'Capabilities'* button of the preconfigured WMS. The
86+
GetCapabilities document of the WMS will open in a new tab.
6987

70-
.. image:: /images/projects/deegree/deegree_capabilities.png
88+
.. image:: /images/projects/deegree/deegree_capabilities.png
7189
:scale: 70 %
7290
:alt: deegree WMS capabilities
7391

74-
#. 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.
92+
#. Use the GetCapabilities request URL to add the WMS to for example :doc:`QGIS
93+
<../overview/qgis_overview>`. Once added, you can choose of a variety of layers served by
94+
the deegree WMS here.
7595

76-
.. image:: /images/projects/deegree/deegree_wms_qgis.png
96+
.. image:: /images/projects/deegree/deegree_wms_qgis.png
7797
:scale: 70 %
7898
:alt: deegree WMS in QGIS
7999

80100
What next?
81-
==========
101+
===============================================================================
82102

83103
This was a brief introduction to deegree's core features.
84-
Further information and comprehensive documentation of all functionalities are available on the deegree website.
104+
Further information and comprehensive documentation of all functionalities are
105+
available on the deegree website.
85106

86-
* deegree website - Available here: https://www.deegree.org
107+
* deegree website - Available here: https://www.deegree.org
108+
* deegree documentation - Available here: https://www.deegree.org/documentation
109+
* deegree workshop (INSPIRE) - Available here:
110+
https://github.com/lat-lon/deegree-workshop
111+
* deegree Soildata Assimilation Guidance
112+
https://ejpsoil.github.io/soildata-assimilation-guidance/cookbook/deegree.html
113+
* deegree docker images - Available here:
87114

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

90-
* deegree workshop (INSPIRE) - Available here: https://github.com/lat-lon/deegree-workshop
91-
92-
* deegree Soildata Assimilation Guidance https://ejpsoil.github.io/soildata-assimilation-guidance/cookbook/deegree.html
93-
94-
* deegree docker images - Available here:
95-
* deegree webservices - https://hub.docker.com/r/deegree/deegree3-docker
96-
* deegree OGC API - https://hub.docker.com/r/deegree/deegree-ogcapi
97-

doc/quickstart/geoserver_quickstart.rst

+1-3
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,7 @@ apply various symbolizers to the data.
151151

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

158156
Create simple styles
159157
----------------------------------

locale/en/LC_MESSAGES/overview/deegree_overview.po

+4-13
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: OSGeoLive 17.0.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-11-18 16:56+0000\n"
11+
"POT-Creation-Date: 2025-04-29 17:48+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language: en\n"
@@ -17,7 +17,7 @@ msgstr ""
1717
"MIME-Version: 1.0\n"
1818
"Content-Type: text/plain; charset=utf-8\n"
1919
"Content-Transfer-Encoding: 8bit\n"
20-
"Generated-By: Babel 2.16.0\n"
20+
"Generated-By: Babel 2.17.0\n"
2121

2222
#: ../../build/doc/overview/deegree_overview.rst:21
2323
msgid "deegree"
@@ -370,20 +370,11 @@ msgstr ""
370370
msgid ":doc:`Quickstart documentation <../quickstart/deegree_quickstart>`"
371371
msgstr ""
372372

373-
#: ../../build/doc/overview/deegree_overview.rst:148
374-
msgid ""
375-
"deegree is another robust application which has claimed the title of "
376-
"supporting the most comprehensive set of OGC Web Services in free and "
377-
"open source software, ranging from a transactional Web Feature Service to"
378-
" executing geospatial processes with a Web Processing Service and many "
379-
"more!"
380-
msgstr ""
381-
382-
#: ../../build/doc/<rst_epilog>:13
373+
#: ../../build/doc/<rst_epilog>:11
383374
msgid "vmdk"
384375
msgstr ""
385376

386-
#: ../../build/doc/<rst_epilog>:16
377+
#: ../../build/doc/<rst_epilog>:14
387378
msgid "nologo"
388379
msgstr ""
389380

0 commit comments

Comments
 (0)