Skip to content
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
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ def setup(app):
r'http://localhost:\d+/', r'http://localhost:\d+', r'http://localhost/', r'http://127.0.0.1:\d+/',
r'https://localhost:\d+/', r'https://localhost:\d+', r'https://localhost/', r'https://127.0.0.1:\d+/',

# TODO remove when openlayers page is found
'https://openlayers.org/en/master/examples/preload.html',
# TODO remove when 15 is located
'https://sourceforge.net/projects/osgeo-live/files/15.0/',
]
linkcheck_anchors = False

Expand Down
3 changes: 1 addition & 2 deletions docs/interactions/chapter-11.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ be added to that map object.

The center and resolution (zoom level) of the map are controlled through the
*view* object. Unless other mapping libraries, the view is separated from the
map; one advantage is to allow multiple maps to share the same view. See `this
example <https://openlayers.org/en/master/examples/preload.html>`__.
map; one advantage is to allow multiple maps to share the same view.

OpenLayers features three renderers: the *Canvas* renderer, the *WebGL*
renderer, and the *DOM* renderer. Currently, the most capable renderer is
Expand Down
2 changes: 1 addition & 1 deletion docs/scripts/get_data/get_osgeolive_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
# TODO Use the /15/osm instead of data/osm/FIRENZE_IT
CITY="@PGR_WORKSHOP_CITY_FILE@"
wget -N --progress=dot:mega \
"http://download.osgeo.org/livedvd/data/osm/FIRENZE_IT/$CITY.osm.bz2"
"http://download.osgeo.org/livedvd/15/osm/$CITY.osm.bz2"
bunzip2 -f "$CITY.osm.bz2"
# 4.2.2 to-here