Skip to content
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

Setting up to date some files #887

Merged
merged 11 commits into from
Nov 18, 2024
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
59 changes: 0 additions & 59 deletions appveyor.yml

This file was deleted.

5 changes: 0 additions & 5 deletions compile

This file was deleted.

3 changes: 0 additions & 3 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@


# NewConnectionError looks like information is wrong
r'http://udig.refractions.net',
r'https://sgx.geodatenzentrum.de',

# link exists but does not accept robots and linkchecker is a robot
Expand Down Expand Up @@ -279,8 +278,6 @@
.. |osgeolive-iso-size| replace:: %(iso_size).1f GB
.. |osgeolive-vm-7z-size| replace:: %(vm_7z_size).1f GB
.. |osgeolive-appmenupath-geoserver| replace:: :menuselection:`Geospatial --> Web Services --> GeoServer --> Start GeoServer`
.. |osgeolive-appmenupath-udig| replace:: :menuselection:`Geospatial --> Desktop GIS --> uDig`
.. |osgeolive-appmenupath-52nWPS| replace:: :menuselection:`Geospatial --> Web Services --> 52North --> Start 52North WPS`
.. |osgeolive-appmenupath-ETF| replace:: :menuselection:`Geospatial --> Spatial tools --> ETF`
.. |vmdk| image:: /images/logos/vmdk.png
:align: bottom
Expand Down
Binary file not shown.
Binary file removed doc/images/projects/mapproxy/mapproxy_udig.png
Binary file not shown.
Binary file modified doc/images/projects/osgeolive/osgeolive_install_start.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/projects/osgeolive/osgeolive_menu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed doc/images/projects/udig/logo_udig.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_AddWMSLayers.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_MapMylar.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_Quickstart1Splash.png
Binary file not shown.
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_StyleEditor.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_WMSMap.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_WebViewClick.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_backward_nav.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_forward_nav.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_info_mode.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_pan_mode.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_screenshot.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_welcome.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_workbench.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_zoom_extent_co.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_zoom_in_co.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_zoom_mode.png
Binary file not shown.
Binary file removed doc/images/projects/udig/udig_zoom_out_co.png
Binary file not shown.
2 changes: 1 addition & 1 deletion doc/overview/geotools_overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
GeoTools is an open source (LGPL) Java library which provides standards compliant methods for manipulating geospatial data, and uses data structures based on Open Geospatial Consortium (OGC) specifications.

GeoTools is used by a number of projects including web services, command line tools and desktop applications. OSGeoLive applications which include GeoTools include:
:doc:`52nSOS_overview`, AtlasStyler, Geopublisher, :doc:`geoserver_overview`, and :doc:`udig_overview`.
:doc:`52nSOS_overview`, AtlasStyler, Geopublisher, :doc:`geoserver_overview`.

@SCREENSHOT_geotools@

Expand Down
3 changes: 0 additions & 3 deletions doc/overview/pgrouting_overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ geospatial database to provide geospatial routing and other network analysis fun

Advantages of the database routing approach are:

* Data and attributes can be modified by many clients, like :doc:`qgis_overview`
and :doc:`udig_overview` through JDBC, ODBC, or directly using Pl/pgSQL.
The clients can either be PCs or mobile devices.
* Data changes can be reflected instantaneously through the routing engine.
There is no need for precalculation.
* The "cost" parameter can be dynamically calculated through SQL and its value can come
Expand Down
6 changes: 2 additions & 4 deletions doc/overview/postgis_overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,8 @@ from desktop and web GIS clients. These clients can also map and manipulate Post
.. Writing Tip:
Provide a image of the application which will typically be a screen shot
or a collage of screen shots.
Store image in image/<application>_<name>.png . Eg: udig_main_page.png
Screenshots should be captured from a 1024x768 display.
Don't include the desktop background as this changes with each release
and will become dated.
doc/images/projects/<name>/<name>_screenshot.png


@SCREENSHOT_postgis@

Expand Down
85 changes: 0 additions & 85 deletions doc/overview/udig_overview.rst

This file was deleted.

13 changes: 8 additions & 5 deletions doc/prior_applications.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Previously available applications
:delim: %

|nologo| % 52nWPS_ % `QuickStart <52nWPS_q_>`__ % 16.0 % Web Processing Services
|nologo| % udig_ % `QuickStart <udig_q_>`__ % 16.0 % Desktop GIS
|nologo| % ncWMS_ % `QuickStart <ncwms_q_>`__ % 14.0 % Web Map Service
|nologo| % LibLAS_ % `QuickStart <LibLAS_q_>`__ % 13.0 % LiDAR Data Access
|nologo| % MapSlicer_ % `QuickStart <MapSlicer_q_>`__ % 13.0 % Create Map Tiles
|nologo| % Geomajas_ % `QuickStart <Geomajas_q_>`__ % 13.0 % Browser GIS Client
Expand All @@ -37,6 +39,9 @@ Previously available applications
|osgeo_community| % MapGuide_ % `QuickStart <MapGuide_q_>`__ % 5.0 % Web Service


