Fix 'add_cities' to use modern GeoNames data

docs/source/index.rst

@@ -14,7 +14,8 @@ images using data from the GSHHS and WDBII datasets
 .. toctree::
    :maxdepth: 2
 
-   installation
+   installation_shape_files
+   installation_city_names
    usage
    high_quality_contours
    graticule

docs/source/installation_city_names.rst

@@ -0,0 +1,35 @@
+Installation of city names
+--------------------------
+
+Add a subdirectory CITIES to your *DB_DATA_ROOT*.
+Download cities2022.zip_ from github/pytroll/pycoast.
+If this deep link does no work (anymore) you can try
+do download it from github.com/pytroll/pycoast/ from
+directory tests/test_data/ by pressing the *Download*
+button. If all fails ask for help on the google
+pytroll_ list or on MSG-1_. Put cities2022.zip into
+CITIES. The structure of *DB_DATA_ROOT* should now be::
+
+    .
+    ├── GSHHS_shp
+    │   ├── c
+    │   ├── f
+    │   ├── h
+    │   ├── i
+    │   └── l
+    ├── WDBII_shp
+    │   ├── c
+    │   ├── f
+    │   ├── h
+    │   ├── i
+    │   └── l
+    └── CITIES
+
+Where CITIES contains cities2022.zip. Enter this archive
+and read file README_PyCoast.txt inside. Follow its instructions.
+You will end up with an additional tab delimited text file *cities.red* in CITIES.
+The PyCoast API documentation explains in detail how to call the function *add_cities()*.
+
+.. _cities2022.zip: https://raw.githubusercontent.com/lobsiger/pycoast/fix_cities/pycoast/tests/test_data/gshhs/CITIES/cities2022.zip
+.. _pytroll: https://groups.google.com/g/pytroll/
+.. _MSG-1: https://groups.io/g/MSG-1/

docs/source/installation.rst → docs/source/installation_shape_files.rst

@@ -1,12 +1,14 @@
-Installation
-------------
+Installation of shape files
+---------------------------
 Pycoast depends on pyshp_ and PIL_.
 
 Install pycoast and dependencies.
 
 Download the zipped GSHHS and WDBII Shapefiles from SOEST_.
-Unzip the files to a data directory (hereafter called *GSHHS_DATA_ROOT*).
-The structure of *GSHHS_DATA_ROOT* should now be::
+Unzip the files to a data directory (hereafter *DB_DATA_ROOT*).
+The absolute path/name of this directory is called *db_root_path*
+in the code examples further down.
+The structure of *DB_DATA_ROOT* should now be::
 
     .
     ├── GSHHS_shp
@@ -22,8 +24,9 @@ The structure of *GSHHS_DATA_ROOT* should now be::
         ├── i
         └── l
 
-Where each dir on the lowest level contains Shapefiles like *GSHHS_shp/c/GSHHS_c_L1.shp*
+Where each dir on the lowest level contains Shapefiles like
+*GSHHS_shp/c/GSHHS_c_L1.shp, WDBII_shp/WDBII_border_c_L1.shp*
 
 .. _SOEST: http://www.soest.hawaii.edu/pwessel/gshhs/index.html
-.. _PIL: http://www.pythonware.com/products/pil/
+.. _PIL: https://pillow.readthedocs.io/en/stable/
 .. _pyshp: http://code.google.com/p/pyshp/

pycoast/cw_agg.py

@@ -124,25 +124,25 @@ def _draw_asterisk(self, draw, pt_size, coordinate, **kwargs):
         # draw '|'
         (x_bm, y_bm) = (x, y - half_ptsize)  # bottom middle point
         (x_tm, y_tm) = (x, y + half_ptsize)  # top middle point
-        self._draw_line(draw, [(x_bm, y_bm), (x_tm, y_tm)],
+        self._draw_line(draw, [x_bm, y_bm, x_tm, y_tm],
                         outline=outline, width=width,
                         outline_opacity=outline_opacity)
         # draw '-'
         (x_lm, y_lm) = (x - half_ptsize, y)  # left middle point
         (x_rm, y_rm) = (x + half_ptsize, y)  # right middle point
-        self._draw_line(draw, [(x_lm, y_lm), (x_rm, y_rm)],
+        self._draw_line(draw, [x_lm, y_lm, x_rm, y_rm],
                         outline=outline, width=width,
                         outline_opacity=outline_opacity)
         # draw '/'
         (x_bl, y_bl) = (x - half_ptsize, y - half_ptsize)  # bottom left point
         (x_tr, y_tr) = (x + half_ptsize, y + half_ptsize)  # top right point
-        self._draw_line(draw, [(x_bl, y_bl), (x_tr, y_tr)],
+        self._draw_line(draw, [x_bl, y_bl, x_tr, y_tr],
                         outline=outline, width=width,
                         outline_opacity=outline_opacity)
         # draw '\'
         (x_tl, y_tl) = (x - half_ptsize, y + half_ptsize)  # top left point
         (x_br, y_br) = (x + half_ptsize, y - half_ptsize)  # bottom right point
-        self._draw_line(draw, [(x_tl, y_tl), (x_br, y_br)],
+        self._draw_line(draw, [x_tl, y_tl, x_br, y_br],
                         outline=outline, width=width,
                         outline_opacity=outline_opacity)