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.

Sign up for GitHub

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

Jump to bottom

DOC: Fix some minor issues #1123

Merged
merged 4 commits into from
Sep 25, 2018
Merged

DOC: Fix some minor issues #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ee2d26
DOC: Fix Mercator docstring.
QuLogic Sep 25, 2018
b78ea0d
DOC: Fix intersphinx link to Shapely.
QuLogic Sep 25, 2018
0784065
DOC: Fix sphinx warning about unterminated list.
QuLogic Sep 25, 2018
6da3731
DOC: Fix formatting of GoogleTiles url example.
QuLogic Sep 25, 2018
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 docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'python': ('https://docs.python.org/3', None),
'matplotlib': ('https://matplotlib.org', None),
'shapely': ('https://toblerity.org/shapely', None), }
'shapely': ('http://toblerity.org/shapely', None), }



Expand Down
10 changes: 5 additions & 5 deletions docs/source/whats_new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ What's New in cartopy 0.17
Features
--------
* The :class:`cartopy.feature.NaturalEarthFeature` class now allows a
:class:`cartopy.feature.AdaptiveScaler` object to be passed as the `scale`
argument. This will automatically choose the appropriate feature scale from
the GeoAxes extent. This can also be used interactively while panning and
zooming in a figure. :data:`cartopy.feature.NaturalEarthFeature.scale` is
now read-only. (:pull:`1102`, :pull:`983`)
:class:`cartopy.feature.AdaptiveScaler` object to be passed as the `scale`
argument. This will automatically choose the appropriate feature scale from
the GeoAxes extent. This can also be used interactively while panning and
zooming in a figure. :data:`cartopy.feature.NaturalEarthFeature.scale` is
now read-only. (:pull:`1102`, :pull:`983`)

--------

Expand Down
2 changes: 2 additions & 0 deletions lib/cartopy/crs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,8 @@ def __init__(self, central_longitude=0.0,
scale_factor: optional
Scale factor at natural origin. Defaults to unused.

Notes
-----
Only one of ``latitude_true_scale`` and ``scale_factor`` should
be included.
"""
Expand Down
4 changes: 2 additions & 2 deletions lib/cartopy/io/img_tiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ def __init__(self, desired_tile_form='RGB', style="street",
'satellite', 'terrain', and 'only_streets'. Defaults to 'street'.
url: optional
URL pointing to a tile source and containing {x}, {y}, and {z}.
Such as: ('https://server.arcgisonline.com/ArcGIS/rest/services/'
'World_Shaded_Relief/MapServer/tile/{z}/{y}/{x}.jpg')
Such as: ``'https://server.arcgisonline.com/ArcGIS/rest/services/\
World_Shaded_Relief/MapServer/tile/{z}/{y}/{x}.jpg'``

"""
# Only streets are partly transparent tiles that can be overlayed over
Expand Down