.. _52nWPS: https://live.osgeo.org/archive/16.0/en/overview/52nWPS_overview.html
.. _udig: https://live.osgeo.org/archive/16.0/en/overview/udig_overview.html
.. _ncWMS: https://live.osgeo.org/archive/14.0/en/overview/ncWMS_overview.html
.. _LibLAS: https://live.osgeo.org/archive/13.0/en/overview/liblas_overview.html
.. _MapSlicer: https://live.osgeo.org/archive/13.0/en/overview/mapslicer_overview.html
.. _Geomajas: https://live.osgeo.org/archive/13.0/en/overview/geomajas_overview.html
Expand Down Expand Up @@ -64,6 +69,9 @@ Previously available applications
.. _52nWPS: https://live.osgeo.org/archive/16.0/en/overview/52nWPS_overview.html


.. _52nWPS_q: https://live.osgeo.org/archive/16.0/en/quickstart/52nWPS_quickstart.html
.. _udig_q: https://live.osgeo.org/archive/16.0/en/quickstart/udig_quickstart.html
.. _ncwms_q: https://live.osgeo.org/archive/14.0/en/quickstart/ncWMS_quickstart.html
.. _LibLAS_q: https://live.osgeo.org/archive/13.0/en/quickstart/liblas_quickstart.html
.. _MapSlicer_q: https://live.osgeo.org/archive/13.0/en/quickstart/mapslicer_quickstart.html
.. _Geomajas_q: https://live.osgeo.org/archive/13.0/en/quickstart/geomajas_quickstart.html
Expand All @@ -89,8 +97,3 @@ Previously available applications
.. _MapGuide_q: https://live.osgeo.org/archive/5.0/en/quickstart/mapguide_quickstart.html
.. _52nWPS_q: https://live.osgeo.org/archive/16.0/en/quickstart/52nWPS_quickstart.html






62 changes: 3 additions & 59 deletions doc/quickstart/geoserver_quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@


.. |GS| replace:: GeoServer
.. |UG| replace:: uDig


********************************************************************************
Expand Down Expand Up @@ -156,66 +155,12 @@ 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.

Using |UG| to create simple styles
Create simple styles
----------------------------------

.. note::

For more details on how to use |UG| see the :doc:`uDig Quickstart <../quickstart/udig_quickstart>`

#. Open |UG| and add the shapefiles (using the add data button in the top left
hand corner).
#. Drag the ne_10m_land and ne_10m_ocean tables into the map window. |UG|
automatically applies a style (so you can see the data).

.. image:: /images/projects/geoserver/geoserver-udig_startup.png
:align: center
:scale: 70 %
:alt: Default Styling in uDig

#. In the :ref:`Layer list <Layer_list>` select the style button (it looks like
an artist's palette).

.. _Layer_list:
.. image:: /images/projects/geoserver/geoserver-layer-chooser.png
:align: center
:scale: 70 %
:alt: The Layer list window

This will open the :ref:`Style Pane <Style_Pane>`.
#. In the simple window we can easily select a nice blue for the oceans by
clicking on the colored box on the fill tab and choosing from the color
picker it produces. We can also increase the opacity of the fill to 100% to
make the color look better. Pick the same blue for the border color so it
will match.

.. _Style_Pane:
.. image:: /images/projects/geoserver/geoserver-style-pane.png
:align: center
:scale: 70 %
:alt: The Style Pane
Please follow this instructions.

#. Click ``OK`` and |UG| will display the changes.

.. image:: /images/projects/geoserver/geoserver-blue-ocean.png
:align: center
:scale: 70 %
:alt: Blue Oceans

#. Repeat the steps above to change the color of the land layer. You can use the
``define custom colors`` section to create your preferred color.

.. image:: /images/projects/geoserver/geoserver-custom-colour.png
:align: center
:scale: 70 %
:alt: Defining a nicer land color

This gives a nice looking basic world map.

.. image:: /images/projects/geoserver/geoserver-basic-world.png
:align: center
:scale: 70 %
:alt: A basic word map
https://docs.geoserver.org/latest/en/user/styling/qgis/index.html

Adding the style to GeoServer
-----------------------------
Expand Down Expand Up @@ -285,7 +230,6 @@ Clients for WMS layers
The |WMS| layers you are serving from |GS| can be used with a variety of clients
on this OSGeoLive distribution, including:

* :doc:`uDig <../overview/udig_overview>`
* :doc:`OpenLayers <../overview/openlayers_overview>`
* :doc:`MapBender <../overview/mapbender_overview>`

Expand Down
12 changes: 4 additions & 8 deletions doc/quickstart/mapproxy_quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,12 @@ The MapProxy demo page contains a rudimentary WMS and tile client for each confi
View in desktop GIS
===================

You can add MapProxy in any WMS Desktop GIS like uDig, QGIS or gvSIG. The service URL is: `<http://localhost:8011/service?>`_
You can add MapProxy in any WMS Desktop GIS like QGIS or gvSIG. The service URL
is: `<http://localhost:8011/service?>`_

The MapProxy example configuration contains a few layers that use different map engines and map data. See below for more details about each layer.
The MapProxy example configuration contains a few layers that use different map
engines and map data. See below for more details about each layer.

.. figure:: /images/projects/mapproxy/mapproxy_udig.png
:scale: 70 %
:alt: MapProxy example in uDig
:align: center

Single WMS layer with data from two cascaded sources and `FeatureInformation` from one source.

Available layers
----------------
Expand Down
Loading