summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-03 18:31:22 +0000
committerKarl Berry <karl@freefriends.org>2009-09-03 18:31:22 +0000
commit5c627c8066bc3d073519704718fffb64af14609a (patch)
tree25ccc61aba3a849fd39148531748b1ec9be530a5
parentdaeaddcef56178dd571d9c813fbdde669ec40f34 (diff)
pst-geo update (31aug09)
git-svn-id: svn://tug.org/texlive/trunk@15032 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/Asia3d.pdfbin1235392 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/Asia3d.tex19
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/Changes14
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/China3d.pdfbin497952 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/China3d.tex25
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/Europe3d.pdfbin549379 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/Europe3d.tex25
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/PSTricks.bib181
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/README24
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/SouthAmerica3d.pdfbin999587 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/SouthAmerica3d.tex38
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/data.tgzbin2623595 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/dataII.tgzbin30910116 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/doc-map2d.pdfbin5264131 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/doc-map2dII.pdfbin7128921 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/doc-map3dII.pdfbin4575673 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/examples2d.tgzbin3347 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/examples3d.tgzbin1066 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/index.phtml62
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-geo-compress.pl460
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-geo-decompress.pl120
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map2d-doc.pdfbin0 -> 1184818 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map2d-doc.tex (renamed from Master/texmf-dist/doc/generic/pst-geo/doc-map2d.tex)81
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map2dII-doc.pdfbin0 -> 1052868 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map2dII-doc.tex (renamed from Master/texmf-dist/doc/generic/pst-geo/doc-map2dII.tex)58
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc-pdf.pdfbin0 -> 378675 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc-pdf.tex463
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc.pdfbin14664961 -> 1297780 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc.tex (renamed from Master/texmf-dist/tex/generic/pst-geo/pst-map3d-doc.tex)199
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map3dII-doc.pdfbin0 -> 877453 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-geo/pst-map3dII-doc.tex (renamed from Master/texmf-dist/doc/generic/pst-geo/doc-map3dII.tex)82
-rw-r--r--Master/texmf-dist/dvips/pst-geo/map3dII.pro3
-rw-r--r--Master/texmf-dist/dvips/pst-geo/pst-map3d.pro58
-rw-r--r--Master/texmf-dist/dvips/pst-geo/pst-map3dII.pro205
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/README86
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/aus.datbin0 -> 14063 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/c-cap.dat324
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/c-sub.datbin0 -> 7049 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/canada.datbin0 -> 33816 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/capitales.tex51
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/capitales3d.tex51
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/capitals.datbin0 -> 2901 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/cities.data1234
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/cities.tex1379
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/citycapitals.dat325
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/citysub.datbin0 -> 6552 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/convert.py80
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/corse.dat3
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/france.datbin0 -> 4174 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/mex.datbin0 -> 14638 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/pborder.datbin0 -> 368124 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/pcoast.datbin0 -> 173738 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/pisland.datbin0 -> 175634 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/plake.datbin0 -> 43780 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/rhone.datbin0 -> 2809 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/ridge.datbin0 -> 20669 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/river.datbin0 -> 155831 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/seine.datbin0 -> 4283 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/transfrm.datbin0 -> 10673 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/trench.datbin0 -> 14945 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/usa.datbin0 -> 35437 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/villesFrance.tex44
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/villesFrance3d.tex44
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/villesItalia.tex100
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/villesItalia3d.tex100
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/wfraczon.datbin0 -> 176080 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/data/wmaglin.datbin0 -> 358703 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/README86
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/africa-bdy.datbin0 -> 430869 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/africa-cil.datbin0 -> 1208423 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/africa-riv.datbin0 -> 2190429 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/asia-bdy.datbin0 -> 385718 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/asia-cil.datbin0 -> 3821210 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/asia-isl.datbin0 -> 61375 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/asia-riv.datbin0 -> 3505155 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/c-cap.datbin0 -> 3063 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/c-sub.datbin0 -> 7049 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/citycapitals.datbin0 -> 2903 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/citysub.datbin0 -> 6552 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/europe-bdy.datbin0 -> 165937 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/europe-cil.datbin0 -> 1360271 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/europe-riv.datbin0 -> 741031 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/namer-bdy.datbin0 -> 33667 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/namer-cil.datbin0 -> 3605338 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/namer-pby.datbin0 -> 226150 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/namer-riv.datbin0 -> 1391336 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/samer-arc.datbin0 -> 11826 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/samer-bdy.datbin0 -> 236953 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/samer-cil.datbin0 -> 1609186 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/dataII/samer-riv.datbin0 -> 1696756 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex81
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex4
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex219
-rw-r--r--Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex26
-rw-r--r--Master/texmf-dist/tex/latex/pst-geo/pst-map3d.sty6
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds74
96 files changed, 5950 insertions, 484 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-geo/Asia3d.pdf b/Master/texmf-dist/doc/generic/pst-geo/Asia3d.pdf
deleted file mode 100644
index f0c054190fd..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/Asia3d.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/Asia3d.tex b/Master/texmf-dist/doc/generic/pst-geo/Asia3d.tex
deleted file mode 100644
index 3eae5789850..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/Asia3d.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-\documentclass[12pt,a4paper]{article} % <voss _ at _ perce.de>
-\usepackage{pst-map3d}
-\topmargin=-0.75in
-\begin{document}
-\section*{Asia}
-\begin{verbatim}
-\begin{pspicture*}(-7,-6.5)(7,6.5)%
- \psset{path=../data,linewidth=0.1pt}
- \WorldMapThreeD[PHI=40,THETA=100,rivers=false]
-\end{pspicture*}
-\end{verbatim}
-
-\makebox[\textwidth]{\psframebox{%
-\begin{pspicture*}(-7,-6.5)(7,6.5)%
- \psset{path=../data,linewidth=0.1pt}
- \WorldMapThreeD[PHI=40,THETA=100,rivers=false]
-\end{pspicture*}}}%
-\end{document}
-
diff --git a/Master/texmf-dist/doc/generic/pst-geo/Changes b/Master/texmf-dist/doc/generic/pst-geo/Changes
index 1843e127351..e99f9460ccd 100644
--- a/Master/texmf-dist/doc/generic/pst-geo/Changes
+++ b/Master/texmf-dist/doc/generic/pst-geo/Changes
@@ -1,23 +1,37 @@
..... pst-map2d.tex
+1.10 2009-08-26 use compressed datafiles
+1.09 2008-09-26 add colors for sea and lake
1.08 2008-04-05 rename internal \variables... macro to prevent clash
with package pst-vue3d
1.07 2005-11-11 fix introduced bug with loading xkey
1.06 2005-11-10 using pst-xkey instead of pst-key
..... pst-map2dII.tex
+0.83 2009-08-26 use compressed datafiles
0.82 2008-04-05 rename internal \variables... macro to prevent clash
with package pst-vue3d
0.81 2005-11-10 using pst-xkey instead of pst-key
..... pst-map3d.tex
+2.03 2009-08-26 use compressed datafiles
+2.02 2009-08-11 - allow empty names in \mapputIIID
+2.01 2009-08-09 - allow empty arguments for \psepicenter
+ - do not use \edef for optional setting
+ - rename \variableTroisD to \variablesIIID@map3d to
+ prvent clashes with other packages
+2.00 2008-06-29 a lot of new optional arguments and an updated
+ set of data for earthquakes and magnetic fields
1.04 2008-04-05 rename internal \variables... macro to prevent clash
with package pst-vue3d
1.03 2005-11-10 using pst-xkey instead of pst-key
..... pst-map3dII.tex
+0.25 2009-08-26 use compressed datafiles
0.24 2008-04-05 rename internal \variables... macro to prevent clash
with package pst-vue3d
0.23 2005-11-10 using pst-xkey instead of pst-key
+..... pst-map3d.pro
+1.01 2009-08-11 fix bug with ondes for \psepicenter
diff --git a/Master/texmf-dist/doc/generic/pst-geo/China3d.pdf b/Master/texmf-dist/doc/generic/pst-geo/China3d.pdf
deleted file mode 100644
index c5dffe21849..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/China3d.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/China3d.tex b/Master/texmf-dist/doc/generic/pst-geo/China3d.tex
deleted file mode 100644
index 0dfe7061727..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/China3d.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\documentclass[12pt,a4paper]{article} % <voss@perce.de>
-\usepackage{pstricks}
-\usepackage{pst-map3d}
-\topmargin=-0.75in
-\pagestyle{empty}
-\begin{document}
-\section*{China}
-\begin{verbatim}
-\psset{unit=1,path=../data}
-\begin{pspicture*}(-7,-6.5)(7,6.5)%
-\psset{unit=2}
- \WorldMapThreeD[PHI=35,THETA=100,rivers=false]
-\end{pspicture*}
-\end{verbatim}
-
-\begin{center}
-\psset{path=../data}
-\begin{pspicture*}(-7,-6.5)(7,6.5)%
-\psset{unit=2}
- \WorldMapThreeD[PHI=35,THETA=100,rivers=false]
-\end{pspicture*}
-\end{center}
-
-\end{document}
-
diff --git a/Master/texmf-dist/doc/generic/pst-geo/Europe3d.pdf b/Master/texmf-dist/doc/generic/pst-geo/Europe3d.pdf
deleted file mode 100644
index 38f6cf80f10..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/Europe3d.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/Europe3d.tex b/Master/texmf-dist/doc/generic/pst-geo/Europe3d.tex
deleted file mode 100644
index 12e3a89b37e..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/Europe3d.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\documentclass[12pt,a4paper]{article} % <voss@perce.de>
-\usepackage{pstricks}
-\usepackage{pst-map3d}
-\definecolor{ocean}{rgb}{0.5,0.8,0.8}
-\topmargin=-0.75in
-\begin{document}
-\section*{Europe}
-\begin{verbatim}
-\psset{unit=2.75,path=../data}
-\psframebox{%
-\begin{pspicture*}(-1.5,-1.6)(3.25,4)%
- \WorldMapThreeD[rivers=false]
-\end{pspicture*}
-}
-\end{verbatim}
-
-\psset{unit=2.75,path=../data}
-\psframebox{%
-\begin{pspicture*}(-1.5,-1.6)(3.25,4)%
- \WorldMapThreeD[rivers=false]
-\end{pspicture*}
-}
-%
-\end{document}
-
diff --git a/Master/texmf-dist/doc/generic/pst-geo/PSTricks.bib b/Master/texmf-dist/doc/generic/pst-geo/PSTricks.bib
new file mode 100644
index 00000000000..d7ec06279cf
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/PSTricks.bib
@@ -0,0 +1,181 @@
+%% -*-bibtex-*-
+@STRING{tugboat = {TUGboat} }
+@STRING{beiprogramm = {{\TeX}-Beiprogramm} }
+@STRING{bretter = {Bretter, die die Welt bedeuten} }
+@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
+@STRING{editorial = {Editorial} }
+@STRING{fremdebuehne = {Von fremden B{\"u}hnen} }
+@STRING{fundus = {Aus dem Fundus} }
+@STRING{hinterbuehne = {Hinter der B{\"u}hne} }
+@STRING{leserbrief = {Leserbrief(e)} }
+@STRING{magazin = {Magazin} }
+@STRING{rezension = {Rezensionen} }
+@STRING{schonimmer = {Was Sie schon immer {\"u}ber {\TeX} wissen wollten \dots} }
+@STRING{theaterkasse = {Von der Theaterkasse} }
+@STRING{theatertage = {{\TeX}-Theatertage} }
+
+@Book{PSTricks2,
+ author = {Herbert Vo\ss},
+ title = {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX},
+ edition = {forth},
+ publisher = {DANTE -- Lehmanns},
+ year = {2007},
+ address = {Heidelberg/Hamburg}
+}
+
+@Book{companion04,
+ author = {Frank Mittelbach and Michel Goosens et al},
+ title = {The {\LaTeX} {C}ompanion},
+ edition = {second},
+ publisher = {Addison-Wesley Publishing Company},
+ year = {2004},
+ address = {Boston}
+}
+
+@Book{begleiter05,
+ author = {Frank Mittelbach and Michel Goosens et al},
+ title = {Der {\LaTeX} {B}egleiter},
+ edition = {zweite},
+ publisher = {Pearson Education},
+ year = {2005},
+ address = {M\"unchen}
+}
+
+@Book{unbound,
+ author = {Alan Hoenig},
+ title = {\TeX{} {U}nbound: \LaTeX{} \& \TeX{} {S}trategies, {F}onts, {G}raphics, and {M}ore},
+ publisher = {Oxford University Press},
+ year = {1998},
+ address = {London}
+}
+@Article{ dtk02.2:jackson.voss:plot-funktionen,
+ author = {Laura E. Jackson and Herbert Vo{\ss}},
+ title = {Die Plot-Funktionen von {\texttt{pst-plot}}},
+ journal = dtk,
+ year = 2002,
+ volume = {2/02},
+ altvolume = 2,
+ altnumber = 14,
+ month = jun,
+ pages = {27--34},
+ annote = bretter,
+ keywords = {},
+ abstract = { Im letzten Heft wurden die mathematischen Funktionen von
+ \PS~im Zusammenhang mit dem {\LaTeX}-Paket
+ \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben
+ und durch Beispiele erl{\"a}utert. In diesem Teil werden
+ die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r
+ externe Daten behandelt. }
+}
+
+@Article{ dtk02.1:voss:mathematischen,
+ author = {Herbert Vo{\ss}},
+ title = {Die mathematischen {F}unktionen von {P}ost{S}cript},
+ journal = dtk,
+ year = 2002,
+ volume = {1/02},
+ altvolume = 1,
+ altnumber = 14,
+ month = mar,
+ pages = {},
+ annote = bretter,
+ keywords = {},
+ abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
+ Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
+ darum geht zu beurteilen, was es denn nun im eigentlichen
+ Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass
+ sich mit den \PS-Funktionen viele Dinge erledigen lassen,
+ bei denen sonst auf externe Programme zur{\"u}ckgegriffen
+ wird. Dies wird im Folgenden f{\"u}r die mathematischen
+ Funktionen im Zusammenhang mit dem Paket \texttt{pst-plot}
+ gezeigt. }
+}
+
+@Book{tlgc2,
+ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
+ title = {The {\LaTeX} {G}raphics {C}ompanion},
+ publisher = {{Addison-Wesley Publishing Company}},
+ edition = second,
+ year = {2007},
+ address = {Reading, Mass.}
+}
+
+@Book{voss:chaos,
+ author = {Herbert Vo{\ss}},
+ title = {Chaos und {F}raktale selbst programmieren: von {M}andelbrotmengen {\"u}ber {F}arbmanipulationen zur perfekten Darstellung},
+ publisher = {{Franzis Verlag}},
+ year = {1994},
+ address = {Poing}
+}
+
+@Article{girou:01:,
+ author = {Denis Girou},
+ title = {Pr\'esentation de {PST}ricks},
+ journal = {Cahier {GUT}enberg},
+ year = 1994,
+ volume = {16},
+ month = apr,
+ pages = {21-70}
+}
+
+@Article{girou:02:,
+ author = {{Timothy Van} Zandt and Denis Girou},
+ title = {Inside {PST}ricks},
+ journal = TUGboat,
+ year = 1994,
+ volume = {15},
+ month = sep,
+ pages = {239-246}
+}
+
+@Book{PostScript,
+ Author = {Kollock, Nikolai G.},
+ Title = {PostScript richtig eingesetzt: vom {K}onzept zum
+ praktischen {E}insatz},
+ Publisher = {IWT},
+ Address = {Vaterstetten},
+ year = 1989,
+}
+
+@Manual{pstricks,
+ Title = {PSTricks - {\PS} macros for generic {\TeX}},
+ Author = {{Timothy Van} Zandt},
+ Organization = {},
+ Address = {\url{http://www.tug.org/application/PSTricks}},
+ Note = {},
+ year = 1993
+}
+
+@Manual{pst-plot,
+ Title = {\texttt{pst-plot}: Plotting two dimensional functions and data},
+ Author = {{Timothy Van} Zandt},
+ Organization = {},
+ Address = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}},
+ Note = {},
+ year = 1999
+}
+
+@Manual{multido,
+ Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
+ Author = {{Timothy Van} Zandt},
+ Organization = {},
+ Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
+ Note = {},
+ year = 1997
+}
+
+@MISC{xkeyval,
+ author = {Hendri Adriaens},
+ title = {xkeyval package},
+ howpublished = {\url{CTAN:/macros/latex/contrib/xkeyval}},
+ year = 2004
+}
+
+@book{voss06,
+ Title = {\LaTeX{} in {N}aturwissenschaften \&{} {M}athematik},
+ Author = {Herbert Vo\ss},
+ Publisher = {Franzis Verlag},
+ Edition= {first},
+ Address= {M\"unchen},
+ Year= {2006},
+}
diff --git a/Master/texmf-dist/doc/generic/pst-geo/README b/Master/texmf-dist/doc/generic/pst-geo/README
index 427f71d8e50..c31c9df13ca 100644
--- a/Master/texmf-dist/doc/generic/pst-geo/README
+++ b/Master/texmf-dist/doc/generic/pst-geo/README
@@ -1,18 +1,8 @@
-2004-05-09 data small database and city files "extract the tarzip"
-2004-05-10 dataII big database "extract the tarzip"
-2004-05-07 doc "extract the tarzip"
-2004-05-10 examples2d "extract the tarzip"
-2004-05-10 examples3d "extract the tarzip"
-2004-05-04 map3d.pro PostScript header file
-2004-05-05 map3dII.pro PostScript header file
-2004-05-03 pst-map2d.sty LaTeX style file
-2004-05-09 pst-map2d.tex corresponding TeX file
-2004-05-03 pst-map2dII.sty LaTeX style file
-2004-05-09 pst-map2dII.tex corresponding TeX file
-2004-05-03 pst-map3d.sty LaTeX style file
-2004-05-09 pst-map3d.tex corresponding TeX file
-2004-05-03 pst-map3dII.sty LaTeX style file
-2004-05-09 pst-map3dII.tex corresponding TeX file
+All decumentations are created with the script pst2pdf
+which extracts all psapicture or postscript environments
+from the documents, run them as stand alone documents
+with the same preamble as the main document, and creates
+png images to decrease the size of the pdf document.
+
+For more information see pst2pdf.
-Install all files as usual, decompress the zipped ones and update
-the TeX database with texhash or mktexlsr, if needed. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/generic/pst-geo/SouthAmerica3d.pdf b/Master/texmf-dist/doc/generic/pst-geo/SouthAmerica3d.pdf
deleted file mode 100644
index 6a36320b514..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/SouthAmerica3d.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/SouthAmerica3d.tex b/Master/texmf-dist/doc/generic/pst-geo/SouthAmerica3d.tex
deleted file mode 100644
index 2b2280cba6e..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/SouthAmerica3d.tex
+++ /dev/null
@@ -1,38 +0,0 @@
-\documentclass[12pt,a4paper]{article} % <voss@perce.de>
-\usepackage{pstricks}
-\usepackage{pst-map3d}
-\topmargin=-0.5in
-\begin{document}
-\section*{Southamerica}
-
-\begin{verbatim}
-\psset{path=../data}
-\psframebox{%
-\begin{pspicture*}(-6.5,-6.5)(6.5,6.5)
- \WorldMapThreeD[RotZ=-65,RotY=-65]
-\end{pspicture*}}
-
-
-\psframebox{%
-\begin{pspicture*}(-6.5,-6.5)(6.5,6.5)
- \psset{unit=2}
- \WorldMapThreeD[RotZ=-65,RotY=-65]
-\end{pspicture*}}
-\end{verbatim}
-
-\psset{path=../data}
-\psframebox{%
-\begin{pspicture*}(-6.5,-6.5)(6.5,6.5)
- \WorldMapThreeD[RotZ=-65,RotY=-65]
-\end{pspicture*}}
-
-
-\psframebox{%
-\begin{pspicture*}(-6.5,-6.5)(6.5,6.5)
- \psset{unit=2}
- \WorldMapThreeD[RotZ=-65,RotY=-65]
-\end{pspicture*}}
-
-
-\end{document}
-
diff --git a/Master/texmf-dist/doc/generic/pst-geo/data.tgz b/Master/texmf-dist/doc/generic/pst-geo/data.tgz
deleted file mode 100644
index dc504e54495..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/data.tgz
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/dataII.tgz b/Master/texmf-dist/doc/generic/pst-geo/dataII.tgz
deleted file mode 100644
index a9bc0618c5a..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/dataII.tgz
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/doc-map2d.pdf b/Master/texmf-dist/doc/generic/pst-geo/doc-map2d.pdf
deleted file mode 100644
index 0e1038ff644..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/doc-map2d.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/doc-map2dII.pdf b/Master/texmf-dist/doc/generic/pst-geo/doc-map2dII.pdf
deleted file mode 100644
index 4a923a35b50..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/doc-map2dII.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/doc-map3dII.pdf b/Master/texmf-dist/doc/generic/pst-geo/doc-map3dII.pdf
deleted file mode 100644
index 704f20de40b..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/doc-map3dII.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/examples2d.tgz b/Master/texmf-dist/doc/generic/pst-geo/examples2d.tgz
deleted file mode 100644
index 28db02a0748..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/examples2d.tgz
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/examples3d.tgz b/Master/texmf-dist/doc/generic/pst-geo/examples3d.tgz
deleted file mode 100644
index 6a6c4a002b8..00000000000
--- a/Master/texmf-dist/doc/generic/pst-geo/examples3d.tgz
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/index.phtml b/Master/texmf-dist/doc/generic/pst-geo/index.phtml
new file mode 100644
index 00000000000..95f59054ef3
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/index.phtml
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><html><head>
+<html>
+<head>
+ <title>my LaTeX pages</title>
+</head>
+<body bgcolor="#ffffff" text="#000000" link="#aa0000" alink="#ff3300" vlink="#330099">
+ <hr noshade="noshade">
+ <h1>pst-geo by Manuel Luque, Giuseppe Mattarazzi, Herbert Voß</h1>
+<h4> All the files have a <strong>Beta-Status</strong>! For a stable version look at <a href="ftp://ftp.dante
+.de/pub/tex/graphics/pstricks/contrib/pst-3dplot/">CTAN</a></h4>
+ <hr noshade="noshade">
+ <div class=text>
+<?
+$cdir = dir("./");
+
+$entries=array();
+while ($entry = $cdir->read())
+ $entries[] = $entry;
+
+echo "Files in this directory:";
+echo " <hr noshade=\"noshade\">";
+echo "<table>";
+
+asort($entries);
+reset($entries);
+
+//foreach($entries as $entry) {
+while (list(, $entry) = each($entries)) {
+// if (!is_dir($entry) && ($entry != "index.phtml") && ($entry != ".htaccess")) {
+ if (($entry != ".") && ($entry != "index.phtml") && ($entry != ".htaccess")) {
+ echo "<tr>";
+ echo "<td><a href=\"$entry\">$entry</a></td>";
+ if (is_dir($entry))
+ echo "<td>&lt;Dir&gt;</td>";
+ else
+ echo "<td></td>";
+ echo "<td align=\"right\">&nbsp;".filesize($entry)." Byte&nbsp;</td>";
+ echo "<td align=\"right\">&nbsp;".date("D, j F Y, H:i:s",filemtime($entry))."&nbsp;</td>";
+ echo "</tr>";
+ }
+}
+echo "</table>";
+
+?>
+<hr noshade="noshade">
+Page last updated on <?php echo date("d.m.Y", getlastmod() ); ?>
+</p>
+</div>
+<hr>
+<?
+if (file_exists("README")) {
+ $fp = fopen("README","r");
+ echo "<pre>";
+ while ($line=fgets($fp,1000)) {
+ echo "$line";
+ }
+ echo "</pre>";
+ fclose($fp);
+}
+?>
+</body>
+</html>
diff --git a/Master/texmf-dist/doc/generic/pst-geo/pst-geo-compress.pl b/Master/texmf-dist/doc/generic/pst-geo/pst-geo-compress.pl
new file mode 100644
index 00000000000..051b37b4470
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-geo-compress.pl
@@ -0,0 +1,460 @@
+#!/usr/bin/env perl
+use strict;
+$^W=1;
+# pst-geo-compress.pl
+# Copyright (C) 2009 Heiko Oberdiek.
+#
+# This work may be distributed and/or modified under the
+# conditions of the LaTeX Project Public License, either version 1.3
+# of this license or (at your option) any later version.
+# The latest version of this license is in
+# http://www.latex-project.org/lppl.txt
+# and version 1.3 or later is part of all distributions of LaTeX
+# version 2005/12/01 or later.
+#
+# This work has the LPPL maintenance status `maintained'.
+#
+# The Current Maintainer of this work is Heiko Oberdiek.
+#
+# See file "README" for a list of files that belong to this project.
+my $file = "pst-geo-compress.pl";
+my $program = uc($&) if $file =~ /^\w+/;
+my $version = "1.1";
+my $date = "2009/07/30";
+my $author = "Heiko Oberdiek";
+my $copyright = "Copyright (c) 2009 by $author.";
+# History:
+# 2009/07/30 v1.0: First release.
+my $title = "$program $version, $date - $copyright\n";
+print $title;
+my $prg_gs = "gs";
+$prg_gs = "gs386" if $^O =~ /dos/i;
+$prg_gs = "gsos2" if $^O =~ /os2/i;
+$prg_gs = "gswin32c" if $^O =~ /mswin32/i;
+$prg_gs = "gswin32c" if $^O =~ /cygwin/i;
+$prg_gs = "mgs" if defined($ENV{"TEXSYSTEM"}) and
+ $ENV{"TEXSYSTEM"} =~ /miktex/i;
+my $prg_gstest = $prg_gs;
+
+my $data = 1;
+my @bool = ('false', 'true');
+$::opt_help = 0;
+$::opt_test = 0;
+$::opt_gscmd = '';
+$::opt_gstestcmd = '';
+
+my $usage = <<"END_OF_USAGE";
+Function: Compresses data files for pst-geo
+Options: (defaults:)
+ --help print usage
+ --data1 | -1 .dat files from data.tgz ($bool[$data == 1])
+ --data2 | -2 .dat files from dataII.tgz ($bool[$data == 2])
+ --gscmd <name> call of ghostscript ($prg_gs)
+ --gstestcmd <name> call of ghostscript for testing ($prg_gstest)
+ --test test mode without compressing ($bool[$::opt_test])
+END_OF_USAGE
+use Getopt::Long;
+GetOptions(
+ "help!",
+ "test!",
+ "data1|1" => sub { $data = 1; },
+ "data2|2" => sub { $data = 2; },
+ "prediction!",
+ "gscmd=s",
+ "gstestcmd=s",
+) or die $usage;
+!$::opt_help or die $usage;
+
+$prg_gs = $::opt_gscmd if $::opt_gscmd;
+if ($::opt_gstestcmd) {
+ $prg_gstest = $::opt_gstestcmd;
+}
+else {
+ $prg_gstest = $prg_gs;
+}
+
+my $tmpfile = "__geo-pst-compress__$$.tmp";
+my $predict_threshold = 0.95;
+
+my @data1 = qw[
+ aus.dat
+ canada.dat
+ capitals.dat
+ c-cap.dat
+ citysub.dat
+ corse.dat
+ c-sub.dat
+ france.dat
+ mex.dat
+ pborder.dat
+ pcoast.dat
+ pisland.dat
+ plake.dat
+ rhone.dat
+ ridge.dat
+ river.dat
+ seine.dat
+ transfrm.dat
+ trench.dat
+ usa.dat
+ wfraczon.dat
+ wmaglin.dat
+];
+
+my @data2 = qw[
+ africa-bdy.dat
+ africa-cil.dat
+ africa-riv.dat
+ asia-bdy.dat
+ asia-cil.dat
+ asia-isl.dat
+ asia-riv.dat
+ c-cap.dat
+ citycapitals.dat
+ citysub.dat
+ c-sub.dat
+ europe-bdy.dat
+ europe-cil.dat
+ europe-riv.dat
+ namer-bdy.dat
+ namer-cil.dat
+ namer-pby.dat
+ namer-riv.dat
+ samer-arc.dat
+ samer-bdy.dat
+ samer-cil.dat
+ samer-riv.dat
+];
+
+my @data = ($data == 1) ? @data1 : @data2;
+
+my %city = (
+ 'capitals.dat' => 1,
+ 'c-cap.dat' => 1,
+ 'citysub.dat' => 1,
+ 'c-sub.dat' => 1,
+ 'citycapitals.dat' => 1,
+);
+
+my %predict = (
+ # data 1
+ 'pborder.dat' => 24,
+ 'pcoast.dat' => 24,
+ 'pisland.dat' => 25,
+ 'plake.dat' => 24,
+ 'ridge.dat' => 25,
+ 'river.dat' => 24,
+ 'seine.dat' => 26,
+ 'transfrm.dat' => 24,
+ 'trench.dat' => 25,
+ 'wfraczon.dat' => 25,
+ 'wmaglin.dat' => 25,
+ # data 2
+ 'africa-cil.dat' => 22,
+ 'asia-cil.dat' => 23,
+ 'europe-riv.dat' => 21,
+ 'samer-cil.dat' => 23,
+);
+
+my %array;
+
+sub catch_zap {
+ unlink $tmpfile if -f $tmpfile;
+ my $signame = shift;
+ chomp $signame;
+ die "!!! Aborted by SIG$signame!\n";
+}
+$SIG{'INT'} = \&catch_zap;
+$SIG{'__DIE__'} = sub { unlink $tmpfile if -f $tmpfile; };
+
+sub tmp_open () {
+ open(TMP, '>', $tmpfile) or die "!!! Error: Cannot write `$tmpfile'!\n";
+}
+sub file_open ($) {
+ my $file = shift;
+ open(IN, '<', $file) or die "!!! Error: Cannot open `$file'!\n";
+}
+
+sub tmp_move ($) {
+ my $file = shift;
+ close(IN);
+ close(TMP);
+ unlink $file or die "!!! Error: Cannot delete `$file'!\n";
+ rename $tmpfile, $file or die "!!! Error: Cannot move `$tmpfile' to `$file'!\n";
+}
+
+# 1. sanitizing
+print "\n";
+print "1. Sanitizing\n";
+print "=============\n";
+
+foreach my $file (@data) {
+ if ($::opt_test) {
+ print "[skipping because of test mode]\n";
+ last;
+ }
+ print "* $file\n";
+ file_open $file;
+ my $old_line = <IN>;
+ not($old_line =~ /^%!PS/)
+ or die "!!! Error: File `$file' is already compressed!\n";
+ $old_line =~ /\/([\w\-]+)(\s|\[)/
+ or die "!!! Internal error: Name not found!\n";
+ $array{$file} = $1;
+ $old_line =~ s/%.*$// unless $city{$file};
+ $old_line =~ s/\s+$//;
+ tmp_open;
+ while (<IN>) {
+ if ($old_line and $old_line =~ /%/) {
+ print TMP "$old_line\n";
+ $old_line = '';
+ }
+ s/%.*$// unless $city{$file};
+ s/^\s+//;
+ s/\s+$//;
+ /^\[%/ or s/(.)%.*$/$1/;
+ s/\s+$//;
+ s/([\[\]])\s+/$1/g;
+ s/\s+(\])/$1/g;
+ s/\s+/ /g;
+ if ($file eq 'seine.dat') {
+ s/(\[\d) /$1.000000000 /;
+ s/(\[\d\.\d) /${1}00000000 /;
+ s/(\[\d\.\d\d) /${1}0000000 /;
+ s/( \d+)\]/$1.00000000]/;
+ s/(\d\.\d)\]/${1}0000000]/;
+ s/(\d\.\d\d)\]/${1}000000]/;
+ }
+ if ($city{$file}) {
+ s/(\.0+)(\D)/$2/g;
+ s/(\.\d*[1-9])0+(\D)/$1$2/g;
+ s/(\D)0\./$1./g;
+ }
+ next unless $_;
+ if ($_ eq '[' or $_ eq ']' or $_ eq ']def' or $_ =~ /\[%/) {
+ $old_line .= $_;
+ next;
+ }
+ if ($_ eq 'def') {
+ $old_line .= $_;
+ $_ = '';
+ }
+ if ($old_line) {
+ print TMP "$old_line\n";
+ $old_line = '';
+ }
+ print TMP "$_\n" if $_;
+ }
+ print TMP "$old_line\n" if $old_line;
+ tmp_move $file;
+}
+print "\n";
+
+# 2. line length analysis
+print "2. Line length analysis\n";
+print "=======================\n";
+
+foreach my $file (@data) {
+ if ($::opt_test) {
+ print "[skipping because of test mode]\n";
+ last;
+ }
+ print "* $file\n";
+ my @lens;
+ my $num;
+ file_open $file;
+ while (<IN>) {
+ $num++;
+ my $len = length $_;
+ if ($lens[$len]) {
+ $lens[$len]++;
+ }
+ else {
+ $lens[$len] = 1;
+ }
+ }
+ close(IN);
+ my $max = 0;
+ for (my $i = 0; $i < @lens; $i++) {
+ next unless $lens[$i];
+ $max = $i;
+ print " $i: $lens[$i]\n";
+ my $threshold = $predict_threshold * $num;
+ next if $predict{$file};
+ if (($lens[$i] > $threshold) or
+ ($lens[$i-1] and ($lens[$i-1] + $lens[$i] > $threshold)) or
+ ($lens[$i-1] and $lens[$i-2] and
+ ($lens[$i-2] + $lens[$i-1] + $lens[$i] > $threshold))) {
+ $predict{$file} = $i;
+ }
+ }
+ if ($predict{$file}) {
+ print " --> predict($file) = $predict{$file}\n";
+ $predict{$file} == $max
+ or die "!!! Internal error: prediction ($predict{$file}) too small ($max)!\n";
+ }
+ else {
+ print " --> predict($file) = ??\n";
+ }
+}
+print "\n";
+
+# 3. Prediction preparation
+print "3. Prepare prediction\n";
+print "=====================\n";
+
+foreach my $file (@data) {
+ if ($::opt_test) {
+ print "[skipping because of test mode]\n";
+ last;
+ }
+ next unless $predict{$file};
+ print "* $file\n";
+ my $predict = $predict{$file};
+ tmp_open;
+ file_open $file;
+ while (<IN>) {
+ my $len = length $_;
+ if ($len % $predict == 0) {
+ print TMP $_;
+ next;
+ }
+ chomp;
+ $_ .= ' ' x ($predict - ($len % $predict));
+ $_ .= "\n";
+ length($_) % $predict == 0 or die "!!! Internal Error!\n";
+ print TMP $_;
+ }
+ tmp_move $file;
+}
+print "\n";
+
+# 4. Compression
+print "4. Compress files\n";
+print "=================\n";
+
+sub check_gs_end () {
+ if ($? & 127) {
+ die sprintf "!!! Error: Ghostscript died with signal %d!\n",
+ ($? & 127);
+ }
+ elsif ($? != 0) {
+ die sprintf "!!! Error: Ghostscript exited with error code %d!\n",
+ $? >> 8;
+ }
+}
+
+foreach my $file (@data) {
+ if ($::opt_test) {
+ print "[skipping because of test mode]\n";
+ last;
+ }
+ print "* $file\n";
+ my $predict = $predict{$file};
+ my $filter_dict = '';
+ $filter_dict = "<</Predictor 12/Columns $predict>>" if $predict;
+ my $compress_dict = "<</Effort 9>>";
+ $compress_dict = "<</Effort 9/Predictor 12/Columns $predict>>" if $predict;
+ my $ps_code = <<"END_PS_CODE";
+%!PS
+/buf 10000 string def
+/tmpfilename ($tmpfile) def
+/header (%!PS\\ncurrentfile$filter_dict/FlateDecode filter cvx exec\\n) def
+($file)
+% Convert file, stack: <file name>
+( converting `) print dup print (' ... ) print flush
+dup (r) file
+% test if file is already converted
+dup header length string readstring
+{
+ 1 index 0 setfileposition
+ header eq
+ {
+ (nothing to do.\\n) print flush
+ false
+ }
+ {true}
+ ifelse
+}
+{
+ (read error.\\n) print flush
+ false
+}
+ifelse
+{
+ tmpfilename (w) file
+ dup header writestring
+ $compress_dict
+ /FlateEncode filter
+ exch
+ % stack: <input file name> <output file obj> <input file obj>
+ {
+ 2 copy
+ buf readstring
+ 3 1 roll
+ writestring
+ not {exit} if
+ } loop
+ closefile
+ closefile
+ dup deletefile tmpfilename exch renamefile
+ (done.\\n) print flush
+} if
+quit
+%%EOF
+END_PS_CODE
+ my @cmd = (
+ $prg_gs,
+ '-q',
+ '-sDEVICE=nullpage',
+ '-dBATCH',
+ '-c',
+ $ps_code
+ );
+ system @cmd;
+ check_gs_end;
+}
+print "\n";
+
+# 5. Test
+print "5. Testing\n";
+print "==========\n";
+
+foreach my $file (@data) {
+ print "* $file\n";
+ my $ps_code = <<"END_PS_CODE";
+%!PS
+( testing `$file' ... ) print flush
+($file) run
+END_PS_CODE
+ $ps_code .= <<"END_PS_CODE" if $::opt_test;
+(\\n) print flush
+END_PS_CODE
+ $ps_code .= <<"END_PS_CODE" unless $::opt_test;
+$array{$file} type /arraytype eq
+{
+ (ok.\\n) print flush
+}{
+ (FAILED!\\n) print flush
+ ioerror
+}
+ifelse
+END_PS_CODE
+ $ps_code .= <<"END_PS_CODE";
+quit
+%%EOF
+END_PS_CODE
+ my @cmd = (
+ $prg_gstest,
+ '-q',
+ '-sDEVICE=nullpage',
+ '-dBATCH',
+ '-c',
+ $ps_code
+ );
+ system @cmd;
+ check_gs_end;
+}
+
+print "\n";
+__END__
diff --git a/Master/texmf-dist/doc/generic/pst-geo/pst-geo-decompress.pl b/Master/texmf-dist/doc/generic/pst-geo/pst-geo-decompress.pl
new file mode 100644
index 00000000000..38574176ce4
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-geo-decompress.pl
@@ -0,0 +1,120 @@
+#!/usr/bin/env perl
+use strict;
+$^W=1;
+# pst-geo-uncompress.pl
+# Copyright (C) 2009 Heiko Oberdiek.
+#
+# This work may be distributed and/or modified under the
+# conditions of the LaTeX Project Public License, either version 1.3
+# of this license or (at your option) any later version.
+# The latest version of this license is in
+# http://www.latex-project.org/lppl.txt
+# and version 1.3 or later is part of all distributions of LaTeX
+# version 2005/12/01 or later.
+#
+# This work has the LPPL maintenance status `maintained'.
+#
+# The Current Maintainer of this work is Heiko Oberdiek.
+#
+# See file "README" for a list of files that belong to this project.
+my $file = "pst-geo-uncompress.pl";
+my $program = uc($&) if $file =~ /^\w+/;
+my $version = "1.0";
+my $date = "2009/07/30";
+my $author = "Heiko Oberdiek";
+my $copyright = "Copyright (c) 2009 by $author.";
+# History:
+# 2009/07/30 v1.0: First release.
+my $title = "$program $version, $date - $copyright\n";
+print STDERR $title;
+my $prg_gs = "gs";
+$prg_gs = "gs386" if $^O =~ /dos/i;
+$prg_gs = "gsos2" if $^O =~ /os2/i;
+$prg_gs = "gswin32c" if $^O =~ /mswin32/i;
+$prg_gs = "gswin32c" if $^O =~ /cygwin/i;
+$prg_gs = "mgs" if defined($ENV{"TEXSYSTEM"}) and
+ $ENV{"TEXSYSTEM"} =~ /miktex/i;
+
+$::opt_help = 0;
+
+my $usage = <<"END_OF_USAGE";
+Function: Compresses data files for pst-geo
+Syntax: $0 <input file> [output file]
+If the output file is not given, standard output is used.
+Options: (defaults:)
+ --help print usage
+ --gscmd <name> call of ghostscript ($prg_gs)
+END_OF_USAGE
+use Getopt::Long;
+GetOptions(
+ "help!",
+ "gscmd=s" => \$prg_gs
+) or die $usage;
+!$::opt_help or die $usage;
+
+(@ARGV == 1 or @ARGV == 2) or die $usage;
+
+my $input = $ARGV[0];
+my $output = $ARGV[1];
+
+open(IN, '<', $input) or die "!!! Error: Cannot open file `$input'!\n";
+my $header = <IN> . <IN>;
+$header =~ /^%!PS\s+(.*)currentfile((<<[^>]+>>)?\/[\w\d]+ filter) cvx exec\s*$/s
+ or die "!!! Error: Unknown file format of `$input'!\n";
+my $decode = $2;
+my $pos = tell(IN);
+my $ps_input = unpack 'H*', $input;
+my $ps_output = '';
+my $ps_output = unpack 'H*', $output if $output;
+
+my $ps_code = <<"END_PS_CODE";
+%!PS
+/buf 10000 string def
+<$ps_input> (r) file
+dup $pos setfileposition
+$decode
+END_PS_CODE
+$ps_code .= <<"END_PS_CODE" if $output;
+<$ps_output> (w) file
+exch
+END_PS_CODE
+$ps_code .= <<"END_PS_CODE";
+{ dup buf readstring exch
+END_PS_CODE
+$ps_code .= <<"END_PS_CODE" unless $output;
+ print
+END_PS_CODE
+$ps_code .= <<"END_PS_CODE" if $output;
+ 3 index exch writestring
+END_PS_CODE
+$ps_code .= <<"END_PS_CODE";
+ not {exit} if
+} loop
+closefile
+END_PS_CODE
+$ps_code .= <<"END_PS_CODE" if $output;
+closefile
+END_PS_CODE
+$ps_code .= <<"END_PS_CODE";
+quit
+%%EOF
+END_PS_CODE
+my @cmd = (
+ $prg_gs,
+ '-q',
+ '-sDEVICE=nullpage',
+ '-dBATCH',
+ '-c',
+ $ps_code
+);
+system @cmd;
+if ($? & 127) {
+ die sprintf "!!! Error: Ghostscript died with signal %d!\n",
+ ($? & 127);
+}
+elsif ($? != 0) {
+ die sprintf "!!! Error: Ghostscript exited with error code %d!\n",
+ $? >> 8;
+}
+print STDERR "* `$output' written.\n" if $output;
+__END__
diff --git a/Master/texmf-dist/doc/generic/pst-geo/pst-map2d-doc.pdf b/Master/texmf-dist/doc/generic/pst-geo/pst-map2d-doc.pdf
new file mode 100644
index 00000000000..424513e210d
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map2d-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/doc-map2d.tex b/Master/texmf-dist/doc/generic/pst-geo/pst-map2d-doc.tex
index a5a972badf9..b801bd1cb24 100644
--- a/Master/texmf-dist/doc/generic/pst-geo/doc-map2d.tex
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map2d-doc.tex
@@ -1,9 +1,13 @@
-%-------------------------------------------------------------------
-% Map2d-doc Dec.05,2003 - rev.0.92 by M. Luque, G. Matarazzo
-%-------------------------------------------------------------------
\documentclass[a4paper]{article}
\usepackage{pstricks,pst-map2d,url}
\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{listings}
+\lstset{basicstyle=\small\ttfamily}
+\usepackage{ragged2e,xspace}
+\def\PST{\texttt{PSTricks}\xspace}
+\def\PS{\texttt{PostScript}\xspace}
+
\pagestyle{empty}
\title{The \PstMapTwoDPackage{} package\\A PSTricks package for Geographical Projections}
\author{Manuel \textsc{Luque}
@@ -31,8 +35,10 @@
\^etre d\'etaill\'ees dans la suite du document.
\end{abstract}
\tableofcontents
+
\section{Les sources\label{sources}}
\subsection{Pour la partie math\'ematique}
+
\begin{enumerate}
\item Henri \textsc{Bouasse} : G\'eographie math\'ematique (1919), Delagrave.
\item \url{http://mathworld.wolfram.com/topics/MapProjections.html}
@@ -47,6 +53,7 @@ Elles ont \'et\'e converties sous forme de tableau PostScript, en
degr\'es,
gr\^ ace à un petit programme en pascal (de Giuseppe Matarazzo) qui
fait partie de la distribution.
+
\subsection{Le pr\'ecurseur en postscript}
Bill \textsc{Casselman} :
\url{http://www.math.ubc.ca/~cass/graphics/text/www/}
@@ -91,7 +98,7 @@ la longitude $(\pm 180)$.
\item \Parameter{increment=10} : est la valeur par défaut, en degrés, de l'écart angulaire entre deux
méridiens ou parallèles. On pourra donc fixer une valeur plus petite dans le cas
d'un zoom.
-\item \Parameter{MapFillColor=0.99 0.95 0.7 } : permet de choisir la couleur de remplissage des continents,
+\item \Parameter{MapFillColor={[rgb]{0.99,0.95,0.7}}} : permet de choisir la couleur de remplissage des continents,
en mode RGB.
\item \Parameter{borders=true} : on dessine les frontières des pays.
\item \Parameter{rivers=true} : permet de dessiner les fleuves et les rivières.
@@ -112,40 +119,48 @@ de Mercator, sans les parallèles et les méridiens. Par défaut, c'est le
niveau de détail le plus élevé et la projection type Mercator qui ont été choisis :
\Parameter{[type=1,level=1]}. On jouera sur les unités
afin d'adapter le dessin aux dimensions souhaitées, avec par exemple~:
-\begin{verbatim}
+\begin{lstlisting}
\psset{linewidth=0.75\pslinewidth}
{\psset{xunit=0.5,yunit=0.5}
\begin{pspicture}*(-9,-9)(10,9)
\WorldMap[maillage=false]
\end{pspicture}}
-\end{verbatim}
+\end{lstlisting}
qui permet d'obtenir la projection de Mercator suivante :
\begin{center}
+\begin{postscript}
\psset{linewidth=0.75\pslinewidth}
{\psset{xunit=0.5,yunit=0.5}
-\psset{MapFillColor=0.5 0.8 0.5}
+\psset{MapFillColor={[rgb]{0.5,0.8,0.5}}}
\begin{pspicture}*(-9,-9)(10,9)
\WorldMap[maillage=false]
\end{pspicture}}
+\end{postscript}
\end{center}
+
Le script suivant dessine la projection de Mercator, en mode paysage :
-\begin{verbatim}
-\hbox{\hspace{-3cm}%
+\begin{lstlisting}
\begin{pspicture}*(-9,-9)(9,10)
\rput{90}(0,0){\WorldMap[city=true,borders=true]}
-\end{pspicture}}
-\end{verbatim}
-\hbox{\hspace{-3cm}%
+\end{pspicture}
+\end{lstlisting}
+\hspace*{-3cm}%
+\begin{postscript}
\begin{pspicture}*(-9,-9)(9,10)
\rput{90}(0,0){\WorldMap[city=true,borders=true,USA=true,AUS=true,MEX=true]}
-\end{pspicture}}
+\end{pspicture}
+\end{postscript}
+
\subsection{Projection de Lambert}
\begin{center}
+\begin{postscript}
{\psset{xunit=0.75,yunit=0.75}
\begin{pspicture}(-9,-4.5)(9.5,4.5)
\WorldMap[type=2,city=true]
\end{pspicture}}
+\end{postscript}
\end{center}
+
\subsection{Projection simple}
\begin{center}
\begin{pspicture}(-3,-9)(3,10)
@@ -153,32 +168,43 @@ Le script suivant dessine la projection de Mercator, en mode paysage :
\WorldMap[type=3,maillage=true]}
\end{pspicture}
\end{center}
+
\subsection{Projection Sanson-Flamsteed}
\begin{center}
+\begin{postscript}
\psset{xunit=0.75,yunit=0.75}
\begin{pspicture}(-5,-5)(8,5)
\WorldMap[type=4]
\end{pspicture}
+\end{postscript}
\end{center}
+
\subsection{Projection cylindrique}
-\hbox{\hspace{-3cm}
+\hspace*{-3cm}
\begin{pspicture}*(-9,-9)(9.5,9)
\WorldMap[type=5]
-\end{pspicture}}
+\end{pspicture}
+
\subsection{Projection de Babinet}
\begin{center}
+\begin{postscript}
{\psset{xunit=0.75,yunit=0.75}
\begin{pspicture}(-9,-9)(10,9)
\WorldMap[type=6]
\end{pspicture}}
+\end{postscript}
\end{center}
+
\subsection{Projection de Collignon}
\begin{center}
+\begin{postscript}
{\psset{xunit=0.75,yunit=0.75}
\begin{pspicture}(-9,-9)(10,9)
\WorldMap[type=7]
\end{pspicture}}
+\end{postscript}
\end{center}
+
\subsection{Projection de Bonne}
On peut choisir la latitude et la longitude de référence avec les
paramètres : \Parameter{latitude0=45} et \Parameter{longitude0=0},
@@ -188,6 +214,7 @@ qui sont les valeurs par défaut.
\WorldMap[type=8]
\end{pspicture}
\end{center}
+
\section{Comment faire un zoom sur un pays ou une région donnée}
Il n'a pas été prévu de commande particulière, mais la procédure
suivante :
@@ -195,15 +222,16 @@ suivante :
\item Placer un \verb+\psgrid+ après le tracé de la carte, puis
repérer les coordonnées des deux sommets opposés du rectangle
dans lequel sera inclus la région souhaitée.
-\psset{level=1}
\begin{center}
-\psset{linewidth=0.5\pslinewidth}
+\begin{postscript}
+\psset{level=1,linewidth=0.5\pslinewidth}
\psset{xunit=0.75,yunit=0.75}
\begin{pspicture}*(-9,-9)(10,9)
\WorldMap[rivers=true,city=true,USA=true,maillage=false]
\psgrid(-8,-8)(9,8)
\psframe[linewidth=0.5mm,linecolor=red](-6.5,1)(-3,3)
\end{pspicture}
+\end{postscript}
\end{center}
\item Par exemple, si nous choisissons de représenter les
\'Etats-Unis les coordonnées des coins bas-gauche et haut-droit
@@ -212,7 +240,7 @@ suivante :
L'agrandissement sera obtenu en changeant d'unité, un zoom $\times4$ s'obtiendra avec :
\verb+\psset{xunit=4,yunit=4}+. Finalement la
commande s'écrira :
-\begin{verbatim}
+\begin{lstlisting}
\begin{center}
\psset{xunit=4,yunit=4}% zoom 4*
\psset{linewidth=1.25\pslinewidth}
@@ -220,15 +248,18 @@ suivante :
\WorldMap[rivers=true,city=true,USA=true]
\end{pspicture}
\end{center}
-\end{verbatim}
+\end{lstlisting}
\begin{center}
+\begin{postscript}
\psset{xunit=4,yunit=4}% zoom 4*
\psset{linewidth=1.25\pslinewidth}
\begin{pspicture}*(-6.5,1)(-3,3)
\WorldMap[rivers=true,city=true,USA=true,maillage=true]
\end{pspicture}
+\end{postscript}
\end{center}
\end{enumerate}
+
\section{Téléchargement des fichiers}
Le fichier des données (\texttt{wdb.zip}) est sur : \url{http://melusine.eu.org/syracuse/mluque/mappemonde/}
@@ -251,4 +282,16 @@ directement dans le fichier \verb+pst-map2d.tex+.
Il est prévu la création d'un CR-ROM contenant toutes données, il
sera gravé et fourni gratuitement par Giuseppe à tous ceux qui lui
en feront la demande.
+
+
+\nocite{*}
+\bgroup
+\RaggedRight
+\bibliographystyle{plain}
+\bibliography{PSTricks}
+\egroup
+
+
+
+
\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-geo/pst-map2dII-doc.pdf b/Master/texmf-dist/doc/generic/pst-geo/pst-map2dII-doc.pdf
new file mode 100644
index 00000000000..2767a7e6a25
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map2dII-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/doc-map2dII.tex b/Master/texmf-dist/doc/generic/pst-geo/pst-map2dII-doc.tex
index f0e25e3ddca..0475c150d46 100644
--- a/Master/texmf-dist/doc/generic/pst-geo/doc-map2dII.tex
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map2dII-doc.tex
@@ -1,8 +1,15 @@
\documentclass{article}
+\usepackage[T1]{fontenc}%
\usepackage[latin1]{inputenc}%
+\usepackage{lmodern}
+\usepackage{listings}
+\lstset{basicstyle=\small\ttfamily}
\usepackage{pstricks,url,graphicx,lscape}
\usepackage[francais]{babel}
\usepackage{pst-map2dII}
+\usepackage{ragged2e,xspace}
+\def\PST{\texttt{PSTricks}\xspace}
+\def\PS{\texttt{PostScript}\xspace}
\definecolor{ocean}{rgb}{0.5,0.8,0.8}
\title{The \PstMapIIPackage{} package\\A PSTricks package for Geographical Projections}
\author{Manuel \textsc{Luque}
@@ -31,11 +38,13 @@ données à traiter. Cependant des options permettent de choisir la
représentation d'un continent ou plusieurs. Un ordinateur puissant
avec beaucoup de mémoire vive est donc souhaitable.
\begin{center}
+\begin{postscript}
\psset{xunit=5,yunit=5}
\psframebox[framesep=0pt,linewidth=0.2mm,doubleline=true]{%
\begin{pspicture}*(-0.5,1.70)(1.5,3)%
\WorldMapII[africa=true,increment=2]
\end{pspicture}}
+\end{postscript}
\end{center}
\end{abstract}
@@ -179,9 +188,11 @@ Le script suivant dessine la projection de Mercator (qui est le type par défaut)
\end{pspicture}}
\end{verbatim}
\makebox[\textwidth]{%
+\begin{postscript}
\begin{pspicture*}(-9,-9)(9,10)
\rput{90}(0,0){\WorldMapII[all=true,rivers=false,borders=false,linewidth=0.1\pslinewidth,level=75]}
\end{pspicture*}
+\end{postscript}
}
\subsection{Projection de Lambert}
\begin{verbatim}
@@ -190,10 +201,12 @@ Le script suivant dessine la projection de Mercator (qui est le type par défaut)
\end{pspicture*}
\end{verbatim}
\makebox[\textwidth]{%
-{\psset{xunit=0.75,yunit=0.75}
+\begin{postscript}
+\psset{xunit=0.75,yunit=0.75}
\begin{pspicture}(-9,-5)(9,5)
\WorldMapII[type=2,all=true,rivers=false,borders=false,linewidth=0.1\pslinewidth]
-\end{pspicture}}
+\end{pspicture}
+\end{postscript}
}
\begin{landscape}
@@ -204,10 +217,12 @@ Le script suivant dessine la projection de Mercator (qui est le type par défaut)
\WorldMapII[type=3,maillage=false,all=true]
\end{pspicture*}
\end{verbatim}
+\begin{postscript}
\begin{pspicture*}(-9,-3)(9,3)
\psframe*[linecolor=ocean](-9,-3)(9,3)
\WorldMapII[type=3,all=true,maillage=false,rivers=false,borders=false,linewidth=0.1\pslinewidth]
\end{pspicture*}
+\end{postscript}
\end{landscape}
\subsection{Projection Sanson-Flamsteed}
@@ -218,9 +233,12 @@ Le script suivant dessine la projection de Mercator (qui est le type par défaut)
\end{verbatim}
\begin{center}
\resizebox{\linewidth}{!}{%
+\begin{postscript}
\begin{pspicture*}(-10,-5)(10,5)
\WorldMapII[type=4,all=true,rivers=false,borders=false,linewidth=0.1\pslinewidth]
-\end{pspicture*}}
+\end{pspicture*}
+\end{postscript}
+}
\end{center}
\clearpage
@@ -233,11 +251,13 @@ Le script suivant dessine la projection de Mercator (qui est le type par défaut)
\WorldMapII[type=5,all=true]
\end{pspicture}
\end{verbatim}
-{\psset{xunit=0.5,yunit=0.5}
+\begin{postscript}
+\psset{xunit=0.5,yunit=0.5}
\begin{pspicture}*(-9,-12)(9.5,14)
\psframe(-9,-12)(9.5,14)
\WorldMapII[type=5,all=true,linewidth=0.1\pslinewidth,rivers=false,borders=false]
-\end{pspicture}}
+\end{pspicture}
+\end{postscript}
\clearpage
@@ -249,20 +269,25 @@ Le script suivant dessine la projection de Mercator (qui est le type par défaut)
\WorldMapII[type=6,all=true,rivers=false,borders=false,linewidth=0.1\pslinewidth]
\end{pspicture*}}
\end{verbatim}
-{\psset{xunit=0.75,yunit=0.75}
+\begin{postscript}
+\psset{xunit=0.75,yunit=0.75}
\begin{pspicture*}(-10,-5)(10,5)
\WorldMapII[type=6,all=true,rivers=false,borders=false,linewidth=0.1\pslinewidth]
-\end{pspicture*}}
+\end{pspicture*}
+\end{postscript}
\clearpage
\subsection{Projection de Collignon}
\begin{center}
\resizebox{\linewidth}{!}{%
+\begin{postscript}
\psset{xunit=0.75,yunit=0.75}
\begin{pspicture*}(-10,-5)(10,5)
\WorldMapII[type=7,all=true]
-\end{pspicture*}}
+\end{pspicture*}
+\end{postscript}
+}
\end{center}
\clearpage
@@ -273,9 +298,11 @@ On peut choisir la latitude et la longitude de référence avec les
paramètres : \Parameter{latitude0=45} et \Parameter{longitude0=0},
qui sont les valeurs par défaut.
\begin{center}
+\begin{postscript}
\begin{pspicture*}(-7,-10)(7,3)
\WorldMapII[type=8,all=true]
\end{pspicture*}
+\end{postscript}
\end{center}
\clearpage
@@ -289,12 +316,14 @@ suivante :
repérer les coordonnées des deux sommets opposés du rectangle
dans lequel sera inclus la région souhaitée.
\begin{center}
+\begin{postscript}
\psset{linewidth=0.2\pslinewidth}
\psset{xunit=0.75,yunit=0.75}
\begin{pspicture*}[showgrid=true](-9,-9)(10,9)
\WorldMapII[maillage=false,rivers=false,borders=false,all=true]
\psframe[linewidth=0.5mm,linecolor=red](-6.5,1)(-3,3)
\end{pspicture*}
+\end{postscript}
\end{center}
\item Par exemple, si nous choisissons de représenter les
\'Etats-Unis les coordonnées des coins bas-gauche et haut-droit
@@ -313,22 +342,35 @@ suivante :
\end{center}
\end{verbatim}
\begin{center}
+\begin{postscript}
\psset{xunit=4,yunit=4}% zoom 4*
\psset{linewidth=1.25\pslinewidth}
\begin{pspicture}*(-6.5,1)(-3,3)
\WorldMapII[samer=true,namer=true,europe=false]
\end{pspicture}
+\end{postscript}
\end{center}
+
\item Pour le Japon, on choisira le cadre \verb+(6.2,1.4)(7.6,2.8)+ avec un
zoom$\times10$. On ne sectionnera que \texttt{asia=true}, tous les autres
sont à \texttt{false}.
\begin{center}
+\begin{postscript}
\psset{xunit=10,yunit=10}% zoom 10*
\psset{linewidth=1.25\pslinewidth}
\begin{pspicture}*(6.2,1.4)(7.6,2.8)
\WorldMapII[asia=true,increment=1]
\end{pspicture}
+\end{postscript}
\end{center}
\end{enumerate}
+\nocite{*}
+\bgroup
+\RaggedRight
+\bibliographystyle{plain}
+\bibliography{PSTricks}
+\egroup
+
+
\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc-pdf.pdf b/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc-pdf.pdf
new file mode 100644
index 00000000000..975273b8e48
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc-pdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc-pdf.tex b/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc-pdf.tex
new file mode 100644
index 00000000000..bc6c8ee2a87
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc-pdf.tex
@@ -0,0 +1,463 @@
+\RequirePackage{graphicx}
+\RequirePackage[pdftex]{xcolor}
+\documentclass[12pt]{article}
+\usepackage{pst-map3d,pstricks-add}
+\let\PSTfileversion\fileversion
+\let\PSTfiledate\filedate
+\usepackage[latin1]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage[garamond]{mathdesign}
+\renewcommand{\ttdefault}{lmtt}
+\usepackage{longtable,array}
+\usepackage{ragged2e}
+%\usepackage{url}
+\usepackage[a4paper,margin=2cm,nohead]{geometry}
+\usepackage[colorlinks=true]{hyperref}
+\usepackage{showexpl,xspace}
+\usepackage[french]{babel}
+\def\PST{\texttt{PSTricks}\xspace}
+\def\PS{\texttt{PostScript}\xspace}
+\makeatletter
+\newdimen\pssizeStar
+\def\psset@sizeStar#1{\pssetlength\pssizeStar{#1}}
+\psset@sizeStar{1.5pt}
+
+%% adapté de \psRandom du package pstricks-add
+%% pour rendre aléatoire la taille des étoiles
+\def\psRandomStar{\pst@object{psRandomStar}}%
+\def\psRandomStar@i{\@ifnextchar({\psRandomStar@ii}{\psRandomStar@iii(0,0)(1,1)}}
+\def\psRandomStar@ii(#1){\@ifnextchar({\psRandomStar@iii(#1)}{\psRandomStar@iii(0,0)(#1)}}
+\def\psRandomStar@iii(#1)(#2)#3{%
+ \def\pst@tempA{#3}%
+ \ifx\pst@tempA\pst@empty\psclip{\psframe(#2)}\else\psclip{#3}\fi
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getcoor{#2}\pst@tempB
+ \begin@SpecialObj
+ \addto@pscode{
+ \pst@tempA\space /yMin exch def
+ /xMin exch def
+ \pst@tempB\space /yMax exch def
+ /xMax exch def
+ /dy yMax yMin sub def
+ /dx xMax xMin sub def
+ rrand srand % initializes the random generator
+ /getRandReal { rand 2147483647 div } def
+ \psk@randomPoints {
+ /DS \pst@number\pssizeStar\space getRandReal mul def
+ \@nameuse{psds@\psk@dotstyle}
+ \ifPst@color getRandReal 1 1 sethsbcolor \fi
+ getRandReal dx mul xMin add
+ getRandReal dy mul yMin add
+ Dot
+ \ifx\psk@fillstyle\psfs@solid fill \fi stroke
+ } repeat
+ }%
+ \end@SpecialObj
+ \endpsclip
+ \ignorespaces
+}
+\makeatother
+\definecolor{graygreen}{cmyk}{0.7,0,0.6,0.2}
+\newcommand{\PstMapThreeDPackage}{`\textsf{pst-map3d}'}
+ \title{The \PstMapThreeDPackage{} package\\A PSTricks package for Geographical Projections}
+ \author{Manuel \textsc{Luque}
+ \mbox{\texttt{<manuel.luque27@gmail.com>}}\\
+ and\\
+ Giuseppe \textsc{Matarazzo} \mbox{\texttt{<joematara@hotmail.com>}}}
+ \date{Version 2.0\\ 18 mars 2008}
+
+\begin{document}
+\maketitle
+\begin{abstract}
+\PstMapThreeDPackage{} traite de la représentation en trois dimensions
+ du globe terrestre avec plusieurs fonctionnalités qui rendent son
+ utilisation agréable (tout au moins nous l'espérons).
+
+Il s'agit d'une reprise du package élaboré avec Giuseppe Matarazzo en
+2003. Celui-ci présentait quelques erreurs de représentation lorsqu'une
+grande partie d'un pays était cachée aux yeux de l'observateur. Une idée
+très astucieuse de Christophe Poulain permettant de résoudre ce problème
+est à l'origine de la refonte du package. J'ai aussi profité de quelques
+macros \texttt{postscript} mises au point par Jean-Paul Vignault pour
+l'écriture du package \texttt{`pst-solides3d'}.
+
+L'élaboration et la mise en ligne de ce package a bénéficié des
+encouragements, de toute la compétence et de la disponibilité de
+Jean-Michel Sarlat.
+
+La plus grande le code ayant donc du être réécrite, il m'a semblé
+judicieux d'introduire de nouvelles fonctionnalités parmi lesquelles :
+le \textit{globe tellure}, les plaques tectoniques, les épicentres des
+séismes, les zones de fracture et les linéations magnétiques (anomalies
+magnétiques des fonds océaniques).
+
+\end{abstract}
+ \tableofcontents
+% \newpage
+ \section{Les données\label{datas}}
+GLOBE Binaries DECODING : World Public Domain Dbase :
+ F.Pospeschil, A.Rivera (1999)
+
+\url{ftp://ftp.blm.gov/pub/gis/wdbprg.zip}
+
+Elles ont \'et\'e converties sous forme de tableau PostScript, en
+degr\'es,
+gr\^ ace à un petit programme en pascal (de Giuseppe Matarazzo) qui
+fait partie de la distribution. Ce sont les mêmes données que
+celles du package \textsf{pst-map2d}.
+\section{Les paramètres}
+\begin{longtable}{|>{\bfseries\ttfamily\color{blue}}l|c|m{10cm}|}
+ \hline
+ \multicolumn{1}{|c|}{\textbf{Paramètre}}&
+ \multicolumn{1}{c|}{\textbf{Défaut}}&
+ \multicolumn{1}{c|}{\textbf{Signification}} \\ \hline\hline
+\endfirsthead
+\hline
+ \multicolumn{1}{|c|}{\textbf{Paramètre}}&
+ \multicolumn{1}{c|}{\textbf{Défaut}}&
+ \multicolumn{1}{c|}{\textbf{Signification}} \\ \hline\hline
+\endhead
+\multicolumn{3}{|r|}{\textit{Suite à la page suivante}}\\ \hline
+\endfoot
+\multicolumn{3}{|r|}{\textit{Fin de la table}}\\ \hline
+\endlastfoot
+Radius&5&rayon du globe \\\hline
+Dobs&20&distance de l'observateur au centre du globe \\\hline
+Decran&25&distance de l'écran à l'observateur \\\hline
+THETA&0& angle définissant, avec $\phi$ en coordonnées sphériques la position de l'observateur \\\hline
+PHI&45& angle définissant, avec $\theta$ en coordonnées sphériques la position de l'observateur \\\hline
+RotZ&0& rotation du globe autour de l'axe vertical $Oz$ en degrés\\\hline
+RotX&0& rotation du globe autour de l'axe horizontal $Ox$ en degrés\\\hline
+RotY&0& rotation du globe autour de l'axe horizontal $Oy$ en degrés\\\hline
+gridmap&true& boléen : trace le maillage de la sphère : méridiens et parallèles\\\hline
+gridmapdiv&$10^{\mathrm{o}}$& écart angulaire entre 2 méridiens ou 2 parallèles\\\hline
+gridmapcolor&black& couleur des méridiens et parallèles\\\hline
+gridmapwidth&0.8pt & épaisseur des lignes des méridiens et parallèles\\\hline
+mapcolor&``terre''& couleur des continents : la couleur ``terre'' a été prédéfinie\\\hline
+oceancolor&``mer''& couleur des océans et mers : : la couleur ``mer'' a été prédéfinie\\\hline
+borders&true& booléen : dessine les frontières\\\hline
+bordercolor&black& couleur des frontières\\\hline
+borderwidth&0.8pt & épaisseur des frontières\\\hline
+france&false& booléen : dessine la France métropolitaine et la Corse.
+ Destiné à la représentation particulière de la France ou bien à sa mise en valeur.\\\hline
+coasts&true& booléen : dessine les côtes\\\hline
+coastcolor&black& couleur des côtes\\\hline
+coastwidth&0.8pt & épaisseur des côtes\\\hline
+islandcolor&black& couleur du contour des îles\\\hline
+rivers&true& booléen : dessine les fleuves\\\hline
+lakes&true& booléen : dessine les lacs\\\hline
+capitals&true& booléen : marque les capitales visibles\\\hline
+citys&true& booléen : marque toutes les villes visibles\\\hline
+usa&false& booléen : dessine les états \\\hline
+australia&false& booléen : dessine les états \\\hline
+mexico&false& booléen : dessine les états \\\hline
+circles&false& booléen : dessine des cercles parallèles sur les océans et les mers \\\hline
+circlecolor&blue& couleur des côtes\\\hline
+circlewidth&0.5pt & épaisseur des côtes\\\hline
+circlesep&$2^{\mathrm{o}}$& écart angulaire entre 2 cercles\\\hline
+visibility&booléen& true : dessine les parties du globe visibles pour l'observateur\\\hline
+blueEarth&booléen& true : dessine un disque couleur de l'océan à la dimension du globe\\\hline
+daynight&booléen& false : dessine la nuit sur le globe\\\hline
+hour&12 & heure locale du lieu\\\hline
+Day&le jour actuel& jour d'observation\\\hline
+Month&le mois actuel& mois d'observation\\\hline
+ridge&false& trace les limites des plaques tectoniques\\\hline
+ridgecolor&red& couleur des dorsales\\ \hline
+trenchcolor&darkgreen& couleur des lignes de convergence\\ \hline
+transfrmcolor&orange& couleur des lignes de transcurrence\\ \hline
+ridgewidth&2 pt& épaisseur des lignes précédentes\\ \hline
+zonefrac&false& booléen : tracé des lignes de fracture\\ \hline
+zonefraccolor&red& couleur des lignes de fracture\\ \hline
+zonefracwidth&0.8 pt& épaisseur des lignes de fracture\\ \hline
+wmaglinwidth&0.8 pt& épaisseur des lignes de linéation magnétique\\ \hline
+wmaglin&false& booléen : tracé des linéations magnétiques\\ \hline
+wmaglincolor&red& couleur des linéations magnétiques\\ \hline
+Year&l'année actuelle& l'année d'observation\\\hline
+waves&3& nombre de cercles concentriques à partir de l'épicentre\\\hline
+Rmax&1500& Rayon, en km, du plus grand cercle centré sur l'épicentre\\\hline
+\end{longtable}
+\section{La représentation du globe}
+
+La représentation du globe est centrée sur Paris avec les paramètres
+\begin{center}\centering \verb+\psset{PHI=48.85,THETA=2.32}+.\end{center}
+Un effet de moirage apparaît du aux
+cercles concentriques tracés sur la sphère. Différentes options de
+couleur sont testées avec cet exemple.
+
+%\begin{LTXexample}[width=8cm]
+\includegraphics[scale=0.5]{images/./pst-map3d-doc-tmp-0.png}
+%\end{LTXexample}
+
+\section{Effet de transparence et rotations}
+
+La transparence(resp. opacité) du globe se règle avec le paramètre
+\texttt{opacity}. Si l'on souhaite combiner les rotations celles-ci
+s'effectuent, pour des raisons spécifiques à ce package, dans l'ordre
+suivant \texttt{RotZ}, \texttt{RotX}, \texttt{RotY}.
+
+Rappelons que les effets de transparence ne sont possibles qu'avec le
+fichier \texttt{pdf}, celui-ci sera obtenu avec la séquence de commandes:
+\texttt{\LaTeX}-->\texttt{dvips}-->\texttt{ps2pdf}.
+
+%\begin{LTXexample}[width=8.2cm]
+\includegraphics[scale=0.5]{images/./pst-map3d-doc-tmp-1.png}
+%\end{LTXexample}
+
+
+\section{Mise en valeur du territoire français}
+\begin{center}
+
+\begin{pspicture*}(-0.5\linewidth,-0.45\textheight)(0.5\linewidth,0.5\textheight)
+\psset{PHI=45,THETA=5,unit=7.5,path=../data}
+\WorldMapThreeD[lakes=false,circlesep=0.25,lakes=false,gridmap=false,
+ mapcolor=graygreen!50,bordercolor=red,rivers=false,
+ coasts=false,islandcolor=blue]%
+\WorldMapThreeD[gridmapcolor=yellow,circles=false,lakes=true,gridmapdiv=5,france=true,
+ islandcolor=blue,blueEarth=false,
+ bordercolor=red,islands=false,borders=false,rivers=true,coasts=true,
+ coastcolor=blue]%
+\psmeridien{2.32}
+\psparallel{48.85}
+\newpsstyle{NodeLabelStyle}{fillstyle=solid,fillcolor=yellow!50,framesep=0,
+ linestyle=none,opacity=0.5}
+\input{villesFrance3d}
+\newpsstyle{NodeLabelStyle}{fillstyle=solid,fillcolor=red!50,
+ framesep=0,linestyle=none,opacity=0.5}
+\newpsstyle{psNodeMapStyle}{fillstyle=solid,fillcolor=yellow!50,linecolor=red}
+\psset{nodeWidth=0.025\psunit,linecolor=red}
+\pnodeMapIIID(15.2833,37.0833){Syracuse}
+\pscircle[fillstyle=solid,fillcolor=green](Syracuse){0.025\psunit}
+\psdot[dotsize=0.025\psunit](Syracuse)
+\uput[l](Syracuse){\psframebox[fillstyle=solid,fillcolor=yellow,framesep=0,
+ linestyle=none,opacity=0.5]{\textsf{Syracuse}}}
+\pnodeMapIIID(10.51667,43.85){Lucques}
+\pscircle[fillstyle=solid,fillcolor=green](Lucques){0.025\psunit}
+\psdot[dotsize=0.025\psunit](Lucques)
+\uput[u](Lucques){\psframebox[fillstyle=solid,fillcolor=yellow!50,framesep=0,
+ linestyle=none,opacity=0.5]{\textsf{Lucques}}}
+\input{capitales}
+\psepicenter[circlecolor=red,waves=16,Rmax=2000](0.3333,46.5833){Poitiers}
+\end{pspicture*}
+
+\end{center}
+
+\section{Les macros}
+\subsection{La commande \textbackslash pnodeMapIIID}
+Une commande créée à cet effet permet de placer en un point du globe, défini
+par sa longitude et sa latitude, une ville, un lieu, un symbole ou une
+annotation quelconque. Cette commande qui utilise le package
+\textsf{pst-node} est la suivante :
+\begin{verbatim}
+\pnodeMapIIID(longitude,latitude){nom}
+\end{verbatim}
+\textsf{longitude} et \textsf{latitude} sont en degrés, le \textsf{nom}
+attribué au n\oe{}ud ne doit pas contenir de lettre accentuée.
+\subsection{La commande \textbackslash mapputIIID}
+La commande \verb+\mapputIIID(0.100000,49.483333){Le Havre}+ est identique à la suite de commandes :
+\begin{itemize}
+\item \verb+\pnodeMapIIID(0.100000,49.483333){LeHavre}+
+\item \verb+\psdot[linecolor=red,dotsize=2mm](LeHavre)+
+\item \verb+\uput[u](LeHavre){\psframebox*[fillstyle=solid,+\\
+ \verb+ fillcolor=yellow,framesep=0]{\textsf{Le Havre}}}+
+\end{itemize}
+D'une façon générale elle s'écrit :
+\begin{verbatim}
+ \mapputIIID[angle](longitude,lattitude)[node name]{node label}[country]
+\end{verbatim}
+Ce qui est entre crochets est facultatif. Par défaut l'angle de positionnement vaut $90^{\mathrm{o}}$.
+
+Les paramètres avec les valeurs par défaut sont les suivants :
+\begin{verbatim}
+ \newpsstyle{psNodeMapStyle}{fillstyle=solid,fillcolor=red}
+ \newpsstyle{NodeLabelStyle}{fillstyle=solid,fillcolor=yellow,
+ framesep=0,linestyle=none}
+ nodeWidth=1 mm
+\end{verbatim}
+\subsection{La commande \textbackslash psmeridien}
+\begin{verbatim}
+\psmeridien[options]{longitude}
+\end{verbatim}
+Elle permet de tracer la partir visible du méridien défini par sa
+longitude en degrés.
+
+\subsection{La commande \textbackslash psparallel}
+\begin{verbatim}
+\psparallel[options]{latitude}
+\end{verbatim}
+Elle permet de tracer la partir visible du cercle parallèle à
+l'équateur défini par sa latitude en degrés.
+
+\section{Le globe tellure}
+
+Le \textit{globe tellure} est décrit dans le document
+\textit{Globe\_tellure\_original.pdf}.
+
+La macro qui lui est associée est la suivante :
+\begin{verbatim}
+\def\psGlobeTellure{\pst@object{psGlobeTellure}}
+\def\psGlobeTellure@i(#1,#2)#3{% longitude, latitude et nom de la ville
+ \begin@SpecialObj%
+ \pnode(!/ux 0 def /uy 90 #2 sub sin def /uz 90 #2 sub cos def 0 0){ttt}%
+ \psset{PHI=0,THETA=0}%
+ {\psset{RotX=#2 90 sub,RotZ=90 #1 add}
+ \WorldMapThreeD[style=\psk@styleGlobe,daynight=false]%
+ \mapputIIID(#1,#2){#3}}%
+ \WorldMapThreeD[style=\psk@styleNight,daynight=true,circles=false,
+ blueEarth=false,
+ borders=false,islands=false,
+ rivers=false,lakes=false,
+ gridmap=false,latitudeParallel=#2]%
+ \psframe*(-3,-6.5)(3,-5.5)
+ \rput(! 0 \psk@TroisD@Radius\space neg -1 add){%
+ \white%
+ \psk@WorldMap@hour h le \psk@WorldMap@J/\psk@WorldMap@M/\psk@WorldMap@A}
+ \end@SpecialObj%
+ \ignorespaces}%
+\end{verbatim}
+Les deux styles associés à la partie éclairée et à la partie dans
+l'ombre sont :
+
+\begin{verbatim}
+\newpsstyle{Globe}{circles=true}
+\newpsstyle{night}{fillstyle=solid,fillcolor=black,opacity=0.8}
+\end{verbatim}
+et sont modifiables grâce aux deux options : \texttt{[styleGlobe=Globe]}
+et \texttt{[styleNight=night]} qui sont les styles par défaut.
+
+Elle s'utilise simplement, mais elle n'est valable que pour les villes de l'hémisphère nord :
+
+%\begin{LTXexample}[width=8cm]
+\begin{postcript}
+\definecolor{BlueDark}{cmyk}{1,1,0,0.5}
+\newpsstyle{Globe}{circles=true,gridmap=true,daynight=false}
+\newpsstyle{night}{fillstyle=solid,fillcolor=BlueDark,linecolor=BlueDark,opacity=0.8}
+\psset{Radius=5,Decran=100,Dobs=100,unit=0.5,path=../data}
+\includegraphics[scale=0.5]{images/./pst-map3d-doc-tmp-2.png}
+\end{postcript}
+%\end{LTXexample}
+
+Elle comprend en options, l'heure locale, le jour, le mois et l'année et
+en argument les coordonnées géographiques de la ville ainsi que son nom.
+
+La commande \verb+\psRandomStar(-7,-7)(7,7){\psframe(-7,-7)(7,7)}+ a été
+empruntée au package \texttt{pstricks-add} et permet de dessiner des
+étoiles dont la position et la taille sont aléatoires. Par rapport à la
+commande de \texttt{pstricks-add}, il y a en plus l'option
+\texttt{[sizeStar=1.5pt]} qui permet de fixer la taille maximale des
+étoiles. La package
+\texttt{pstricks-add} doit être chargé en préambule avant
+\PstMapThreeDPackage.
+
+\begin{verbatim}
+\newdimen\pssizeStar
+\def\psset@sizeStar#1{\pssetlength\pssizeStar{#1}}
+\psset@sizeStar{1.5pt}
+
+%% adapté de \psRandom du package pstricks-add
+%% pour rendre aléatoire la taille des étoiles
+\def\psRandomStar{\pst@object{psRandomStar}}%
+\def\psRandomStar@i{%
+ \@ifnextchar({\psRandomStar@ii}{\psRandomStar@iii(0,0)(1,1)}}
+\def\psRandomStar@ii(#1){%
+ \@ifnextchar({\psRandomStar@iii(#1)}{\psRandomStar@iii(0,0)(#1)}}
+\def\psRandomStar@iii(#1)(#2)#3{%
+ \def\pst@tempA{#3}%
+ \ifx\pst@tempA\pst@empty\psclip{\psframe(#2)}\else\psclip{#3}\fi
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getcoor{#2}\pst@tempB
+ \begin@SpecialObj
+ \addto@pscode{
+ \pst@tempA\space /yMin exch def
+ /xMin exch def
+ \pst@tempB\space /yMax exch def
+ /xMax exch def
+ /dy yMax yMin sub def
+ /dx xMax xMin sub def
+ rrand srand % initializes the random generator
+ /getRandReal { rand 2147483647 div } def
+ \psk@randomPoints {
+ /DS \pst@number\pssizeStar\space getRandReal mul def
+ \@nameuse{psds@\psk@dotstyle}
+ \ifPst@color getRandReal 1 1 sethsbcolor \fi
+ getRandReal dx mul xMin add
+ getRandReal dy mul yMin add
+ Dot
+ \ifx\psk@fillstyle\psfs@solid fill \fi stroke
+ } repeat
+ }%
+ \end@SpecialObj
+ \endpsclip
+ \ignorespaces
+}
+\makeatother
+\end{verbatim}
+\section{Les épicentres}
+La commande suivante :
+\begin{verbatim}
+\psepicenter[circlecolor=red,waves=4,Rmax=2000](95.98,3.30){Sumatra}
+\end{verbatim}
+tracera l'épicentre du séisme qui eut lieu sur la côte occidentale du
+nord de Sumatra le 26 décembre 2004, les coordonnées géographiques sont
+indiquées entre les parenthèses :
+\texttt{(longitude, latitude)}, la nom de la ville ou de la région entre
+accolades. Les paramètres optionnels concernent la couleur des cercles
+concentriques, leur nombre et le rayon maximum en km de l'onde,
+l'épaisseur se règle avec
+\texttt{[circlewidth=2pt]}.
+
+Il y a de très nombreux renseignements sur les séismes sur le site :
+
+\centerline{\url{http://earthquake.usgs.gov/eqcenter/eqarchives/year/magnitude8_1900_date.php}}
+
+%\begin{LTXexample}[pos=t]
+\includegraphics[scale=0.5]{images/./pst-map3d-doc-tmp-3.png}
+%\end{LTXexample}
+
+
+\section{Les plaques tectoniques}
+
+Elles se tracent avec l'option \texttt{ridge}. Les différents types se
+distinguent par des couleurs différentes (paramétrables : voir la partie
+correspondant aux paramètres).
+
+Les données relatives aux plaques ont été obtenues sur le site :
+
+\centerline{\url{http://www.ig.utexas.edu/research/projects/plates/}}
+
+%\begin{LTXexample}[pos=t]
+\includegraphics[0.5=0.5]{images/./pst-map3d-doc-tmp-4.png}
+
+%\end{LTXexample}
+
+\section{Les zones de fracture et les linéations magnétiques}
+
+%\begin{LTXexample}[pos=t]
+\includegraphics[0.5=0.5]{images/./pst-map3d-doc-tmp-5.png}
+%\end{LTXexample}
+%\begin{LTXexample}[pos=t]
+
+\includegraphics[0.5=0.5]{images/./pst-map3d-doc-tmp-6.png}
+%\end{LTXexample}
+
+
+\section{Quelques liens}
+Le développement du package : \url{http://syracuse-dev.org/mpst-globe}
+
+\url{http://melusine.eu.org/syracuse/pstricks/pst-solides3d/}
+
+Pour les données sur les plaques tectoniques, les volcans, les
+linéations magnétiques et le zones de fracture :
+
+\url{http://www.versamap.com/webdoc03.htm}
+
+
+\nocite{*}
+\bgroup
+\RaggedRight
+\bibliographystyle{plain}
+\bibliography{PSTricks}
+\egroup
+
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc.pdf b/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc.pdf
index a16633b0c57..24113a861bd 100644
--- a/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map3d-doc.tex b/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc.tex
index a4149e3ce14..de50a02a711 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map3d-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map3d-doc.tex
@@ -17,9 +17,8 @@
\def\PS{\texttt{PostScript}\xspace}
\makeatletter
\newdimen\pssizeStar
-\def\psset@sizeStar#1{\pssetlength\pssizeStar{#1}}
-\psset@sizeStar{1.5pt}
-
+\define@key[psset]{}{sizeStar}[1.5pt]{\pssetlength\pssizeStar{#1}}
+\psset{sizeStar=1.5pt}
%% adapté de \psRandom du package pstricks-add
%% pour rendre aléatoire la taille des étoiles
\def\psRandomStar{\pst@object{psRandomStar}}%
@@ -56,6 +55,7 @@
}
\makeatother
\definecolor{graygreen}{cmyk}{0.7,0,0.6,0.2}
+\definecolor{BlueDark}{cmyk}{1,1,0,0.5}
\newcommand{\PstMapThreeDPackage}{`\textsf{pst-map3d}'}
\title{The \PstMapThreeDPackage{} package\\A PSTricks package for Geographical Projections}
\author{Manuel \textsc{Luque}
@@ -177,12 +177,14 @@ Rmax&1500& Rayon, en km, du plus grand cercle centré sur l'épicentre\\\hline
\section{La représentation du globe}
La représentation du globe est centrée sur Paris avec les paramètres
-\begin{center}\centering \verb+\psset{PHI=48.85,THETA=2.32}+.\end{center}
+
+\verb+\psset{PHI=48.85,THETA=2.32}+.
+
Un effet de moirage apparaît du aux
cercles concentriques tracés sur la sphère. Différentes options de
couleur sont testées avec cet exemple.
-%\begin{LTXexample}[width=8cm]
+\begin{center}
\begin{pspicture}(-4,-4)(4,4)
\psset{PHI=48.85,THETA=2.32,Decran=15,path=../data}
\WorldMapThreeD[gridmapcolor=yellow,circlesep=1,mapcolor=green!50,bordercolor=red,
@@ -191,7 +193,21 @@ couleur sont testées avec cet exemple.
\psparallel{48.85}
\mapputIIID(2.32,48.85){Paris}
\end{pspicture}
-%\end{LTXexample}
+\end{center}
+
+\begin{lstlisting}
+\begin{pspicture}(-4,-4)(4,4)
+\psset{PHI=48.85,THETA=2.32,Decran=15,path=../data}
+\WorldMapThreeD[gridmapcolor=yellow,circlesep=1,mapcolor=green!50,bordercolor=red,
+ coastwidth=1.2pt,capitals,islandcolor=blue,coastcolor=blue,coasts]
+\psmeridien{2.32}
+\psparallel{48.85}
+\mapputIIID(2.32,48.85){Paris}
+\end{pspicture}
+\end{lstlisting}
+
+
+
\section{Effet de transparence et rotations}
@@ -204,7 +220,7 @@ Rappelons que les effets de transparence ne sont possibles qu'avec le
fichier \texttt{pdf}, celui-ci sera obtenu avec la séquence de commandes:
\texttt{\LaTeX}-->\texttt{dvips}-->\texttt{ps2pdf}.
-%\begin{LTXexample}[width=8.2cm]
+\begin{center}
\begin{pspicture}(-4,-4)(4,4)
\psset{RotX=-23,RotZ=30,PHI=46.5833,THETA=0.3333,visibility=false,Decran=15,path=../data}
\WorldMapThreeD[circles=false,blueEarth=false]
@@ -213,12 +229,23 @@ fichier \texttt{pdf}, celui-ci sera obtenu avec la séquence de commandes:
\psparallel[visibility=true]{46.5833}
\mapputIIID(0.3333,46.5833){Poitiers}
\end{pspicture}
-%\end{LTXexample}
+\end{center}
+\begin{lstlisting}
+\begin{pspicture}(-4,-4)(4,4)
+\psset{RotX=-23,RotZ=30,PHI=46.5833,THETA=0.3333,visibility=false,Decran=15,path=../data}
+\WorldMapThreeD[circles=false,blueEarth=false]
+\WorldMapThreeD[circles=false,visibility=true,opacity=0.7]
+\psmeridien[visibility=true]{0.333}
+\psparallel[visibility=true]{46.5833}
+\mapputIIID(0.3333,46.5833){Poitiers}
+\end{pspicture}
+\end{lstlisting}
\section{Mise en valeur du territoire français}
-\begin{center}
+\begin{center}
+\begin{postscript}
\begin{pspicture*}(-0.5\linewidth,-0.45\textheight)(0.5\linewidth,0.5\textheight)
\psset{PHI=45,THETA=5,unit=7.5,path=../data}
\WorldMapThreeD[lakes=false,circlesep=0.25,lakes=false,gridmap=false,
@@ -247,23 +274,61 @@ fichier \texttt{pdf}, celui-ci sera obtenu avec la séquence de commandes:
\psdot[dotsize=0.025\psunit](Lucques)
\uput[u](Lucques){\psframebox[fillstyle=solid,fillcolor=yellow!50,framesep=0,
linestyle=none,opacity=0.5]{\textsf{Lucques}}}
-\input{capitales}
+\input{capitales3d}
\psepicenter[circlecolor=red,waves=16,Rmax=2000](0.3333,46.5833){Poitiers}
\end{pspicture*}
-
+\end{postscript}
\end{center}
+\begin{lstlisting}
+\begin{pspicture*}(-0.5\linewidth,-0.45\textheight)(0.5\linewidth,0.5\textheight)
+\psset{PHI=45,THETA=5,unit=7.5,path=../data}
+\WorldMapThreeD[lakes=false,circlesep=0.25,lakes=false,gridmap=false,
+ mapcolor=graygreen!50,bordercolor=red,rivers=false,
+ coasts=false,islandcolor=blue]%
+\WorldMapThreeD[gridmapcolor=yellow,circles=false,lakes=true,gridmapdiv=5,france=true,
+ islandcolor=blue,blueEarth=false,
+ bordercolor=red,islands=false,borders=false,rivers=true,coasts=true,
+ coastcolor=blue]%
+\psmeridien{2.32}
+\psparallel{48.85}
+\newpsstyle{NodeLabelStyle}{fillstyle=solid,fillcolor=yellow!50,framesep=0,
+ linestyle=none,opacity=0.5}
+\input{villesFrance3d}
+\newpsstyle{NodeLabelStyle}{fillstyle=solid,fillcolor=red!50,
+ framesep=0,linestyle=none,opacity=0.5}
+\newpsstyle{psNodeMapStyle}{fillstyle=solid,fillcolor=yellow!50,linecolor=red}
+\psset{nodeWidth=0.025\psunit,linecolor=red}
+\pnodeMapIIID(15.2833,37.0833){Syracuse}
+\pscircle[fillstyle=solid,fillcolor=green](Syracuse){0.025\psunit}
+\psdot[dotsize=0.025\psunit](Syracuse)
+\uput[l](Syracuse){\psframebox[fillstyle=solid,fillcolor=yellow,framesep=0,
+ linestyle=none,opacity=0.5]{\textsf{Syracuse}}}
+\pnodeMapIIID(10.51667,43.85){Lucques}
+\pscircle[fillstyle=solid,fillcolor=green](Lucques){0.025\psunit}
+\psdot[dotsize=0.025\psunit](Lucques)
+\uput[u](Lucques){\psframebox[fillstyle=solid,fillcolor=yellow!50,framesep=0,
+ linestyle=none,opacity=0.5]{\textsf{Lucques}}}
+\input{capitales3d}
+\psepicenter[circlecolor=red,waves=16,Rmax=2000](0.3333,46.5833){Poitiers}
+\end{pspicture*}
+\end{lstlisting}
+
\section{Les macros}
\subsection{La commande \textbackslash pnodeMapIIID}
+
Une commande créée à cet effet permet de placer en un point du globe, défini
par sa longitude et sa latitude, une ville, un lieu, un symbole ou une
annotation quelconque. Cette commande qui utilise le package
\textsf{pst-node} est la suivante :
-\begin{verbatim}
+
+\begin{lstlisting}
\pnodeMapIIID(longitude,latitude){nom}
-\end{verbatim}
+\end{lstlisting}
+
\textsf{longitude} et \textsf{latitude} sont en degrés, le \textsf{nom}
attribué au n\oe{}ud ne doit pas contenir de lettre accentuée.
+
\subsection{La commande \textbackslash mapputIIID}
La commande \verb+\mapputIIID(0.100000,49.483333){Le Havre}+ est identique à la suite de commandes :
\begin{itemize}
@@ -272,40 +337,42 @@ La commande \verb+\mapputIIID(0.100000,49.483333){Le Havre}+ est identique à la
\item \verb+\uput[u](LeHavre){\psframebox*[fillstyle=solid,+\\
\verb+ fillcolor=yellow,framesep=0]{\textsf{Le Havre}}}+
\end{itemize}
+
D'une façon générale elle s'écrit :
-\begin{verbatim}
+\begin{lstlisting}
\mapputIIID[angle](longitude,lattitude)[node name]{node label}[country]
-\end{verbatim}
+\end{lstlisting}
+
Ce qui est entre crochets est facultatif. Par défaut l'angle de positionnement vaut $90^{\mathrm{o}}$.
Les paramètres avec les valeurs par défaut sont les suivants :
-\begin{verbatim}
+\begin{lstlisting}
\newpsstyle{psNodeMapStyle}{fillstyle=solid,fillcolor=red}
\newpsstyle{NodeLabelStyle}{fillstyle=solid,fillcolor=yellow,
framesep=0,linestyle=none}
nodeWidth=1 mm
-\end{verbatim}
+\end{lstlisting}
+
\subsection{La commande \textbackslash psmeridien}
-\begin{verbatim}
+\begin{lstlisting}
\psmeridien[options]{longitude}
-\end{verbatim}
+\end{lstlisting}
Elle permet de tracer la partir visible du méridien défini par sa
longitude en degrés.
\subsection{La commande \textbackslash psparallel}
-\begin{verbatim}
+\begin{lstlisting}
\psparallel[options]{latitude}
-\end{verbatim}
+\end{lstlisting}
Elle permet de tracer la partir visible du cercle parallèle à
l'équateur défini par sa latitude en degrés.
\section{Le globe tellure}
-Le \textit{globe tellure} est décrit dans le document
-\textit{Globe\_tellure\_original.pdf}.
+Le \textit{globe tellure} est décrit dans le document \textit{Globe\_tellure\_original.pdf}.
La macro qui lui est associée est la suivante :
-\begin{verbatim}
+\begin{lstlisting}
\def\psGlobeTellure{\pst@object{psGlobeTellure}}
\def\psGlobeTellure@i(#1,#2)#3{% longitude, latitude et nom de la ville
\begin@SpecialObj%
@@ -325,21 +392,21 @@ La macro qui lui est associée est la suivante :
\psk@WorldMap@hour h le \psk@WorldMap@J/\psk@WorldMap@M/\psk@WorldMap@A}
\end@SpecialObj%
\ignorespaces}%
-\end{verbatim}
-Les deux styles associés à la partie éclairée et à la partie dans
-l'ombre sont :
+\end{lstlisting}
-\begin{verbatim}
+Les deux styles associés à la partie éclairée et à la partie dans l'ombre sont :
+
+\begin{lstlisting}
\newpsstyle{Globe}{circles=true}
\newpsstyle{night}{fillstyle=solid,fillcolor=black,opacity=0.8}
-\end{verbatim}
+\end{lstlisting}
+
et sont modifiables grâce aux deux options : \texttt{[styleGlobe=Globe]}
et \texttt{[styleNight=night]} qui sont les styles par défaut.
Elle s'utilise simplement, mais elle n'est valable que pour les villes de l'hémisphère nord :
-%\begin{LTXexample}[width=8cm]
-\begin{postcript}
+\begin{postscript}
\definecolor{BlueDark}{cmyk}{1,1,0,0.5}
\newpsstyle{Globe}{circles=true,gridmap=true,daynight=false}
\newpsstyle{night}{fillstyle=solid,fillcolor=BlueDark,linecolor=BlueDark,opacity=0.8}
@@ -349,8 +416,19 @@ Elle s'utilise simplement, mais elle n'est valable que pour les villes de l'hémi
\psRandomStar[linecolor=yellow!50,randomPoints=100](-7,-7)(7,7){\psframe(-7,-7)(7,7)}
\psGlobeTellure[hour=10,Day=22,Month=06,Year=2008](15.28,37.07){Syracuse}
\end{pspicture}
-\end{postcript}
-%\end{LTXexample}
+\end{postscript}
+
+\begin{lstlisting}
+\definecolor{BlueDark}{cmyk}{1,1,0,0.5}
+\newpsstyle{Globe}{circles=true,gridmap=true,daynight=false}
+\newpsstyle{night}{fillstyle=solid,fillcolor=BlueDark,linecolor=BlueDark,opacity=0.8}
+\psset{Radius=5,Decran=100,Dobs=100,unit=0.5,path=../data}
+\begin{pspicture}(-7,-7)(7,7)
+\psframe*[linecolor=BlueDark](-7,-7)(7,7)%
+\psRandomStar[linecolor=yellow!50,randomPoints=100](-7,-7)(7,7){\psframe(-7,-7)(7,7)}
+\psGlobeTellure[hour=10,Day=22,Month=06,Year=2008](15.28,37.07){Syracuse}
+\end{pspicture}
+\end{lstlisting}
Elle comprend en options, l'heure locale, le jour, le mois et l'année et
en argument les coordonnées géographiques de la ville ainsi que son nom.
@@ -364,11 +442,10 @@ commande de \texttt{pstricks-add}, il y a en plus l'option
\texttt{pstricks-add} doit être chargé en préambule avant
\PstMapThreeDPackage.
-\begin{verbatim}
+\begin{lstlisting}
\newdimen\pssizeStar
-\def\psset@sizeStar#1{\pssetlength\pssizeStar{#1}}
-\psset@sizeStar{1.5pt}
-
+\define@key[psset]{}{sizeStar}[1.5pt]{\pssetlength\pssizeStar{#1}}
+\psset{sizeStar=1.5pt}
%% adapté de \psRandom du package pstricks-add
%% pour rendre aléatoire la taille des étoiles
\def\psRandomStar{\pst@object{psRandomStar}}%
@@ -406,12 +483,15 @@ commande de \texttt{pstricks-add}, il y a en plus l'option
\ignorespaces
}
\makeatother
-\end{verbatim}
+\end{lstlisting}
+
\section{Les épicentres}
La commande suivante :
-\begin{verbatim}
+
+\begin{lstlisting}
\psepicenter[circlecolor=red,waves=4,Rmax=2000](95.98,3.30){Sumatra}
-\end{verbatim}
+\end{lstlisting}
+
tracera l'épicentre du séisme qui eut lieu sur la côte occidentale du
nord de Sumatra le 26 décembre 2004, les coordonnées géographiques sont
indiquées entre les parenthèses :
@@ -423,9 +503,8 @@ l'épaisseur se règle avec
Il y a de très nombreux renseignements sur les séismes sur le site :
-\centerline{\url{http://earthquake.usgs.gov/eqcenter/eqarchives/year/magnitude8_1900_date.php}}
+\url{http://earthquake.usgs.gov/eqcenter/eqarchives/year/magnitude8_1900_date.php}
-%\begin{LTXexample}[pos=t]
\begin{pspicture}(-5,-5)(5,5)
\psset{Radius=5,Dobs=200,Decran=200,path=../data}
\psset{PHI=10,THETA=120,circlewidth=1.5pt}
@@ -437,8 +516,20 @@ Il y a de très nombreux renseignements sur les séismes sur le site :
\psparallel[parallelcolor=green]{52.76}
\psepicenter[circlecolor=green](160,52.76){Kamchatka}
\end{pspicture}
-%\end{LTXexample}
+\begin{lstlisting}
+\begin{pspicture}(-5,-5)(5,5)
+\psset{Radius=5,Dobs=200,Decran=200,path=../data}
+\psset{PHI=10,THETA=120,circlewidth=1.5pt}
+\WorldMapThreeD[circles=false,australia=true]%
+\psmeridien{95.98}
+\psparallel{3.30}
+\psepicenter[circlecolor=red,waves=4,Rmax=2000](95.98,3.30){Sumatra}
+\psmeridien[meridiencolor=green]{160}
+\psparallel[parallelcolor=green]{52.76}
+\psepicenter[circlecolor=green](160,52.76){Kamchatka}
+\end{pspicture}
+\end{lstlisting}
\section{Les plaques tectoniques}
@@ -448,7 +539,7 @@ correspondant aux paramètres).
Les données relatives aux plaques ont été obtenues sur le site :
-\centerline{\url{http://www.ig.utexas.edu/research/projects/plates/}}
+\url{http://www.ig.utexas.edu/research/projects/plates/}
%\begin{LTXexample}[pos=t]
\begin{postscript}
@@ -466,12 +557,28 @@ Les données relatives aux plaques ont été obtenues sur le site :
\WorldMapThreeD[gridmapcolor=yellow,circles=false,ridge=true]%
\end{pspicture}
\end{postscript}
-
%\end{LTXexample}
+\begin{lstlisting}
+\psset{unit=0.8,RotX=0,Decran=100,Dobs=100,PHI=0,THETA=-100,path=../data}
+\begin{pspicture}(-5,-5)(5,5)
+\WorldMapThreeD[gridmapcolor=yellow,circles=false,ridge=true]%
+\psframe(4,-6.4)(10.5,-3.6)
+\uput[r](4,-4){Tectonic plates boundaries}
+\psline[linecolor=red,linewidth=2pt](4.2,-4.5)(5,-4.5)\uput[r](5,-4.5){\color{red}{Ridge}}
+\psline[linecolor=darkgreen,linewidth=2pt](4.2,-5.25)(5,-5.25)\uput[r](5,-5.25){\color{darkgreen}{Trench}}
+\psline[linecolor=orange,linewidth=2pt](4.2,-6)(5,-6)\uput[r](5,-6){\color{orange}{Transform}}
+\end{pspicture}\\
+\begin{pspicture}(-5,-5)(5,5)
+\psset{PHI=0,THETA=100}
+\WorldMapThreeD[gridmapcolor=yellow,circles=false,ridge=true]%
+\end{pspicture}
+\end{lstlisting}
+
\section{Les zones de fracture et les linéations magnétiques}
%\begin{LTXexample}[pos=t]
+\noindent
\begin{postscript}
\psset{Decran=100,Dobs=100,unit=0.8,path=../data}
\begin{pspicture}(-5,-5)(5,5)
@@ -485,8 +592,8 @@ Les données relatives aux plaques ont été obtenues sur le site :
\end{pspicture}
\end{postscript}
%\end{LTXexample}
-%\begin{LTXexample}[pos=t]
+%\begin{LTXexample}[pos=t]
\begin{postscript}
\psset{Decran=100,Dobs=100,unit=0.8,path=../data}
\begin{pspicture}(-5,-5)(5,5)
diff --git a/Master/texmf-dist/doc/generic/pst-geo/pst-map3dII-doc.pdf b/Master/texmf-dist/doc/generic/pst-geo/pst-map3dII-doc.pdf
new file mode 100644
index 00000000000..f9fd82768d2
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map3dII-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-geo/doc-map3dII.tex b/Master/texmf-dist/doc/generic/pst-geo/pst-map3dII-doc.tex
index e5a8591797d..c58c3ca5759 100644
--- a/Master/texmf-dist/doc/generic/pst-geo/doc-map3dII.tex
+++ b/Master/texmf-dist/doc/generic/pst-geo/pst-map3dII-doc.tex
@@ -1,24 +1,30 @@
-%-------------------------------------------------------------------
-% doc-pst-map3dII.tex Dec.22,2003 - rev.02 by M. Luque, G. Matarazzo
-%-------------------------------------------------------------------
\documentclass[a4paper]{article}
\usepackage{pstricks,pst-map3dII,url}
+\usepackage[T1]{fontenc}
+\usepackage[garamond]{mathdesign}
+\renewcommand{\ttdefault}{lmtt}
\psset{path=../dataII,level=50}
\usepackage[francais]{babel}
-\usepackage[ansinew]{inputenc}%
- \title{The \PstMapThreeDIIPackage{} package\\A PSTricks package for Geographical Projections}
- \author{Manuel \textsc{Luque}
- \mbox{\texttt{<Mluque5130@aol.com>}}\\
- and\\
- Giuseppe \textsc{Matarazzo} \mbox{\texttt{<joematara@hotmail.com>}}}
+\usepackage[latin9]{inputenc}%
+
+\title{The \PstMapThreeDIIPackage{} package\\A PSTricks package for Geographical Projections}
+\author{Manuel \textsc{Luque}
+ \mbox{\texttt{<Mluque5130@aol.com>}}\\
+ and\\
+ Giuseppe \textsc{Matarazzo} \mbox{\texttt{<joematara@hotmail.com>}}}
\date{Version 0.2\\ December 20, 2003\\
- {\small Documentation revised November 11, 2005 by hv}}
+ {\small Documentation revised August 28, 2009 by hv}}
+
+\usepackage{ragged2e,xspace}
+\def\PST{\texttt{PSTricks}\xspace}
+\def\PS{\texttt{PostScript}\xspace}
+\def\psp{pspicture}
\newcommand{\PstMapThreeDIIPackage}{`\textsf{pst-map3dII}'}
\newcommand\Parameter[1]{\colorbox{black}{\textcolor{white}{#1}}}
\begin{document}
- \maketitle
- \begin{abstract}
- Dans la continuité de \textsf{pst-map2dII}, cette solution se propose
+\maketitle
+\begin{abstract}
+Dans la continuité de \textsf{pst-map2dII}, cette solution se propose
d'utiliser la base de données géographiques : \textsf{CIA World DataBank II}, que l'on trouvera sur
\url{http://www.evl.uic.edu/pape/data/WDB/} pour dessiner la
mappemonde en 3D.
@@ -36,7 +42,7 @@ on se limite au dessin de certaines parties du monde, le temps de
calcul est très raisonnable et une mémoire réduite suffisante.
\end{abstract}
- \tableofcontents
+\tableofcontents
\section{La mise en forme des données}
Pour faciliter le travail de PostScript et diminuer le temps de
@@ -78,7 +84,7 @@ Elle s'obtient par la commande :
Dans laquelle \textsf{PHI=40,THETA=15} fixent en latitude et longitude la
position du point de vue : sur la carte le point de coordonnées
géographiques correspondantes sera au centre ; il est nécessaire cependant, que les coordonnées de
-l'environnement \verb+\begin{pspicture}*(-9,-4)(9,4)+ possèdent une symétrie
+l'environnement \texttt{\{\psp\}(-9,-4)(9,4)} possèdent une symétrie
centrale. \textsf{Decran=80} fixe la distance de l'écran de projection de
l'image vue, plus cette distance sera grande et plus l'image obtenue (plus
l'effet de zoom) sera grande.
@@ -91,13 +97,19 @@ parallèles ou deux méridiens. Les explications concernant ces paramètres
vont être développées dans les exemples suivants, ainsi que celles d'autres
paramètres.
+\begin{postscript}
\makebox[\textwidth]{%
\begin{pspicture*}(-9,-4)(9,4)
\WorldMapThreeDII[PHI=35,THETA=15,Decran=80,city=true,%
borders=true,asia=true,
africa=true,rivers=false,%
linewidth=0.5\pslinewidth,increment=5]%
-\end{pspicture*}}
+\end{pspicture*}
+}
+\end{postscript}
+
+
+
\section{Les paramètres et les options}
\subsection{Les paramètres}
@@ -154,15 +166,18 @@ Avec le scénario suivant on se place au-dessus du pôle Nord.
rivers=false,borders=false]%
\end{verbatim}
\begin{center}
-\begin{pspicture}*(-7,-7)(7,7)
+\begin{postscript}
+\begin{pspicture*}(-7,-7)(7,7)
\psframe*[linecolor=black](-7,-7)(7,7)
\WorldMapThreeDII[PHI=80,THETA=-10,Decran=25,city=true,%
asia=true,africa=true,namer=true,samer=true,%
rivers=false,borders=false,
linewidth=0.5\pslinewidth]%
-\end{pspicture}
+\end{pspicture*}
+\end{postscript}
\end{center}
+
\clearpage
Avec les paramètres :
@@ -175,13 +190,15 @@ On tourne le globe terrestre de $\mathrm{-45^o}$ autour de $Ox$, dans le repère
les nouvelles coordonnées sont re-calculées ; le dessin
des fleuves et rivières est désactivé.
\begin{center}
-\begin{pspicture}*(-7,-7)(7,7)
+\begin{postscript}
+\begin{pspicture*}(-7,-7)(7,7)
\psframe*[linecolor=black](-7,-7)(7,7)
\WorldMapThreeDII[PHI=42,THETA=20,Decran=25,RotX=-45,city=true,%
asia=true,africa=true,namer=true,samer=true,%
rivers=true,borders=true,
linewidth=0.5\pslinewidth]%
-\end{pspicture}
+\end{pspicture*}
+\end{postscript}
\end{center}
\subsection{Visualiser une partie du globe terrestre}
@@ -198,11 +215,13 @@ représentées, comme nous l'avons vu dans le premier exemple de présentation.
\end{pspicture}
\end{verbatim}
\begin{center}
-\hbox{\hspace{-1.5cm}%
+\hspace*{-1.5cm}%
+\begin{postscript}
\begin{pspicture}*(-8,-8)(8,8)
\WorldMapThreeDII[PHI=45,THETA=2,Decran=150,city=true,%
asia=false,africa=false,samer=true,europe=true,increment=2]% France
-\end{pspicture}}
+\end{pspicture}
+\end{postscript}
\end{center}
@@ -218,11 +237,13 @@ représentées, comme nous l'avons vu dans le premier exemple de présentation.
\end{pspicture}}
\end{verbatim}
\begin{center}
-\hbox{\hspace{-1.5cm}%
+\hspace*{-1.5cm}%
+\begin{postscript}
\begin{pspicture}*(-8,-8)(8,8)
\WorldMapThreeDII[PHI=15,THETA=-90,Decran=80,city=true,%
asia=false,africa=false,samer=true,europe=false,namer=true,increment=2]% Mexico
-\end{pspicture}}
+\end{pspicture}
+\end{postscript}
\end{center}
@@ -236,11 +257,14 @@ représentées, comme nous l'avons vu dans le premier exemple de présentation.
namer=false,increment=2]% Madagascar
\end{pspicture}
\end{verbatim}
+
\begin{center}
+\begin{postscript}
\begin{pspicture}*(-5,-5)(5,5)
\WorldMapThreeDII[PHI=-19,THETA=47.5,Decran=85,Dobs=15,city=true,%
asia=false,africa=true,samer=false,europe=false,namer=false,increment=2]% Madagascar
\end{pspicture}
+\end{postscript}
\end{center}
\section{Téléchargement des fichiers}
\begin{itemize}
@@ -258,4 +282,14 @@ nom des villes, les degrés de méridiens et parallèles etc.
Par conséquent, si ce sujet vous intéresse et si vous souhaitez compléter et
améliorer ces packages : \textsf{pst-map2d, pst-map3d, pst-map2dII,
pst-map3dII}, n'hésitez pas à vous manifester\ldots
+
+\nocite{*}
+\bgroup
+\RaggedRight
+\bibliographystyle{plain}
+\bibliography{PSTricks}
+\egroup
+
+
+
\end{document}
diff --git a/Master/texmf-dist/dvips/pst-geo/map3dII.pro b/Master/texmf-dist/dvips/pst-geo/map3dII.pro
index 543014d2f03..1652adb185c 100644
--- a/Master/texmf-dist/dvips/pst-geo/map3dII.pro
+++ b/Master/texmf-dist/dvips/pst-geo/map3dII.pro
@@ -25,8 +25,7 @@ tx@mapII3DDict begin
} {pop pop} ifelse
} for
/ncount 0 def % hv 2004-05-04
- /stepPoint step def
- Counter step div 2 lt { stepPoint 1 def } if % hv 2004-05-04
+ /stepPoint Counter step div 2 lt { 1 }{ step } ifelse def % hv 2004-05-04
Counter 2 sub -2 2 {
/Counter exch def
/ncount ncount 1 add def % hv 2004-05-04
diff --git a/Master/texmf-dist/dvips/pst-geo/pst-map3d.pro b/Master/texmf-dist/dvips/pst-geo/pst-map3d.pro
index eb46bfac51e..bb98d796fb5 100644
--- a/Master/texmf-dist/dvips/pst-geo/pst-map3d.pro
+++ b/Master/texmf-dist/dvips/pst-geo/pst-map3d.pro
@@ -1,8 +1,10 @@
% premiere version 29 novembre 2003
-% entierement modifiee le 08/02/2008
-% allégée de 3D.pro
-% version 1.0 du 5 mars 2008
+% entierement modifiee le 11/08/2009
+% allegee de 3D.pro
+% version 1.01 2009-08-11 (hv)
% manuel.luque27@gmail.com
+% hvoss@tug.org
+%
/tx@map3DDict 100 dict def
tx@map3DDict begin
%%
@@ -20,7 +22,7 @@ tx@map3DDict begin
/region exch def
/nbr region length def % nombre de points
0 1 nbr 1 sub {
- /counter exch def % pour mémoriser le premier point vu
+ /counter exch def % pour memoriser le premier point vu
region counter get aload pop
CalcCoor
CalculsPointsAfterTransformations
@@ -116,8 +118,7 @@ TableauRegionsVisibles
/CalcCoordinates{%
formulesTroisD
Xi xunit Yi yunit
- }
- def
+} def
% pour la 3D conventionnelle
/formulesTroisD{%
/xObservateur Xabscisse Sin1 mul neg Yordonnee Cos1 mul add def
@@ -125,8 +126,7 @@ TableauRegionsVisibles
/zObservateur Xabscisse neg Cos1Cos2 mul Yordonnee Sin1Cos2 mul sub Zcote Sin2 mul sub Dobs add def
/Xi DScreen xObservateur mul zObservateur div def
/Yi DScreen yObservateur mul zObservateur div def
- }
-def
+} def
%
/CalculsPointsAfterTransformations{%
/Xabscisse M11 Xpoint mul M12 Ypoint mul add M13 Zpoint mul add def
@@ -135,12 +135,12 @@ def
}
def
%
-/Test { % test de visibilité d'un point
+/Test { % test de visibilite d'un point
% rayon vers point de vue
/RXvue XpointVue Xabscisse sub def
/RYvue YpointVue Yordonnee sub def
/RZvue ZpointVue Zcote sub def
-% test de visibilité
+% test de visibilite
/PS RXvue Xabscisse mul % produit scalaire
RYvue Yordonnee mul add
RZvue Zcote mul add
@@ -171,7 +171,7 @@ CalculsPointsAfterTransformations
/xCentreFacette Xabscisse def
/yCentreFacette Yordonnee def
/zCentreFacette Zcote def
-% normale à la facette
+% normale a la facette
/nXfacette xCentreFacette def
/nYfacette yCentreFacette def
/nZfacette zCentreFacette def
@@ -179,7 +179,7 @@ CalculsPointsAfterTransformations
/RXvue XpointVue xCentreFacette sub def
/RYvue YpointVue yCentreFacette sub def
/RZvue ZpointVue zCentreFacette sub def
-% test de visibilité
+% test de visibilite
/PSfacette RXvue nXfacette mul
RYvue nYfacette mul add
RZvue nZfacette mul add
@@ -375,7 +375,7 @@ def
end
} def
-% coordonnées sphériques -> coordonnées cartésiennes
+% coordonnees spheriques -> coordonnees cartesiennes
/rtp2xyz {
6 dict begin
/phi exch def
@@ -469,7 +469,7 @@ end
%%%%% ### rotV3d ###
%% rotation autour d'un vecteur u
%% defini par (ux,uy,uz)
-%% ici l'axe des pôles de la Terre
+%% ici l'axe des peles de la Terre
%% d'un angle theta
/rotV3d {
15 dict begin
@@ -506,7 +506,7 @@ u1 u2 u3 rotV3d
% vecteur normal dans le plan equateur
/theta0 u1 neg u2 atan def
theta0 cos theta0 sin 0 /v defpoint3d
-% w tels que le trièdre u v w soit direct
+% w tels que le triadre u v w soit direct
u v vectprod3d dupp3d norme3d 1 exch div mulv3d /w defpoint3d
/TabPointsVusNeg[
-180 1 0{ % for
@@ -637,11 +637,11 @@ def
50 dict begin
/l exch def % latitude : phi
/L exch def % longitude : theta
- /dlmax exch def % intervalle maximal en degrés
+ /dlmax exch def % intervalle maximal en degres
/nbr exch def % nombre de cercles
/dl dlmax nbr div def
% le vecteur unitaire normal
-% à la sphère au point considéré
+% a la sphere au point considere
L cos l cos mul
L sin l cos mul
l sin
@@ -655,8 +655,8 @@ def
/y_o r L sin mul l cos mul def
/z_o r l sin mul def
% un vecteur unitaire du plan du cercle
-% perpendiculaire à n et dans le plan méridien
-% donc même longitude
+% perpendiculaire a n et dans le plan meridien
+% donc meme longitude
/x_I Rsphere L cos mul l' cos mul def
/y_I Rsphere L sin mul l' cos mul def
/z_I Rsphere l' sin mul def
@@ -666,34 +666,34 @@ def
/uOI defpoint3d
uOI dupp3d norme3d 1 exch div mulv3d
/v defpoint3d
-% un vecteur w normal à u et v dans le plan du cercle
+% un vecteur w normal a u et v dans le plan du cercle
u v vectprod3d dupp3d norme3d 1 exch div mulv3d
/w defpoint3d
-% on décrit le cercle
-
+% on decrit le cercle
v 0 cos r' mul mulv3d
w 0 sin r' mul mulv3d
addv3d x_o y_o z_o addv3d
/Zpoint exch def /Ypoint exch def /Xpoint exch def
+ MatriceTransformation %%%%%%%%%%%%%%%%% hv 2009-08-11
CalculsPointsAfterTransformations
CalcCoordinates
moveto
-0 1 360{%
+ 0 1 360 {
/t exch def
v t cos r' mul mulv3d
w t sin r' mul mulv3d
addv3d x_o y_o z_o addv3d
- /Zpoint exch def /Ypoint exch def /Xpoint exch def
- CalculsPointsAfterTransformations
- CalcCoordinates
- lineto
+ /Zpoint exch def /Ypoint exch def /Xpoint exch def
+ CalculsPointsAfterTransformations
+ CalcCoordinates
+ lineto
} for
-stroke
+ stroke
} for
end
} def
-%% nouvelle construction des parallèles
+%% nouvelle construction des paralleles
/Parallel {
0 1 360{ % for
/theta exch def
diff --git a/Master/texmf-dist/dvips/pst-geo/pst-map3dII.pro b/Master/texmf-dist/dvips/pst-geo/pst-map3dII.pro
new file mode 100644
index 00000000000..1652adb185c
--- /dev/null
+++ b/Master/texmf-dist/dvips/pst-geo/pst-map3dII.pro
@@ -0,0 +1,205 @@
+%version 14 May 2004
+% allégée de 3D.pro
+/tx@mapII3DDict 100 dict def
+tx@mapII3DDict begin
+%
+ /CalculsPoints{%
+ /region exch def
+ newpath
+ /nbr region length def % nombre de régions
+ nbr 2 sub -2 2 {
+ /Counter exch def
+ region Counter get
+ /Y exch def
+ region Counter 1 add get
+ /X exch def
+ /Xpoint { Y cos X cos mul Rsphere mul } def
+ /Ypoint { Y cos X sin mul Rsphere mul } def
+ /Zpoint { Y sin Rsphere mul } def
+ CalculsPointsAfterTransformations
+ CalcCoordinates
+ Test
+ PS 0 lt {% marque le point
+ moveto
+ exit % termine
+ } {pop pop} ifelse
+ } for
+ /ncount 0 def % hv 2004-05-04
+ /stepPoint Counter step div 2 lt { 1 }{ step } ifelse def % hv 2004-05-04
+ Counter 2 sub -2 2 {
+ /Counter exch def
+ /ncount ncount 1 add def % hv 2004-05-04
+ ncount stepPoint ge Counter 2 le or { % hv 2004-05-04
+ region Counter get
+ /Y exch def
+ region Counter 1 add get
+ /X exch def
+ /Xpoint { Y cos X cos mul Rsphere mul } def
+ /Ypoint { Y cos X sin mul Rsphere mul } def
+ /Zpoint { Y sin Rsphere mul } def
+ CalculsPointsAfterTransformations
+ CalcCoordinates
+ Test
+ PS 0 lt { lineto }{ pop pop } ifelse
+ /ncount 0 def % hv 2004-05-04
+ }{ /ncount ncount 1 add def } ifelse % hv 2004-05-04
+ } for
+} def
+%
+/MatriceTransformation{%
+ /Sin1 THETA sin def
+ /Sin2 PHI sin def
+ /Cos1 THETA cos def
+ /Cos2 PHI cos def
+ /Cos1Sin2 Cos1 Sin2 mul def
+ /Sin1Sin2 Sin1 Sin2 mul def
+ /Cos1Cos2 Cos1 Cos2 mul def
+ /Sin1Cos2 Sin1 Cos2 mul def
+ /XpointVue Dobs Cos1Cos2 mul def
+ /YpointVue Dobs Sin1Cos2 mul def
+ /ZpointVue Dobs Sin2 mul def
+ /M11 RotZ cos RotY cos mul def
+ /M12 RotZ cos RotY sin mul RotX sin mul
+ RotZ sin RotX cos mul sub def
+ /M13 RotZ cos RotY sin mul RotX cos mul
+ RotZ sin RotX sin mul add def
+ /M21 RotZ sin RotY cos mul def
+ /M22 RotZ sin RotY sin RotX sin mul mul
+ RotZ cos RotX cos mul add def
+ /M23 RotZ sin RotY sin mul RotX cos mul
+ RotZ cos RotX sin mul sub def
+ /M31 RotY sin neg def
+ /M32 RotX sin RotY cos mul def
+ /M33 RotX cos RotY cos mul def
+ } def
+/CalcCoordinates{%
+ formulesTroisD
+ Xi xunit Yi yunit
+} def
+% pour la 3D conventionnelle
+/formulesTroisD{%
+ /xObservateur Xabscisse Sin1 mul neg Yordonnee Cos1 mul add def
+ /yObservateur Xabscisse Cos1Sin2 mul neg Yordonnee Sin1Sin2 mul sub Zcote Cos2 mul add def
+ /zObservateur Xabscisse neg Cos1Cos2 mul Yordonnee Sin1Cos2 mul sub Zcote Sin2 mul sub Dobs add def
+ /Xi DScreen xObservateur mul zObservateur div def
+ /Yi DScreen yObservateur mul zObservateur div def
+ }
+def
+%
+/CalculsPointsAfterTransformations{%
+ /Xabscisse M11 Xpoint mul M12 Ypoint mul add M13 Zpoint mul add def
+ /Yordonnee M21 Xpoint mul M22 Ypoint mul add M23 Zpoint mul add def
+ /Zcote M31 Xpoint mul M32 Ypoint mul add M33 Zpoint mul add def
+ }
+def
+%
+/Test { % test de visibilité d'un point
+% rayon vers point de vue
+ /RXvue Xabscisse XpointVue sub def
+ /RYvue Yordonnee YpointVue sub def
+ /RZvue Zcote ZpointVue sub def
+% test de visibilité
+ /PS RXvue Xabscisse mul % produit scalaire
+ RYvue Yordonnee mul add
+ RZvue Zcote mul add
+ def
+} def
+%
+/MaillageSphere {
+0 increment 360 increment sub {%
+ /theta exch def
+departPhi increment 90 increment sub {%
+ /phi exch def
+% newpath
+ /Xpoint Rsphere theta cos mul phi cos mul def
+ /Ypoint Rsphere theta sin mul phi cos mul def
+ /Zpoint Rsphere phi sin mul def
+CalculsPointsAfterTransformations
+ CalcCoordinates
+ moveto
+% Centre de la facette
+ /Xpoint Rsphere theta increment 2 div add cos mul phi increment 2 div add cos mul def
+ /Ypoint Rsphere theta increment 2 div add sin mul phi increment 2 div add cos mul def
+ /Zpoint Rsphere phi increment 2 div add sin mul def
+CalculsPointsAfterTransformations
+ /xCentreFacette Xabscisse def
+ /yCentreFacette Yordonnee def
+ /zCentreFacette Zcote def
+% normale à la facette
+ /nXfacette xCentreFacette def
+ /nYfacette yCentreFacette def
+ /nZfacette zCentreFacette def
+% rayon vers point de vue
+ /RXvue xCentreFacette XpointVue sub def
+ /RYvue yCentreFacette YpointVue sub def
+ /RZvue zCentreFacette ZpointVue sub def
+% test de visibilité
+ /PSfacette RXvue nXfacette mul
+ RYvue nYfacette mul add
+ RZvue nZfacette mul add
+ def
+condition {
+theta 1 theta increment add {%
+ /theta1 exch def
+ /Xpoint Rsphere theta1 cos mul phi cos mul def
+ /Ypoint Rsphere theta1 sin mul phi cos mul def
+ /Zpoint Rsphere phi sin mul def
+CalculsPointsAfterTransformations
+ CalcCoordinates
+ lineto
+ } for
+phi 1 phi increment add {
+ /phi1 exch def
+ /Xpoint Rsphere theta increment add cos mul phi1 cos mul def
+ /Ypoint Rsphere theta increment add sin mul phi1 cos mul def
+ /Zpoint Rsphere phi1 sin mul def
+CalculsPointsAfterTransformations
+ CalcCoordinates
+ lineto
+ } for
+theta increment add -1 theta {%
+ /theta1 exch def
+ /Xpoint Rsphere theta1 cos mul phi increment add cos mul def
+ /Ypoint Rsphere theta1 sin mul phi increment add cos mul def
+ /Zpoint Rsphere phi increment add sin mul def
+CalculsPointsAfterTransformations
+ CalcCoordinates
+ lineto
+ } for
+phi increment add -1 phi {
+ /phi1 exch def
+ /Xpoint Rsphere theta cos mul phi1 cos mul def
+ /Ypoint Rsphere theta sin mul phi1 cos mul def
+ /Zpoint Rsphere phi1 sin mul def
+CalculsPointsAfterTransformations
+ CalcCoordinates
+ lineto
+ } for
+} if
+} for
+} for
+gsave
+0 setgray
+stroke
+grestore
+} def
+%
+/DrawCitys {
+ /CITY exch def
+ /Rayon exch def
+ /nbr CITY length def % nombre de villes
+ 0 1 nbr 1 sub {
+ /compteur exch def
+ CITY compteur get aload pop
+ /X exch def /Y exch def
+ /Xpoint { Y cos X cos mul Rsphere mul } def
+ /Ypoint { Y cos X sin mul Rsphere mul } def
+ /Zpoint { Y sin Rsphere mul } def
+ CalculsPointsAfterTransformations
+ CalcCoordinates
+ Test
+ PS 0 lt %
+ { 1 0 0 setrgbcolor newpath Rayon 0 360 arc closepath fill }{ pop pop } ifelse
+ } for
+} def
+end
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/README b/Master/texmf-dist/tex/generic/pst-geo/data/README
new file mode 100644
index 00000000000..bd25910dd4e
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/README
@@ -0,0 +1,86 @@
+Project pst-geo-compress 2009-07-30
+========================
+
+Author: Heiko Oberdiek <oberdiek@uni-freiburg.de>
+License is LPPL 1.3c,
+ maintainance status: maintained
+ current maintainer: author
+
+Files:
+ README (this file)
+ pst-geo-compress.pl
+ pst-geo-decompress.pl
+
+Requirements: Ghostscript >= 8.56 (if prediction is used)
+
+`pst-geo' (CTAN:graphics/pstricks/contrib/pst-geo/) comes with
+huge data files:
+ CTAN:graphics/pstricks/contrib/pst-geo/data/data.tgz
+ CTAN:graphics/pstricks/contrib/pst-geo/dataII/dataII.tgz
+Unpacked the data files consume about 134 MB.
+
+The data files (files with extension `.dat') are PostScript files.
+PostScript supports compression and decompression via filter.
+The Perl script `pst-geo-compress.pl' compresses the data files
+using the /FlateEncode filter and adds code to decompresses the file,
+if read by a PostScript interpreter. Now the space requirements of
+the data files is about 24 MB.
+
+Caveat: Filters /FlateEncode and /FlateDecode require
+PostScript language level 3 (supported by ghostscript).
+(LZW compression don't need language level 3, but
+the compression is less effective.)
+
+Size reduction details:
+* Much unnecessary white space is removed.
+* Some comments are removed (especially number comments
+ in .dat files of data.tgz), the remaining comments are preserved
+ (especially city names).
+* /FlateEncode filter.
+* PNG prediction (method `up') is used for most of the files.
+ Spaces at line ends are added to fill the space up to
+ to the columns count. This improves the prediction,
+ because these files contains long lists of sorted coordinate pairs.
+ The prediction columns count is also the maximal line length,
+ because of a ghostscript bug:
+
+Ghostscript has a bug regarding prediction, it is fixed in
+version 8.56 (2007-03-14):
+
+| 2006-12-11T17:30:53.980862Z L. Peter Deutsch
+|
+| Fixes bug: the PNG predictor filters produced incorrect data for the last
+| pixel of each row. (The encoder and decoder had matching bugs, so
+| encode+decode produced the correct result!) Fixes a diff in PS3 CET
+| 23-12U-1.
+
+By having each line at the same length, the last byte of a row
+has always the same value (end of line character). This does
+not trigger this bug (tested with gs 7.07/8.64).
+
+After compression the files aren't human-readable any more.
+The Perl script `pst-geo-decompress.pl' can be used to
+decompress a data file.
+
+Both scripts know option -h that prints a short usage screen.
+Option --gscmd allows to configure the ghostscript programm call,
+if the automatic ghostscript isn't sufficient.
+
+`pst-geo-compress.pl' is called inside the directory where
+the data files are present. Options `-1' and `-2' choose
+between the files from `data.tgz' and `dataII.tgz'.
+
+`pst-geo-decompress.pl' expects the data file to decompress.
+If an output file is given, the result is stored there. Otherwise
+standard output is used.
+
+History:
+ 2009-07-30 v1.0 First release
+ 2009-07-30 v1.1:
+ * Workaround for ghostscript bug added:
+ * Files that are compressed with prediction have
+ equal line length.
+ * Removing comments (except for city data files)
+ * Obsolete option --prediction is therefore removed
+ * Adding standalone test mode (option `--test').
+
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/aus.dat b/Master/texmf-dist/tex/generic/pst-geo/data/aus.dat
new file mode 100644
index 00000000000..6607b782a8a
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/aus.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/c-cap.dat b/Master/texmf-dist/tex/generic/pst-geo/data/c-cap.dat
new file mode 100644
index 00000000000..7cd261c12fa
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/c-cap.dat
@@ -0,0 +1,324 @@
+/citycapitals[
+%Abidjan IVORY COAST
+[5.316667 -4.033333]
+%Accra GHANA
+[5.533333 -.233333]
+%Addis Ababa ETHIOPIA
+[9.033333 38.75]
+%Aden YEMEN
+[12.683333 45.016667]
+%Algiers ALGERIA
+[36.75 3.05]
+%Amman JORDAN
+[31.95 35.933333]
+%Amsterdam NETHERLANDS
+[52.366667 4.883333]
+%Andorra la Vella ANDORRA
+[42.516667 1.516667]
+%Ankara TURKEY
+[39.933333 32.866667]
+%Antananarivo MADAGASCAR
+[-19 47.5]
+%Asuncion PARAGUAY
+[-25.3 -57.65]
+%Athens GREECE
+[37.966667 23.733333]
+%Baghdad IRAQ
+[33.333333 44.433333]
+%Bamako MALI
+[12.65 -8.016667]
+%Bangkok THAILAND
+[13.766667 100.533333]
+%Bangui CENTRAL AFRICAN REPUBLIC
+[4 18]
+%Banjul GAMBIA
+[13 -17]
+%Beijing CHINA
+[39.916667 116.383333]
+%Beirut LEBANON
+[33.9 35.5]
+%Belfast N [IRELAND
+[54.583333 -5.933333]
+%Belgrade YUGOSLAVIA
+[44.816667 20.466667]
+%Belize BELIZE
+[17.5 -88]
+%Berlin GERMANY
+[52.533333 13.416667]
+%Bern SWITZERLAND
+[46.966667 7.433333]
+%Bissau GUINEA-BISSAU
+[12 -16]
+%Bogota COLUMBIA
+[4.583333 -74.083333]
+%Bonn GERMANY
+[50.733333 7.1]
+%Brasilia BRAZIL
+[-15.8 -47.866667]
+%Brazzaville CONGO
+[-5 15]
+%Bridgetown BARBADOS
+[13.1 -59]
+%Brussels BELGIUM
+[50.85 4.366667]
+%Bucharest ROMANIA
+[44.433333 26.083333]
+%Budapest HUNGARY
+[47.516667 19.05]
+%Buenos Aires ARGENTINA
+[-34.366667 -58.15]
+%Bujumbura BURUNDI
+[-3 29.5]
+%Cairo EGYPT
+[30.066667 31.25]
+%Canberra AUSTRALIA
+[-35.316667 149.1]
+%Caracas VENEZUELA
+[10.516667 -66.916667]
+%Cayenne FR GUIANA
+[4.933333 -52.333333]
+%Colombo SRI LANKA
+[6.916667 79.85]
+%Conakry GUINEA
+[9.5 -13.5]
+%Copenhagen DENMARK
+[55.683333 12.583333]
+%Dacca BENGLADESH
+[23.716667 90.416667]
+%Dakar SENEGAL
+[14.833333 -17.666667]
+%Damascus SYRIA
+[33.516667 36.3]
+%Dar Es Salaam TANZANIA
+[-6.816667 39.283333]
+%Djibouti DJIBOUTI
+[11.5 43]
+%Dublin IRELAND
+[53.333333 -6.25]
+%Edinburgh SCOTLAND
+[55.95 -3.183333]
+%Freetown SIERRA LEONE
+[8.45 -13.183333]
+%Gaborone BOTSWANA
+[-23 25.5]
+%Georgetown GUYANA
+[6.816667 -58.15]
+%Godthab GREENLAND
+[64 -51]
+%Guatemala GUATEMALA
+[14.633333 -90.516667]
+%Hanoi N VIETNAM
+[21.033333 105.85]
+%Harare ZIMBABWE
+[-17.816667 31.066667]
+%Havana CUBA
+[23.116667 -82.383333]
+%Helsinki FINLAND
+[60.166667 24.933333]
+%Ho Chi Minh City S VIETNAM
+[10.783333 106.683333]
+%Islamabad PAKISTAN
+[34 73]
+%Jakarta INDONESIA
+[-6.183333 106.883333]
+%Jerusalem ISRAEL
+[31.783333 35.216667]
+%Kabul AFGANISTAN
+[34.533333 69.166667]
+%Kampala UGANDA
+[2.85 15.8]
+%Katmandu NEPAL
+[27.733333 85.283333]
+%Khartoum SUDAN
+[15.583333 32.516667]
+%Kiev UKRAINE
+[50.433333 30.533333]
+%Kigali RWANDA
+[-2 30.2]
+%Kingston JAMAICA
+[18 -76.766667]
+%Kinshasa ZAIRE
+[-5.316667 15.3]
+%Koror (Palau) BELAU
+[7.316667 134.533333]
+%Kuala Lumpur MALAYSIA
+[3.133333 101.716667]
+%Kuwait KUWAIT
+[29 48]
+%La Paz BOLIVIA
+[-16.483333 -68.15]
+%Lagos NIGERIA
+[6.433333 3.433333]
+%Libreville GABON
+[5 9.5]
+%Lilongwe MALAWI
+[-14 34]
+%Lima PERU
+[-12.05 -77.033333]
+%Lisbon PORTUGAL
+[38.716667 -9.133333]
+%Lome TOGO
+[6.116667 1.216667]
+%London ENGLAND
+[51.016667 -.133333]
+%Luanda ANGOLA
+[-8.816667 13.233333]
+%Lusaka ZAMBIA
+[-15.416667 28.3]
+%Luxembourg LUXEMBOURG
+[49.616667 6.116667]
+%Madrid SPAIN
+[40.433333 -3.683333]
+%Malabo E GUINEA
+[4 8.5]
+%Male MALDIVES
+[4.5 73]
+%Managua NICARAGUA
+[12.15 -86.133333]
+%Manama BAHRAIN
+[26 51]
+%Maputo MOZAMBIQUE
+[-26 32]
+%Mbabane SWAZILAND
+[-26 32.5]
+%Mexico City MEXICO
+[19.433333 -99.133333]
+%Mogadiscio SOMALIA
+[2.016667 45.366667]
+%Monrovia LIBERIA
+[6.7 -11.5]
+%Monte Carlo MONACO
+[43.733333 7.433333]
+%Montevideo URAGUAY
+[-34.916667 -56.183333]
+%Moscow RUSSIA
+[55.766667 37.616667]
+%N'djamena CHAD
+[12 16]
+%Nairobi KENYA
+[-1.283333 36.816667]
+%Nassau BAHAMAS
+[25.066667 -77.333333]
+%New Delhi INDIA
+[28.583333 77.233333]
+%Niamey NIGER
+[14 3]
+%Nicosia CYPRUS
+[35.166667 33.35]
+%Nouakchott MAURITANIA
+[18 -16]
+%Oslo NORWAY
+[59.916667 10.733333]
+%Ottawa CANADA
+[45.416667 -75.7]
+%Ouagadougou BURKINA
+[0 -2]
+%Pago Pago AM SAMOA
+[-14 -170.5]
+%Panama PANAMA
+[8.95 -79.533333]
+%Paramaribo SURINAM
+[5.833333 -55.166667]
+%Paris FRANCE
+[48.85 2.316667]
+%Phnom Penh CAMBODIA
+[11.533333 104.883333]
+%Port-au-Prince HAITI
+[18.533333 -72.333333]
+%Port Louis MARITIUS
+[-20.1 57.5]
+%Port Moresby PAPUA NEW GUINEA
+[-9.383333 147.1]
+%Porto Novo BENIN
+[6.25 2.65]
+%Prague CZECHOSLOVAKIA
+[50.083333 14.433333]
+%Praia CAPE VERDE
+[15 -23.7]
+%Pretoria S AFRICA
+[-25.733333 28.183333]
+%Pyongyang N KOREA
+[39.016667 125.733333]
+%Quezon PHILIPPINES
+[14.8 121]
+%Quito ECUADOR
+[-.183333 -78.483333]
+%Rabat MOROCCO
+[34.016667 -6.833333]
+%Rangoon BURMA
+[16.766667 96.15]
+%Reykjavik ICELAND
+[64.133333 -22.933333]
+%Riyadh SAUDI ARABIA
+[24.633333 46.683333]
+%Rome ITALY
+[41.883333 12.483333]
+%Roseau DOMINICA
+[15.283333 -61.4]
+%San Jose COSTA RICA
+[9.933333 -84.066667]
+%San Juan PUERTO RICO
+[18.466667 -66.116667]
+%San Marino SAN MARINO
+[43.933333 12.433333]
+%San Salvador EL SALVADOR
+[13.7 -89.183333]
+%San'a YEMEN
+[15.5 44]
+%Santiago CHILE
+[-33.433333 -70.666667]
+%Santo Domingo DOMINICAN REPUBLIC
+[18.466667 -69.9]
+%Seoul S KOREA
+[37.583333 126.983333]
+%Singapore SINGAPORE
+[1.283333 103.85]
+%Sofia BULGARIA
+[42.683333 23.316667]
+%St George's GRENADA
+[12.05 -61.716667]
+%St John's ANTIGUA AND BARBUDA
+[17.966667 -61.8]
+%Stanley FALKLAND ISLES
+[-51.683333 -57.866667]
+%Stockholm SWEDEN
+[59.333333 18.066667]
+%Suva FIJI
+[-18.133333 178.433333]
+%Taipei TAIWAN
+[25.066667 121.516667]
+%Tegucigalpa HONDURAS
+[14.1 -87.216667]
+%Tehran IRAN
+[35.683333 51.416667]
+%Thimbu BHUTAN
+[27.566667 89.65]
+%Tirane ALBANIA
+[41.333333 19.833333]
+%Tokyo JAPAN
+[35.683333 139.766667]
+%Tripoli LIBYA
+[32.883333 13.183333]
+%Tunis TUNISIA
+[36.783333 10.183333]
+%Ulan Bator MONGOLIA
+[48.016667 105.883333]
+%Valletta MALTA
+[35.9 14.516667]
+%Victoria SEYCHELLES
+[-4.616667 55.466667]
+%Vienna AUSTRIA
+[48.216667 16.366667]
+%Vientiane LAOS
+[19 103]
+%Warsaw POLAND
+[52.233333 21.016667]
+%Washington DC USA
+[38.883333 -77.016667]
+%Wellington NEW ZEALAND
+[-41.316667 174.666667]
+%Windhoek NAMIBIA
+[-22.5 17.066667]
+%Yaounde CAMEROON
+[4 12]
+]def
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/c-sub.dat b/Master/texmf-dist/tex/generic/pst-geo/data/c-sub.dat
new file mode 100644
index 00000000000..10f9bf0280e
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/c-sub.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/canada.dat b/Master/texmf-dist/tex/generic/pst-geo/data/canada.dat
new file mode 100644
index 00000000000..0beaccd1876
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/canada.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/capitales.tex b/Master/texmf-dist/tex/generic/pst-geo/data/capitales.tex
new file mode 100644
index 00000000000..28be04099e0
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/capitales.tex
@@ -0,0 +1,51 @@
+\mapput[90](2.316667,48.85000){Paris}
+\mapput[90](-0.133333,51.016667){London}
+\mapput[90](-3.683333,40.433333){Madrid}
+\mapput[90](-9.133333,38.716667){Lisbon}
+\mapput[90](1.516667,42.516667){Andorra}
+\mapput[90](12.483333,41.883333){Rome}
+\mapput[40](4.366667,50.850000){Brussels}
+\mapput[90](13.416667,52.533333){Berlin}
+\mapput[90](7.433333,46.966667){Bern}
+\mapput[0](12.583333,55.683333){Copenhagen}
+\mapput[90](16.366667,48.216667){Vienna}
+\mapput[90](-6.250000,53.333333){Dublin}
+\mapput[90](-5.933333,54.583333){Belfast}
+\mapput[90](10.733333,59.916667){Oslo}
+\mapput[90](18.066667,59.333333){Stockholm}
+\mapput[90](14.516667,35.900000){Valletta}
+\mapput[90](10.183333,36.783333){Tunis}
+\mapput[90](19.833333,41.333333){Tirane}
+\mapput[90](13.183333,32.883333){Tripoli}
+\mapput[90](14.433333,50.083333){Prague}
+\mapput[90](21.016667,52.233333){Warsaw}
+\mapput[90](4.883333,52.366667){Amsterdam}
+\mapput[-60](6.116667,49.616667){Luxembourg}
+\mapput[0](19.050000,47.516667){Budapest}
+\mapput[90](26.08333,44.4333333){Bucharest}
+\mapput[90](24.933333,60.166667){Helsinsky}
+\mapput[90](23.733333,37.966667){Athens}
+\mapput[90](-22.933333,64.133333){Reykjavik}
+\mapput[90](-6.833333,34.016667){Rabat}
+\mapput[90](3.050000,36.750000){Algiers}
+\mapput[90](15.966667,45.783333){Zagreb}
+\mapput[90](23.316667,42.683333){Sofia}
+\mapput[90](7.433333,43.733333){Monaco}
+\mapput[90](12.433333,43.933333){SanMarino}
+\mapput[90](20.466667,44.816667){Belgrade}
+\mapput[90](18.43333,43.866667){Sarajevo}
+\mapput[90](21.46666,42.01667){Skoje}
+\mapput[90](32.866667,39.933333){Ankara}
+\mapput[90](30.533333,50.433333){Kiev}
+\mapput[90](33.350000,35.166667){Nicosia}
+\mapput[90](31.250000,30.066667){Cairo}
+\mapput[90](37.616667,55.766667){Moscow}
+\mapput[-90](27.550000,53.900000){Minsk}
+\mapput[90](24.100000,56.933333){Riga}
+\mapput[90](24.3333,54.63333){Vilnius}
+\mapput[90](24.8,59.0333){Tallin}
+\mapput[90](28.8333,47){Chisinau}
+\mapput[90](35.500000,33.900000){Beirut}
+\mapput[0](35.216667,31.783333){Jerusalem}
+\mapput[180](34.8,32.0666){Tel-Aviv}
+\mapput[90](38.26667,33.5){Damas}
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/capitales3d.tex b/Master/texmf-dist/tex/generic/pst-geo/data/capitales3d.tex
new file mode 100644
index 00000000000..d2a7376a58a
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/capitales3d.tex
@@ -0,0 +1,51 @@
+\mapputIIID[90](2.316667,48.85000){Paris}
+\mapputIIID[90](-0.133333,51.016667){London}
+\mapputIIID[90](-3.683333,40.433333){Madrid}
+\mapputIIID[90](-9.133333,38.716667){Lisbon}
+\mapputIIID[90](1.516667,42.516667){Andorra}
+\mapputIIID[90](12.483333,41.883333){Rome}
+\mapputIIID[40](4.366667,50.850000){Brussels}
+\mapputIIID[90](13.416667,52.533333){Berlin}
+\mapputIIID[90](7.433333,46.966667){Bern}
+\mapputIIID[0](12.583333,55.683333){Copenhagen}
+\mapputIIID[90](16.366667,48.216667){Vienna}
+\mapputIIID[90](-6.250000,53.333333){Dublin}
+\mapputIIID[90](-5.933333,54.583333){Belfast}
+\mapputIIID[90](10.733333,59.916667){Oslo}
+\mapputIIID[90](18.066667,59.333333){Stockholm}
+\mapputIIID[90](14.516667,35.900000){Valletta}
+\mapputIIID[90](10.183333,36.783333){Tunis}
+\mapputIIID[90](19.833333,41.333333){Tirane}
+\mapputIIID[90](13.183333,32.883333){Tripoli}
+\mapputIIID[90](14.433333,50.083333){Prague}
+\mapputIIID[90](21.016667,52.233333){Warsaw}
+\mapputIIID[90](4.883333,52.366667){Amsterdam}
+\mapputIIID[-60](6.116667,49.616667){Luxembourg}
+\mapputIIID[0](19.050000,47.516667){Budapest}
+\mapputIIID[90](26.08333,44.4333333){Bucharest}
+\mapputIIID[90](24.933333,60.166667){Helsinsky}
+\mapputIIID[90](23.733333,37.966667){Athens}
+\mapputIIID[90](-22.933333,64.133333){Reykjavik}
+\mapputIIID[90](-6.833333,34.016667){Rabat}
+\mapputIIID[90](3.050000,36.750000){Algiers}
+\mapputIIID[90](15.966667,45.783333){Zagreb}
+\mapputIIID[90](23.316667,42.683333){Sofia}
+\mapputIIID[90](7.433333,43.733333){Monaco}
+\mapputIIID[90](12.433333,43.933333){SanMarino}
+\mapputIIID[90](20.466667,44.816667){Belgrade}
+\mapputIIID[90](18.43333,43.866667){Sarajevo}
+\mapputIIID[90](21.46666,42.01667){Skoje}
+\mapputIIID[90](32.866667,39.933333){Ankara}
+\mapputIIID[90](30.533333,50.433333){Kiev}
+\mapputIIID[90](33.350000,35.166667){Nicosia}
+\mapputIIID[90](31.250000,30.066667){Cairo}
+\mapputIIID[90](37.616667,55.766667){Moscow}
+\mapputIIID[-90](27.550000,53.900000){Minsk}
+\mapputIIID[90](24.100000,56.933333){Riga}
+\mapputIIID[90](24.3333,54.63333){Vilnius}
+\mapputIIID[90](24.8,59.0333){Tallin}
+\mapputIIID[90](28.8333,47){Chisinau}
+\mapputIIID[90](35.500000,33.900000){Beirut}
+\mapputIIID[0](35.216667,31.783333){Jerusalem}
+\mapputIIID[180](34.8,32.0666){Tel-Aviv}
+\mapputIIID[90](38.26667,33.5){Damas}
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/capitals.dat b/Master/texmf-dist/tex/generic/pst-geo/data/capitals.dat
new file mode 100644
index 00000000000..bf27a489ca9
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/capitals.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/cities.data b/Master/texmf-dist/tex/generic/pst-geo/data/cities.data
new file mode 100644
index 00000000000..2622d8817fc
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/cities.data
@@ -0,0 +1,1234 @@
+Aachen Deutschland 50° 46' N 6° 06' O
+Aalborg Dänemark 57° 03' N 9° 56' O
+Aarhus Dänemark 56° 10' N 10° 13' O
+Aberdeen Großbritannien 57° 08' N 2° 06' W
+Abidjan Elfenbeinküste 5° 19' N 4° 02' W
+Abilene USA, TX 32° 28' N 99° 43' W
+Abu Dhabi Vereinigte Arabische Emirate 24° 28' N 54° 25' O
+Acapulco Mexiko 16° 50' N 99° 55' W
+Accra Ghana 5° 33' N 0° 15' W
+Adana Türkei 37° 00' N 35° 19' O
+Addis Abeba Äthiopien 9° 02' N 38° 47' O
+Adelaide Australien 34° 56' S 138° 36' O
+Aden Jemen 12° 46' N 45° 01' O
+Agadez Niger 17° 00' N 7° 56' O
+Agadir Marokko 30° 30' N 9° 40' W
+Ahmedabad Indien 23° 00' N 72° 40' O
+Akron USA, OH 41° 05' N 81° 31' O
+Akureyri Island 65° 41' N 18° 04' W
+Akyab Myanmar 20° 09' N 92° 55' O
+Al-Mobarraz Saudi-Arabien 25° 26' N 49° 37' O
+Al Mahalla Al-Kubra Ägypten 30° 59' N 31° 10' O
+Albany USA, GA 31° 34' N 84° 09' W
+Albany USA, NY 42° 39' N 73° 45' W
+Albuquerque USA, NM 35° 05' N 106° 39' W
+Aleppo Syrien 36° 14' N 37° 10' O
+Alexandria Ägypten 31° 13' N 29° 55' O
+Alexandria USA, LA 31° 18' N 92° 27' W
+Alexandria USA, VA 38° 48' N 77° 03' W
+Algier Algerien 36° 47' N 3° 03' O
+Allentown USA, PA 40° 36' N 75° 28' W
+Altoona USA, PA 40° 31' N 78° 24' W
+Amadora Portugal 38° 45' N 9° 13' W
+Amarillo USA, TX 35° 12' N 101° 50' W
+Ambato Ecuador 1° 18' S 78° 39' W
+Amman Jordanien 31° 57' N 35° 56' O
+Amsterdam Niederlande 52° 23' N 4° 54' O
+Amstetten Österreich 48° 07' N 14° 52' O
+Anaheim USA, CA 33° 50' N 117° 55' W
+Anchorage USA, AK 61° 13' N 149° 53' W
+Andorra La Vella Andorra 42° 30' N 1° 30' O
+Angeles Philippinen 15° 09' N 120° 33' O
+Ankara Türkei 39° 56' N 32° 52' O
+Ann Arbor USA, MI 42° 17' N 83° 45' W
+Annaba Algerien 36° 55' N 7° 47' O
+Annapolis USA, MD 38° 59' N 76° 30' W
+Antananarivo Madagaskar 18° 52' S 47° 30' O
+Antofagasta Chile 23° 39' S 70° 24' W
+Antsirabe Madagaskar 19° 51' S 47° 01' O
+Antsiranana Madagaskar 12° 25' S 49° 20' O
+Antwerpen Belgien 51° 13' N 4° 25' O
+Apeldoorn Niederlande 52° 13' N 5° 57' O
+Apia Westsamoa 13° 50' S 171° 44' W
+Arequipa Peru 16° 24' S 71° 33' W
+Ariana Tunesien 36° 52' N 10° 12' O
+Arica Chile 18° 30' S 70° 20' W
+Arlington USA, VA 38° 53' N 77° 07' W
+Arusha Tansania 3° 23' S 36° 40' O
+As-Smara Sahara 26° 48' N 11° 41' W
+Asheville USA, NC 35° 36' N 82° 33' W
+Asmara Äthiopien 15° 20' N 38° 58' O
+Assiut Ägypten 27° 14' N 31° 07' O
+Asuncion Paraguay 25° 16' S 57° 40' W
+Atbara Sudan 17° 42' N 34° 00' O
+Athen Griechenland 37° 58' N 23° 43' O
+Atlanta USA, GA 33° 45' N 84° 24' W
+Atlantic City USA, NJ 39° 22' N 74° 26' W
+Auckland Neuseeland 36° 51' S 174° 45' O
+Augsburg Deutschland 48° 22' N 10° 53' O
+Augusta USA, GA 33° 28' N 81° 58' W
+Austin USA, TX 30° 16' N 97° 45' W
+Bacolod Philippinen 10° 38' N 122° 58' O
+Baden Österreich 48° 01' N 16° 14' O
+Bagdad Irak 33° 21' N 44° 25' O
+Bahia Blanca Argentinien 38° 45' S 62° 15' W
+Bakersfield USA, CA 35° 22' N 119° 01' W
+Bakhtaran Iran 31° 28' N 54° 54' O
+Baku Sowjetunion 40° 23' N 49° 51' O
+Baltimore USA, MD 39° 17' N 76° 37' W
+Bamako Mali 12° 40' N 7° 59' W
+Bandar Seri Begawan Brunei 4° 56' N 114° 58' O
+Bandung Indonesien 6° 57' S 107° 34' O
+Bangalore Indien 12° 58' N 77° 35' O
+Bangkok Thailand 13° 45' N 100° 31' O
+Bangor USA, ME 44° 48' N 68° 46' W
+Bangui Zentralafrikanische Republik 4° 23' N 18° 37' O
+Banjul Gambia 13° 28' N 16° 39' W
+Barcelona Spanien 41° 23' N 2° 11' O
+Barcelona Venezuela 10° 08' N 64° 43' W
+Bari Italien 41° 07' N 16° 52' O
+Barquisimeto Venezuela 10° 03' N 69° 18' W
+Barranquilla Kolumbien 10° 59' N 74° 48' W
+Barreiro Portugal 38° 40' N 9° 05' W
+Basel Schweiz 47° 33' N 7° 36' O
+Basra Irak 30° 30' N 47° 50' O
+Bassein Myanmar 16° 46' N 94° 45' O
+Basseterre St. Kitts-Nevis 17° 17' N 62° 43' W
+Bata Äquatorial-Guinea 1° 51' N 9° 46' O
+Baton Rouge USA, LA 30° 27' N 91° 11' W
+Beaumont USA, TX 30° 05' N 94° 06' W
+Beersheba Israel 31° 15' N 34° 47' O
+Beijing China 39° 56' N 116° 24' O
+Beira Mosambik 19° 49' S 34° 52' O
+Beirut Libanon 33° 53' N 35° 30' O
+Belem Brasilien 1° 27' S 48° 29' W
+Belfast Nordirland 54° 36' N 5° 56' W
+Belize City Belize 17° 30' N 88° 12' W
+Belmopan Belize 17° 13' N 88° 48' W
+Belo Horizonte Brasilien 19° 54' S 43° 54' W
+Bengasi Libyen 32° 07' N 20° 04' O
+Beograd Jugoslawien 44° 50' N 20° 30' O
+Berbera Somalia 10° 28' N 45° 02' O
+Bergen Norwegen 60° 23' N 5° 20' O
+Bergisch-Gladbach Deutschland 50° 59' N 7° 08' O
+Berlin Deutschland 52° 33' N 13° 22' O
+Bern Schweiz 46° 57' N 7° 28' O
+Bethlehem USA, PA 40° 37' N 75° 23' W
+Biel Schweiz 46° 27' N 8° 13' O
+Bielefeld Deutschland 52° 02' N 8° 32' O
+Bilbao Spanien 43° 15' N 2° 56' W
+Billings USA, MT 45° 47' N 108° 30' W
+Biloxi USA, MS 30° 24' N 88° 53' W
+Binghamton USA, NY 42° 06' N 75° 55' W
+Birmingham Großbritannien 52° 29' N 1° 53' W
+Birmingham USA, AL 33° 31' N 86° 49' W
+Bismarck USA, ND 46° 48' N 100° 47' W
+Bissau Guinea-Bissau 11° 52' N 15° 39' W
+Bizerta Tunesien 37° 18' N 9° 52' O
+Blantyre Malawi 15° 46' S 35° 00' O
+Blida Algerien 36° 30' N 2° 50' O
+Bnei Brak Israel 32° 05' N 34° 52' O
+Bo Sierra Leone 7° 58' N 11° 45' W
+Bobo-Dioulasso Burkina Faso 11° 11' N 4° 18' W
+Bochum Deutschland 51° 29' N 7° 13' O
+Bogata Kolumbien 4° 36' N 74° 05' W
+Boise USA, ID 43° 37' N 116° 12' W
+Bologna Italien 44° 30' N 11° 20' O
+Bombay Indien 18° 58' N 72° 50' O
+Bonn Deutschland 50° 44' N 7° 06' O
+Boras Schweden 57° 44' N 12° 55' O
+Bordeaux Frankreich 44° 50' N 0° 34' W
+Boston USA, MA 42° 21' N 71° 03' W
+Bottrop Deutschland 51° 31' N 6° 55' O
+Boulder USA, CO 40° 01' N 105° 17' W
+Boulogne Frankreich 50° 43' N 1° 37' O
+Bozen Italien 46° 31' N 11° 22' O
+Bradford Großbritannien 53° 48' N 1° 45' W
+Braga Portugal 41° 32' N 8° 26' W
+Braila Rumänien 45° 17' N 27° 58' O
+Brasilia Brasilien 15° 47' S 47° 55' W
+Bratislava Slovakei 48° 10' N 17° 10' O
+Braunau Österreich 48° 16' N 13° 02' O
+Braunschweig Deutschland 52° 16' N 10° 32' O
+Brazzaville Kongo 4° 14' S 15° 14' O
+Bregenz Österreich 47° 30' N 9° 46' O
+Bremen Deutschland 53° 05' N 8° 48' O
+Bremerhaven Deutschland 53° 33' N 8° 35' O
+Breslau Polen 51° 05' N 17° 00' O
+Bridgeport USA, CT 41° 11' N 73° 11' W
+Bridgetown Barbados 13° 06' N 59° 37' W
+Brisbane Australien 27° 30' S 153° 01' O
+Bristol Großbritannien 51° 27' N 2° 35' W
+Brno Tschechien 49° 13' N 16° 40' O
+Bromberg Polen 53° 16' N 18° 00' O
+Brownsville USA, TX 25° 54' N 97° 30' W
+Bruckmur Österreich 47° 25' N 15° 17' O
+Brügge Belgien 51° 13' N 3° 14' O
+Brüssel Belgien 50° 50' N 4° 20' O
+Buake Elfenbeinküste 7° 42' N 5° 00' W
+Bucaramanga Kolumbien 7° 08' N 73° 10' W
+Budapest Ungarn 47° 30' N 19° 05' O
+Buenos Aires Argentinien 34° 36' S 58° 27' W
+Buffalo USA, NY 42° 53' N 78° 52' W
+Bujumbura Burundi 3° 22' S 29° 19' O
+Bukarest Rumänien 44° 26' N 26° 06' O
+Bukavu Zaire 2° 30' S 28° 50' O
+Bulawayo Simbabwe 20° 10' S 28° 43' O
+Buraidah Saudi-Arabien 26° 20' N 43° 59' O
+Burgas Bulgarien 42° 30' N 27° 29' O
+Burlington USA, VT 44° 29' N 73° 13' W
+Bursa Türkei 40° 12' N 29° 04' O
+Butare Ruanda 2° 35' S 29° 44' O
+Butte USA, MT 46° 00' N 112° 32' W
+Cagayan De Oro Philippinen 8° 29' N 124° 40' O
+Calcutta Indien 22° 32' N 88° 22' O
+Calgary Kanada 51° 03' N 114° 05' W
+Cali Kolumbien 3° 27' N 76° 31' W
+Callao Peru 12° 05' S 77° 08' W
+Caloocan Philippinen 14° 38' N 120° 58' O
+Cam Ranh Vietnam 11° 54' N 109° 14' O
+Camaguey Kuba 21° 25' N 77° 55' W
+Camden USA, NJ 39° 57' N 75° 07' W
+Canberra Australien 35° 20' S 149° 10' O
+Canton USA, OH 40° 48' N 81° 23' W
+Cap-Haitien Haiti 19° 47' N 72° 17' W
+Caracas Venezuela 10° 30' N 66° 55' W
+Cardiff Wales 51° 29' N 3° 10' W
+Cartagena Kolumbien 10° 24' N 75° 33' W
+Casablanca Marokko 33° 36' N 7° 37' W
+Casper USA, WY 42° 51' N 106° 19' W
+Castries St. Lucia 14° 01' N 60° 59' W
+Catania Italien 37° 31' N 15° 04' O
+Cayenne Französisch-Guayana 4° 56' N 52° 20' W
+Cebu Philippinen 10° 17' N 123° 56' O
+Cedar Rapids USA, IA 41° 58' N 91° 40' W
+Champaign USA, IL 40° 07' N 88° 15' W
+Chania Griechenland 35° 31' N 24° 01' O
+Charkow Sowjetunion 50° 00' N 36° 15' O
+Charleroi Belgien 50° 25' N 4° 27' O
+Charleston USA, SC 32° 47' N 79° 56' W
+Charleston USA, WV 38° 21' N 81° 38' W
+Charlotte USA, NC 35° 13' N 80° 51' W
+Charlottesville USA, VA 38° 02' N 78° 30' W
+Chattanooga USA, TN 35° 03' N 85° 19' W
+Chemnitz Deutschland 50° 50' N 12° 55' O
+Chengdu China 30° 37' N 104° 06' O
+Cheyenne USA, WY 41° 08' N 104° 49' W
+Chiang Mai Thailand 18° 48' N 98° 59' O
+Chiayi Taiwan 23° 09' N 120° 11' O
+Chicago USA, IL 41° 52' N 87° 38' W
+Chiclayo Peru 6° 47' S 79° 47' W
+Chihuahua Mexiko 28° 38' N 106° 05' W
+Chillan Chile 36° 37' S 72° 10' W
+Chimbote Peru 9° 04' S 78° 34' W
+Chingola Sambia 12° 31' S 27° 53' O
+Chittagong Bangladesch 22° 20' N 91° 48' O
+Chitungwiza Simbabwe 18° 00' S 31° 06' O
+Choluteca Honduras 13° 15' N 87° 10' W
+Chon Buri Thailand 13° 24' N 100° 59' O
+Chongjin Korea Dvr 41° 50' N 129° 55' O
+Chongqing China 29° 30' N 106° 35' O
+Choybalsan Mongolei 48° 02' N 114° 32' O
+Christchurch Neuseeland 43° 35' S 172° 36' O
+Chungli Taiwan 24° 55' N 121° 08' O
+Chur Schweiz 46° 50' N 9° 35' O
+Cincinnati USA, OH 39° 06' N 84° 31' W
+Circleville USA, OH 39° 34' N 83° 02' W
+Ciudad Guayana Venezuela 8° 22' N 62° 37' W
+Ciudad Juarez Mexiko 31° 42' N 106° 29' W
+Clarksville USA, TN 36° 32' N 87° 21' W
+Cleveland USA, OH 41° 30' N 81° 42' W
+Cochabamba Bolivien 17° 24' S 66° 09' W
+Coimbra Portugal 40° 12' N 8° 25' W
+Colombo Sri Lanka 6° 56' N 79° 51' O
+Colon Panama 9° 21' N 79° 54' W
+Colorado Springs USA, CO 38° 50' N 104° 49' W
+Columbia USA, MO 38° 57' N 92° 20' W
+Columbia USA, SC 34° 00' N 81° 02' W
+Columbus USA, GA 32° 28' N 84° 59' W
+Columbus USA, OH 39° 58' N 83° 00' W
+Conakry Guinea 9° 31' N 13° 43' W
+Concepcion Chile 36° 50' S 73° 03' W
+Concepcion Paraguay 23° 22' S 57° 26' W
+Concord USA, NH 43° 12' N 71° 32' W
+Constantine Algerien 36° 22' N 6° 40' O
+Cordoba Argentinien 31° 24' S 64° 11' W
+Cork Irland 51° 54' N 8° 28' W
+Corozal Belize 18° 23' N 88° 23' W
+Corpus Christi USA, TX 27° 48' N 97° 24' W
+Cotonou Benin 6° 24' N 2° 31' O
+Cottbus Deutschland 51° 46' N 14° 20' O
+Craiova Rumänien 44° 18' N 23° 47' O
+Cucuta Kolumbien 7° 55' N 72° 31' W
+Cuenca Ecuador 2° 54' S 79° 00' W
+Curitiba Brasilien 25° 25' S 49° 15' W
+Cuzco Peru 13° 32' S 71° 57' W
+Da Nang Vietnam 16° 04' N 108° 14' O
+Dachla Sahara 23° 50' N 15° 33' W
+Dakar Senegal 14° 40' N 17° 26' W
+Dallas USA, TX 32° 47' N 96° 48' W
+Daloa Elfenbeinküste 6° 56' N 6° 28' W
+Damaskus Syrien 33° 30' N 36° 18' O
+Damman Saudi-Arabien 26° 25' N 50° 06' O
+Danbury USA, CT 41° 24' N 73° 28' W
+Dangriga Belize 16° 59' N 88° 13' W
+Danzig Polen 54° 20' N 18° 40' O
+Darchan Mongolei 46° 29' N 109° 24' O
+Daressalam Tansania 6° 48' S 39° 17' O
+Darmstadt Deutschland 49° 52' N 8° 39' O
+Davao Philippinen 7° 04' N 125° 36' O
+David Panama 8° 26' N 82° 26' W
+Dayton USA, OH 39° 46' N 84° 12' W
+Daytona Beach USA, FL 29° 13' N 81° 01' W
+Debrecen Ungarn 47° 30' N 21° 37' O
+Dehiwala Sri Lanka 6° 52' N 79° 52' O
+Deir-Ez-Zor Syrien 35° 20' N 40° 05' O
+Den Haag Niederlande 52° 04' N 4° 19' O
+Denver USA, CO 39° 45' N 104° 59' W
+Des Moines USA, IA 41° 35' N 93° 37' W
+Dessau Deutschland 51° 50' N 12° 15' O
+Detroit USA, MI 42° 20' N 83° 03' W
+Dhaka Bangladesch 23° 43' N 90° 25' O
+Differdingen Luxemburg 49° 32' N 5° 53' O
+Djerba Tunesien 33° 52' N 10° 51' O
+Dodoma Tansania 6° 10' S 35° 40' O
+Doha Katar 25° 15' N 51° 36' O
+Donetzk Sowjetunion 48° 00' N 37° 48' O
+Dornbirn Österreich 47° 25' N 9° 44' O
+Dortmund Deutschland 51° 32' N 7° 27' O
+Douala Kamerun 4° 04' N 9° 43' O
+Drammen Norwegen 59° 45' N 10° 15' O
+Dresden Deutschland 51° 03' N 13° 45' O
+Dschibuti Dschibuti 11° 30' N 45° 05' O
+Dschidda Saudi-Arabien 21° 30' N 39° 10' O
+Dubai Vereinigte Arabische Emirate 25° 14' N 55° 17' O
+Dublin Irland 53° 20' N 6° 15' W
+Duedelingen Luxemburg 49° 28' N 6° 05' O
+Duisburg Deutschland 51° 26' N 6° 45' O
+Duluth USA, MN 46° 47' N 92° 06' W
+Dunedin Neuseeland 45° 52' S 170° 30' O
+Durban Südafrika 29° 53' S 31° 00' O
+Durham USA, NC 36° 00' N 78° 55' W
+Durres Albanien 41° 18' N 19° 28' O
+Düsseldorf Deutschland 51° 13' N 6° 47' O
+Edinburgh Großbritannien 55° 57' N 3° 12' W
+Edmonton Kanada 53° 33' N 113° 28' W
+Eerdenet Mongolei 46° 18' N 100° 35' O
+Eindhoven Niederlande 51° 26' N 5° 30' O
+Eisenstadt Österreich 47° 51' N 16° 31' O
+El-Mansoura Ägypten 31° 03' N 31° 23' O
+El Alaiun Sahara 27° 10' N 13° 11' W
+El Paso USA, TX 31° 46' N 106° 29' W
+Elizabeth USA, NJ 40° 40' N 74° 13' W
+Elmira USA, NY 42° 06' N 76° 48' W
+Elobied Sudan 13° 11' N 30° 10' O
+Elsinore Dänemark 56° 03' N 12° 38' O
+Encarnacion Paraguay 27° 20' S 55° 50' W
+Enschede Niederlande 52° 13' N 6° 55' O
+Entebbe Uganda 0° 04' N 32° 27' O
+Erfurt Deutschland 50° 58' N 11° 02' O
+Erie USA, PA 42° 07' N 80° 05' W
+Erlangen Deutschland 49° 36' N 11° 01' O
+Esbjerg Dänemark 55° 28' N 8° 28' O
+Esch Luxemburg 49° 32' N 6° 00' O
+Escuintla Guatemala 14° 18' N 90° 47' W
+Esmeraldas Ecuador 0° 56' N 79° 40' W
+Espoo Finnland 60° 10' N 24° 42' O
+Essen Deutschland 51° 27' N 7° 01' O
+Eugene USA, OR 44° 03' N 123° 05' W
+Evansville USA, IN 37° 58' N 87° 34' W
+Fairbanks USA, AK 64° 51' N 147° 43' W
+Faisalabad Pakistan 31° 25' N 73° 09' O
+Fargo USA, ND 46° 52' N 96° 47' W
+Fayetteville USA, NC 35° 03' N 78° 53' W
+Feldkirch Österreich 47° 14' N 9° 36' O
+Fernando De La Mora Paraguay 25° 19' S 57° 36' W
+Fes Marokko 34° 05' N 5° 00' W
+Fianar Madagaskar 21° 27' S 47° 05' O
+Flint USA, MI 43° 01' N 83° 42' W
+Florenz Italien 43° 46' N 11° 15' O
+Fort-De-France Martinique 14° 36' N 61° 05' W
+Fort Lauderdale USA, FL 26° 07' N 80° 08' W
+Fort Smith USA, AR 35° 23' N 94° 25' W
+Fort Wayne USA, IN 41° 04' N 85° 08' W
+Fort Worth USA, TX 32° 45' N 97° 20' W
+Fortaleza Brasilien 3° 45' S 38° 35' W
+Francistown Botswana 21° 07' S 27° 32' O
+Frankfurt Deutschland 50° 07' N 8° 41' O
+Freeport Bahamas 26° 30' N 78° 42' W
+Freetown Sierra Leone 8° 29' N 13° 13' W
+Freiburg Deutschland 48° 00' N 7° 51' O
+Freising Deutschland 48° 24' N 11° 44' O
+Fresno USA, CA 36° 44' N 119° 47' W
+Fribourg Schweiz 46° 50' N 7° 10' O
+Ft Lauderdale USA, FL 26° 07' N 80° 08' W
+Ft Smith USA, AR 35° 23' N 94° 25' W
+Ft Wayne USA, IN 41° 04' N 85° 08' W
+Ft Worth USA, TX 32° 45' N 97° 20' W
+Fukuoka Japan 33° 39' N 130° 21' O
+Funafuti Tuvalu 8° 30' S 179° 12' O
+Funchal Portugal 40° 08' N 7° 30' W
+Gaborone Botswana 24° 45' S 25° 55' O
+Gainesville USA, FL 29° 40' N 82° 20' W
+Galatz Rumänien 45° 27' N 28° 02' O
+Galle Sri Lanka 6° 01' N 80° 13' O
+Galveston USA, TX 29° 18' N 94° 48' W
+Galway Irland 53° 16' N 9° 03' W
+Gao Mali 16° 19' N 0° 09' W
+Garland USA, TX 32° 54' N 96° 38' W
+Gary USA, IN 41° 36' N 87° 20' W
+Gasiantep Türkei 37° 06' N 37° 23' O
+Geelong Australien 38° 10' S 144° 26' O
+Gelsenkirchen Deutschland 51° 31' N 7° 06' O
+Geneve Schweiz 46° 12' N 6° 10' O
+Gent Belgien 51° 02' N 3° 42' O
+Genua Italien 44° 24' N 8° 56' O
+Georgetown Guyana 6° 46' N 58° 10' W
+Gera Deutschland 50° 52' N 12° 05' O
+Germiston Südafrika 26° 15' S 28° 10' O
+Gibraltar Gibraltar 36° 06' N 5° 21' W
+Gize Ägypten 30° 01' N 31° 10' O
+Glasgow Großbritannien 55° 51' N 4° 16' W
+Goeteborg Schweden 57° 43' N 11° 58' O
+Gold Coast Australien 27° 59' S 153° 22' O
+Gorki Sowjetunion 56° 20' N 44° 00' O
+Göttingen Deutschland 51° 32' N 9° 56' O
+Granada Nicaragua 11° 58' N 85° 59' W
+Grand Forks USA, ND 47° 55' N 97° 03' W
+Grand Rapids USA, MI 42° 58' N 85° 40' W
+Graz Österreich 47° 05' N 15° 22' O
+Great Falls USA, MT 47° 30' N 111° 17' W
+Green Bay USA, WI 44° 31' N 88° 01' W
+Greensboro USA, NC 36° 04' N 79° 47' W
+Greenville USA, SC 34° 51' N 82° 24' W
+Groningen Niederlande 53° 13' N 6° 34' O
+Guadalajara Mexiko 20° 40' N 103° 20' W
+Guangzhou China 23° 07' N 113° 15' O
+Guantanamo Kuba 19° 59' N 75° 10' W
+Guatemala City Guatemala 14° 38' N 90° 31' W
+Guayaquil Ecuador 2° 10' S 79° 50' W
+Gujranwala Pakistan 32° 06' N 74° 11' O
+Gulf Port USA, MS 30° 22' N 89° 05' W
+Gweru Simbabwe 19° 27' S 29° 49' O
+Gyoer Ungarn 47° 41' N 17° 40' O
+Haarlem Niederlande 52° 23' N 4° 38' O
+Hagen Deutschland 51° 21' N 7° 28' O
+Haifa Israel 32° 49' N 34° 59' O
+Haiphong Vietnam 20° 50' N 106° 41' O
+Halle Deutschland 51° 28' N 11° 58' O
+Hallein Österreich 47° 41' N 13° 06' O
+Hama Syrien 35° 05' N 36° 40' O
+Hamburg Deutschland 53° 33' N 10° 00' O
+Hamilton Bermuda-Inseln 32° 17' N 64° 46' W
+Hamilton Kanada 43° 14' N 79° 51' W
+Hamilton Neuseeland 37° 46' S 175° 18' O
+Hamm Deutschland 51° 41' N 7° 48' O
+Hampton USA, VA 37° 01' N 76° 20' W
+Hannover Deutschland 52° 22' N 9° 43' O
+Hanoi Vietnam 21° 02' N 105° 51' O
+Harare Simbabwe 17° 50' S 31° 03' O
+Harbin China 45° 45' N 126° 41' O
+Hargeisa Somalia 9° 31' N 44° 02' O
+Harrisburg USA, PA 40° 16' N 76° 53' W
+Hartford USA, CT 41° 46' N 72° 41' W
+Havanna Kuba 23° 08' N 82° 22' W
+Heidelberg Deutschland 49° 25' N 8° 42' O
+Heilbronn Deutschland 49° 08' N 9° 13' O
+Helena USA, MT 46° 36' N 112° 02' W
+Helsingborg Schweden 56° 05' N 12° 45' O
+Helsinki Finnland 60° 10' N 24° 58' O
+Herat Afghanistan 34° 20' N 62° 12' O
+Herne Deutschland 51° 33' N 7° 13' O
+High Point USA, NC 35° 57' N 80° 00' W
+Hilo USA, HI 19° 43' N 155° 05' W
+Hiroshima Japan 34° 23' N 132° 27' O
+Ho-Chi-Minh-Stadt Vietnam 10° 45' N 106° 40' O
+Hobart Australien 42° 55' S 147° 20' O
+Hodeida Jemen 14° 50' N 42° 58' O
+Hofuf Saudi-Arabien 25° 20' N 49° 34' O
+Holguin Kuba 20° 54' N 76° 15' W
+Holon Israel 32° 02' N 34° 47' O
+Homs Syrien 34° 44' N 37° 17' O
+Hongkong Hongkong 22° 17' N 114° 09' O
+Honiara Salomonen 9° 28' S 159° 57' O
+Honolulu USA, HI 21° 19' N 157° 52' W
+Horsens Dänemark 57° 07' N 10° 07' O
+Hospitalet Spanien 41° 21' N 2° 06' O
+Houston USA, TX 29° 45' N 95° 22' W
+Hsinchu Taiwan 24° 48' N 120° 59' O
+Huambo Angola 12° 44' S 15° 47' O
+Hungnam Korea Dvr 39° 49' N 127° 40' O
+Huntington USA, WV 38° 25' N 82° 27' W
+Huntsville USA, AL 34° 44' N 86° 35' W
+Hyderabad Indien 17° 22' N 78° 26' O
+Hyderabad Pakistan 25° 23' N 68° 24' O
+Iasi Rumänien 47° 09' N 27° 38' O
+Ibadan Nigeria 7° 23' N 3° 56' O
+Ibague Kolumbien 4° 25' N 75° 20' W
+Idaho Falls USA, ID 43° 29' N 112° 02' W
+Iloilo Philippinen 10° 41' N 122° 33' O
+Inchon Korea 37° 30' N 126° 38' O
+Independence USA, MO 39° 06' N 94° 25' W
+Indianapolis USA, IN 39° 46' N 86° 10' W
+Innsbruck Österreich 47° 16' N 11° 24' O
+Ipoh Malaysia 4° 36' N 101° 02' O
+Iquitos Peru 3° 51' S 73° 13' W
+Iraklion Griechenland 35° 20' N 25° 12' O
+Irbid Jordanien 32° 33' N 35° 51' O
+Irkutsk Sowjetunion 52° 16' N 104° 20' O
+Isfahan Iran 32° 41' N 51° 41' O
+Islamabad Pakistan 33° 42' N 73° 10' O
+Istanbul Türkei 41° 01' N 28° 58' O
+Izmir Türkei 38° 25' N 27° 10' O
+Jackson USA, MS 32° 18' N 90° 11' W
+Jacksonville USA, FL 30° 20' N 81° 40' W
+Jaffna Sri Lanka 9° 40' N 80° 01' O
+Jaipur Indien 26° 53' N 75° 50' O
+Jakarta Indonesien 6° 10' S 106° 49' O
+Jalalabad Afghanistan 34° 26' N 70° 28' O
+Jefferson City USA, MO 38° 34' N 92° 10' W
+Jena Deutschland 50° 56' N 11° 35' O
+Jerewan Sowjetunion 40° 11' N 44° 30' O
+Jersey City USA, NJ 40° 44' N 74° 04' W
+Jerusalem Israel 31° 47' N 35° 13' O
+Jinja Uganda 0° 27' N 33° 14' O
+Joenkoeping Schweden 57° 45' N 14° 10' O
+Johannesburg Südafrika 26° 10' S 28° 02' O
+Johnstown USA, PA 40° 20' N 78° 55' W
+Johore Bharu Malaysia 1° 29' N 103° 44' O
+Jumla Nepal 29° 17' N 82° 10' O
+Jurong Singapur 1° 21' N 103° 42' O
+Kabul Afghanistan 34° 30' N 69° 13' O
+Kaesong Korea Dvr 37° 59' N 126° 30' O
+Kairo Ägypten 30° 03' N 31° 15' O
+Kaiserslautern Deutschland 49° 27' N 7° 45' O
+Kalamazoo USA, MI 42° 17' N 85° 35' W
+Kampala Uganda 0° 20' N 32° 35' O
+Kananga Zaire 5° 53' S 22° 26' O
+Kandahar Afghanistan 31° 35' N 65° 45' O
+Kandy Sri Lanka 7° 17' N 80° 40' O
+Kankan Guinea 10° 23' N 9° 18' W
+Kano Nigeria 12° 00' N 8° 30' O
+Kanpur Indien 26° 27' N 80° 14' O
+Kansas City USA, KS 39° 07' N 94° 38' W
+Kansas City USA, MO 39° 05' N 94° 35' W
+Kaolack Senegal 14° 09' N 16° 08' W
+Kapfenberg Österreich 47° 26' N 15° 18' O
+Kapstadt Südafrika 33° 55' S 18° 27' O
+Karachi Pakistan 24° 52' N 67° 03' O
+Karlsruhe Deutschland 49° 01' N 8° 24' O
+Karonga Malawi 9° 54' S 35° 55' O
+Kasan Sowjetunion 55° 45' N 49° 00' O
+Kassel Deutschland 51° 19' N 9° 30' O
+Katmandu Nepal 27° 42' N 85° 20' O
+Kattowitz Polen 50° 15' N 18° 59' O
+Kavala Griechenland 41° 05' N 24° 55' O
+Kawasaki Japan 35° 32' N 139° 41' O
+Kayes Mali 14° 26' N 11° 28' W
+Keelung Taiwan 25° 08' N 121° 44' O
+Keetmanshoop Namibia 26° 36' S 18° 08' O
+Kenitra Marokko 34° 20' N 6° 34' W
+Key West USA, FL 24° 33' N 81° 48' W
+Khamis-Mushait Saudi-Arabien 18° 19' N 42° 45' O
+Khaosiung Taiwan 22° 38' N 120° 17' O
+Khartum Sudan 15° 36' N 32° 32' O
+Kiel Deutschland 54° 20' N 10° 08' O
+Kiew Sowjetunion 50° 26' N 30° 31' O
+Kigali Ruanda 1° 56' S 30° 04' O
+Kingston Jamaika 18° 00' N 76° 48' W
+Kingstown St. Vincent 13° 12' N 61° 14' W
+Kinshasa Zaire 4° 18' S 15° 18' O
+Kirkuk Irak 35° 28' N 44° 26' O
+Kisangani Zaire 0° 33' N 25° 14' O
+Kisimayu Somalia 0° 25' S 42° 31' O
+Kisumu Kenia 0° 08' S 34° 47' O
+Kitakiushu Japan 33° 52' N 130° 49' O
+Kitchener Kanada 43° 27' N 80° 30' W
+Kitwe Sambia 12° 50' S 28° 11' O
+Klagenfurt Österreich 46° 38' N 14° 20' O
+Klausenburg Rumänien 46° 47' N 23° 37' O
+Klosterneuburg Österreich 48° 18' N 16° 19' O
+Knoxville USA, TN 35° 58' N 83° 55' W
+Kobe Japan 34° 40' N 135° 12' O
+Koblenz Deutschland 50° 21' N 7° 36' O
+Koeniz Schweiz 46° 56' N 7° 25' O
+Kolding Dänemark 55° 29' N 9° 30' O
+Köln Deutschland 50° 56' N 6° 57' O
+Konstanza Rumänien 44° 12' N 28° 40' O
+Kopenhagen Dänemark 55° 40' N 12° 35' O
+Kortrijk Belgien 50° 50' N 3° 17' O
+Kosice Slovakei 48° 44' N 21° 15' O
+Kota Bharu Malaysia 6° 07' N 102° 15' O
+Kowloon Hongkong 22° 20' N 114° 15' O
+Krakau Polen 50° 05' N 19° 55' O
+Krefeld Deutschland 51° 20' N 6° 34' O
+Krems Österreich 48° 25' N 15° 36' O
+Kristiansand Norwegen 58° 08' N 8° 01' O
+Kronstadt Rumänien 45° 39' N 25° 35' O
+Kuala Lumpur Malaysia 3° 01' N 101° 42' O
+Kuala Trengganu Malaysia 5° 20' N 103° 07' O
+Kuibyschew Sowjetunion 53° 12' N 50° 09' O
+Kumasi Ghana 6° 45' N 1° 35' W
+Kuopio Finnland 62° 54' N 27° 40' O
+Kuwait City Kuwait 29° 20' N 47° 59' O
+Kwangju Korea 35° 07' N 126° 52' O
+Kyoto Japan 35° 02' N 135° 45' O
+La-Chaux-De-Fonds Schweiz 47° 06' N 6° 50' O
+La Ceiba Honduras 15° 45' N 86° 45' W
+La Chorrera Panama 8° 51' N 79° 46' W
+La Crosse USA, WI 43° 48' N 91° 15' W
+La Paz Bolivien 16° 30' S 68° 09' W
+La Plata Argentinien 44° 55' S 71° 50' W
+La Romana Dominikanische Republik 18° 27' N 68° 57' W
+Labe Guinea 11° 19' N 12° 17' W
+Lae Papua-Neuguinea 6° 45' S 147° 00' O
+Lagos Nigeria 6° 26' N 3° 32' O
+Lahore Pakistan 31° 34' N 74° 22' O
+Lahti Finnland 61° 00' N 25° 40' O
+Lancaster USA, PA 40° 02' N 76° 18' W
+Lansing USA, MI 42° 44' N 84° 33' W
+Laredo USA, TX 27° 30' N 99° 30' W
+Larissa Griechenland 39° 38' N 22° 25' O
+Las Cruces USA, NM 32° 19' N 106° 47' W
+Las Palmas Spanien 28° 06' N 15° 24' W
+Las Piedras Uruguay 34° 42' S 56° 14' W
+Las Vegas USA, NV 36° 10' N 115° 09' W
+Latakia Syrien 35° 31' N 35° 47' O
+Lausanne Schweiz 46° 32' N 6° 39' O
+Lawrence USA, KS 38° 58' N 95° 14' W
+Lawrence USA, MA 42° 42' N 71° 10' W
+Le Havre Frankreich 49° 30' N 0° 06' O
+Leeds Großbritannien 53° 50' N 1° 35' W
+Leipzig Deutschland 51° 20' N 12° 25' O
+Leningrad Sowjetunion 59° 55' N 30° 15' O
+Leoben Österreich 47° 23' N 15° 06' O
+Leon Mexiko 21° 07' N 101° 40' W
+Leverkusen Deutschland 51° 01' N 6° 59' O
+Lewiston USA, ME 44° 06' N 70° 13' W
+Lexington USA, KY 38° 03' N 84° 30' W
+Liberec Tschechien 50° 48' N 15° 05' O
+Libreville Gabun 0° 30' N 9° 25' O
+Lilongwe Malawi 13° 58' S 33° 49' O
+Lima Peru 12° 03' S 77° 03' W
+Limassol Zypern 34° 40' N 33° 03' O
+Limerick Irland 52° 40' N 8° 38' W
+Limon Costa Rica 10° 00' N 83° 01' W
+Lincoln USA, NE 40° 49' N 96° 42' W
+Linden Guyana 5° 59' N 58° 19' W
+Linkoeping Schweden 58° 25' N 15° 35' O
+Linz Österreich 48° 19' N 14° 18' O
+Lissabon Portugal 38° 43' N 9° 08' W
+Little Rock USA, AR 34° 45' N 92° 17' W
+Liverpool Großbritannien 53° 23' N 3° 00' W
+Ljubljana Slowenien 46° 04' N 14° 30' O
+Lodsch Polen 51° 49' N 19° 28' O
+Lome Togo 6° 08' N 1° 13' O
+London Großbritannien 51° 31' N 0° 05' W
+Long Beach USA, CA 33° 46' N 118° 11' W
+Los Angeles USA, CA 34° 03' N 118° 14' W
+Louisville USA, KY 38° 15' N 85° 46' W
+Lowell USA, MA 42° 38' N 71° 19' W
+Luanda Angola 8° 50' S 13° 15' O
+Luang Prabang Laos 19° 53' N 102° 10' O
+Lubango Angola 14° 55' S 13° 30' O
+Lubbock USA, TX 33° 35' N 101° 51' W
+Lübeck Deutschland 53° 52' N 10° 42' O
+Lublin Polen 51° 18' N 22° 31' O
+Lubumbashi Zaire 11° 41' S 27° 29' O
+Ludwigshafen Deutschland 49° 29' N 8° 27' O
+Luettich Belgien 50° 38' N 5° 35' O
+Lusaka Sambia 15° 25' S 28° 17' O
+Luxemburg Luxemburg 49° 36' N 6° 07' O
+Luzern Schweiz 47° 02' N 7° 55' O
+Lynchburg USA, VA 37° 25' N 79° 09' W
+Lyon Frankreich 45° 45' N 4° 51' O
+Maastricht Belgien 50° 51' N 5° 42' O
+Macao Macao 22° 12' N 113° 32' O
+Machala Ecuador 3° 20' S 79° 57' W
+Machaze Mosambik 20° 51' S 33° 26' O
+Macon USA, GA 32° 50' N 83° 38' W
+Madison USA, WI 43° 04' N 89° 23' W
+Madras Indien 13° 05' N 80° 17' O
+Madrid Spanien 40° 24' N 3° 41' W
+Magdeburg Deutschland 52° 08' N 11° 37' O
+Mailand Italien 45° 28' N 9° 12' O
+Mainz Deutschland 50° 00' N 8° 15' O
+Majunga Madagaskar 15° 40' S 46° 20' O
+Malabo Äquatorial-Guinea 3° 45' N 8° 48' O
+Malaga Spanien 36° 43' N 4° 25' W
+Malang Indonesien 7° 59' S 112° 45' O
+Malden Bridge USA, NY 42° 28' N 73° 38' W
+Male Malediven 4° 00' N 73° 28' O
+Malmoe Schweden 55° 36' N 13° 00' O
+Managua Nicaragua 12° 09' N 86° 17' W
+Manama Bahrain 26° 12' N 50° 38' O
+Manaus Brasilien 3° 08' S 60° 01' W
+Manchester Großbritannien 53° 28' N 2° 14' W
+Manchester USA, NH 42° 59' N 71° 28' W
+Mandalay Myanmar 21° 57' N 96° 04' O
+Manila Philippinen 14° 36' N 120° 59' O
+Manizales Kolumbien 5° 03' N 75° 32' W
+Mannheim Deutschland 49° 29' N 8° 28' O
+Manta Ecuador 0° 59' S 80° 44' W
+Maputo Mosambik 25° 58' S 32° 35' O
+Mar Del Plata Argentinien 38° 00' S 57° 33' W
+Maracaibo Venezuela 10° 40' N 71° 37' W
+Maracay Venezuela 10° 15' N 67° 36' W
+Maradi Niger 13° 29' N 7° 10' O
+Maroua Kamerun 10° 35' N 14° 20' O
+Marrakesch Marokko 31° 49' N 8° 00' W
+Marseille Frankreich 43° 18' N 5° 24' O
+Maseru Lesotho 29° 19' S 27° 29' O
+Mashhad Iran 36° 41' N 52° 39' O
+Maskat Oman 23° 37' N 58° 38' O
+Mazar-I-Sharif Afghanistan 36° 42' N 67° 06' O
+Mbabane Swasiland 26° 20' S 31° 08' O
+Mbale Uganda 1° 04' N 34° 12' O
+Mbuji-Mayi Zaire 6° 10' S 23° 39' O
+Mechelen Belgien 51° 02' N 4° 29' O
+Medan Indonesien 3° 35' N 98° 39' O
+Medellin Kolumbien 6° 15' N 74° 35' W
+Medina Saudi-Arabien 24° 30' N 39° 35' O
+Mekka Saudi-Arabien 21° 27' N 39° 49' O
+Meknes Marokko 33° 53' N 5° 37' W
+Melbourne Australien 37° 50' S 145° 00' O
+Melbourne USA, FL 28° 05' N 80° 36' W
+Memphis USA, TN 35° 09' N 90° 03' W
+Mendoza Argentinien 32° 53' S 68° 49' W
+Merida Mexiko 20° 58' N 89° 37' W
+Meridian USA, MS 32° 22' N 88° 42' W
+Mexicali Mexiko 32° 36' N 115° 30' W
+Mexico City Mexiko 19° 24' N 99° 09' W
+Miami USA, FL 25° 47' N 80° 12' W
+Middletown USA, OH 39° 31' N 84° 24' W
+Midland USA, TX 32° 00' N 102° 05' W
+Milwaukee USA, WI 43° 02' N 87° 54' W
+Mindelo Kapverden 16° 54' N 25° 00' W
+Minneapolis USA, MN 44° 59' N 93° 16' W
+Minsk Sowjetunion 53° 54' N 27° 34' O
+Miskolc Ungarn 48° 07' N 20° 47' O
+Mobile USA, AL 30° 42' N 88° 03' W
+Moedling Österreich 48° 05' N 16° 28' O
+Moenchengladbach Deutschland 51° 12' N 6° 26' O
+Moers Deutschland 51° 27' N 6° 39' O
+Mogadischu Somalia 2° 02' N 45° 21' O
+Mombasa Kenia 4° 04' S 39° 40' O
+Monaco Monaco 43° 44' N 7° 25' O
+Monroe USA, LA 32° 30' N 92° 07' W
+Monrovia Liberia 6° 20' N 10° 46' W
+Mons Belgien 50° 28' N 3° 58' O
+Monte Carlo Monaco 43° 44' N 7° 25' O
+Montego Bay Jamaika 18° 27' N 77° 56' W
+Monterrey Mexiko 25° 40' N 100° 19' W
+Montevideo Uruguay 34° 53' S 56° 11' W
+Montgomery USA, AL 32° 23' N 86° 19' W
+Montpellier Frankreich 43° 36' N 3° 53' O
+Montreal Kanada 45° 30' N 73° 35' W
+Mopti Mali 14° 29' N 4° 10' W
+Moratuwa Sri Lanka 6° 47' N 79° 53' O
+Moroni Komoren 11° 40' S 43° 16' O
+Moskau Sowjetunion 55° 45' N 37° 35' O
+Mossul Irak 36° 21' N 43° 08' O
+Moulmein Myanmar 16° 30' N 97° 39' O
+Mount Vernon USA, NY 40° 55' N 73° 49' W
+Mukalla Jemen 14° 34' N 49° 07' O
+Mülheim Deutschland 51° 26' N 6° 53' O
+Multan Pakistan 30° 10' N 71° 36' O
+München Deutschland 48° 09' N 11° 35' O
+Muncie USA, IN 40° 11' N 85° 23' W
+Münster Deutschland 51° 58' N 7° 38' O
+Mwanza Tansania 2° 31' S 32° 56' O
+Nacala Mosambik 14° 33' S 40° 40' O
+Nagasaki Japan 32° 48' N 129° 55' O
+Nagoya Japan 35° 08' N 136° 53' O
+Nagpur Indien 21° 10' N 79° 12' O
+Nairobi Kenia 1° 17' S 36° 49' O
+Najaf Irak 31° 59' N 44° 19' O
+Nakhon Rathisama Thailand 15° 00' N 102° 06' O
+Nakhon Si Thammarat Thailand 8° 24' N 99° 58' O
+Nakuru Kenia 0° 16' S 36° 04' O
+Namur Belgien 50° 28' N 4° 52' O
+Nanjing China 32° 03' N 118° 47' O
+Nantes Frankreich 47° 13' N 1° 33' W
+Nashua USA, NH 42° 45' N 71° 28' W
+Nashville USA, TN 36° 10' N 86° 47' W
+Nassau Bahamas 25° 05' N 77° 21' W
+Natchez USA, MS 31° 34' N 91° 23' W
+Natitingou Benin 10° 17' N 1° 29' O
+N'djamena Tschad 12° 10' N 14° 59' O
+Ndola Sambia 13° 00' S 28° 39' O
+Neapel Italien 40° 50' N 14° 15' O
+Nee Soon Singapur 1° 24' N 103° 49' O
+Neu-Delhi Indien 28° 36' N 77° 12' O
+Neuchatel Schweiz 46° 59' N 6° 56' O
+Neuss Deutschland 51° 12' N 6° 42' O
+New Bedford USA, MA 41° 38' N 70° 56' W
+New Haven USA, CT 41° 18' N 72° 55' W
+New Orleans USA, LA 29° 57' N 90° 04' W
+New York USA, NY 40° 45' N 74° 00' W
+Newark USA, NJ 40° 44' N 74° 10' W
+Newcastle Australien 32° 55' S 151° 45' O
+Newport USA, RI 41° 29' N 71° 19' W
+Newport News USA, VA 36° 59' N 76° 25' W
+Nha Trang Vietnam 12° 15' N 109° 10' O
+Niagara Falls USA, NY 43° 06' N 79° 03' W
+Niamey Niger 13° 32' N 2° 05' O
+Nice Frankreich 43° 42' N 7° 15' O
+Nijmegen Niederlande 51° 50' N 5° 52' O
+Nikosia Zypern 35° 11' N 33° 23' O
+Nisch Jugoslawien 43° 20' N 21° 54' O
+Nordpol 89° 59' N 0° 00' W
+Norfolk USA, VA 36° 51' N 76° 17' W
+Norrkoeping Schweden 58° 35' N 16° 10' O
+Norwich USA, CT 41° 31' N 72° 05' W
+Nouadhibou Mauretanien 20° 54' N 17° 01' W
+Nouakchott Mauretanien 18° 09' N 15° 58' W
+Nova Iguacu Brasilien 22° 45' S 43° 28' W
+Novi Sad Jugoslawien 45° 15' N 19° 51' O
+Novosibirsk Sowjetunion 55° 02' N 82° 55' O
+Nuku'alofa Tonga 21° 09' S 175° 14' W
+Nürnberg Deutschland 49° 27' N 11° 05' O
+Nzerekore Guinea 7° 45' N 8° 49' W
+Oakland USA, CA 37° 48' N 122° 16' W
+Oberhausen Deutschland 51° 28' N 6° 51' O
+Odense Dänemark 55° 24' N 10° 25' O
+Odessa Sowjetunion 46° 28' N 30° 44' O
+Odessa USA, TX 31° 51' N 102° 22' W
+Oerebro Schweden 59° 18' N 15° 05' O
+Offenbach Deutschland 50° 06' N 8° 46' O
+Ogbomosho Nigeria 8° 05' N 4° 11' O
+Ogden USA, UT 41° 14' N 111° 58' W
+Oklahoma City USA, OK 35° 28' N 97° 31' W
+Oldenburg Deutschland 53° 10' N 8° 12' O
+Olomouc Tschechien 49° 38' N 17° 15' O
+Omaha USA, NE 41° 16' N 95° 56' W
+Omdurman Sudan 15° 37' N 32° 29' O
+Omsk Sowjetunion 55° 00' N 73° 24' O
+Oostende Belgien 51° 13' N 2° 55' O
+Oran Algerien 35° 45' N 0° 38' W
+Orange Walk Belize 18° 06' N 88° 31' W
+Oranjestad Niederländ. Antillen 12° 32' N 70° 02' W
+Orlando USA, FL 28° 33' N 81° 23' W
+Oruro Bolivien 17° 59' S 67° 08' W
+Osaka Japan 34° 40' N 135° 30' O
+Oshkosh USA, WI 44° 01' N 88° 33' W
+Osijek Kroatien 45° 33' N 18° 41' O
+Oslo Norwegen 59° 55' N 10° 44' O
+Osnabrück Deutschland 52° 16' N 8° 03' O
+Ostrava Slovakei 49° 50' N 18° 15' O
+Ottawa Kanada 45° 25' N 75° 42' W
+Ouagadougou Burkina Faso 12° 22' N 1° 31' W
+Oujda Marokko 34° 41' N 1° 45' W
+Oulu Finnland 65° 00' N 25° 26' O
+Owensboro USA, KY 37° 46' N 87° 07' W
+Oxford Großbritannien 51° 45' N 1° 15' W
+Padang Indonesien 6° 12' S 120° 27' O
+Paderborn Deutschland 51° 43' N 8° 46' O
+Pakse Laos 14° 09' N 105° 50' O
+Palembang Indonesien 2° 59' S 104° 45' O
+Palermo Italien 38° 07' N 13° 22' O
+Palm Springs USA, CA 33° 50' N 116° 33' W
+Palma de Mallorca Spanien 39° 35' N 2° 39' O
+Panama City Panama 8° 57' N 79° 32' W
+Panchiao Taiwan 25° 01' N 121° 27' O
+Papeete Tahiti 17° 32' S 149° 34' W
+Paramaribo Surinam 5° 50' N 55° 13' W
+Paris Frankreich 48° 52' N 2° 20' O
+Pasadena USA, CA 34° 09' N 118° 09' W
+Pasay Philippinen 14° 33' N 121° 00' O
+Paterson USA, NJ 40° 55' N 74° 10' W
+Patras Griechenland 38° 14' N 21° 44' O
+Pau Frankreich 43° 18' N 0° 22' W
+Paysandu Uruguay 32° 21' S 58° 05' W
+Pecs Ungarn 46° 04' N 18° 15' O
+Pedro Juan Caballero Paraguay 22° 30' S 55° 44' W
+Pensacola USA, FL 30° 25' N 87° 13' W
+Peoria USA, IL 40° 42' N 89° 36' W
+Pereira Kolumbien 4° 47' N 75° 46' W
+Perm Sowjetunion 58° 00' N 56° 15' O
+Perth Australien 31° 56' S 115° 50' O
+Petach Tikwa Israel 31° 52' N 34° 55' O
+Petersburg USA, VA 37° 14' N 77° 24' W
+Petingen Luxemburg 49° 33' N 5° 53' O
+Pforzheim Deutschland 48° 53' N 8° 42' O
+Philadelphia USA, PA 39° 57' N 75° 09' W
+Phnom Penh Kambodscha 11° 33' N 104° 55' O
+Phoenix USA, AZ 33° 27' N 112° 04' W
+Pinang Malaysia 5° 30' N 100° 28' O
+Pine Bluff USA, AR 34° 13' N 92° 01' W
+Piraeus Griechenland 37° 57' N 23° 42' O
+Pittsburgh USA, PA 40° 26' N 80° 00' W
+Pittsfield USA, MA 42° 27' N 73° 15' W
+Piura Peru 5° 15' S 80° 38' W
+Plovdiv Bulgarien 42° 08' N 24° 45' O
+Plymouth Großbritannien 50° 23' N 4° 06' W
+Plzen Tschechien 49° 45' N 13° 25' O
+Pocatello USA, ID 42° 52' N 112° 27' W
+Pointe-Noire Kongo 4° 46' S 11° 53' O
+Poona Indien 18° 34' N 73° 58' O
+Pori Finnland 61° 28' N 21° 45' O
+Port-Au-Prince Haiti 18° 32' N 72° 20' W
+Port-Gentil Gabun 0° 40' S 8° 50' O
+Port Arthur USA, TX 29° 54' N 93° 56' W
+Port Elizabeth Südafrika 33° 58' S 25° 36' O
+Port Louis Mauritius 20° 10' S 57° 30' O
+Port Moresby Papua-Neuguinea 9° 29' S 147° 08' O
+Port Of Spain Trinidad und Tobago 10° 39' N 61° 31' W
+Port Said Ägypten 31° 17' N 32° 18' O
+Port Sudan Sudan 19° 38' N 37° 07' O
+Port Vila Vanuatu 17° 45' S 168° 18' O
+Portland USA, ME 43° 40' N 70° 15' W
+Portland USA, OR 45° 31' N 122° 41' W
+Porto Portugal 41° 09' N 8° 37' W
+Porto Alegre Brasilien 30° 03' S 51° 13' W
+Porto Novo Benin 6° 30' N 2° 47' O
+Portoviejo Ecuador 1° 07' S 80° 28' W
+Portsmouth Dominica 15° 34' N 61° 27' W
+Posen Polen 52° 25' N 16° 53' O
+Potosi Bolivien 19° 35' S 65° 45' W
+Potsdam Deutschland 52° 24' N 13° 04' O
+Poughkeepsie USA, NY 41° 42' N 73° 56' W
+Praha Tschechien 50° 04' N 14° 27' O
+Praia Kapverden 14° 55' N 23° 30' W
+Pretoria Südafrika 25° 45' S 28° 12' O
+Providence USA, RI 41° 50' N 71° 25' W
+Provo USA, UT 40° 14' N 111° 39' W
+Puebla Mexiko 19° 03' N 98° 12' W
+Puebla De Zaragoza Mexiko 28° 31' N 100° 54' W
+Pueblo USA, CO 38° 16' N 104° 37' W
+Puerto Barrios Guatemala 15° 41' N 88° 32' W
+Puerto Plata Dominikanische Republik 19° 48' N 70° 41' W
+Puerto Stroessner Paraguay 25° 32' S 54° 34' W
+Puntarenas Costa Rica 10° 00' N 84° 50' W
+Pusan Korea 35° 06' N 129° 03' O
+Pyoengyang Korea Dvr 39° 01' N 125° 45' O
+Pyuthan Nepal 28° 05' N 82° 53' O
+Quebec Kanada 46° 49' N 71° 13' W
+Quezaltenango Guatemala 14° 50' N 91° 30' W
+Quezon City Philippinen 14° 39' N 121° 02' O
+Qui Nhon Vietnam 13° 47' N 109° 11' O
+Quito Ecuador 0° 13' S 78° 30' W
+Rabat Marokko 34° 02' N 6° 51' W
+Rabaul Papua-Neuguinea 4° 13' S 152° 11' O
+Raleigh USA, NC 35° 47' N 78° 38' W
+Ramat Gan Israel 32° 04' N 34° 48' O
+Rancagua Chile 34° 10' S 70° 45' W
+Randers Dänemark 56° 28' N 10° 03' O
+Rangoon Myanmar 16° 47' N 96° 10' O
+Rapid City USA, SD 44° 05' N 103° 14' W
+Raqqa Syrien 35° 57' N 39° 03' O
+Rawalpindi Pakistan 33° 40' N 73° 08' O
+Recife Brasilien 8° 06' S 34° 53' W
+Recklinghausen Deutschland 51° 37' N 7° 12' O
+Regensburg Deutschland 49° 01' N 12° 06' O
+Regina Kanada 50° 25' N 104° 39' W
+Remich Luxemburg 49° 33' N 6° 23' O
+Remscheid Deutschland 51° 11' N 7° 12' O
+Reno USA, NV 39° 31' N 119° 49' W
+Reykjavik Island 64° 09' N 21° 57' W
+Riad Saudi-Arabien 24° 38' N 46° 43' O
+Richmond USA, VA 37° 32' N 77° 26' W
+Riga Sowjetunion 56° 57' N 24° 06' O
+Rio De Janeiro Brasilien 22° 54' S 43° 14' W
+Rivera Uruguay 31° 00' S 55° 50' W
+Riverside USA, CA 33° 59' N 117° 22' W
+Roanoke USA, VA 37° 16' N 79° 57' W
+Rochester USA, MN 44° 01' N 92° 28' W
+Rochester USA, NY 43° 10' N 77° 36' W
+Rock Island USA, IL 41° 29' N 90° 34' W
+Rockford USA, IL 42° 17' N 89° 06' W
+Rom Italien 41° 54' N 12° 29' O
+Roodepoort Südafrika 26° 10' S 27° 53' O
+Rosario Argentinien 32° 57' S 60° 40' W
+Roseau Dominica 15° 18' N 61° 23' W
+Roskilde Dänemark 55° 39' N 12° 07' O
+Rostock Deutschland 54° 05' N 12° 08' O
+Rostow Sowjetunion 47° 14' N 39° 42' O
+Rotterdam Niederlande 51° 55' N 4° 29' O
+Ruse Bulgarien 43° 50' N 27° 59' O
+Saarbrücken Deutschland 49° 14' N 7° 00' O
+Sacramento USA, CA 38° 35' N 121° 30' W
+Safi Marokko 32° 18' N 9° 20' W
+Saginaw USA, MI 43° 26' N 83° 56' W
+Saint-Etienne Frankreich 45° 26' N 4° 23' O
+Saint-Louis Senegal 16° 01' N 16° 30' W
+Saint Augustine USA, FL 29° 53' N 81° 19' W
+Saint Catharine's Kanada 43° 10' N 79° 15' W
+Saint John's Kanada 47° 33' N 52° 43' W
+Saint Joseph USA, MO 39° 46' N 94° 51' W
+Saint Louis USA, MO 38° 38' N 90° 12' W
+Saint Paul USA, MN 44° 57' N 93° 06' W
+Saint Petersburg USA, FL 27° 46' N 82° 38' W
+Salem USA, MA 42° 31' N 70° 53' W
+Salem USA, OR 44° 56' N 123° 02' W
+Salinas USA, CA 36° 40' N 121° 39' W
+Saliyan Nepal 28° 21' N 82° 11' O
+Salt Lake City USA, UT 40° 45' N 111° 53' W
+Salta Argentinien 24° 47' S 65° 25' W
+Salto Uruguay 31° 27' S 57° 50' W
+Salvador Brasilien 12° 59' S 38° 31' W
+Salzburg Österreich 47° 48' N 13° 03' O
+Salzgitter Deutschland 52° 05' N 10° 20' O
+San Antonio USA, TX 29° 26' N 98° 29' W
+San Bernardino USA, CA 34° 06' N 117° 17' W
+San Cristobal Venezuela 7° 46' N 72° 15' W
+San Diego USA, CA 32° 43' N 117° 09' W
+San Francisco USA, CA 37° 47' N 122° 25' W
+San Jose Costa Rica 9° 56' N 84° 05' W
+San Jose USA, CA 37° 20' N 121° 53' W
+San Juan Argentinien 31° 32' S 68° 31' W
+San Juan Dominikanische Republik 18° 49' N 71° 12' W
+San Juan Puerto Rico 18° 28' N 66° 07' W
+San Lorenzo Paraguay 25° 20' S 57° 32' W
+San Luis Potosi Mexiko 22° 09' N 100° 59' W
+San Marino San Marino 43° 55' N 12° 28' O
+San Miguel El Salvador 13° 28' N 88° 10' W
+San Miguel De Tucuman Argentinien 26° 47' S 65° 15' W
+San Pedro Sula Honduras 15° 26' N 88° 01' W
+San Salvador El Salvador 13° 42' N 89° 12' W
+Sana Jemen 15° 23' N 44° 12' O
+Sankt Poelten Österreich 48° 13' N 15° 37' O
+Sansibar Tansania 6° 12' S 39° 12' O
+Santa Ana El Salvador 14° 00' N 89° 31' W
+Santa Barbara USA, CA 34° 25' N 119° 42' W
+Santa Clara Kuba 22° 25' N 79° 58' W
+Santa Cruz Bolivien 17° 48' S 63° 10' W
+Santa Fe Argentinien 31° 35' S 60° 41' W
+Santa Fe USA, NM 35° 41' N 105° 56' W
+Santa Rosa USA, CA 38° 26' N 122° 43' W
+Santiago Dominikanische Republik 19° 30' N 70° 40' W
+Santiago Panama 8° 08' N 80° 59' W
+Santiago De Chile Chile 33° 27' S 70° 40' W
+Santiago De Cuba Kuba 20° 00' N 75° 49' W
+Santo Domingo Dominikanische Republik 18° 28' N 69° 54' W
+Sao Paulo Brasilien 23° 32' S 46° 37' W
+Sao Tome Sao Tome und Principe 0° 12' N 6° 43' O
+Sapporo Japan 43° 03' N 141° 21' O
+Sarajewo Bosnien-Herzegowina 43° 50' N 18° 25' O
+Sarh Tschad 9° 08' N 18° 22' O
+Savannah USA, GA 32° 05' N 81° 06' W
+Savannakhet Laos 16° 34' N 104° 45' O
+Schaffhausen Schweiz 47° 40' N 8° 40' O
+Schenectady USA, NY 42° 49' N 73° 57' W
+Schwerin Deutschland 53° 38' N 11° 23' O
+Scranton USA, PA 41° 25' N 75° 40' W
+Seattle USA, WA 47° 37' N 122° 20' W
+Segou Mali 13° 28' N 6° 18' W
+Semarang Indonesien 6° 58' S 110° 29' O
+Seoul Korea 37° 34' N 127° 00' O
+Serangoon Singapur 1° 23' N 103° 55' O
+Serka Jordanien 32° 04' N 36° 06' O
+Serres Griechenland 41° 05' N 23° 31' O
+Setif Algerien 36° 11' N 5° 24' O
+Setubal Portugal 38° 31' N 8° 54' W
+Sevilla Spanien 37° 23' N 5° 59' W
+Sfax Tunesien 34° 45' N 10° 43' O
+Shanghai China 31° 14' N 121° 28' O
+Sharjah Vereinigte Arabische Emirate 25° 20' N 55° 26' O
+Sheffield Großbritannien 53° 23' N 1° 30' W
+Shenyang China 41° 50' N 123° 26' O
+Shiraz Iran 29° 38' N 52° 34' O
+Shkoder Albanien 42° 03' N 19° 01' O
+Shreveport USA, LA 32° 31' N 93° 45' W
+Shubra Al-Khaima Ägypten 30° 06' N 31° 15' O
+Sidi-Bel-Abbes Algerien 35° 15' N 0° 39' W
+Siegen Deutschland 50° 52' N 8° 02' O
+Siguiri Guinea 11° 28' N 9° 07' W
+Sikasso Mali 11° 18' N 5° 38' W
+Singapur Singapur 1° 17' N 103° 51' O
+Sioux City USA, IA 42° 30' N 96° 24' W
+Sioux Falls USA, SD 43° 33' N 96° 44' W
+Skopje Mazedonien 42° 00' N 21° 29' O
+Sliema Malta 35° 55' N 14° 31' O
+Sofia Bulgarien 42° 41' N 23° 19' O
+Solingen Deutschland 51° 11' N 7° 05' O
+Songkhla Thailand 7° 12' N 100° 35' O
+Sosnowitz Polen 50° 16' N 19° 07' O
+South Bend USA, IN 41° 41' N 86° 15' W
+Southampton Großbritannien 50° 54' N 1° 23' W
+Spartanburg USA, SC 34° 56' N 81° 57' W
+Split Kroatien 43° 31' N 16° 28' O
+Spokane USA, WA 47° 40' N 117° 26' W
+Springfield USA, IL 39° 48' N 89° 39' W
+Springfield USA, MA 42° 06' N 72° 36' W
+Springfield USA, MO 37° 13' N 93° 18' W
+St Catharine's Kanada 45° 24' N 73° 34' W
+St Gallen Schweiz 47° 25' N 9° 23' O
+St George's Bermuda-Inseln 32° 24' N 64° 42' W
+St George's Grenada 12° 04' N 61° 44' W
+St John's Antigua 17° 08' N 61° 50' W
+St Laurent Französisch-Guayana 5° 29' N 54° 03' W
+Stamford USA, CT 41° 03' N 73° 32' W
+Stara Zagora Bulgarien 42° 25' N 25° 37' O
+Stavanger Norwegen 58° 58' N 5° 45' O
+Stettin Polen 53° 25' N 14° 32' O
+Steyr Österreich 48° 04' N 14° 25' O
+Stockholm Schweden 59° 20' N 18° 03' O
+Stockton USA, CA 37° 57' N 121° 17' W
+Strasbourg Frankreich 48° 35' N 7° 45' O
+Stuttgart Deutschland 48° 46' N 9° 11' O
+Sucre Bolivien 19° 02' S 65° 17' W
+Sudbury Kanada 46° 30' N 81° 00' W
+Südpol 89° 59' S 0° 00' W
+Suez Ägypten 29° 59' N 32° 33' O
+Sunnyvale USA, CA 37° 23' N 122° 02' W
+Surabaya Indonesien 7° 14' S 112° 45' O
+Surakarta Indonesien 7° 32' S 110° 50' O
+Suva Fidschi 18° 08' S 178° 25' O
+Swerdlowsk Sowjetunion 56° 51' N 60° 36' O
+Sydney Australien 33° 53' S 151° 12' O
+Syracuse USA, NY 43° 03' N 76° 09' W
+Szeged Ungarn 46° 15' N 20° 09' O
+Tabouk Saudi-Arabien 28° 22' N 36° 32' O
+Tabriz Iran 38° 05' N 46° 18' O
+Tacoma USA, WA 47° 15' N 122° 26' W
+Taegu Korea 35° 52' N 128° 36' O
+Taejeon Korea 36° 20' N 127° 26' O
+Tahoua Niger 14° 57' N 5° 19' O
+Taichung Taiwan 24° 09' N 120° 40' O
+Taif Saudi-Arabien 21° 15' N 40° 21' O
+Tainan Taiwan 23° 01' N 120° 14' O
+Taipeh Taiwan 25° 03' N 121° 30' O
+Tais Jemen 13° 35' N 44° 02' O
+Talca Chile 35° 28' S 71° 40' W
+Talcahuano Chile 36° 40' S 73° 10' W
+Tallahassee USA, FL 30° 27' N 84° 17' W
+Tamale Ghana 9° 26' N 0° 49' W
+Tampa USA, FL 27° 57' N 82° 27' W
+Tampere Finnland 61° 32' N 23° 45' O
+Tampico Mexiko 22° 13' N 97° 51' W
+Tanga Tansania 5° 07' S 30° 50' O
+Tanger Marokko 35° 48' N 5° 50' W
+Tanta Ägypten 30° 48' N 31° 00' O
+Tarawa Kiribati 1° 30' N 173° 00' O
+Taschkent Sowjetunion 41° 20' N 69° 18' O
+Taunggyi Myanmar 20° 55' N 96° 53' O
+Tbilisi Sowjetunion 41° 42' N 44° 45' O
+Tegucigalpa Honduras 14° 06' N 87° 13' W
+Teheran Iran 35° 40' N 51° 26' O
+Tel Aviv Israel 32° 05' N 34° 46' O
+Temeschburg Rumänien 45° 45' N 21° 15' O
+Tempe USA, AZ 33° 25' N 111° 56' W
+Temuco Chile 38° 45' S 72° 40' W
+Ternitz Österreich 47° 43' N 16° 02' O
+Terre Haute USA, IN 39° 28' N 87° 24' W
+Tetouan Marokko 35° 34' N 5° 22' W
+Thessaloniki Griechenland 40° 38' N 22° 58' O
+Thies Senegal 14° 49' N 16° 52' W
+Thimbu Bhutan 27° 32' N 89° 45' O
+Thun Schweiz 46° 46' N 7° 38' O
+Tianjin China 39° 08' N 117° 12' O
+Tijuana Mexiko 32° 32' N 117° 01' W
+Tilburg Niederlande 51° 34' N 5° 05' O
+Timbuktu Mali 16° 46' N 3° 01' W
+Tirana Albanien 41° 20' N 19° 50' O
+Tlemcen Algerien 34° 53' N 1° 21' W
+Toamasina Madagaskar 18° 10' S 49° 23' O
+Tokyo Japan 35° 42' N 139° 46' O
+Toledo USA, OH 41° 39' N 83° 33' W
+Toliary Madagaskar 23° 20' S 43° 41' O
+Topeka USA, KS 39° 03' N 95° 40' W
+Toronto Kanada 43° 39' N 79° 23' W
+Torreon Mexiko 25° 33' N 103° 26' W
+Toulouse Frankreich 43° 37' N 1° 27' O
+Tours Frankreich 47° 23' N 0° 41' O
+Traun Österreich 48° 13' N 14° 14' O
+Trenton USA, NJ 40° 13' N 74° 46' W
+Tripoli Libanon 34° 27' N 35° 50' O
+Tripolis Libyen 32° 54' N 13° 11' O
+Trondheim Norwegen 63° 25' N 10° 25' O
+Troy USA, NY 42° 44' N 73° 41' W
+Trujillo Peru 8° 07' S 79° 02' W
+Tschoudjo Togo 8° 59' N 1° 11' O
+Tsumeb Namibia 19° 13' S 17° 42' O
+Tucson USA, AZ 32° 13' N 110° 58' W
+Tulsa USA, OK 36° 09' N 96° 00' W
+Tunis Tunesien 36° 48' N 10° 12' O
+Turin Italien 45° 03' N 7° 40' O
+Turku Finnland 60° 27' N 22° 15' O
+Tuscaloosa USA, AL 33° 12' N 87° 34' W
+Ujung Padang Indonesien 5° 09' S 119° 28' O
+Ulan Bator Mongolei 47° 55' N 106° 53' O
+Ulm Deutschland 48° 25' N 10° 00' O
+Umhlazi Südafrika 29° 53' S 31° 00' O
+Uppsala Schweden 59° 55' N 17° 38' O
+Utica USA, NY 43° 06' N 75° 14' W
+Utrecht Niederlande 52° 06' N 5° 07' O
+Vaduz Lichtenstein 47° 08' N 9° 32' O
+Vaesteras Schweden 59° 36' N 16° 32' O
+Valencia Spanien 39° 28' N 0° 22' W
+Valencia Venezuela 10° 11' N 68° 00' W
+Valladolid Spanien 41° 39' N 4° 45' W
+Valletta Malta 35° 54' N 14° 32' O
+Valparaiso Chile 33° 05' S 71° 40' W
+Vancouver Kanada 49° 17' N 123° 07' W
+Vantaa Finnland 60° 18' N 24° 57' O
+Varna Bulgarien 43° 12' N 27° 57' O
+Vejle Dänemark 55° 43' N 9° 33' O
+Venedig Italien 45° 27' N 12° 21' O
+Vera Cruz Mexiko 19° 12' N 96° 08' W
+Victoria Hongkong 22° 16' N 114° 13' O
+Victoria Kanada 48° 25' N 123° 22' W
+Victoria Seschellen 4° 38' S 55° 28' O
+Vientiane Laos 17° 58' N 102° 36' O
+Vila Nova De Gaia Portugal 41° 04' N 8° 40' W
+Villach Österreich 46° 37' N 13° 51' O
+Vina Del Mar Chile 33° 02' S 71° 35' W
+Vineland USA, NJ 39° 29' N 75° 02' W
+Volos Griechenland 39° 22' N 22° 57' O
+Waco USA, TX 31° 33' N 97° 08' W
+Wadi Medani Sudan 14° 24' N 33° 03' O
+Warschau Polen 52° 15' N 21° 00' O
+Warwick USA, RI 41° 42' N 71° 27' W
+Washington USA, DC 38° 54' N 77° 01' W
+Waterbury USA, CT 41° 33' N 73° 03' W
+Waterford Irland 52° 15' N 7° 06' W
+Waterloo USA, IA 42° 30' N 92° 20' W
+Wellington Neuseeland 41° 28' S 174° 51' O
+Wels Österreich 48° 10' N 14° 02' O
+West Palm Beach USA, FL 26° 43' N 80° 03' W
+Wheeling USA, WV 40° 04' N 80° 43' W
+Wichita USA, KS 37° 41' N 97° 20' W
+Wichita Falls USA, TX 33° 55' N 98° 29' W
+Wien Österreich 48° 12' N 16° 22' O
+Wiener Neustadt Österreich 47° 48' N 16° 15' O
+Wiesbaden Deutschland 50° 05' N 8° 15' O
+Wilkes Barre USA, PA 41° 15' N 75° 53' W
+Willemstad Niederlande 12° 06' N 68° 57' W
+Williamsburg USA, VA 37° 16' N 76° 42' W
+Williston USA, ND 48° 11' N 103° 37' W
+Wilmington USA, DE 39° 45' N 75° 33' W
+Wilmington USA, NC 34° 14' N 77° 55' W
+Windhuk Namibia 22° 34' S 17° 06' O
+Windsor Kanada 42° 18' N 83° 01' W
+Winnipeg Kanada 49° 53' N 97° 09' W
+Winston Salem USA, NC 36° 06' N 80° 15' W
+Winterthur Schweiz 47° 30' N 8° 45' O
+Witten Deutschland 51° 26' N 7° 20' O
+Wladiwostok Sowjetunion 43° 08' N 131° 54' O
+Wolfsberg Österreich 46° 50' N 14° 50' O
+Wolfsburg Deutschland 52° 26' N 10° 48' O
+Wolgograd Sowjetunion 48° 45' N 44° 25' O
+Wollongong Australien 17° 13' S 137° 57' O
+Worcester USA, MA 42° 16' N 71° 48' W
+Wuhan China 36° 45' N 114° 15' O
+Wuppertal Deutschland 51° 16' N 7° 11' O
+Würzburg Deutschland 49° 48' N 9° 56' O
+Xian China 34° 16' N 108° 54' O
+Yakima USA, WA 46° 36' N 120° 31' W
+Yaounde Kamerun 3° 51' N 11° 31' O
+Yaren Nauru 1° 50' S 167° 10' O
+Yokohama Japan 41° 04' N 141° 15' O
+York Großbritannien 53° 57' N 1° 05' W
+York USA, PA 39° 58' N 76° 44' W
+Youngstown USA, PA 41° 06' N 80° 39' W
+Yunghu Taiwan 24° 51' N 120° 03' O
+Zagazig Ägypten 30° 35' N 31° 30' O
+Zagreb Koratien 45° 48' N 16° 00' O
+Zamboanga Philippinen 6° 55' N 122° 05' O
+Zaragoza Spanien 41° 39' N 0° 54' W
+Ziguinchor Senegal 12° 35' N 16° 20' W
+Zinder Niger 13° 46' N 8° 58' O
+Zomba Malawi 15° 22' S 35° 22' O
+Zürich Schweiz 47° 22' N 8° 31' O
+Zwickau Deutschland 50° 44' N 12° 30' O
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/cities.tex b/Master/texmf-dist/tex/generic/pst-geo/data/cities.tex
new file mode 100644
index 00000000000..16ddfb35b06
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/cities.tex
@@ -0,0 +1,1379 @@
+% (c) Herbert Voss <voss _at_ perce.de
+\mapput(6.1,50.7666666667){Aachen}[Germany]
+\mapput(9.93333333333,57.05){Aalborg}[Denmark]
+\mapput(10.2166666667,56.1666666667){Aarhus}[Denmark]
+\mapput(-2.1,57.1333333333){Aberdeen}[GreatBritain]
+\mapput(-4.03333333333,5.31666666667){Abidjan}[IvoryCoast]
+\mapput(-99.7166666667,32.4666666667){Abilene}[USA]
+\mapput(54.4166666667,24.4666666667)[Abu_Dhabi]{Abu Dhabi}[Emirates]
+\mapput(-99.9166666667,16.8333333333){Acapulco}[Mexiko]
+\mapput(-0.25,5.55){Accra}[Ghana]
+\mapput(35.3166666667,37.0){Adana}[Turkey]
+\mapput(38.7833333333,9.03333333333)[Addis_Abeba]{Addis Abeba}[Ethiopia]
+\mapput(138.6,-34.9333333333){Adelaide}[Australia]
+\mapput(45.0166666667,12.7666666667){Aden}[Jemen]
+\mapput(7.93333333333,17.0){Agadez}[Niger]
+\mapput(-9.66666666667,30.5){Agadir}[Marokko]
+\mapput(72.6666666667,23.0){Ahmedabad}[Indien]
+\mapput(81.5166666667,41.0833333333){Akron}[USA]
+\mapput(-18.0666666667,65.6833333333){Akureyri}[Island]
+\mapput(92.9166666667,20.15){Akyab}[Myanmar]
+\mapput(49.6166666667,25.4333333333){Al-Mobarraz}[Saudi-Arabien]
+\mapput(31.1666666667,30.9833333333)[Al_Mahalla_Al-Kubra]{Al Mahalla Al-Kubra}[Egypt]
+\mapput(-84.15,31.5666666667){Albany}[USA]
+\mapput(-73.75,42.65){Albany}[USA]
+\mapput(-106.65,35.0833333333){Albuquerque}[USA]
+\mapput(37.1666666667,36.2333333333){Aleppo}[Syrien]
+\mapput(29.9166666667,31.2166666667){Alexandria}[Egypt]
+\mapput(-92.45,31.3){Alexandria}[USA]
+\mapput(-77.05,38.8){Alexandria}[USA]
+\mapput(3.05,36.7833333333){Algier}[Algerien]
+\mapput(-75.4666666667,40.6){Allentown}[USA]
+\mapput(-78.4,40.5166666667){Altoona}[USA]
+\mapput(-9.21666666667,38.75){Amadora}[Portugal]
+\mapput(-101.833333333,35.2){Amarillo}[USA]
+\mapput(-78.65,-1.3){Ambato}[Ecuador]
+\mapput(35.9333333333,31.95){Amman}[Jordanien]
+\mapput(4.9,52.3833333333){Amsterdam}[Niederlande]
+\mapput(14.8666666667,48.1166666667){Amstetten}[Austria]
+\mapput(-117.916666667,33.8333333333){Anaheim}[USA]
+\mapput(-149.883333333,61.2166666667){Anchorage}[USA]
+\mapput(1.5,42.5)[Andorra_La_Vella]{Andorra La Vella}[Andorra]
+\mapput(120.55,15.15){Angeles}[Philippinen]
+\mapput(32.8666666667,39.9333333333){Ankara}[Turkey]
+\mapput(-83.75,42.2833333333)[Ann_Arbor]{Ann Arbor}[USA]
+\mapput(7.78333333333,36.9166666667){Annaba}[Algerien]
+\mapput(-76.5,38.9833333333){Annapolis}[USA]
+\mapput(47.5,-18.8666666667){Antananarivo}[Madagaskar]
+\mapput(-70.4,-23.65){Antofagasta}[Chile]
+\mapput(47.0166666667,-19.85){Antsirabe}[Madagaskar]
+\mapput(49.3333333333,-12.4166666667){Antsiranana}[Madagaskar]
+\mapput(4.41666666667,51.2166666667){Antwerpen}[Belgien]
+\mapput(5.95,52.2166666667){Apeldoorn}[Niederlande]
+\mapput(-171.733333333,-13.8333333333){Apia}[Westsamoa]
+\mapput(-71.55,-16.4){Arequipa}[Peru]
+\mapput(10.2,36.8666666667){Ariana}[Tunesien]
+\mapput(-70.3333333333,-18.5){Arica}[Chile]
+\mapput(-77.1166666667,38.8833333333){Arlington}[USA]
+\mapput(36.6666666667,-3.38333333333){Arusha}[Tansania]
+\mapput(-11.6833333333,26.8){As-Smara}[Sahara]
+\mapput(-82.55,35.6){Asheville}[USA]
+\mapput(38.9666666667,15.3333333333){Asmara}[Ethiopia]
+\mapput(31.1166666667,27.2333333333){Assiut}[Egypt]
+\mapput(-57.6666666667,-25.2666666667){Asuncion}[Paraguay]
+\mapput(34.0,17.7){Atbara}[Sudan]
+\mapput(23.7166666667,37.9666666667){Athen}[Griechenland]
+\mapput(-84.4,33.75){Atlanta}[USA]
+\mapput(-74.4333333333,39.3666666667)[Atlantic_City]{Atlantic City}[USA]
+\mapput(174.75,-36.85){Auckland}[Neuseeland]
+\mapput(10.8833333333,48.3666666667){Augsburg}[Germany]
+\mapput(-81.9666666667,33.4666666667){Augusta}[USA]
+\mapput(-97.75,30.2666666667){Austin}[USA]
+\mapput(122.966666667,10.6333333333){Bacolod}[Philippinen]
+\mapput(16.2333333333,48.0166666667){Baden}[Austria]
+\mapput(44.4166666667,33.35){Bagdad}[Irak]
+\mapput(-62.25,-38.75)[Bahia_Blanca]{Bahia Blanca}[Argentinien]
+\mapput(-119.016666667,35.3666666667){Bakersfield}[USA]
+\mapput(54.9,31.4666666667){Bakhtaran}[Iran]
+\mapput(49.85,40.3833333333){Baku}[Sowjetunion]
+\mapput(-76.6166666667,39.2833333333){Baltimore}[USA]
+\mapput(-7.98333333333,12.6666666667){Bamako}[Mali]
+\mapput(114.966666667,4.93333333333)[Bandar_Seri_Begawan]{Bandar Seri Begawan}[Brunei]
+\mapput(107.566666667,-6.95){Bandung}[Indonesien]
+\mapput(77.5833333333,12.9666666667){Bangalore}[Indien]
+\mapput(100.516666667,13.75){Bangkok}[Thailand]
+\mapput(-68.7666666667,44.8){Bangor}[USA]
+\mapput(18.6166666667,4.38333333333){Bangui}[Zentralafrikanische Republik]
+\mapput(-16.65,13.4666666667){Banjul}[Gambia]
+\mapput(2.18333333333,41.3833333333){Barcelona}[Spanien]
+\mapput(-64.7166666667,10.1333333333){Barcelona}[Venezuela]
+% \mapput(16.8666666667,41.1166666667){Bari}[Italy]
+\mapput(-69.3,10.05){Barquisimeto}[Venezuela]
+\mapput(-74.8,10.9833333333){Barranquilla}[Kolumbien]
+\mapput(-9.08333333333,38.6666666667){Barreiro}[Portugal]
+\mapput(7.6,47.55){Basel}[Schweiz]
+\mapput(47.8333333333,30.5){Basra}[Irak]
+\mapput(94.75,16.7666666667){Bassein}[Myanmar]
+\mapput(-62.7166666667,17.2833333333){Basseterre}[St. Kitts-Nevis]
+\mapput(9.76666666667,1.85){Bata}[Äquatorial-Guinea]
+\mapput(-91.1833333333,30.45)[Baton_Rouge]{Baton Rouge}[USA]
+\mapput(-94.1,30.0833333333){Beaumont}[USA]
+\mapput(34.7833333333,31.25){Beersheba}[Israel]
+\mapput(116.4,39.9333333333){Beijing}[China]
+\mapput(34.8666666667,-19.8166666667){Beira}[Mosambik]
+\mapput(35.5,33.8833333333){Beirut}[Libanon]
+\mapput(-48.4833333333,-1.45){Belem}[Brasilien]
+\mapput(-5.93333333333,54.6){Belfast}[Nordirland]
+\mapput(-88.2,17.5)[Belize_City]{Belize City}[Belize]
+\mapput(-88.8,17.2166666667){Belmopan}[Belize]
+\mapput(-43.9,-19.9)[Belo_Horizonte]{Belo Horizonte}[Brasilien]
+\mapput(20.0666666667,32.1166666667){Bengasi}[Libyen]
+\mapput(20.5,44.8333333333){Beograd}[Jugoslawien]
+\mapput(45.0333333333,10.4666666667){Berbera}[Somalia]
+\mapput(5.33333333333,60.3833333333){Bergen}[Norwegen]
+\mapput(7.13333333333,50.9833333333){Bergisch-Gladbach}[Germany]
+\mapput(13.3666666667,52.55){Berlin}[Germany]
+\mapput(7.46666666667,46.95){Bern}[Schweiz]
+\mapput(-75.3833333333,40.6166666667){Bethlehem}[USA]
+\mapput(8.21666666667,46.45){Biel}[Schweiz]
+\mapput(8.53333333333,52.0333333333){Bielefeld}[Germany]
+\mapput(-2.93333333333,43.25){Bilbao}[Spanien]
+\mapput(-108.5,45.7833333333){Billings}[USA]
+\mapput(-88.8833333333,30.4){Biloxi}[USA]
+\mapput(-75.9166666667,42.1){Binghamton}[USA]
+\mapput(-1.88333333333,52.4833333333){Birmingham}[GreatBritain]
+\mapput(-86.8166666667,33.5166666667){Birmingham}[USA]
+\mapput(-100.783333333,46.8){Bismarck}[USA]
+\mapput(-15.65,11.8666666667){Bissau}[Guinea-Bissau]
+\mapput(9.86666666667,37.3){Bizerta}[Tunesien]
+\mapput(35.0,-15.7666666667){Blantyre}[Malawi]
+\mapput(2.83333333333,36.5){Blida}[Algerien]
+\mapput(34.8666666667,32.0833333333)[Bnei_Brak]{Bnei Brak}[Israel]
+\mapput(-11.75,7.96666666667){Bo}[Sierra Leone]
+\mapput(-4.3,11.1833333333){Bobo-Dioulasso}[Burkina Faso]
+\mapput(7.21666666667,51.4833333333){Bochum}[Germany]
+\mapput(-74.0833333333,4.6){Bogata}[Kolumbien]
+\mapput(-116.2,43.6166666667){Boise}[USA]
+% \mapput(11.3333333333,44.5){Bologna}[Italy]
+\mapput(72.8333333333,18.9666666667){Bombay}[Indien]
+\mapput(7.1,50.7333333333){Bonn}[Germany]
+\mapput(12.9166666667,57.7333333333){Boras}[Schweden]
+\mapput(-0.566666666667,44.8333333333){Bordeaux}[France]
+\mapput(-71.05,42.35){Boston}[USA]
+\mapput(6.91666666667,51.5166666667){Bottrop}[Germany]
+\mapput(-105.283333333,40.0166666667){Boulder}[USA]
+\mapput(1.61666666667,50.7166666667){Boulogne}[France]
+% \mapput(11.3666666667,46.5166666667){Bozen}[Italy]
+\mapput(-1.75,53.8){Bradford}[GreatBritain]
+\mapput(-8.43333333333,41.5333333333){Braga}[Portugal]
+\mapput(27.9666666667,45.2833333333){Braila}[Rumänien]
+\mapput(-47.9166666667,-15.7833333333){Brasilia}[Brasilien]
+\mapput(17.1666666667,48.1666666667){Bratislava}[Slovakei]
+\mapput(13.0333333333,48.2666666667){Braunau}[Austria]
+\mapput(10.5333333333,52.2666666667){Braunschweig}[Germany]
+\mapput(15.2333333333,-4.23333333333){Brazzaville}[Kongo]
+\mapput(9.76666666667,47.5){Bregenz}[Austria]
+\mapput(8.8,53.0833333333){Bremen}[Germany]
+\mapput(8.58333333333,53.55){Bremerhaven}[Germany]
+\mapput(17.0,51.0833333333){Breslau}[Polen]
+\mapput(-73.1833333333,41.1833333333){Bridgeport}[USA]
+\mapput(-59.6166666667,13.1){Bridgetown}[Barbados]
+\mapput(153.016666667,-27.5){Brisbane}[Australia]
+\mapput(-2.58333333333,51.45){Bristol}[GreatBritain]
+\mapput(16.6666666667,49.2166666667){Brno}[Tschechien]
+\mapput(18.0,53.2666666667){Bromberg}[Polen]
+\mapput(-97.5,25.9){Brownsville}[USA]
+\mapput(15.2833333333,47.4166666667){Bruckmur}[Austria]
+\mapput(3.23333333333,51.2166666667)[Brugge]{Brügge}[Belgien]
+\mapput(4.33333333333,50.8333333333)[Brussel]{Brüssel}[Belgien]
+\mapput(-5.0,7.7){Buake}[IvoryCoast]
+\mapput(-73.1666666667,7.13333333333){Bucaramanga}[Kolumbien]
+\mapput(19.0833333333,47.5){Budapest}[Ungarn]
+\mapput(-58.45,-34.6)[Buenos_Aires]{Buenos Aires}[Argentinien]
+\mapput(-78.8666666667,42.8833333333){Buffalo}[USA]
+\mapput(29.3166666667,-3.36666666667){Bujumbura}[Burundi]
+\mapput(26.1,44.4333333333){Bukarest}[Rumänien]
+\mapput(28.8333333333,-2.5){Bukavu}[Zaire]
+\mapput(28.7166666667,-20.1666666667){Bulawayo}[Simbabwe]
+\mapput(43.9833333333,26.3333333333){Buraidah}[Saudi-Arabien]
+\mapput(27.4833333333,42.5){Burgas}[Bulgarien]
+\mapput(-73.2166666667,44.4833333333){Burlington}[USA]
+\mapput(29.0666666667,40.2){Bursa}[Turkey]
+\mapput(29.7333333333,-2.58333333333){Butare}[Ruanda]
+\mapput(-112.533333333,46.0){Butte}[USA]
+\mapput(124.666666667,8.48333333333)[Cagayan_De_Oro]{Cagayan De Oro}[Philippinen]
+\mapput(88.3666666667,22.5333333333){Calcutta}[Indien]
+\mapput(-114.083333333,51.05){Calgary}[Kanada]
+\mapput(-76.5166666667,3.45){Cali}[Kolumbien]
+\mapput(-77.1333333333,-12.0833333333){Callao}[Peru]
+\mapput(120.966666667,14.6333333333){Caloocan}[Philippinen]
+\mapput(109.233333333,11.9)[Cam_Ranh]{Cam Ranh}[Vietnam]
+\mapput(-77.9166666667,21.4166666667){Camaguey}[Kuba]
+\mapput(-75.1166666667,39.95){Camden}[USA]
+\mapput(149.166666667,-35.3333333333){Canberra}[Australia]
+\mapput(-81.3833333333,40.8){Canton}[USA]
+\mapput(-72.2833333333,19.7833333333){Cap-Haitien}[Haiti]
+\mapput(-66.9166666667,10.5){Caracas}[Venezuela]
+\mapput(-3.16666666667,51.4833333333){Cardiff}[Wales]
+\mapput(-75.55,10.4){Cartagena}[Kolumbien]
+\mapput(-7.61666666667,33.6){Casablanca}[Marokko]
+\mapput(-106.316666667,42.85){Casper}[USA]
+\mapput(-60.9833333333,14.0166666667){Castries}[St. Lucia]
+% \mapput(15.0666666667,37.5166666667){Catania}[Italy]
+\mapput(-52.3333333333,4.93333333333){Cayenne}[Französisch-Guayana]
+\mapput(123.933333333,10.2833333333){Cebu}[Philippinen]
+\mapput(-91.6666666667,41.9666666667)[Cedar_Rapids]{Cedar Rapids}[USA]
+\mapput(-88.25,40.1166666667){Champaign}[USA]
+\mapput(24.0166666667,35.5166666667){Chania}[Griechenland]
+\mapput(36.25,50.0){Charkow}[Sowjetunion]
+\mapput(4.45,50.4166666667){Charleroi}[Belgien]
+\mapput(-79.9333333333,32.7833333333){Charleston}[USA]
+\mapput(-81.6333333333,38.35){Charleston}[USA]
+\mapput(-80.85,35.2166666667){Charlotte}[USA]
+\mapput(-78.5,38.0333333333){Charlottesville}[USA]
+\mapput(-85.3166666667,35.05){Chattanooga}[USA]
+\mapput(12.9166666667,50.8333333333){Chemnitz}[Germany]
+\mapput(104.1,30.6166666667){Chengdu}[China]
+\mapput(-104.816666667,41.1333333333){Cheyenne}[USA]
+\mapput(98.9833333333,18.8)[Chiang_Mai]{Chiang Mai}[Thailand]
+\mapput(120.183333333,23.15){Chiayi}[Taiwan]
+\mapput(-87.6333333333,41.8666666667){Chicago}[USA]
+\mapput(-79.7833333333,-6.78333333333){Chiclayo}[Peru]
+\mapput(-106.083333333,28.6333333333){Chihuahua}[Mexiko]
+\mapput(-72.1666666667,-36.6166666667){Chillan}[Chile]
+\mapput(-78.5666666667,-9.06666666667){Chimbote}[Peru]
+\mapput(27.8833333333,-12.5166666667){Chingola}[Sambia]
+\mapput(91.8,22.3333333333){Chittagong}[Bangladesch]
+\mapput(31.1,-18.0){Chitungwiza}[Simbabwe]
+\mapput(-87.1666666667,13.25){Choluteca}[Honduras]
+\mapput(100.983333333,13.4)[Chon_Buri]{Chon Buri}[Thailand]
+\mapput(129.916666667,41.8333333333){Chongjin}[Korea Dvr]
+\mapput(106.583333333,29.5){Chongqing}[China]
+\mapput(114.533333333,48.0333333333){Choybalsan}[Mongolei]
+\mapput(172.6,-43.5833333333){Christchurch}[Neuseeland]
+\mapput(121.133333333,24.9166666667){Chungli}[Taiwan]
+\mapput(9.58333333333,46.8333333333){Chur}[Schweiz]
+\mapput(-84.5166666667,39.1){Cincinnati}[USA]
+\mapput(-83.0333333333,39.5666666667){Circleville}[USA]
+\mapput(-62.6166666667,8.36666666667)[Ciudad_Guayana]{Ciudad Guayana}[Venezuela]
+\mapput(-106.483333333,31.7)[Ciudad_Juarez]{Ciudad Juarez}[Mexiko]
+\mapput(-87.35,36.5333333333){Clarksville}[USA]
+\mapput(-81.7,41.5){Cleveland}[USA]
+\mapput(-66.15,-17.4){Cochabamba}[Bolivien]
+\mapput(-8.41666666667,40.2){Coimbra}[Portugal]
+\mapput(79.85,6.93333333333){Colombo}[Sri Lanka]
+\mapput(-79.9,9.35){Colon}[Panama]
+\mapput(-104.816666667,38.8333333333)[Colorado_Springs]{Colorado Springs}[USA]
+\mapput(-92.3333333333,38.95){Columbia}[USA]
+\mapput(-81.0333333333,34.0){Columbia}[USA]
+\mapput(-84.9833333333,32.4666666667){Columbus}[USA]
+\mapput(-83.0,39.9666666667){Columbus}[USA]
+\mapput(-13.7166666667,9.51666666667){Conakry}[Guinea]
+\mapput(-73.05,-36.8333333333){Concepcion}[Chile]
+\mapput(-57.4333333333,-23.3666666667){Concepcion}[Paraguay]
+\mapput(-71.5333333333,43.2){Concord}[USA]
+\mapput(6.66666666667,36.3666666667){Constantine}[Algerien]
+\mapput(-64.1833333333,-31.4){Cordoba}[Argentinien]
+\mapput(-8.46666666667,51.9){Cork}[Irland]
+\mapput(-88.3833333333,18.3833333333){Corozal}[Belize]
+\mapput(-97.4,27.8)[Corpus_Christi]{Corpus Christi}[USA]
+\mapput(2.51666666667,6.4){Cotonou}[Benin]
+\mapput(14.3333333333,51.7666666667){Cottbus}[Germany]
+\mapput(23.7833333333,44.3){Craiova}[Rumänien]
+\mapput(-72.5166666667,7.91666666667){Cucuta}[Kolumbien]
+\mapput(-79.0,-2.9){Cuenca}[Ecuador]
+\mapput(-49.25,-25.4166666667){Curitiba}[Brasilien]
+\mapput(-71.95,-13.5333333333){Cuzco}[Peru]
+\mapput(108.233333333,16.0666666667)[Da_Nang]{Da Nang}[Vietnam]
+\mapput(-15.55,23.8333333333){Dachla}[Sahara]
+\mapput(-17.4333333333,14.6666666667){Dakar}[Senegal]
+\mapput(-96.8,32.7833333333){Dallas}[USA]
+\mapput(-6.46666666667,6.93333333333){Daloa}[IvoryCoast]
+\mapput(36.3,33.5){Damaskus}[Syrien]
+\mapput(50.1,26.4166666667){Damman}[Saudi-Arabien]
+\mapput(-73.4666666667,41.4){Danbury}[USA]
+\mapput(-88.2166666667,16.9833333333){Dangriga}[Belize]
+\mapput(18.6666666667,54.3333333333){Danzig}[Polen]
+\mapput(109.4,46.4833333333){Darchan}[Mongolei]
+\mapput(39.2833333333,-6.8){Daressalam}[Tansania]
+\mapput(8.65,49.8666666667){Darmstadt}[Germany]
+\mapput(125.6,7.06666666667){Davao}[Philippinen]
+\mapput(-82.4333333333,8.43333333333){David}[Panama]
+\mapput(-84.2,39.7666666667){Dayton}[USA]
+\mapput(-81.0166666667,29.2166666667)[Daytona_Beach]{Daytona Beach}[USA]
+\mapput(21.6166666667,47.5){Debrecen}[Ungarn]
+\mapput(79.8666666667,6.86666666667){Dehiwala}[Sri Lanka]
+\mapput(40.0833333333,35.3333333333){Deir-Ez-Zor}[Syrien]
+\mapput(4.31666666667,52.0666666667)[Den_Haag]{Den Haag}[Niederlande]
+\mapput(-104.983333333,39.75){Denver}[USA]
+\mapput(-93.6166666667,41.5833333333)[Des_Moines]{Des Moines}[USA]
+\mapput(12.25,51.8333333333){Dessau}[Germany]
+\mapput(-83.05,42.3333333333){Detroit}[USA]
+\mapput(90.4166666667,23.7166666667){Dhaka}[Bangladesch]
+\mapput(5.88333333333,49.5333333333){Differdingen}[Luxemburg]
+\mapput(10.85,33.8666666667){Djerba}[Tunesien]
+\mapput(35.6666666667,-6.16666666667){Dodoma}[Tansania]
+\mapput(51.6,25.25){Doha}[Katar]
+\mapput(37.8,48.0){Donetzk}[Sowjetunion]
+\mapput(9.73333333333,47.4166666667){Dornbirn}[Austria]
+\mapput(7.45,51.5333333333){Dortmund}[Germany]
+\mapput(9.71666666667,4.06666666667){Douala}[Kamerun]
+\mapput(10.25,59.75){Drammen}[Norwegen]
+\mapput(13.75,51.05){Dresden}[Germany]
+\mapput(45.0833333333,11.5){Dschibuti}[Dschibuti]
+\mapput(39.1666666667,21.5){Dschidda}[Saudi-Arabien]
+\mapput(55.2833333333,25.2333333333){Dubai}[Emirates]
+\mapput(-6.25,53.3333333333){Dublin}[Irland]
+\mapput(6.08333333333,49.4666666667){Duedelingen}[Luxemburg]
+\mapput(6.75,51.4333333333){Duisburg}[Germany]
+\mapput(-92.1,46.7833333333){Duluth}[USA]
+\mapput(170.5,-45.8666666667){Dunedin}[Neuseeland]
+\mapput(31.0,-29.8833333333){Durban}[SouthAfrica]
+\mapput(-78.9166666667,36.0){Durham}[USA]
+\mapput(19.4666666667,41.3){Durres}[Albanien]
+\mapput(6.78333333333,51.2166666667)[Dusseldorf]{Düsseldorf}[Germany]
+\mapput(-3.2,55.95){Edinburgh}[GreatBritain]
+\mapput(-113.466666667,53.55){Edmonton}[Kanada]
+\mapput(100.583333333,46.3){Eerdenet}[Mongolei]
+\mapput(5.5,51.4333333333){Eindhoven}[Niederlande]
+\mapput(16.5166666667,47.85){Eisenstadt}[Austria]
+\mapput(31.3833333333,31.05){El-Mansoura}[Egypt]
+\mapput(-13.1833333333,27.1666666667)[El_Alaiun]{El Alaiun}[Sahara]
+\mapput(-106.483333333,31.7666666667)[El_Paso]{El Paso}[USA]
+\mapput(-74.2166666667,40.6666666667){Elizabeth}[USA]
+\mapput(-76.8,42.1){Elmira}[USA]
+\mapput(30.1666666667,13.1833333333){Elobied}[Sudan]
+\mapput(12.6333333333,56.05){Elsinore}[Denmark]
+\mapput(-55.8333333333,-27.3333333333){Encarnacion}[Paraguay]
+\mapput(6.91666666667,52.2166666667){Enschede}[Niederlande]
+\mapput(32.45,0.0666666666667){Entebbe}[Uganda]
+\mapput(11.0333333333,50.9666666667){Erfurt}[Germany]
+\mapput(-80.0833333333,42.1166666667){Erie}[USA]
+\mapput(11.0166666667,49.6){Erlangen}[Germany]
+\mapput(8.46666666667,55.4666666667){Esbjerg}[Denmark]
+\mapput(6.0,49.5333333333){Esch}[Luxemburg]
+\mapput(-90.7833333333,14.3){Escuintla}[Guatemala]
+\mapput(-79.6666666667,0.933333333333){Esmeraldas}[Ecuador]
+\mapput(24.7,60.1666666667){Espoo}[Finnland]
+\mapput(7.01666666667,51.45){Essen}[Germany]
+\mapput(-123.083333333,44.05){Eugene}[USA]
+\mapput(-87.5666666667,37.9666666667){Evansville}[USA]
+\mapput(-147.716666667,64.85){Fairbanks}[USA]
+\mapput(73.15,31.4166666667){Faisalabad}[Pakistan]
+\mapput(-96.7833333333,46.8666666667){Fargo}[USA]
+\mapput(-78.8833333333,35.05){Fayetteville}[USA]
+\mapput(9.6,47.2333333333){Feldkirch}[Austria]
+\mapput(-57.6,-25.3166666667)[Fernando_De_La_Mora]{Fernando De La Mora}[Paraguay]
+\mapput(-5.0,34.0833333333){Fes}[Marokko]
+\mapput(47.0833333333,-21.45){Fianar}[Madagaskar]
+\mapput(-83.7,43.0166666667){Flint}[USA]
+% \mapput(11.25,43.7666666667){Florenz}[Italy]
+\mapput(-61.0833333333,14.6){Fort-De-France}[Martinique]
+\mapput(-80.1333333333,26.1166666667)[Fort_Lauderdale]{Fort Lauderdale}[USA]
+\mapput(-94.4166666667,35.3833333333)[Fort_Smith]{Fort Smith}[USA]
+\mapput(-85.1333333333,41.0666666667)[Fort_Wayne]{Fort Wayne}[USA]
+\mapput(-97.3333333333,32.75)[Fort_Worth]{Fort Worth}[USA]
+\mapput(-38.5833333333,-3.75){Fortaleza}[Brasilien]
+\mapput(27.5333333333,-21.1166666667){Francistown}[Botswana]
+\mapput(8.68333333333,50.1166666667){Frankfurt}[Germany]
+\mapput(-78.7,26.5){Freeport}[Bahamas]
+\mapput(-13.2166666667,8.48333333333){Freetown}[Sierra Leone]
+\mapput(7.85,48.0){Freiburg}[Germany]
+\mapput(11.7333333333,48.4){Freising}[Germany]
+\mapput(-119.783333333,36.7333333333){Fresno}[USA]
+\mapput(7.16666666667,46.8333333333){Fribourg}[Schweiz]
+\mapput(-80.1333333333,26.1166666667)[Ft_Lauderdale]{Ft Lauderdale}[USA]
+\mapput(-94.4166666667,35.3833333333)[Ft_Smith]{Ft Smith}[USA]
+\mapput(-85.1333333333,41.0666666667)[Ft_Wayne]{Ft Wayne}[USA]
+\mapput(-97.3333333333,32.75)[Ft_Worth]{Ft Worth}[USA]
+\mapput(130.35,33.65){Fukuoka}[Japan]
+\mapput(179.2,-8.5){Funafuti}[Tuvalu]
+\mapput(-7.5,40.1333333333){Funchal}[Portugal]
+\mapput(25.9166666667,-24.75){Gaborone}[Botswana]
+\mapput(-82.3333333333,29.6666666667){Gainesville}[USA]
+\mapput(28.0333333333,45.45){Galatz}[Rumänien]
+\mapput(80.2166666667,6.01666666667){Galle}[Sri Lanka]
+\mapput(-94.8,29.3){Galveston}[USA]
+\mapput(-9.05,53.2666666667){Galway}[Irland]
+\mapput(-0.15,16.3166666667){Gao}[Mali]
+\mapput(-96.6333333333,32.9){Garland}[USA]
+\mapput(-87.3333333333,41.6){Gary}[USA]
+\mapput(37.3833333333,37.1){Gasiantep}[Turkey]
+\mapput(144.433333333,-38.1666666667){Geelong}[Australia]
+\mapput(7.1,51.5166666667){Gelsenkirchen}[Germany]
+\mapput(6.16666666667,46.2){Geneve}[Schweiz]
+\mapput(3.7,51.0333333333){Gent}[Belgien]
+% \mapput(8.93333333333,44.4){Genua}[Italy]
+\mapput(-58.1666666667,6.76666666667){Georgetown}[Guyana]
+\mapput(12.0833333333,50.8666666667){Gera}[Germany]
+\mapput(28.1666666667,-26.25){Germiston}[SouthAfrica]
+\mapput(-5.35,36.1){Gibraltar}[Gibraltar]
+\mapput(31.1666666667,30.0166666667){Gize}[Egypt]
+\mapput(-4.26666666667,55.85){Glasgow}[GreatBritain]
+\mapput(11.9666666667,57.7166666667){Goeteborg}[Schweden]
+\mapput(153.366666667,-27.9833333333)[Gold_Coast]{Gold Coast}[Australia]
+\mapput(44.0,56.3333333333){Gorki}[Sowjetunion]
+\mapput(9.93333333333,51.5333333333)[Gottingen]{Göttingen}[Germany]
+\mapput(-85.9833333333,11.9666666667){Granada}[Nicaragua]
+\mapput(-97.05,47.9166666667)[Grand_Forks]{Grand Forks}[USA]
+\mapput(-85.6666666667,42.9666666667)[Grand_Rapids]{Grand Rapids}[USA]
+\mapput(15.3666666667,47.0833333333){Graz}[Austria]
+\mapput(-111.283333333,47.5)[Great_Falls]{Great Falls}[USA]
+\mapput(-88.0166666667,44.5166666667)[Green_Bay]{Green Bay}[USA]
+\mapput(-79.7833333333,36.0666666667){Greensboro}[USA]
+\mapput(-82.4,34.85){Greenville}[USA]
+\mapput(6.56666666667,53.2166666667){Groningen}[Niederlande]
+\mapput(-103.333333333,20.6666666667){Guadalajara}[Mexiko]
+\mapput(113.25,23.1166666667){Guangzhou}[China]
+\mapput(-75.1666666667,19.9833333333){Guantanamo}[Kuba]
+\mapput(-90.5166666667,14.6333333333)[Guatemala_City]{Guatemala City}[Guatemala]
+\mapput(-79.8333333333,-2.16666666667){Guayaquil}[Ecuador]
+\mapput(74.1833333333,32.1){Gujranwala}[Pakistan]
+\mapput(-89.0833333333,30.3666666667)[Gulf_Port]{Gulf Port}[USA]
+\mapput(29.8166666667,-19.45){Gweru}[Simbabwe]
+\mapput(17.6666666667,47.6833333333){Gyoer}[Ungarn]
+\mapput(4.63333333333,52.3833333333){Haarlem}[Niederlande]
+\mapput(7.46666666667,51.35){Hagen}[Germany]
+\mapput(34.9833333333,32.8166666667){Haifa}[Israel]
+\mapput(106.683333333,20.8333333333){Haiphong}[Vietnam]
+\mapput(11.9666666667,51.4666666667){Halle}[Germany]
+\mapput(13.1,47.6833333333){Hallein}[Austria]
+\mapput(36.6666666667,35.0833333333){Hama}[Syrien]
+\mapput(10.0,53.55){Hamburg}[Germany]
+\mapput(-64.7666666667,32.2833333333){Hamilton}[Bermuda-Inseln]
+\mapput(-79.85,43.2333333333){Hamilton}[Kanada]
+\mapput(175.3,-37.7666666667){Hamilton}[Neuseeland]
+\mapput(7.8,51.6833333333){Hamm}[Germany]
+\mapput(-76.3333333333,37.0166666667){Hampton}[USA]
+\mapput(9.71666666667,52.3666666667){Hannover}[Germany]
+\mapput(105.85,21.0333333333){Hanoi}[Vietnam]
+\mapput(31.05,-17.8333333333){Harare}[Simbabwe]
+\mapput(126.683333333,45.75){Harbin}[China]
+\mapput(44.0333333333,9.51666666667){Hargeisa}[Somalia]
+\mapput(-76.8833333333,40.2666666667){Harrisburg}[USA]
+\mapput(-72.6833333333,41.7666666667){Hartford}[USA]
+\mapput(-82.3666666667,23.1333333333){Havanna}[Kuba]
+\mapput(8.7,49.4166666667){Heidelberg}[Germany]
+\mapput(9.21666666667,49.1333333333){Heilbronn}[Germany]
+\mapput(-112.033333333,46.6){Helena}[USA]
+\mapput(12.75,56.0833333333){Helsingborg}[Schweden]
+\mapput(24.9666666667,60.1666666667){Helsinki}[Finnland]
+\mapput(62.2,34.3333333333){Herat}[Afghanistan]
+\mapput(7.21666666667,51.55){Herne}[Germany]
+\mapput(-80.0,35.95)[High_Point]{High Point}[USA]
+\mapput(-155.083333333,19.7166666667){Hilo}[USA]
+\mapput(132.45,34.3833333333){Hiroshima}[Japan]
+\mapput(106.666666667,10.75){Ho-Chi-Minh-Stadt}[Vietnam]
+\mapput(147.333333333,-42.9166666667){Hobart}[Australia]
+\mapput(42.9666666667,14.8333333333){Hodeida}[Jemen]
+\mapput(49.5666666667,25.3333333333){Hofuf}[Saudi-Arabien]
+\mapput(-76.25,20.9){Holguin}[Kuba]
+\mapput(34.7833333333,32.0333333333){Holon}[Israel]
+\mapput(37.2833333333,34.7333333333){Homs}[Syrien]
+\mapput(114.15,22.2833333333){Hongkong}[Hongkong]
+\mapput(159.95,-9.46666666667){Honiara}[Salomonen]
+\mapput(-157.866666667,21.3166666667){Honolulu}[USA]
+\mapput(10.1166666667,57.1166666667){Horsens}[Denmark]
+\mapput(2.1,41.35){Hospitalet}[Spanien]
+\mapput(-95.3666666667,29.75){Houston}[USA]
+\mapput(120.983333333,24.8){Hsinchu}[Taiwan]
+\mapput(15.7833333333,-12.7333333333){Huambo}[Angola]
+\mapput(127.666666667,39.8166666667){Hungnam}[Korea Dvr]
+\mapput(-82.45,38.4166666667){Huntington}[USA]
+\mapput(-86.5833333333,34.7333333333){Huntsville}[USA]
+\mapput(78.4333333333,17.3666666667){Hyderabad}[Indien]
+\mapput(68.4,25.3833333333){Hyderabad}[Pakistan]
+\mapput(27.6333333333,47.15){Iasi}[Rumänien]
+\mapput(3.93333333333,7.38333333333){Ibadan}[Nigeria]
+\mapput(-75.3333333333,4.41666666667){Ibague}[Kolumbien]
+\mapput(-112.033333333,43.4833333333)[Idaho_Falls]{Idaho Falls}[USA]
+\mapput(122.55,10.6833333333){Iloilo}[Philippinen]
+\mapput(126.633333333,37.5){Inchon}[Korea]
+\mapput(-94.4166666667,39.1){Independence}[USA]
+\mapput(-86.1666666667,39.7666666667){Indianapolis}[USA]
+\mapput(11.4,47.2666666667){Innsbruck}[Austria]
+\mapput(101.033333333,4.6){Ipoh}[Malaysia]
+\mapput(-73.2166666667,-3.85){Iquitos}[Peru]
+\mapput(25.2,35.3333333333){Iraklion}[Griechenland]
+\mapput(35.85,32.55){Irbid}[Jordanien]
+\mapput(104.333333333,52.2666666667){Irkutsk}[Sowjetunion]
+\mapput(51.6833333333,32.6833333333){Isfahan}[Iran]
+\mapput(73.1666666667,33.7){Islamabad}[Pakistan]
+\mapput(28.9666666667,41.0166666667){Istanbul}[Turkey]
+\mapput(27.1666666667,38.4166666667){Izmir}[Turkey]
+\mapput(-90.1833333333,32.3){Jackson}[USA]
+\mapput(-81.6666666667,30.3333333333){Jacksonville}[USA]
+\mapput(80.0166666667,9.66666666667){Jaffna}[Sri Lanka]
+\mapput(75.8333333333,26.8833333333){Jaipur}[Indien]
+\mapput(106.816666667,-6.16666666667){Jakarta}[Indonesien]
+\mapput(70.4666666667,34.4333333333){Jalalabad}[Afghanistan]
+\mapput(-92.1666666667,38.5666666667)[Jefferson_City]{Jefferson City}[USA]
+\mapput(11.5833333333,50.9333333333){Jena}[Germany]
+\mapput(44.5,40.1833333333){Jerewan}[Sowjetunion]
+\mapput(-74.0666666667,40.7333333333)[Jersey_City]{Jersey City}[USA]
+\mapput(35.2166666667,31.7833333333){Jerusalem}[Israel]
+\mapput(33.2333333333,0.45){Jinja}[Uganda]
+\mapput(14.1666666667,57.75){Joenkoeping}[Schweden]
+\mapput(28.0333333333,-26.1666666667){Johannesburg}[SouthAfrica]
+\mapput(-78.9166666667,40.3333333333){Johnstown}[USA]
+\mapput(103.733333333,1.48333333333)[Johore_Bharu]{Johore Bharu}[Malaysia]
+\mapput(82.1666666667,29.2833333333){Jumla}[Nepal]
+\mapput(103.7,1.35){Jurong}[Singapur]
+\mapput(69.2166666667,34.5){Kabul}[Afghanistan]
+\mapput(126.5,37.9833333333){Kaesong}[Korea Dvr]
+\mapput(31.25,30.05){Kairo}[Egypt]
+\mapput(7.75,49.45){Kaiserslautern}[Germany]
+\mapput(-85.5833333333,42.2833333333){Kalamazoo}[USA]
+\mapput(32.5833333333,0.333333333333){Kampala}[Uganda]
+\mapput(22.4333333333,-5.88333333333){Kananga}[Zaire]
+\mapput(65.75,31.5833333333){Kandahar}[Afghanistan]
+\mapput(80.6666666667,7.28333333333){Kandy}[Sri Lanka]
+\mapput(-9.3,10.3833333333){Kankan}[Guinea]
+\mapput(8.5,12.0){Kano}[Nigeria]
+\mapput(80.2333333333,26.45){Kanpur}[Indien]
+\mapput(-94.6333333333,39.1166666667)[Kansas_City]{Kansas City}[USA]
+\mapput(-94.5833333333,39.0833333333)[Kansas_City]{Kansas City}[USA]
+\mapput(-16.1333333333,14.15){Kaolack}[Senegal]
+\mapput(15.3,47.4333333333){Kapfenberg}[Austria]
+\mapput(18.45,-33.9166666667){Kapstadt}[SouthAfrica]
+\mapput(67.05,24.8666666667){Karachi}[Pakistan]
+\mapput(8.4,49.0166666667){Karlsruhe}[Germany]
+\mapput(35.9166666667,-9.9){Karonga}[Malawi]
+\mapput(49.0,55.75){Kasan}[Sowjetunion]
+\mapput(9.5,51.3166666667){Kassel}[Germany]
+\mapput(85.3333333333,27.7){Katmandu}[Nepal]
+\mapput(18.9833333333,50.25){Kattowitz}[Polen]
+\mapput(24.9166666667,41.0833333333){Kavala}[Griechenland]
+\mapput(139.683333333,35.5333333333){Kawasaki}[Japan]
+\mapput(-11.4666666667,14.4333333333){Kayes}[Mali]
+\mapput(121.733333333,25.1333333333){Keelung}[Taiwan]
+\mapput(18.1333333333,-26.6){Keetmanshoop}[Namibia]
+\mapput(-6.56666666667,34.3333333333){Kenitra}[Marokko]
+\mapput(-81.8,24.55)[Key_West]{Key West}[USA]
+\mapput(42.75,18.3166666667){Khamis-Mushait}[Saudi-Arabien]
+\mapput(120.283333333,22.6333333333){Khaosiung}[Taiwan]
+\mapput(32.5333333333,15.6){Khartum}[Sudan]
+\mapput(10.1333333333,54.3333333333){Kiel}[Germany]
+\mapput(30.5166666667,50.4333333333){Kiew}[Sowjetunion]
+\mapput(30.0666666667,-1.93333333333){Kigali}[Ruanda]
+\mapput(-76.8,18.0){Kingston}[Jamaika]
+\mapput(-61.2333333333,13.2){Kingstown}[St. Vincent]
+\mapput(15.3,-4.3){Kinshasa}[Zaire]
+\mapput(44.4333333333,35.4666666667){Kirkuk}[Irak]
+\mapput(25.2333333333,0.55){Kisangani}[Zaire]
+\mapput(42.5166666667,-0.416666666667){Kisimayu}[Somalia]
+\mapput(34.7833333333,-0.133333333333){Kisumu}[Kenia]
+\mapput(130.816666667,33.8666666667){Kitakiushu}[Japan]
+\mapput(-80.5,43.45){Kitchener}[Kanada]
+\mapput(28.1833333333,-12.8333333333){Kitwe}[Sambia]
+\mapput(14.3333333333,46.6333333333){Klagenfurt}[Austria]
+\mapput(23.6166666667,46.7833333333){Klausenburg}[Rumänien]
+\mapput(16.3166666667,48.3){Klosterneuburg}[Austria]
+\mapput(-83.9166666667,35.9666666667){Knoxville}[USA]
+\mapput(135.2,34.6666666667){Kobe}[Japan]
+\mapput(7.6,50.35){Koblenz}[Germany]
+\mapput(7.41666666667,46.9333333333){Koeniz}[Schweiz]
+\mapput(9.5,55.4833333333){Kolding}[Denmark]
+\mapput(6.95,50.9333333333)[Koln]{Köln}[Germany]
+\mapput(28.6666666667,44.2){Konstanza}[Rumänien]
+\mapput(12.5833333333,55.6666666667){Kopenhagen}[Denmark]
+\mapput(3.28333333333,50.8333333333){Kortrijk}[Belgien]
+\mapput(21.25,48.7333333333){Kosice}[Slovakei]
+\mapput(102.25,6.11666666667)[Kota_Bharu]{Kota Bharu}[Malaysia]
+\mapput(114.25,22.3333333333){Kowloon}[Hongkong]
+\mapput(19.9166666667,50.0833333333){Krakau}[Polen]
+\mapput(6.56666666667,51.3333333333){Krefeld}[Germany]
+\mapput(15.6,48.4166666667){Krems}[Austria]
+\mapput(8.01666666667,58.1333333333){Kristiansand}[Norwegen]
+\mapput(25.5833333333,45.65){Kronstadt}[Rumänien]
+\mapput(101.7,3.01666666667)[Kuala_Lumpur]{Kuala Lumpur}[Malaysia]
+\mapput(103.116666667,5.33333333333)[Kuala_Trengganu]{Kuala Trengganu}[Malaysia]
+\mapput(50.15,53.2){Kuibyschew}[Sowjetunion]
+\mapput(-1.58333333333,6.75){Kumasi}[Ghana]
+\mapput(27.6666666667,62.9){Kuopio}[Finnland]
+\mapput(47.9833333333,29.3333333333)[Kuwait_City]{Kuwait City}[Kuwait]
+\mapput(126.866666667,35.1166666667){Kwangju}[Korea]
+\mapput(135.75,35.0333333333){Kyoto}[Japan]
+\mapput(6.83333333333,47.1){La-Chaux-De-Fonds}[Schweiz]
+\mapput(-86.75,15.75)[La_Ceiba]{La Ceiba}[Honduras]
+\mapput(-79.7666666667,8.85)[La_Chorrera]{La Chorrera}[Panama]
+\mapput(-91.25,43.8)[La_Crosse]{La Crosse}[USA]
+\mapput(-68.15,-16.5)[La_Paz]{La Paz}[Bolivien]
+\mapput(-71.8333333333,-44.9166666667)[La_Plata]{La Plata}[Argentinien]
+\mapput(-68.95,18.45)[La_Romana]{La Romana}[Dominikanische Republik]
+\mapput(-12.2833333333,11.3166666667){Labe}[Guinea]
+\mapput(147.0,-6.75){Lae}[Papua-Neuguinea]
+\mapput(3.53333333333,6.43333333333){Lagos}[Nigeria]
+\mapput(74.3666666667,31.5666666667){Lahore}[Pakistan]
+\mapput(25.6666666667,61.0){Lahti}[Finnland]
+\mapput(-76.3,40.0333333333){Lancaster}[USA]
+\mapput(-84.55,42.7333333333){Lansing}[USA]
+\mapput(-99.5,27.5){Laredo}[USA]
+\mapput(22.4166666667,39.6333333333){Larissa}[Griechenland]
+\mapput(-106.783333333,32.3166666667)[Las_Cruces]{Las Cruces}[USA]
+\mapput(-15.4,28.1)[Las_Palmas]{Las Palmas}[Spanien]
+\mapput(-56.2333333333,-34.7)[Las_Piedras]{Las Piedras}[Uruguay]
+\mapput(-115.15,36.1666666667)[Las_Vegas]{Las Vegas}[USA]
+\mapput(35.7833333333,35.5166666667){Latakia}[Syrien]
+\mapput(6.65,46.5333333333){Lausanne}[Schweiz]
+\mapput(-95.2333333333,38.9666666667){Lawrence}[USA]
+\mapput(-71.1666666667,42.7){Lawrence}[USA]
+\mapput(0.1,49.5)[Le_Havre]{Le Havre}[France]
+\mapput(-1.58333333333,53.8333333333){Leeds}[GreatBritain]
+\mapput(12.4166666667,51.3333333333){Leipzig}[Germany]
+\mapput(30.25,59.9166666667){Leningrad}[Sowjetunion]
+\mapput(15.1,47.3833333333){Leoben}[Austria]
+\mapput(-101.666666667,21.1166666667){Leon}[Mexiko]
+\mapput(6.98333333333,51.0166666667){Leverkusen}[Germany]
+\mapput(-70.2166666667,44.1){Lewiston}[USA]
+\mapput(-84.5,38.05){Lexington}[USA]
+\mapput(15.0833333333,50.8){Liberec}[Tschechien]
+\mapput(9.41666666667,0.5){Libreville}[Gabun]
+\mapput(33.8166666667,-13.9666666667){Lilongwe}[Malawi]
+\mapput(-77.05,-12.05){Lima}[Peru]
+\mapput(33.05,34.6666666667){Limassol}[Zypern]
+\mapput(-8.63333333333,52.6666666667){Limerick}[Irland]
+\mapput(-83.0166666667,10.0){Limon}[Costa Rica]
+\mapput(-96.7,40.8166666667){Lincoln}[USA]
+\mapput(-58.3166666667,5.98333333333){Linden}[Guyana]
+\mapput(15.5833333333,58.4166666667){Linkoeping}[Schweden]
+\mapput(14.3,48.3166666667){Linz}[Austria]
+\mapput(-9.13333333333,38.7166666667){Lissabon}[Portugal]
+\mapput(-92.2833333333,34.75)[Little_Rock]{Little Rock}[USA]
+\mapput(-3.0,53.3833333333){Liverpool}[GreatBritain]
+\mapput(14.5,46.0666666667){Ljubljana}[Slowenien]
+\mapput(19.4666666667,51.8166666667){Lodsch}[Polen]
+\mapput(1.21666666667,6.13333333333){Lome}[Togo]
+\mapput(-0.0833333333333,51.5166666667){London}[GreatBritain]
+\mapput(-118.183333333,33.7666666667)[Long_Beach]{Long Beach}[USA]
+\mapput(-118.233333333,34.05)[Los_Angeles]{Los Angeles}[USA]
+\mapput(-85.7666666667,38.25){Louisville}[USA]
+\mapput(-71.3166666667,42.6333333333){Lowell}[USA]
+\mapput(13.25,-8.83333333333){Luanda}[Angola]
+\mapput(102.166666667,19.8833333333)[Luang_Prabang]{Luang Prabang}[Laos]
+\mapput(13.5,-14.9166666667){Lubango}[Angola]
+\mapput(-101.85,33.5833333333){Lubbock}[USA]
+\mapput(10.7,53.8666666667)[Lubeck]{Lübeck}[Germany]
+\mapput(22.5166666667,51.3){Lublin}[Polen]
+\mapput(27.4833333333,-11.6833333333){Lubumbashi}[Zaire]
+\mapput(8.45,49.4833333333){Ludwigshafen}[Germany]
+\mapput(5.58333333333,50.6333333333){Luettich}[Belgien]
+\mapput(28.2833333333,-15.4166666667){Lusaka}[Sambia]
+\mapput(6.11666666667,49.6){Luxemburg}[Luxemburg]
+\mapput(7.91666666667,47.0333333333){Luzern}[Schweiz]
+\mapput(-79.15,37.4166666667){Lynchburg}[USA]
+\mapput(4.85,45.75){Lyon}[France]
+\mapput(5.7,50.85){Maastricht}[Belgien]
+\mapput(113.533333333,22.2){Macao}[Macao]
+\mapput(-79.95,-3.33333333333){Machala}[Ecuador]
+\mapput(33.4333333333,-20.85){Machaze}[Mosambik]
+\mapput(-83.6333333333,32.8333333333){Macon}[USA]
+\mapput(-89.3833333333,43.0666666667){Madison}[USA]
+\mapput(80.2833333333,13.0833333333){Madras}[Indien]
+\mapput(-3.68333333333,40.4){Madrid}[Spanien]
+\mapput(11.6166666667,52.1333333333){Magdeburg}[Germany]
+% \mapput(9.2,45.4666666667){Mailand}[Italy]
+\mapput(8.25,50.0){Mainz}[Germany]
+\mapput(46.3333333333,-15.6666666667){Majunga}[Madagaskar]
+\mapput(8.8,3.75){Malabo}[Äquatorial-Guinea]
+\mapput(-4.41666666667,36.7166666667){Malaga}[Spanien]
+\mapput(112.75,-7.98333333333){Malang}[Indonesien]
+\mapput(-73.6333333333,42.4666666667)[Malden_Bridge]{Malden Bridge}[USA]
+\mapput(73.4666666667,4.0){Male}[Malediven]
+\mapput(13.0,55.6){Malmoe}[Schweden]
+\mapput(-86.2833333333,12.15){Managua}[Nicaragua]
+\mapput(50.6333333333,26.2){Manama}[Bahrain]
+\mapput(-60.0166666667,-3.13333333333){Manaus}[Brasilien]
+\mapput(-2.23333333333,53.4666666667){Manchester}[GreatBritain]
+\mapput(-71.4666666667,42.9833333333){Manchester}[USA]
+\mapput(96.0666666667,21.95){Mandalay}[Myanmar]
+\mapput(120.983333333,14.6){Manila}[Philippinen]
+\mapput(-75.5333333333,5.05){Manizales}[Kolumbien]
+\mapput(8.46666666667,49.4833333333){Mannheim}[Germany]
+\mapput(-80.7333333333,-0.983333333333){Manta}[Ecuador]
+\mapput(32.5833333333,-25.9666666667){Maputo}[Mosambik]
+\mapput(-57.55,-38.0)[Mar_Del_Plata]{Mar Del Plata}[Argentinien]
+\mapput(-71.6166666667,10.6666666667){Maracaibo}[Venezuela]
+\mapput(-67.6,10.25){Maracay}[Venezuela]
+\mapput(7.16666666667,13.4833333333){Maradi}[Niger]
+\mapput(14.3333333333,10.5833333333){Maroua}[Kamerun]
+\mapput(-8.0,31.8166666667){Marrakesch}[Marokko]
+\mapput(5.4,43.3){Marseille}[France]
+\mapput(27.4833333333,-29.3166666667){Maseru}[Lesotho]
+\mapput(52.65,36.6833333333){Mashhad}[Iran]
+\mapput(58.6333333333,23.6166666667){Maskat}[Oman]
+\mapput(67.1,36.7){Mazar-I-Sharif}[Afghanistan]
+\mapput(31.1333333333,-26.3333333333){Mbabane}[Swasiland]
+\mapput(34.2,1.06666666667){Mbale}[Uganda]
+\mapput(23.65,-6.16666666667){Mbuji-Mayi}[Zaire]
+\mapput(4.48333333333,51.0333333333){Mechelen}[Belgien]
+\mapput(98.65,3.58333333333){Medan}[Indonesien]
+\mapput(-74.5833333333,6.25){Medellin}[Kolumbien]
+\mapput(39.5833333333,24.5){Medina}[Saudi-Arabien]
+\mapput(39.8166666667,21.45){Mekka}[Saudi-Arabien]
+\mapput(-5.61666666667,33.8833333333){Meknes}[Marokko]
+\mapput(145.0,-37.8333333333){Melbourne}[Australia]
+\mapput(-80.6,28.0833333333){Melbourne}[USA]
+\mapput(-90.05,35.15){Memphis}[USA]
+\mapput(-68.8166666667,-32.8833333333){Mendoza}[Argentinien]
+\mapput(-89.6166666667,20.9666666667){Merida}[Mexiko]
+\mapput(-88.7,32.3666666667){Meridian}[USA]
+\mapput(-115.5,32.6){Mexicali}[Mexiko]
+\mapput(-99.15,19.4)[Mexico_City]{Mexico City}[Mexiko]
+\mapput(-80.2,25.7833333333){Miami}[USA]
+\mapput(-84.4,39.5166666667){Middletown}[USA]
+\mapput(-102.083333333,32.0){Midland}[USA]
+\mapput(-87.9,43.0333333333){Milwaukee}[USA]
+\mapput(-25.0,16.9){Mindelo}[Kapverden]
+\mapput(-93.2666666667,44.9833333333){Minneapolis}[USA]
+\mapput(27.5666666667,53.9){Minsk}[Sowjetunion]
+\mapput(20.7833333333,48.1166666667){Miskolc}[Ungarn]
+\mapput(-88.05,30.7){Mobile}[USA]
+\mapput(16.4666666667,48.0833333333){Moedling}[Austria]
+\mapput(6.43333333333,51.2){Moenchengladbach}[Germany]
+\mapput(6.65,51.45){Moers}[Germany]
+\mapput(45.35,2.03333333333){Mogadischu}[Somalia]
+\mapput(39.6666666667,-4.06666666667){Mombasa}[Kenia]
+\mapput(7.41666666667,43.7333333333){Monaco}[Monaco]
+\mapput(-92.1166666667,32.5){Monroe}[USA]
+\mapput(-10.7666666667,6.33333333333){Monrovia}[Liberia]
+\mapput(3.96666666667,50.4666666667){Mons}[Belgien]
+\mapput(7.41666666667,43.7333333333)[Monte_Carlo]{Monte Carlo}[Monaco]
+\mapput(-77.9333333333,18.45)[Montego_Bay]{Montego Bay}[Jamaika]
+\mapput(-100.316666667,25.6666666667){Monterrey}[Mexiko]
+\mapput(-56.1833333333,-34.8833333333){Montevideo}[Uruguay]
+\mapput(-86.3166666667,32.3833333333){Montgomery}[USA]
+\mapput(3.88333333333,43.6){Montpellier}[France]
+\mapput(-73.5833333333,45.5){Montreal}[Kanada]
+\mapput(-4.16666666667,14.4833333333){Mopti}[Mali]
+\mapput(79.8833333333,6.78333333333){Moratuwa}[Sri Lanka]
+\mapput(43.2666666667,-11.6666666667){Moroni}[Komoren]
+\mapput(37.5833333333,55.75){Moskau}[Sowjetunion]
+\mapput(43.1333333333,36.35){Mossul}[Irak]
+\mapput(97.65,16.5){Moulmein}[Myanmar]
+\mapput(-73.8166666667,40.9166666667)[Mount_Vernon]{Mount Vernon}[USA]
+\mapput(49.1166666667,14.5666666667){Mukalla}[Jemen]
+\mapput(6.88333333333,51.4333333333)[Mulheim]{Mülheim}[Germany]
+\mapput(71.6,30.1666666667){Multan}[Pakistan]
+\mapput(11.5833333333,48.15)[Munchen]{München}[Germany]
+\mapput(-85.3833333333,40.1833333333){Muncie}[USA]
+\mapput(7.63333333333,51.9666666667)[Munster]{Münster}[Germany]
+\mapput(32.9333333333,-2.51666666667){Mwanza}[Tansania]
+\mapput(40.6666666667,-14.55){Nacala}[Mosambik]
+\mapput(129.916666667,32.8){Nagasaki}[Japan]
+\mapput(136.883333333,35.1333333333){Nagoya}[Japan]
+\mapput(79.2,21.1666666667){Nagpur}[Indien]
+\mapput(36.8166666667,-1.28333333333){Nairobi}[Kenia]
+\mapput(44.3166666667,31.9833333333){Najaf}[Irak]
+\mapput(102.1,15.0)[Nakhon_Rathisama]{Nakhon Rathisama}[Thailand]
+\mapput(99.9666666667,8.4)[Nakhon_Si_Thammarat]{Nakhon Si Thammarat}[Thailand]
+\mapput(36.0666666667,-0.266666666667){Nakuru}[Kenia]
+\mapput(4.86666666667,50.4666666667){Namur}[Belgien]
+\mapput(118.783333333,32.05){Nanjing}[China]
+\mapput(-1.55,47.2166666667){Nantes}[France]
+\mapput(-71.4666666667,42.75){Nashua}[USA]
+\mapput(-86.7833333333,36.1666666667){Nashville}[USA]
+\mapput(-77.35,25.0833333333){Nassau}[Bahamas]
+\mapput(-91.3833333333,31.5666666667){Natchez}[USA]
+\mapput(1.48333333333,10.2833333333){Natitingou}[Benin]
+\mapput(14.9833333333,12.1666666667){N'djamena}[Tschad]
+\mapput(28.65,-13.0){Ndola}[Sambia]
+% \mapput(14.25,40.8333333333){Neapel}[Italy]
+\mapput(103.816666667,1.4)[Nee_Soon]{Nee Soon}[Singapur]
+\mapput(77.2,28.6){Neu-Delhi}[Indien]
+\mapput(6.93333333333,46.9833333333){Neuchatel}[Schweiz]
+\mapput(6.7,51.2){Neuss}[Germany]
+\mapput(-70.9333333333,41.6333333333)[New_Bedford]{New Bedford}[USA]
+\mapput(-72.9166666667,41.3)[New_Haven]{New Haven}[USA]
+\mapput(-90.0666666667,29.95)[New_Orleans]{New Orleans}[USA]
+\mapput(-74.0,40.75)[New_York]{New York}[USA]
+\mapput(-74.1666666667,40.7333333333){Newark}[USA]
+\mapput(151.75,-32.9166666667){Newcastle}[Australia]
+\mapput(-71.3166666667,41.4833333333){Newport}[USA]
+\mapput(-76.4166666667,36.9833333333)[Newport_News]{Newport News}[USA]
+\mapput(109.166666667,12.25)[Nha_Trang]{Nha Trang}[Vietnam]
+\mapput(-79.05,43.1)[Niagara_Falls]{Niagara Falls}[USA]
+\mapput(2.08333333333,13.5333333333){Niamey}[Niger]
+\mapput(7.25,43.7){Nice}[France]
+\mapput(5.86666666667,51.8333333333){Nijmegen}[Niederlande]
+\mapput(33.3833333333,35.1833333333){Nikosia}[Zypern]
+\mapput(21.9,43.3333333333){Nisch}[Jugoslawien]
+\mapput(-0.0,89.9833333333){Nordpol}[]
+\mapput(-76.2833333333,36.85){Norfolk}[USA]
+\mapput(16.1666666667,58.5833333333){Norrkoeping}[Schweden]
+\mapput(-72.0833333333,41.5166666667){Norwich}[USA]
+\mapput(-17.0166666667,20.9){Nouadhibou}[Mauretanien]
+\mapput(-15.9666666667,18.15){Nouakchott}[Mauretanien]
+\mapput(-43.4666666667,-22.75)[Nova_Iguacu]{Nova Iguacu}[Brasilien]
+\mapput(19.85,45.25)[Novi_Sad]{Novi Sad}[Jugoslawien]
+\mapput(82.9166666667,55.0333333333){Novosibirsk}[Sowjetunion]
+\mapput(-175.233333333,-21.15){Nuku'alofa}[Tonga]
+\mapput(11.0833333333,49.45)[Nurnberg]{Nürnberg}[Germany]
+\mapput(-8.81666666667,7.75){Nzerekore}[Guinea]
+\mapput(-122.266666667,37.8){Oakland}[USA]
+\mapput(6.85,51.4666666667){Oberhausen}[Germany]
+\mapput(10.4166666667,55.4){Odense}[Denmark]
+\mapput(30.7333333333,46.4666666667){Odessa}[Sowjetunion]
+\mapput(-102.366666667,31.85){Odessa}[USA]
+\mapput(15.0833333333,59.3){Oerebro}[Schweden]
+\mapput(8.76666666667,50.1){Offenbach}[Germany]
+\mapput(4.18333333333,8.08333333333){Ogbomosho}[Nigeria]
+\mapput(-111.966666667,41.2333333333){Ogden}[USA]
+\mapput(-97.5166666667,35.4666666667)[Oklahoma_City]{Oklahoma City}[USA]
+\mapput(8.2,53.1666666667){Oldenburg}[Germany]
+\mapput(17.25,49.6333333333){Olomouc}[Tschechien]
+\mapput(-95.9333333333,41.2666666667){Omaha}[USA]
+\mapput(32.4833333333,15.6166666667){Omdurman}[Sudan]
+\mapput(73.4,55.0){Omsk}[Sowjetunion]
+\mapput(2.91666666667,51.2166666667){Oostende}[Belgien]
+\mapput(-0.633333333333,35.75){Oran}[Algerien]
+\mapput(-88.5166666667,18.1)[Orange_Walk]{Orange Walk}[Belize]
+\mapput(-70.0333333333,12.5333333333){Oranjestad}[Niederländ. Antillen]
+\mapput(-81.3833333333,28.55){Orlando}[USA]
+\mapput(-67.1333333333,-17.9833333333){Oruro}[Bolivien]
+\mapput(135.5,34.6666666667){Osaka}[Japan]
+\mapput(-88.55,44.0166666667){Oshkosh}[USA]
+\mapput(18.6833333333,45.55){Osijek}[Kroatien]
+\mapput(10.7333333333,59.9166666667){Oslo}[Norwegen]
+\mapput(8.05,52.2666666667)[Osnabruck]{Osnabrück}[Germany]
+\mapput(18.25,49.8333333333){Ostrava}[Slovakei]
+\mapput(-75.7,45.4166666667){Ottawa}[Kanada]
+\mapput(-1.51666666667,12.3666666667){Ouagadougou}[Burkina Faso]
+\mapput(-1.75,34.6833333333){Oujda}[Marokko]
+\mapput(25.4333333333,65.0){Oulu}[Finnland]
+\mapput(-87.1166666667,37.7666666667){Owensboro}[USA]
+\mapput(-1.25,51.75){Oxford}[GreatBritain]
+\mapput(120.45,-6.2){Padang}[Indonesien]
+\mapput(8.76666666667,51.7166666667){Paderborn}[Germany]
+\mapput(105.833333333,14.15){Pakse}[Laos]
+\mapput(104.75,-2.98333333333){Palembang}[Indonesien]
+% \mapput(13.3666666667,38.1166666667){Palermo}[Italy]
+\mapput(-116.55,33.8333333333)[Palm_Springs]{Palm Springs}[USA]
+\mapput(2.65,39.5833333333)[Palma_de_Mallorca]{Palma de Mallorca}[Spanien]
+\mapput(-79.5333333333,8.95)[Panama_City]{Panama City}[Panama]
+\mapput(121.45,25.0166666667){Panchiao}[Taiwan]
+\mapput(-149.566666667,-17.5333333333){Papeete}[Tahiti]
+\mapput(-55.2166666667,5.83333333333){Paramaribo}[Surinam]
+\mapput(2.33333333333,48.8666666667){Paris}[France]
+\mapput(-118.15,34.15){Pasadena}[USA]
+\mapput(121.0,14.55){Pasay}[Philippinen]
+\mapput(-74.1666666667,40.9166666667){Paterson}[USA]
+\mapput(21.7333333333,38.2333333333){Patras}[Griechenland]
+\mapput(-0.366666666667,43.3){Pau}[France]
+\mapput(-58.0833333333,-32.35){Paysandu}[Uruguay]
+\mapput(18.25,46.0666666667){Pecs}[Ungarn]
+\mapput(-55.7333333333,-22.5)[Pedro_Juan_Caballero]{Pedro Juan Caballero}[Paraguay]
+\mapput(-87.2166666667,30.4166666667){Pensacola}[USA]
+\mapput(-89.6,40.7){Peoria}[USA]
+\mapput(-75.7666666667,4.78333333333){Pereira}[Kolumbien]
+\mapput(56.25,58.0){Perm}[Sowjetunion]
+\mapput(115.833333333,-31.9333333333){Perth}[Australia]
+\mapput(34.9166666667,31.8666666667)[Petach_Tikwa]{Petach Tikwa}[Israel]
+\mapput(-77.4,37.2333333333){Petersburg}[USA]
+\mapput(5.88333333333,49.55){Petingen}[Luxemburg]
+\mapput(8.7,48.8833333333){Pforzheim}[Germany]
+\mapput(-75.15,39.95){Philadelphia}[USA]
+\mapput(104.916666667,11.55)[Phnom_Penh]{Phnom Penh}[Kambodscha]
+\mapput(-112.066666667,33.45){Phoenix}[USA]
+\mapput(100.466666667,5.5){Pinang}[Malaysia]
+\mapput(-92.0166666667,34.2166666667)[Pine_Bluff]{Pine Bluff}[USA]
+\mapput(23.7,37.95){Piraeus}[Griechenland]
+\mapput(-80.0,40.4333333333){Pittsburgh}[USA]
+\mapput(-73.25,42.45){Pittsfield}[USA]
+\mapput(-80.6333333333,-5.25){Piura}[Peru]
+\mapput(24.75,42.1333333333){Plovdiv}[Bulgarien]
+\mapput(-4.1,50.3833333333){Plymouth}[GreatBritain]
+\mapput(13.4166666667,49.75){Plzen}[Tschechien]
+\mapput(-112.45,42.8666666667){Pocatello}[USA]
+\mapput(11.8833333333,-4.76666666667){Pointe-Noire}[Kongo]
+\mapput(73.9666666667,18.5666666667){Poona}[Indien]
+\mapput(21.75,61.4666666667){Pori}[Finnland]
+\mapput(-72.3333333333,18.5333333333){Port-Au-Prince}[Haiti]
+\mapput(8.83333333333,-0.666666666667){Port-Gentil}[Gabun]
+\mapput(-93.9333333333,29.9)[Port_Arthur]{Port Arthur}[USA]
+\mapput(25.6,-33.9666666667)[Port_Elizabeth]{Port Elizabeth}[SouthAfrica]
+\mapput(57.5,-20.1666666667)[Port_Louis]{Port Louis}[Mauritius]
+\mapput(147.133333333,-9.48333333333)[Port_Moresby]{Port Moresby}[Papua-Neuguinea]
+\mapput(-61.5166666667,10.65)[Port_Of_Spain]{Port Of Spain}[Trinidad und Tobago]
+\mapput(32.3,31.2833333333)[Port_Said]{Port Said}[Egypt]
+\mapput(37.1166666667,19.6333333333)[Port_Sudan]{Port Sudan}[Sudan]
+\mapput(168.3,-17.75)[Port_Vila]{Port Vila}[Vanuatu]
+\mapput(-70.25,43.6666666667){Portland}[USA]
+\mapput(-122.683333333,45.5166666667){Portland}[USA]
+\mapput(-8.61666666667,41.15){Porto}[Portugal]
+\mapput(-51.2166666667,-30.05)[Porto_Alegre]{Porto Alegre}[Brasilien]
+\mapput(2.78333333333,6.5)[Porto_Novo]{Porto Novo}[Benin]
+\mapput(-80.4666666667,-1.11666666667){Portoviejo}[Ecuador]
+\mapput(-61.45,15.5666666667){Portsmouth}[Dominica]
+\mapput(16.8833333333,52.4166666667){Posen}[Polen]
+\mapput(-65.75,-19.5833333333){Potosi}[Bolivien]
+\mapput(13.0666666667,52.4){Potsdam}[Germany]
+\mapput(-73.9333333333,41.7){Poughkeepsie}[USA]
+\mapput(14.45,50.0666666667){Praha}[Tschechien]
+\mapput(-23.5,14.9166666667){Praia}[Kapverden]
+\mapput(28.2,-25.75){Pretoria}[SouthAfrica]
+\mapput(-71.4166666667,41.8333333333){Providence}[USA]
+\mapput(-111.65,40.2333333333){Provo}[USA]
+\mapput(-98.2,19.05){Puebla}[Mexiko]
+\mapput(-100.9,28.5166666667)[Puebla_De_Zaragoza]{Puebla De Zaragoza}[Mexiko]
+\mapput(-104.616666667,38.2666666667){Pueblo}[USA]
+\mapput(-88.5333333333,15.6833333333)[Puerto_Barrios]{Puerto Barrios}[Guatemala]
+\mapput(-70.6833333333,19.8)[Puerto_Plata]{Puerto Plata}[Dominikanische Republik]
+\mapput(-54.5666666667,-25.5333333333)[Puerto_Stroessner]{Puerto Stroessner}[Paraguay]
+\mapput(-84.8333333333,10.0){Puntarenas}[Costa Rica]
+\mapput(129.05,35.1){Pusan}[Korea]
+\mapput(125.75,39.0166666667){Pyoengyang}[Korea Dvr]
+\mapput(82.8833333333,28.0833333333){Pyuthan}[Nepal]
+\mapput(-71.2166666667,46.8166666667){Quebec}[Kanada]
+\mapput(-91.5,14.8333333333){Quezaltenango}[Guatemala]
+\mapput(121.033333333,14.65)[Quezon_City]{Quezon City}[Philippinen]
+\mapput(109.183333333,13.7833333333)[Qui_Nhon]{Qui Nhon}[Vietnam]
+\mapput(-78.5,-0.216666666667){Quito}[Ecuador]
+\mapput(-6.85,34.0333333333){Rabat}[Marokko]
+\mapput(152.183333333,-4.21666666667){Rabaul}[Papua-Neuguinea]
+\mapput(-78.6333333333,35.7833333333){Raleigh}[USA]
+\mapput(34.8,32.0666666667)[Ramat_Gan]{Ramat Gan}[Israel]
+\mapput(-70.75,-34.1666666667){Rancagua}[Chile]
+\mapput(10.05,56.4666666667){Randers}[Denmark]
+\mapput(96.1666666667,16.7833333333){Rangoon}[Myanmar]
+\mapput(-103.233333333,44.0833333333)[Rapid_City]{Rapid City}[USA]
+\mapput(39.05,35.95){Raqqa}[Syrien]
+\mapput(73.1333333333,33.6666666667){Rawalpindi}[Pakistan]
+\mapput(-34.8833333333,-8.1){Recife}[Brasilien]
+\mapput(7.2,51.6166666667){Recklinghausen}[Germany]
+\mapput(12.1,49.0166666667){Regensburg}[Germany]
+\mapput(-104.65,50.4166666667){Regina}[Kanada]
+\mapput(6.38333333333,49.55){Remich}[Luxemburg]
+\mapput(7.2,51.1833333333){Remscheid}[Germany]
+\mapput(-119.816666667,39.5166666667){Reno}[USA]
+\mapput(-21.95,64.15){Reykjavik}[Island]
+\mapput(46.7166666667,24.6333333333){Riad}[Saudi-Arabien]
+\mapput(-77.4333333333,37.5333333333){Richmond}[USA]
+\mapput(24.1,56.95){Riga}[Sowjetunion]
+\mapput(-43.2333333333,-22.9)[Rio_De_Janeiro]{Rio De Janeiro}[Brasilien]
+\mapput(-55.8333333333,-31.0){Rivera}[Uruguay]
+\mapput(-117.366666667,33.9833333333){Riverside}[USA]
+\mapput(-79.95,37.2666666667){Roanoke}[USA]
+\mapput(-92.4666666667,44.0166666667){Rochester}[USA]
+\mapput(-77.6,43.1666666667){Rochester}[USA]
+\mapput(-90.5666666667,41.4833333333)[Rock_Island]{Rock Island}[USA]
+\mapput(-89.1,42.2833333333){Rockford}[USA]
+% \mapput(12.4833333333,41.9){Rom}[Italy]
+\mapput(27.8833333333,-26.1666666667){Roodepoort}[SouthAfrica]
+\mapput(-60.6666666667,-32.95){Rosario}[Argentinien]
+\mapput(-61.3833333333,15.3){Roseau}[Dominica]
+\mapput(12.1166666667,55.65){Roskilde}[Denmark]
+\mapput(12.1333333333,54.0833333333){Rostock}[Germany]
+\mapput(39.7,47.2333333333){Rostow}[Sowjetunion]
+\mapput(4.48333333333,51.9166666667){Rotterdam}[Niederlande]
+\mapput(27.9833333333,43.8333333333){Ruse}[Bulgarien]
+\mapput(7.0,49.2333333333)[Saarbrucken]{Saarbrücken}[Germany]
+\mapput(-121.5,38.5833333333){Sacramento}[USA]
+\mapput(-9.33333333333,32.3){Safi}[Marokko]
+\mapput(-83.9333333333,43.4333333333){Saginaw}[USA]
+\mapput(4.38333333333,45.4333333333){Saint-Etienne}[France]
+\mapput(-16.5,16.0166666667){Saint-Louis}[Senegal]
+\mapput(-81.3166666667,29.8833333333)[Saint_Augustine]{Saint Augustine}[USA]
+\mapput(-79.25,43.1666666667)[Saint_Catharine's]{Saint Catharine's}[Kanada]
+\mapput(-52.7166666667,47.55)[Saint_John's]{Saint John's}[Kanada]
+\mapput(-94.85,39.7666666667)[Saint_Joseph]{Saint Joseph}[USA]
+\mapput(-90.2,38.6333333333)[Saint_Louis]{Saint Louis}[USA]
+\mapput(-93.1,44.95)[Saint_Paul]{Saint Paul}[USA]
+\mapput(-82.6333333333,27.7666666667)[Saint_Petersburg]{Saint Petersburg}[USA]
+\mapput(-70.8833333333,42.5166666667){Salem}[USA]
+\mapput(-123.033333333,44.9333333333){Salem}[USA]
+\mapput(-121.65,36.6666666667){Salinas}[USA]
+\mapput(82.1833333333,28.35){Saliyan}[Nepal]
+\mapput(-111.883333333,40.75)[Salt_Lake_City]{Salt Lake City}[USA]
+\mapput(-65.4166666667,-24.7833333333){Salta}[Argentinien]
+\mapput(-57.8333333333,-31.45){Salto}[Uruguay]
+\mapput(-38.5166666667,-12.9833333333){Salvador}[Brasilien]
+\mapput(13.05,47.8){Salzburg}[Austria]
+\mapput(10.3333333333,52.0833333333){Salzgitter}[Germany]
+\mapput(-98.4833333333,29.4333333333)[San_Antonio]{San Antonio}[USA]
+\mapput(-117.283333333,34.1)[San_Bernardino]{San Bernardino}[USA]
+\mapput(-72.25,7.76666666667)[San_Cristobal]{San Cristobal}[Venezuela]
+\mapput(-117.15,32.7166666667)[San_Diego]{San Diego}[USA]
+\mapput(-122.416666667,37.7833333333)[San_Francisco]{San Francisco}[USA]
+\mapput(-84.0833333333,9.93333333333)[San_Jose]{San Jose}[Costa Rica]
+\mapput(-121.883333333,37.3333333333)[San_Jose]{San Jose}[USA]
+\mapput(-68.5166666667,-31.5333333333)[San_Juan]{San Juan}[Argentinien]
+\mapput(-71.2,18.8166666667)[San_Juan]{San Juan}[Dominikanische Republik]
+\mapput(-66.1166666667,18.4666666667)[San_Juan]{San Juan}[Puerto Rico]
+\mapput(-57.5333333333,-25.3333333333)[San_Lorenzo]{San Lorenzo}[Paraguay]
+\mapput(-100.983333333,22.15)[San_Luis_Potosi]{San Luis Potosi}[Mexiko]
+\mapput(12.4666666667,43.9166666667)[San_Marino]{San Marino}[San Marino]
+\mapput(-88.1666666667,13.4666666667)[San_Miguel]{San Miguel}[El Salvador]
+\mapput(-65.25,-26.7833333333)[San_Miguel_De_Tucuman]{San Miguel De Tucuman}[Argentinien]
+\mapput(-88.0166666667,15.4333333333)[San_Pedro_Sula]{San Pedro Sula}[Honduras]
+\mapput(-89.2,13.7)[San_Salvador]{San Salvador}[El Salvador]
+\mapput(44.2,15.3833333333){Sana}[Jemen]
+\mapput(15.6166666667,48.2166666667)[Sankt_Poelten]{Sankt Poelten}[Austria]
+\mapput(39.2,-6.2){Sansibar}[Tansania]
+\mapput(-89.5166666667,14.0)[Santa_Ana]{Santa Ana}[El Salvador]
+\mapput(-119.7,34.4166666667)[Santa_Barbara]{Santa Barbara}[USA]
+\mapput(-79.9666666667,22.4166666667)[Santa_Clara]{Santa Clara}[Kuba]
+\mapput(-63.1666666667,-17.8)[Santa_Cruz]{Santa Cruz}[Bolivien]
+\mapput(-60.6833333333,-31.5833333333)[Santa_Fe]{Santa Fe}[Argentinien]
+\mapput(-105.933333333,35.6833333333)[Santa_Fe]{Santa Fe}[USA]
+\mapput(-122.716666667,38.4333333333)[Santa_Rosa]{Santa Rosa}[USA]
+\mapput(-70.6666666667,19.5){Santiago}[Dominikanische Republik]
+\mapput(-80.9833333333,8.13333333333){Santiago}[Panama]
+\mapput(-70.6666666667,-33.45)[Santiago_De_Chile]{Santiago De Chile}[Chile]
+\mapput(-75.8166666667,20.0)[Santiago_De_Cuba]{Santiago De Cuba}[Kuba]
+\mapput(-69.9,18.4666666667)[Santo_Domingo]{Santo Domingo}[Dominikanische Republik]
+\mapput(-46.6166666667,-23.5333333333)[Sao_Paulo]{Sao Paulo}[Brasilien]
+\mapput(6.71666666667,0.2)[Sao_Tome]{Sao Tome}[Sao Tome und Principe]
+\mapput(141.35,43.05){Sapporo}[Japan]
+\mapput(18.4166666667,43.8333333333){Sarajewo}[Bosnien-Herzegowina]
+\mapput(18.3666666667,9.13333333333){Sarh}[Tschad]
+\mapput(-81.1,32.0833333333){Savannah}[USA]
+\mapput(104.75,16.5666666667){Savannakhet}[Laos]
+\mapput(8.66666666667,47.6666666667){Schaffhausen}[Schweiz]
+\mapput(-73.95,42.8166666667){Schenectady}[USA]
+\mapput(11.3833333333,53.6333333333){Schwerin}[Germany]
+\mapput(-75.6666666667,41.4166666667){Scranton}[USA]
+\mapput(-122.333333333,47.6166666667){Seattle}[USA]
+\mapput(-6.3,13.4666666667){Segou}[Mali]
+\mapput(110.483333333,-6.96666666667){Semarang}[Indonesien]
+\mapput(127.0,37.5666666667){Seoul}[Korea]
+\mapput(103.916666667,1.38333333333){Serangoon}[Singapur]
+\mapput(36.1,32.0666666667){Serka}[Jordanien]
+\mapput(23.5166666667,41.0833333333){Serres}[Griechenland]
+\mapput(5.4,36.1833333333){Setif}[Algerien]
+\mapput(-8.9,38.5166666667){Setubal}[Portugal]
+\mapput(-5.98333333333,37.3833333333){Sevilla}[Spanien]
+\mapput(10.7166666667,34.75){Sfax}[Tunesien]
+\mapput(121.466666667,31.2333333333){Shanghai}[China]
+\mapput(55.4333333333,25.3333333333){Sharjah}[Emirates]
+\mapput(-1.5,53.3833333333){Sheffield}[GreatBritain]
+\mapput(123.433333333,41.8333333333){Shenyang}[China]
+\mapput(52.5666666667,29.6333333333){Shiraz}[Iran]
+\mapput(19.0166666667,42.05){Shkoder}[Albanien]
+\mapput(-93.75,32.5166666667){Shreveport}[USA]
+\mapput(31.25,30.1)[Shubra_Al-Khaima]{Shubra Al-Khaima}[Egypt]
+\mapput(-0.65,35.25){Sidi-Bel-Abbes}[Algerien]
+\mapput(8.03333333333,50.8666666667){Siegen}[Germany]
+\mapput(-9.11666666667,11.4666666667){Siguiri}[Guinea]
+\mapput(-5.63333333333,11.3){Sikasso}[Mali]
+\mapput(103.85,1.28333333333){Singapur}[Singapur]
+\mapput(-96.4,42.5)[Sioux_City]{Sioux City}[USA]
+\mapput(-96.7333333333,43.55)[Sioux_Falls]{Sioux Falls}[USA]
+\mapput(21.4833333333,42.0){Skopje}[Mazedonien]
+\mapput(14.5166666667,35.9166666667){Sliema}[Malta]
+\mapput(23.3166666667,42.6833333333){Sofia}[Bulgarien]
+\mapput(7.08333333333,51.1833333333){Solingen}[Germany]
+\mapput(100.583333333,7.2){Songkhla}[Thailand]
+\mapput(19.1166666667,50.2666666667){Sosnowitz}[Polen]
+\mapput(-86.25,41.6833333333)[South_Bend]{South Bend}[USA]
+\mapput(-1.38333333333,50.9){Southampton}[GreatBritain]
+\mapput(-81.95,34.9333333333){Spartanburg}[USA]
+\mapput(16.4666666667,43.5166666667){Split}[Kroatien]
+\mapput(-117.433333333,47.6666666667){Spokane}[USA]
+\mapput(-89.65,39.8){Springfield}[USA]
+\mapput(-72.6,42.1){Springfield}[USA]
+\mapput(-93.3,37.2166666667){Springfield}[USA]
+\mapput(-73.5666666667,45.4)[St_Catharine's]{St Catharine's}[Kanada]
+\mapput(9.38333333333,47.4166666667)[St_Gallen]{St Gallen}[Schweiz]
+\mapput(-64.7,32.4)[St_George's]{St George's}[Bermuda-Inseln]
+\mapput(-61.7333333333,12.0666666667)[St_George's]{St George's}[Grenada]
+\mapput(-61.8333333333,17.1333333333)[St_John's]{St John's}[Antigua]
+\mapput(-54.05,5.48333333333)[St_Laurent]{St Laurent}[Französisch-Guayana]
+\mapput(-73.5333333333,41.05){Stamford}[USA]
+\mapput(25.6166666667,42.4166666667)[Stara_Zagora]{Stara Zagora}[Bulgarien]
+\mapput(5.75,58.9666666667){Stavanger}[Norwegen]
+\mapput(14.5333333333,53.4166666667){Stettin}[Polen]
+\mapput(14.4166666667,48.0666666667){Steyr}[Austria]
+\mapput(18.05,59.3333333333){Stockholm}[Schweden]
+\mapput(-121.283333333,37.95){Stockton}[USA]
+\mapput(7.75,48.5833333333){Strasbourg}[France]
+\mapput(9.18333333333,48.7666666667){Stuttgart}[Germany]
+\mapput(-65.2833333333,-19.0333333333){Sucre}[Bolivien]
+\mapput(-81.0,46.5){Sudbury}[Kanada]
+\mapput(-0.0,-89.9833333333)[Sudpol]{Südpol}[]
+\mapput(32.55,29.9833333333){Suez}[Egypt]
+\mapput(-122.033333333,37.3833333333){Sunnyvale}[USA]
+\mapput(112.75,-7.23333333333){Surabaya}[Indonesien]
+\mapput(110.833333333,-7.53333333333){Surakarta}[Indonesien]
+\mapput(178.416666667,-18.1333333333){Suva}[Fidschi]
+\mapput(60.6,56.85){Swerdlowsk}[Sowjetunion]
+\mapput(151.2,-33.8833333333){Sydney}[Australia]
+\mapput(-76.15,43.05){Syracuse}[USA]
+\mapput(20.15,46.25){Szeged}[Ungarn]
+\mapput(36.5333333333,28.3666666667){Tabouk}[Saudi-Arabien]
+\mapput(46.3,38.0833333333){Tabriz}[Iran]
+\mapput(-122.433333333,47.25){Tacoma}[USA]
+\mapput(128.6,35.8666666667){Taegu}[Korea]
+\mapput(127.433333333,36.3333333333){Taejeon}[Korea]
+\mapput(5.31666666667,14.95){Tahoua}[Niger]
+\mapput(120.666666667,24.15){Taichung}[Taiwan]
+\mapput(40.35,21.25){Taif}[Saudi-Arabien]
+\mapput(120.233333333,23.0166666667){Tainan}[Taiwan]
+\mapput(121.5,25.05){Taipeh}[Taiwan]
+\mapput(44.0333333333,13.5833333333){Tais}[Jemen]
+\mapput(-71.6666666667,-35.4666666667){Talca}[Chile]
+\mapput(-73.1666666667,-36.6666666667){Talcahuano}[Chile]
+\mapput(-84.2833333333,30.45){Tallahassee}[USA]
+\mapput(-0.816666666667,9.43333333333){Tamale}[Ghana]
+\mapput(-82.45,27.95){Tampa}[USA]
+\mapput(23.75,61.5333333333){Tampere}[Finnland]
+\mapput(-97.85,22.2166666667){Tampico}[Mexiko]
+\mapput(30.8333333333,-5.11666666667){Tanga}[Tansania]
+\mapput(-5.83333333333,35.8){Tanger}[Marokko]
+\mapput(31.0,30.8){Tanta}[Egypt]
+\mapput(173.0,1.5){Tarawa}[Kiribati]
+\mapput(69.3,41.3333333333){Taschkent}[Sowjetunion]
+\mapput(96.8833333333,20.9166666667){Taunggyi}[Myanmar]
+\mapput(44.75,41.7){Tbilisi}[Sowjetunion]
+\mapput(-87.2166666667,14.1){Tegucigalpa}[Honduras]
+\mapput(51.4333333333,35.6666666667){Teheran}[Iran]
+\mapput(34.7666666667,32.0833333333)[Tel_Aviv]{Tel Aviv}[Israel]
+\mapput(21.25,45.75){Temeschburg}[Rumänien]
+\mapput(-111.933333333,33.4166666667){Tempe}[USA]
+\mapput(-72.6666666667,-38.75){Temuco}[Chile]
+\mapput(16.0333333333,47.7166666667){Ternitz}[Austria]
+\mapput(-87.4,39.4666666667)[Terre_Haute]{Terre Haute}[USA]
+\mapput(-5.36666666667,35.5666666667){Tetouan}[Marokko]
+\mapput(22.9666666667,40.6333333333){Thessaloniki}[Griechenland]
+\mapput(-16.8666666667,14.8166666667){Thies}[Senegal]
+\mapput(89.75,27.5333333333){Thimbu}[Bhutan]
+\mapput(7.63333333333,46.7666666667){Thun}[Schweiz]
+\mapput(117.2,39.1333333333){Tianjin}[China]
+\mapput(-117.016666667,32.5333333333){Tijuana}[Mexiko]
+\mapput(5.08333333333,51.5666666667){Tilburg}[Niederlande]
+\mapput(-3.01666666667,16.7666666667){Timbuktu}[Mali]
+\mapput(19.8333333333,41.3333333333){Tirana}[Albanien]
+\mapput(-1.35,34.8833333333){Tlemcen}[Algerien]
+\mapput(49.3833333333,-18.1666666667){Toamasina}[Madagaskar]
+\mapput(139.766666667,35.7){Tokyo}[Japan]
+\mapput(-83.55,41.65){Toledo}[USA]
+\mapput(43.6833333333,-23.3333333333){Toliary}[Madagaskar]
+\mapput(-95.6666666667,39.05){Topeka}[USA]
+\mapput(-79.3833333333,43.65){Toronto}[Kanada]
+\mapput(-103.433333333,25.55){Torreon}[Mexiko]
+\mapput(1.45,43.6166666667){Toulouse}[France]
+\mapput(0.683333333333,47.3833333333){Tours}[France]
+\mapput(14.2333333333,48.2166666667){Traun}[Austria]
+\mapput(-74.7666666667,40.2166666667){Trenton}[USA]
+\mapput(35.8333333333,34.45){Tripoli}[Libanon]
+\mapput(13.1833333333,32.9){Tripolis}[Libyen]
+\mapput(10.4166666667,63.4166666667){Trondheim}[Norwegen]
+\mapput(-73.6833333333,42.7333333333){Troy}[USA]
+\mapput(-79.0333333333,-8.11666666667){Trujillo}[Peru]
+\mapput(1.18333333333,8.98333333333){Tschoudjo}[Togo]
+\mapput(17.7,-19.2166666667){Tsumeb}[Namibia]
+\mapput(-110.966666667,32.2166666667){Tucson}[USA]
+\mapput(-96.0,36.15){Tulsa}[USA]
+\mapput(10.2,36.8){Tunis}[Tunesien]
+% \mapput(7.66666666667,45.05){Turin}[Italy]
+\mapput(22.25,60.45){Turku}[Finnland]
+\mapput(-87.5666666667,33.2){Tuscaloosa}[USA]
+\mapput(119.466666667,-5.15)[Ujung_Padang]{Ujung Padang}[Indonesien]
+\mapput(106.883333333,47.9166666667)[Ulan_Bator]{Ulan Bator}[Mongolei]
+\mapput(10.0,48.4166666667){Ulm}[Germany]
+\mapput(31.0,-29.8833333333){Umhlazi}[SouthAfrica]
+\mapput(17.6333333333,59.9166666667){Uppsala}[Schweden]
+\mapput(-75.2333333333,43.1){Utica}[USA]
+\mapput(5.11666666667,52.1){Utrecht}[Niederlande]
+\mapput(9.53333333333,47.1333333333){Vaduz}[Lichtenstein]
+\mapput(16.5333333333,59.6){Vaesteras}[Schweden]
+\mapput(-0.366666666667,39.4666666667){Valencia}[Spanien]
+\mapput(-68.0,10.1833333333){Valencia}[Venezuela]
+\mapput(-4.75,41.65){Valladolid}[Spanien]
+\mapput(14.5333333333,35.9){Valletta}[Malta]
+\mapput(-71.6666666667,-33.0833333333){Valparaiso}[Chile]
+\mapput(-123.116666667,49.2833333333){Vancouver}[Kanada]
+\mapput(24.95,60.3){Vantaa}[Finnland]
+\mapput(27.95,43.2){Varna}[Bulgarien]
+\mapput(9.55,55.7166666667){Vejle}[Denmark]
+% \mapput(12.35,45.45){Venedig}[Italy]
+\mapput(-96.1333333333,19.2)[Vera_Cruz]{Vera Cruz}[Mexiko]
+\mapput(114.216666667,22.2666666667){Victoria}[Hongkong]
+\mapput(-123.366666667,48.4166666667){Victoria}[Kanada]
+\mapput(55.4666666667,-4.63333333333){Victoria}[Seschellen]
+\mapput(102.6,17.9666666667){Vientiane}[Laos]
+\mapput(-8.66666666667,41.0666666667)[Vila_Nova_De_Gaia]{Vila Nova De Gaia}[Portugal]
+\mapput(13.85,46.6166666667){Villach}[Austria]
+\mapput(-71.5833333333,-33.0333333333)[Vina_Del_Mar]{Vina Del Mar}[Chile]
+\mapput(-75.0333333333,39.4833333333){Vineland}[USA]
+\mapput(22.95,39.3666666667){Volos}[Griechenland]
+\mapput(-97.1333333333,31.55){Waco}[USA]
+\mapput(33.05,14.4)[Wadi_Medani]{Wadi Medani}[Sudan]
+\mapput(21.0,52.25){Warschau}[Polen]
+\mapput(-71.45,41.7){Warwick}[USA]
+\mapput(-77.0166666667,38.9){Washington}[USA]
+\mapput(-73.05,41.55){Waterbury}[USA]
+\mapput(-7.1,52.25){Waterford}[Irland]
+\mapput(-92.3333333333,42.5){Waterloo}[USA]
+\mapput(174.85,-41.4666666667){Wellington}[Neuseeland]
+\mapput(14.0333333333,48.1666666667){Wels}[Austria]
+\mapput(-80.05,26.7166666667)[West_Palm_Beach]{West Palm Beach}[USA]
+\mapput(-80.7166666667,40.0666666667){Wheeling}[USA]
+\mapput(-97.3333333333,37.6833333333){Wichita}[USA]
+\mapput(-98.4833333333,33.9166666667)[Wichita_Falls]{Wichita Falls}[USA]
+\mapput(16.3666666667,48.2){Wien}[Austria]
+\mapput(16.25,47.8)[Wiener_Neustadt]{Wiener Neustadt}[Austria]
+\mapput(8.25,50.0833333333){Wiesbaden}[Germany]
+\mapput(-75.8833333333,41.25)[Wilkes_Barre]{Wilkes Barre}[USA]
+\mapput(-68.95,12.1){Willemstad}[Niederlande]
+\mapput(-76.7,37.2666666667){Williamsburg}[USA]
+\mapput(-103.616666667,48.1833333333){Williston}[USA]
+\mapput(-75.55,39.75){Wilmington}[USA]
+\mapput(-77.9166666667,34.2333333333){Wilmington}[USA]
+\mapput(17.1,-22.5666666667){Windhuk}[Namibia]
+\mapput(-83.0166666667,42.3){Windsor}[Kanada]
+\mapput(-97.15,49.8833333333){Winnipeg}[Kanada]
+\mapput(-80.25,36.1)[Winston_Salem]{Winston Salem}[USA]
+\mapput(8.75,47.5){Winterthur}[Schweiz]
+\mapput(7.33333333333,51.4333333333){Witten}[Germany]
+\mapput(131.9,43.1333333333){Wladiwostok}[Sowjetunion]
+\mapput(14.8333333333,46.8333333333){Wolfsberg}[Austria]
+\mapput(10.8,52.4333333333){Wolfsburg}[Germany]
+\mapput(44.4166666667,48.75){Wolgograd}[Sowjetunion]
+\mapput(137.95,-17.2166666667){Wollongong}[Australia]
+\mapput(-71.8,42.2666666667){Worcester}[USA]
+\mapput(114.25,36.75){Wuhan}[China]
+\mapput(7.18333333333,51.2666666667){Wuppertal}[Germany]
+\mapput(9.93333333333,49.8)[Wurzburg]{Würzburg}[Germany]
+\mapput(108.9,34.2666666667){Xian}[China]
+\mapput(-120.516666667,46.6){Yakima}[USA]
+\mapput(11.5166666667,3.85){Yaounde}[Kamerun]
+\mapput(167.166666667,-1.83333333333){Yaren}[Nauru]
+\mapput(141.25,41.0666666667){Yokohama}[Japan]
+\mapput(-1.08333333333,53.95){York}[GreatBritain]
+\mapput(-76.7333333333,39.9666666667){York}[USA]
+\mapput(-80.65,41.1){Youngstown}[USA]
+\mapput(120.05,24.85){Yunghu}[Taiwan]
+\mapput(31.5,30.5833333333){Zagazig}[Egypt]
+\mapput(16.0,45.8){Zagreb}[Koratien]
+\mapput(122.083333333,6.91666666667){Zamboanga}[Philippinen]
+\mapput(-0.9,41.65){Zaragoza}[Spanien]
+\mapput(-16.3333333333,12.5833333333){Ziguinchor}[Senegal]
+\mapput(8.96666666667,13.7666666667){Zinder}[Niger]
+\mapput(35.3666666667,-15.3666666667){Zomba}[Malawi]
+\mapput(8.51666666667,47.3666666667)[Zurich]{Zürich}[Schweiz]
+\mapput(12.5,50.7333333333){Zwickau}[Germany]
+% Italy
+\mapput[90](13.600000,37.296389){Agrigento}[Italy]
+\mapput[0](8.612500,44.914167){Alessandria}[Italy]
+\mapput[90](13.512500,43.623611){Ancona }[Italy]
+\mapput[90](7.316667,45.737500){Aosta}[Italy]
+\mapput[90](11.883333,43.466111){Arezzo}[Italy]
+\mapput[90](13.579167,42.852500){Ascoli Piceno}[Italy]
+\mapput[90](8.204167,44.900278){Asti}[Italy]
+\mapput[90](14.795833,40.914444){Avellino}[Italy]
+\mapput[90](16.879167,41.127500){Bari}[Italy]
+\mapput[90](12.216667,46.137222){Belluno}[Italy]
+\mapput[90](14.775000,41.131111){Benevento}[Italy]
+\mapput[70](9.662500,45.702778){Bergamo}[Italy]
+\mapput[-90](11.350000,44.498056){Bologna}[Italy]
+\mapput[90](11.354167,46.496944){Bolzano}[Italy]
+\mapput[90](10.225000,45.542500){Brescia}[Italy]
+\mapput[90](17.770833,40.653889){Brindisi}[Italy]
+\mapput[90](9.116667,39.220833){Cagliari}[Italy]
+\mapput[90](14.062500,37.470000){Caltanissetta}[Italy]
+\mapput[90](14.654167,41.563056){Campobasso}[Italy]
+\mapput[-180](15.066667,37.033333){Canicattini}% (mon pays)[Italy]
+\mapput[90](14.329167,41.072500){Caserta}[Italy]
+\mapput[90](15.087500,37.503611){Catania}[Italy]
+\mapput[90](16.591667,38.904444){Catanzaro}[Italy]
+\mapput[90](14.166667,42.350556){Chieti}[Italy]
+\mapput[90](9.258333,45.793611){Como}[Italy]
+\mapput[90](16.258333,39.285278){Cosenza}[Italy]
+\mapput[90](10.025000,45.133333){Cremona}[Italy]
+\mapput[90](7.550000,44.392500){Cuneo}[Italy]
+\mapput[90](14.287500,37.541667){Enna}[Italy]
+\mapput[90](11.596111,44.842778){Ferrara}[Italy]
+\mapput[90](11.254167,43.753889){Firenze}[Italy]
+\mapput[90](15.545833,41.462500){Foggia}[Italy]
+\mapput[90](12.037500,44.222500){Forli}[Italy]
+\mapput[90](13.354167,41.639167){Frosinone}[Italy]
+\mapput[90](8.920833,44.418889){Genova}[Italy]
+\mapput[90](13.625000,45.941667){Gorizia}[Italy]
+\mapput[90](11.112500,42.759167){Grosseto}[Italy]
+\mapput[90](8.016667,43.875000){Imperia}[Italy]
+\mapput[90](14.250000,41.400000){Isernia}[Italy]
+\mapput[90](9.816667,44.090556){La Spezia}[Italy]
+\mapput[90](13.400000,42.350278){L'Aquila}[Italy]
+\mapput[90](12.904167,41.466389){Latina}[Italy]
+\mapput[90](18.170833,40.350833){Lecce}[Italy]
+\mapput[90](10.308333,43.526944){Livorno}[Italy]
+\mapput[90](10.504167,43.842778){Lucca}[Italy]
+\mapput[90](13.425000,43.295833){Macerata}[Italy]
+\mapput[90](10.795833,45.159167){Mantova}[Italy]
+\mapput[0](12.45,37.78){Marsala}[Italy]
+\mapput[90](10.133333,44.022222){Massa}[Italy]
+\mapput[90](16.612500,40.665833){Matera}[Italy]
+\mapput[90](15.575000,38.192778){Messina}[Italy]
+\mapput[90](9.191944,45.466389){Milano}[Italy]
+\mapput[-90](10.883333,44.645833){Modena}[Italy]
+\mapput[90](14.254167,40.862778){Napoli}[Italy]
+\mapput[90](8.616667,45.448333){Novara}[Italy]
+\mapput[90](9.337500,40.319722){Nuoro}[Italy]
+\mapput[90](8.600000,39.900000){Oristano}[Italy]
+\mapput[90](11.870833,45.400278){Padova}[Italy]
+\mapput[90](13.379167,38.136667){Palermo}[Italy]
+\mapput[90](12.000000,36.800000){Pantelleria}[Italy]
+\mapput[90](10.333333,44.802222){Parma}[Italy]
+\mapput[90](9.151389,45.184444){Pavia}[Italy]
+\mapput[90](12.391667,43.112222){Perugia}[Italy]
+\mapput[0](12.912500,43.908611){Pesaro}[Italy]
+\mapput[90](14.212500,42.459444){Pescara}[Italy]
+\mapput[90](9.695833,45.050000){Piacenza}[Italy]
+\mapput[90](10.395833,43.722222){Pisa}[Italy]
+\mapput[90](10.916667,43.932778){Pistoia}[Italy]
+\mapput[90](12.645833,45.958056){Pordenone}[Italy]
+\mapput[90](15.808333,40.639167){Potenza}[Italy]
+\mapput[0](14.754167,36.940556){Ragusa}[Italy]
+\mapput[90](12.200000,44.418611){Ravenna}[Italy]
+\mapput[0](15.645833,38.106389){Reggio Calabria}[Italy]
+\mapput[50](10.629167,44.695833){Reggio Emilia}[Italy]
+\mapput[90](12.858333,42.401667){Rieti}[Italy]
+% ROMA 12.454167,41.923611[Italy]
+\mapput[90](12.483333,41.883333){Rome}[Italy]
+\mapput[90](11.791667,45.072500){Rovigo}[Italy]
+\mapput[90](14.762500,40.679444){Salerno}[Italy]
+\mapput[90](8.562500,40.724444){Sassari}[Italy]
+\mapput[90](8.483333,44.304444){Savona}[Italy]
+\mapput[90](11.333333,43.317500){Siena}[Italy]
+\mapput[0](15.308333,37.063333){Siracusa}[Italy]
+\mapput[90](9.870833,46.171111){Sondrio}[Italy]
+\mapput[90](17.229167,40.475000){Taranto}[Italy]
+\mapput[90](13.733333,42.657500){Teramo}[Italy]
+\mapput[90](12.645833,42.561111){Terni}[Italy]
+\mapput[90](7.683333,45.070556){Torino}[Italy]
+\mapput[90](12.508333,38.031389){Trapani}[Italy]
+\mapput[90](11.120833,46.066389){Trento}[Italy]
+\mapput[90](12.245833,45.665278){Treviso}[Italy]
+\mapput[90](13.762500,45.643056){Trieste}[Italy]
+\mapput[90](13.233333,46.059444){Udine}[Italy]
+\mapput[90](8.800000,45.000000){Varese}[Italy]
+\mapput[0](12.337500,45.433611){Venezia}[Italy]
+\mapput[90](8.420833,45.329444){Vercelli}[Italy]
+\mapput[90](10.995833,45.442500){Verona}[Italy]
+\mapput[90](11.545833,45.546667){Vicenza}[Italy]
+\mapput[90](12.104167,42.416389){Viterbo}[Italy]
+% France
+\mapput[90](1.44278,43.6053){Toulouse}[France]
+\mapput[90](0.619444,44.2042){Agen}[France]
+\mapput[90](4.80889,43.9494){Avignon}[France]
+\mapput[90](2.44056,44.9261){Aurillac}[France]
+\mapput[90](5.366667,43.300000){Marseille}[France]
+\mapput[0](4.850000,45.733333){Lyon}[France]
+\mapput[-90](3.0875,45.7806){Clermont-Ferrand}[France]
+\mapput[90](4.39028,45.74347){St Etienne}[France]
+\mapput[90](-0.566667,44.833333){Bordeaux}[France]
+\mapput[90](0.160278,47.65){Angouleme}[France]
+\mapput[90](-1.15,46.1603){La Rochelle}[France]
+\mapput[90](-4.483333,48.383333){Brest}[France]
+\mapput[90](-1.67944,48.1147){Rennes}[France]
+\mapput[-90](-0.36944,49.1831){Caen}[France]
+\mapput[90](5.050000,47.316667){Dijon}[France]
+\mapput[30](2.3775,51.0383){Dunkerque}[France]
+\mapput[90](1.905,47.9031){Orleans}[France]
+\mapput[180](0.100000,49.483333){Le Havre}[France]
+\mapput[90](1.15333,49.0242){Evreux}[France]
+\mapput[90](0.183333,48.000000)[Le_Mans]{Le Mans}[France]
+\mapput[90](0.689167,47.3936){Tours}[France]
+\mapput[90](0.546111,46.8178){Chatellerault}[France]
+\mapput[90](1.266667,45.933333){Limoges}[France]
+\mapput[90](6.183333,49.116667){Metz}[France]
+\mapput[90](-1.583333,47.200000){Nantes}[France]
+\mapput[90](4.016667,49.266667){Reims}[France]
+\mapput[30](7.74861,48.65){Strasbourg}[France]
+\mapput[30](3.56778,47.7983){Auxerre}[France]
+\mapput[90](3.05,50.6333){Lille}[France]
+\mapput[90](1.06667,49.45){Rouen}[France]
+\mapput[90](5.7,45.2){Grenoble}[France]
+\mapput[90](1.53333,45.16667){Brive}[France]
+\mapput[90](1.45,44.45){Cahors}[France]
+\mapput[90](0.36667,43.333){Pau}[France]
+\mapput[90](2.8833,42.7){Perpignan}[France]
+\mapput[90](-1.55,43.4833){Biarritz}[France]
+\mapput[90](2.333,43.2167){Carcassonne}[France]
+\mapput[90](3.87722,43.6119){Montpellier}[France]
+\mapput[90](0.3333,46.5833){Poitiers}[France]
+\mapput[0](2.21667,43.6167){Castres}[France]
+\mapput[90](1.60778,42.9664){Foix}[France]
+\mapput[90](9.45028,42.7008){Bastia}[France]
+\mapput[90](8.73694,41.9267){Ajaccio}[France]
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/citycapitals.dat b/Master/texmf-dist/tex/generic/pst-geo/data/citycapitals.dat
new file mode 100644
index 00000000000..23b7c08daf9
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/citycapitals.dat
@@ -0,0 +1,325 @@
+/citycapitals
+[
+%Abidjan IVORY COAST
+[319 -242]
+%Accra GHANA
+[332 -14]
+%Addis Ababa ETHIOPIA
+[542 2325]
+%Aden YEMEN
+[ 761 2701]
+%Algiers ALGERIA
+ [ 2205 183]
+%Amman JORDAN
+ [1917 2156]
+%Amsterdam NETHERLANDS
+ [3142 293]
+%Andorra la Vella ANDORRA
+ [2551 91]
+%Ankara TURKEY
+ [2396 1972]
+%Antananarivo MADAGASCAR
+ [-1140 2850]
+%Asuncion PARAGUAY
+ [-1518 -3459]
+%Athens GREECE
+ [2278 1424]
+%Baghdad IRAQ
+[2000 2666]
+%Bamako MALI
+ [759 -481]
+%Bangkok THAILAND
+[826 6032]
+%Bangui CENTRAL AFRICAN REPUBLIC
+ [240 1080]
+%Banjul GAMBIA
+ [780 -1020]
+%Beijing CHINA
+ [2395 6983]
+%Beirut LEBANON
+ [2034 2130]
+%Belfast N [IRELAND
+ [3275 -356]
+%Belgrade YUGOSLAVIA
+ [2689 1228]
+%Belize BELIZE
+ [1050 -5280]
+%Berlin GERMANY
+ [3152 805]
+%Bern SWITZERLAND
+ [2818 446]
+%Bissau GUINEA-BISSAU
+ [720 -960]
+%Bogota COLUMBIA
+ [275 -4445]
+%Bonn GERMANY
+ [3044 426]
+%Brasilia BRAZIL
+ [-948 -2872]
+%Brazzaville CONGO
+ [-300 900]
+%Bridgetown BARBADOS
+ [786 -3540]
+%Brussels BELGIUM
+ [3051 262]
+%Bucharest ROMANIA
+ [2666 1565]
+%Budapest HUNGARY
+ [2851 1143]
+%Buenos Aires ARGENTINA
+ [-2062 -3489]
+%Bujumbura BURUNDI
+ [-180 1770]
+%Cairo EGYPT
+ [1804 1875]
+%Canberra AUSTRALIA
+ [-2119 8946]
+%Caracas VENEZUELA
+ [631 -4015]
+%Cayenne FR GUIANA
+ [296 -3140]
+%Colombo SRI LANKA
+ [415 4791]
+%Conakry GUINEA
+ [570 -810]
+%Copenhagen DENMARK
+ [3341 755]
+%Dacca BENGLADESH
+ [1423 5425]
+%Dakar SENEGAL
+ [890 -1060]
+%Damascus SYRIA
+ [2011 2178]
+%Dar Es Salaam TANZANIA
+ [-409 2357]
+%Djibouti DJIBOUTI
+ [690 2580]
+%Dublin IRELAND
+ [3200 -375]
+%Edinburgh SCOTLAND
+ [3357 -191]
+%Freetown SIERRA LEONE
+ [507 -791]
+%Gaborone BOTSWANA
+ [-1380 1530]
+%Georgetown GUYANA
+ [409 -3489]
+%Godthab GREENLAND
+ [3840 -3060]
+%Guatemala GUATEMALA
+ [878 -5431]
+%Hanoi N VIETNAM
+ [1262 6351]
+%Harare ZIMBABWE
+[-1069 1864]
+%Havana CUBA
+ [1387 -4943]
+%Helsinki FINLAND
+ [3610 1496]
+%Ho Chi Minh City S VIETNAM
+ [647 6401]
+%Islamabad PAKISTAN
+[2040 4380]
+%Jakarta INDONESIA
+ [-371 6413]
+%Jerusalem ISRAEL
+ [1907 2113]
+%Kabul AFGANISTAN
+[2072 4150]
+%Kampala UGANDA
+[17 1948]
+%Katmandu NEPAL
+[1664 5117]
+%Khartoum SUDAN
+[935 1951]
+%Kiev UKRAINE
+ [3026 1832]
+%Kigali RWANDA
+ [-120 1812]
+%Kingston JAMAICA
+[1080 -4606]
+%Kinshasa ZAIRE
+[-319 918]
+%Koror (Palau) BELAU
+[439 8072]
+%Kuala Lumpur MALAYSIA
+ [188 6103]
+%Kuwait KUWAIT
+[1740 2880]
+%La Paz BOLIVIA
+[-989 -4089]
+%Lagos NIGERIA
+[386 206]
+%Libreville GABON
+[300 570]
+%Lilongwe MALAWI
+[-840 2040]
+%Lima PERU
+[-723 -4622]
+%Lisbon PORTUGAL
+[2323 -548]
+%Lome TOGO
+[367 73]
+%London ENGLAND
+ [3061 -8]
+%Luanda ANGOLA
+[-529 794]
+%Lusaka ZAMBIA
+[-925 1698]
+%Luxembourg LUXEMBOURG
+ [2977 367]
+%Madrid SPAIN
+ [2426 -221]
+%Malabo E GUINEA
+[240 510]
+%Male MALDIVES
+[270 4380]
+%Managua NICARAGUA
+[729 -5168]
+%Manama BAHRAIN
+[1560 3060]
+%Maputo MOZAMBIQUE
+[-1560 1920]
+%Mbabane SWAZILAND
+[-1560 1950]
+%Mexico City MEXICO
+[1166 -5948]
+%Mogadiscio SOMALIA
+[121 2722]
+%Monrovia LIBERIA
+[402 -690]
+%Monte Carlo MONACO
+[2624 446]
+%Montevideo URAGUAY
+[-2095 -3371]
+%Moscow RUSSIA
+ [3346 2257]
+%N'djamena CHAD
+[720 960]
+%Nairobi KENYA
+[-77 2209]
+%Nassau BAHAMAS
+[1504 -4640]
+%New Delhi INDIA
+[1715 4634]
+%Niamey NIGER
+[840 180]
+%Nicosia CYPRUS
+ [2110 2001]
+%Nouakchott MAURITANIA
+[1080 -960]
+%Oslo NORWAY
+[3595 644]
+%Ottawa CANADA
+[2725 -4542]
+%Ouagadougou BURKINA
+%[750 -120]
+%Pago Pago AM SAMOA
+[-840 -10230]
+%Panama PANAMA
+[537 -4772]
+%Paramaribo SURINAM
+ [350 -3310]
+%Paris FRANCE
+[2931 139]
+%Phnom Penh CAMBODIA
+[692 6293]
+%Port-au-Prince HAITI
+[1112 -4340]
+%Port Louis MARITIUS
+ [-1206 3450]
+%Port Moresby PAPUA NEW GUINEA
+[-563 8826]
+%Porto Novo BENIN
+[375 159]
+%Prague CZECHOSLOVAKIA
+[3005 866]
+%Praia CAPE VERDE
+[900 -1422]
+%Pretoria S AFRICA
+[-1544 1691]
+%Pyongyang N KOREA
+[2341 7544]
+%Quezon PHILIPPINES
+ [888 7260]
+%Quito ECUADOR
+ [-11 -4709]
+%Rabat MOROCCO
+ [2041 -410]
+%Rangoon BURMA
+ [1006 5769]
+%Reykjavik ICELAND
+ [3848 -1376]
+%Riyadh SAUDI ARABIA
+[1478 2801]
+%Rome ITALY
+[2513 749]
+%Roseau DOMINICA
+ [917 -3684]
+%San Jose COSTA RICA
+[596 -5044]
+%San Juan PUERTO RICO
+[1108 -3967]
+%San Marino SAN MARINO
+[2636 746]
+%San Salvador EL SALVADOR
+[822 -5351]
+%San'a YEMEN
+ [930 2640]
+%Santiago CHILE
+ [-2006 -4240]
+%Santo Domingo DOMINICAN REPUBLIC
+ [1108 -4194]
+%Seoul S KOREA
+[2255 7619]
+%Singapore SINGAPORE
+[77 6231]
+%Sofia BULGARIA
+ [2561 1399]
+%St George's GRENADA
+[723 -3703]
+%St John's ANTIGUA AND BARBUDA
+[1078 -3708]
+%Stanley FALKLAND ISLES
+[-3101 -3472]
+%Stockholm SWEDEN
+[3560 1084]
+%Suva FIJI
+ [-1088 10706]
+%Taipei TAIWAN
+[1504 7291]
+%Tegucigalpa HONDURAS
+[846 -5233]
+%Tehran IRAN
+[2141 3085]
+%Thimbu BHUTAN
+[1654 5379]
+%Tirane ALBANIA
+[2480 1190]
+%Tokyo JAPAN
+[2141 8386]
+%Tripoli LIBYA
+[1973 791]
+%Tunis TUNISIA
+[2207 611]
+%Ulan Bator MONGOLIA
+[2881 6353]
+%Valletta MALTA
+[2154 871]
+%Victoria SEYCHELLES
+[-277 3328]
+%Vienna AUSTRIA
+ [2893 982]
+%Vientiane LAOS
+ [1140 6180]
+%Warsaw POLAND
+[3134 1261]
+%Washington DC USA
+[2333 -4621]
+%Wellington NEW ZEALAND
+[-2479 10480]
+%Windhoek NAMIBIA
+[-1350 1024]
+%Yaounde CAMEROON
+[240 720]
+] def
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/citysub.dat b/Master/texmf-dist/tex/generic/pst-geo/data/citysub.dat
new file mode 100644
index 00000000000..7b562e138d7
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/citysub.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/convert.py b/Master/texmf-dist/tex/generic/pst-geo/data/convert.py
new file mode 100644
index 00000000000..57ea71b7b70
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/convert.py
@@ -0,0 +1,80 @@
+from string import *
+
+input=open('cities.data','r')
+output=open('cities.tex','w')
+nZeile=["% (c) Herbert Voss <voss _at_ perce.de\n"]
+def umlaut(instr):
+ return translate(instr, maketrans('äöü ÄÖÜß', 'aou_AOUs'))
+def process(zeile):
+ stadt=rstrip(zeile[0:23])
+ Kstadt=umlaut(stadt)
+ Land=rstrip(zeile[24:56])
+ if (Land=="Deutschland"):
+ Land = "Germany"
+ elif (Land[0:3]=="USA"):
+ Land ="USA"
+ elif (find(Land,"Australien")>-1):
+ Land ="Australia"
+ elif (find(Land,"Italien")>-1):
+ Land ="Italy"
+ elif (find(Land,"Frankreich")>-1):
+ Land ="France"
+ elif (find(Land,"nemark")>0):
+ Land ="Denmark"
+ elif (find(Land,"britannien")>0):
+ Land ="GreatBritain"
+ elif (find(Land,"Elfenbein")>-1):
+ Land ="IvoryCoast"
+ elif (find(Land,"Emirate")>-1):
+ Land ="Emirates"
+ elif (find(Land,"rkei")>-1):
+ Land ="Turkey"
+ elif (find(Land,"thiopien")>-1):
+ Land ="Ethiopia"
+ elif (find(Land,"gypten")>-1):
+ Land ="Egypt"
+ elif (find(Land,"sterreich")>-1):
+ Land ="Austria"
+ elif (find(Land,"dafrika")>-1):
+ Land ="SouthAfrica"
+ Grad=zeile[57:59]
+ Minuten=zeile[61:63]
+ Breitengrad=float(Grad) + float(Minuten)/60.0
+ NS=zeile[65]
+ if (NS=="S"):
+ Breitengrad = -Breitengrad
+ Grad=zeile[68:71]
+ Minuten=zeile[73:75]
+ Laengengrad=float(Grad) + float(Minuten)/60.0
+ OW=zeile[77]
+ if (OW=="W"):
+ Laengengrad = -Laengengrad
+ if (Kstadt!=stadt):
+ Zeile="\\mapput("+str(Laengengrad)+","+str(Breitengrad)+")["+Kstadt+"]{"+stadt+"}["+Land+"]\n"
+# Zeile="\\mapput[90]("+str(Laengengrad)+","+str(Breitengrad)+")["+Kstadt+"]{"+stadt+"}["+Land+"]\n"
+ else:
+ Zeile="\\mapput("+str(Laengengrad)+","+str(Breitengrad)+"){"+stadt+"}["+Land+"]\n"
+# Zeile="\\mapput[90]("+str(Laengengrad)+","+str(Breitengrad)+"){"+stadt+"}["+Land+"]\n"
+ return Zeile
+for line in input.readlines():
+ Zeile = process(line)
+ if (find(Zeile,"Italy")>0): # take Italy from the original file
+ Zeile = "% "+Zeile
+ nZeile.append(Zeile)
+input=open('villesItalia.tex','r')
+nZeile.append("% Italy\n")
+for line in input.readlines():
+ if (find(line,"endinput")<0):
+ Zeile=line[0:len(line)-1]+"[Italy]\n"
+ nZeile.append(Zeile)
+input.close()
+nZeile.append("% France\n")
+input=open('villesFrance.tex','r')
+for line in input.readlines():
+ if (find(line,"endinput")<0):
+ Zeile=line[0:len(line)-1]+"[France]\n"
+ nZeile.append(Zeile)
+output.writelines(nZeile)
+nZeile.append("\\endinput\n")
+input.close()
+output.close()
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/corse.dat b/Master/texmf-dist/tex/generic/pst-geo/data/corse.dat
new file mode 100644
index 00000000000..ce1dee18aab
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/corse.dat
@@ -0,0 +1,3 @@
+%!PS
+currentfile<</Predictor 12/Columns 21>>/FlateDecode filter cvx exec
+xÚ•V»N1\û^!…  DB‰Ž/I‰¨‘àAÐS¢|‘ ¹Ë9ƹ³½ãË[œÍ>ff×Ö·÷w‹Å)Ø¡>zy~[.çt2?:îì†49ËœåD–f»OêOmÓ4õýïÑ7ë~Þt¿õ§þÛ¹jcLëO‹pj öUu-kóMù¼i6j˲¬|„˜Íb66³3ªûoç›AoÛØTpp§ØqÄÁÎf}=–f²1fqUï›vq+© »æ¸¶ ,2ä»tlBÇ¡Ë:ØÛ†¦!×8¨ j`6ÔK‘ͤ^±Ëè˜?±ÙîỼ•€/÷&v‘pA¢oì"0¨á©vl!!:rˆË É*¥B\-‪Þìãëf:¢Câ´ oA‰ƒÊÀp» ¤Þ0-<ÇÐEÈ<è˜ÕqÙWáÞ‰s1‚Ô {+ãÖjÐ$ã€z`$ΆøŠ[öÖ r¬¢Î’l\/*ª’+cÞ³LB .P;ÌjRV ÷†›€&&UR%à#¨©ÉB|E߸¹”„ºbÞr¨Lf(ú¢RGöC+U69…Èk}Å ˜ôÜÀ&ê!K˜Ï‡Ù¥6âNM÷C»W/tÌ/…‘û ߌ¯ˆ$Î<É ‰KrÇédµCEa6%Þ¼`â› Ù%…4-ŠñÅ)äÍ?o EëZÔNždË»˜ œ •K¯LxáUÒ{2¹â[N™)¥Ò”ZŒÞzm·5¬è‹wÖ>ÇúìúòjåŒ>V_Ÿ½ÒVl3 \ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/france.dat b/Master/texmf-dist/tex/generic/pst-geo/data/france.dat
new file mode 100644
index 00000000000..e42bf032761
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/france.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/mex.dat b/Master/texmf-dist/tex/generic/pst-geo/data/mex.dat
new file mode 100644
index 00000000000..951a68f0e01
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/mex.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/pborder.dat b/Master/texmf-dist/tex/generic/pst-geo/data/pborder.dat
new file mode 100644
index 00000000000..8cdd686a0b6
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/pborder.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/pcoast.dat b/Master/texmf-dist/tex/generic/pst-geo/data/pcoast.dat
new file mode 100644
index 00000000000..196203b23d0
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/pcoast.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/pisland.dat b/Master/texmf-dist/tex/generic/pst-geo/data/pisland.dat
new file mode 100644
index 00000000000..080ab722675
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/pisland.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/plake.dat b/Master/texmf-dist/tex/generic/pst-geo/data/plake.dat
new file mode 100644
index 00000000000..f7243bc45f4
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/plake.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/rhone.dat b/Master/texmf-dist/tex/generic/pst-geo/data/rhone.dat
new file mode 100644
index 00000000000..0ba3c51522b
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/rhone.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/ridge.dat b/Master/texmf-dist/tex/generic/pst-geo/data/ridge.dat
new file mode 100644
index 00000000000..e50f1c39b6d
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/ridge.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/river.dat b/Master/texmf-dist/tex/generic/pst-geo/data/river.dat
new file mode 100644
index 00000000000..6a94f1f6e95
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/river.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/seine.dat b/Master/texmf-dist/tex/generic/pst-geo/data/seine.dat
new file mode 100644
index 00000000000..ab5c729b110
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/seine.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/transfrm.dat b/Master/texmf-dist/tex/generic/pst-geo/data/transfrm.dat
new file mode 100644
index 00000000000..239673c77c7
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/transfrm.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/trench.dat b/Master/texmf-dist/tex/generic/pst-geo/data/trench.dat
new file mode 100644
index 00000000000..af41786f1c3
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/trench.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/usa.dat b/Master/texmf-dist/tex/generic/pst-geo/data/usa.dat
new file mode 100644
index 00000000000..201f49814c5
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/usa.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/villesFrance.tex b/Master/texmf-dist/tex/generic/pst-geo/data/villesFrance.tex
new file mode 100644
index 00000000000..256300d9d28
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/villesFrance.tex
@@ -0,0 +1,44 @@
+\mapput[90](1.44278,43.6053){Toulouse}
+\mapput[90](0.619444,44.2042){Agen}
+\mapput[90](4.80889,43.9494){Avignon}
+\mapput[90](2.44056,44.9261){Aurillac}
+\mapput[90](5.366667,43.300000){Marseille}
+\mapput[0](4.850000,45.733333){Lyon}
+\mapput[-90](3.0875,45.7806){Clermont-Ferrand}
+\mapput[90](4.39028,45.74347){St Etienne}
+\mapput[90](-0.566667,44.833333){Bordeaux}
+\mapput[90](0.160278,47.65){Angouleme}
+\mapput[90](-1.15,46.1603){La Rochelle}
+\mapput[90](-4.483333,48.383333){Brest}
+\mapput[90](-1.67944,48.1147){Rennes}
+\mapput[-90](-0.36944,49.1831){Caen}
+\mapput[90](5.050000,47.316667){Dijon}
+\mapput[30](2.3775,51.0383){Dunkerque}
+\mapput[90](1.905,47.9031){Orleans}
+\mapput[180](0.100000,49.483333){Le Havre}
+\mapput[90](1.15333,49.0242){Evreux}
+\mapput[90](0.183333,48.000000)[Le_Mans]{Le Mans}
+\mapput[90](0.689167,47.3936){Tours}
+\mapput[90](0.546111,46.8178){Chatellerault}
+\mapput[90](1.266667,45.933333){Limoges}
+\mapput[90](6.183333,49.116667){Metz}
+\mapput[90](-1.583333,47.200000){Nantes}
+\mapput[90](4.016667,49.266667){Reims}
+\mapput[30](7.74861,48.65){Strasbourg}
+\mapput[30](3.56778,47.7983){Auxerre}
+\mapput[90](3.05,50.6333){Lille}
+\mapput[90](1.06667,49.45){Rouen}
+\mapput[90](5.7,45.2){Grenoble}
+\mapput[90](1.53333,45.16667){Brive}
+\mapput[90](1.45,44.45){Cahors}
+\mapput[90](0.36667,43.333){Pau}
+\mapput[90](2.8833,42.7){Perpignan}
+\mapput[90](-1.55,43.4833){Biarritz}
+\mapput[90](2.333,43.2167){Carcassonne}
+\mapput[90](3.87722,43.6119){Montpellier}
+\mapput[90](0.3333,46.5833){Poitiers}
+\mapput[0](2.21667,43.6167){Castres}
+\mapput[90](1.60778,42.9664){Foix}
+\mapput[90](9.45028,42.7008){Bastia}
+\mapput[90](8.73694,41.9267){Ajaccio}
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/villesFrance3d.tex b/Master/texmf-dist/tex/generic/pst-geo/data/villesFrance3d.tex
new file mode 100644
index 00000000000..f589e8d1966
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/villesFrance3d.tex
@@ -0,0 +1,44 @@
+\mapputIIID[90](1.44278,43.6053){Toulouse}
+\mapputIIID[90](0.619444,44.2042){Agen}
+\mapputIIID[90](4.80889,43.9494){Avignon}
+\mapputIIID[90](2.44056,44.9261){Aurillac}
+\mapputIIID[90](5.366667,43.300000){Marseille}
+\mapputIIID[0](4.850000,45.733333){Lyon}
+\mapputIIID[-90](3.0875,45.7806){Clermont-Ferrand}
+\mapputIIID[90](4.39028,45.74347){St Etienne}
+\mapputIIID[90](-0.566667,44.833333){Bordeaux}
+\mapputIIID[90](0.160278,47.65){Angouleme}
+\mapputIIID[90](-1.15,46.1603){La Rochelle}
+\mapputIIID[90](-4.483333,48.383333){Brest}
+\mapputIIID[90](-1.67944,48.1147){Rennes}
+\mapputIIID[-90](-0.36944,49.1831){Caen}
+\mapputIIID[90](5.050000,47.316667){Dijon}
+\mapputIIID[30](2.3775,51.0383){Dunkerque}
+\mapputIIID[90](1.905,47.9031){Orleans}
+\mapputIIID[180](0.100000,49.483333){Le Havre}
+\mapputIIID[90](1.15333,49.0242){Evreux}
+\mapputIIID[90](0.183333,48.000000)[Le_Mans]{Le Mans}
+\mapputIIID[90](0.689167,47.3936){Tours}
+\mapputIIID[90](0.546111,46.8178){Chatellerault}
+\mapputIIID[90](1.266667,45.933333){Limoges}
+\mapputIIID[90](6.183333,49.116667){Metz}
+\mapputIIID[90](-1.583333,47.200000){Nantes}
+\mapputIIID[90](4.016667,49.266667){Reims}
+\mapputIIID[30](7.74861,48.65){Strasbourg}
+\mapputIIID[30](3.56778,47.7983){Auxerre}
+\mapputIIID[90](3.05,50.6333){Lille}
+\mapputIIID[90](1.06667,49.45){Rouen}
+\mapputIIID[90](5.7,45.2){Grenoble}
+\mapputIIID[90](1.53333,45.16667){Brive}
+\mapputIIID[90](1.45,44.45){Cahors}
+\mapputIIID[90](0.36667,43.333){Pau}
+\mapputIIID[90](2.8833,42.7){Perpignan}
+\mapputIIID[90](-1.55,43.4833){Biarritz}
+\mapputIIID[90](2.333,43.2167){Carcassonne}
+\mapputIIID[90](3.87722,43.6119){Montpellier}
+\mapputIIID[90](0.3333,46.5833){Poitiers}
+\mapputIIID[0](2.21667,43.6167){Castres}
+\mapputIIID[90](1.60778,42.9664){Foix}
+\mapputIIID[90](9.45028,42.7008){Bastia}
+\mapputIIID[90](8.73694,41.9267){Ajaccio}
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/villesItalia.tex b/Master/texmf-dist/tex/generic/pst-geo/data/villesItalia.tex
new file mode 100644
index 00000000000..3f15d8fa7b9
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/villesItalia.tex
@@ -0,0 +1,100 @@
+\mapput[90](13.600000,37.296389){Agrigento}
+\mapput[0](8.612500,44.914167){Alessandria}
+\mapput[90](13.512500,43.623611){Ancona }
+\mapput[90](7.316667,45.737500){Aosta}
+\mapput[90](11.883333,43.466111){Arezzo}
+\mapput[90](13.579167,42.852500){Ascoli Piceno}
+\mapput[90](8.204167,44.900278){Asti}
+\mapput[90](14.795833,40.914444){Avellino}
+\mapput[90](16.879167,41.127500){Bari}
+\mapput[90](12.216667,46.137222){Belluno}
+\mapput[90](14.775000,41.131111){Benevento}
+\mapput[70](9.662500,45.702778){Bergamo}
+\mapput[-90](11.350000,44.498056){Bologna}
+\mapput[90](11.354167,46.496944){Bolzano}
+\mapput[90](10.225000,45.542500){Brescia}
+\mapput[90](17.770833,40.653889){Brindisi}
+\mapput[90](9.116667,39.220833){Cagliari}
+\mapput[90](14.062500,37.470000){Caltanissetta}
+\mapput[90](14.654167,41.563056){Campobasso}
+\mapput[-180](15.066667,37.033333){Canicattini}% (mon pays)
+\mapput[90](14.329167,41.072500){Caserta}
+\mapput[90](15.087500,37.503611){Catania}
+\mapput[90](16.591667,38.904444){Catanzaro}
+\mapput[90](14.166667,42.350556){Chieti}
+\mapput[90](9.258333,45.793611){Como}
+\mapput[90](16.258333,39.285278){Cosenza}
+\mapput[90](10.025000,45.133333){Cremona}
+\mapput[90](7.550000,44.392500){Cuneo}
+\mapput[90](14.287500,37.541667){Enna}
+\mapput[90](11.596111,44.842778){Ferrara}
+\mapput[90](11.254167,43.753889){Firenze}
+\mapput[90](15.545833,41.462500){Foggia}
+\mapput[90](12.037500,44.222500){Forli}
+\mapput[90](13.354167,41.639167){Frosinone}
+\mapput[90](8.920833,44.418889){Genova}
+\mapput[90](13.625000,45.941667){Gorizia}
+\mapput[90](11.112500,42.759167){Grosseto}
+\mapput[90](8.016667,43.875000){Imperia}
+\mapput[90](14.250000,41.400000){Isernia}
+\mapput[90](9.816667,44.090556){La Spezia}
+\mapput[90](13.400000,42.350278){L'Aquila}
+\mapput[90](12.904167,41.466389){Latina}
+\mapput[90](18.170833,40.350833){Lecce}
+\mapput[90](10.308333,43.526944){Livorno}
+\mapput[90](10.504167,43.842778){Lucca}
+\mapput[90](13.425000,43.295833){Macerata}
+\mapput[90](10.795833,45.159167){Mantova}
+\mapput[0](12.45,37.78){Marsala}
+\mapput[90](10.133333,44.022222){Massa}
+\mapput[90](16.612500,40.665833){Matera}
+\mapput[90](15.575000,38.192778){Messina}
+\mapput[90](9.191944,45.466389){Milano}
+\mapput[-90](10.883333,44.645833){Modena}
+\mapput[90](14.254167,40.862778){Napoli}
+\mapput[90](8.616667,45.448333){Novara}
+\mapput[90](9.337500,40.319722){Nuoro}
+\mapput[90](8.600000,39.900000){Oristano}
+\mapput[90](11.870833,45.400278){Padova}
+\mapput[90](13.379167,38.136667){Palermo}
+\mapput[90](12.000000,36.800000){Pantelleria}
+\mapput[90](10.333333,44.802222){Parma}
+\mapput[90](9.151389,45.184444){Pavia}
+\mapput[90](12.391667,43.112222){Perugia}
+\mapput[0](12.912500,43.908611){Pesaro}
+\mapput[90](14.212500,42.459444){Pescara}
+\mapput[90](9.695833,45.050000){Piacenza}
+\mapput[90](10.395833,43.722222){Pisa}
+\mapput[90](10.916667,43.932778){Pistoia}
+\mapput[90](12.645833,45.958056){Pordenone}
+\mapput[90](15.808333,40.639167){Potenza}
+\mapput[0](14.754167,36.940556){Ragusa}
+\mapput[90](12.200000,44.418611){Ravenna}
+\mapput[0](15.645833,38.106389){Reggio Calabria}
+\mapput[50](10.629167,44.695833){Reggio Emilia}
+\mapput[90](12.858333,42.401667){Rieti}
+% ROMA 12.454167,41.923611
+\mapput[90](12.483333,41.883333){Rome}
+\mapput[90](11.791667,45.072500){Rovigo}
+\mapput[90](14.762500,40.679444){Salerno}
+\mapput[90](8.562500,40.724444){Sassari}
+\mapput[90](8.483333,44.304444){Savona}
+\mapput[90](11.333333,43.317500){Siena}
+\mapput[0](15.308333,37.063333){Siracusa}
+\mapput[90](9.870833,46.171111){Sondrio}
+\mapput[90](17.229167,40.475000){Taranto}
+\mapput[90](13.733333,42.657500){Teramo}
+\mapput[90](12.645833,42.561111){Terni}
+\mapput[90](7.683333,45.070556){Torino}
+\mapput[90](12.508333,38.031389){Trapani}
+\mapput[90](11.120833,46.066389){Trento}
+\mapput[90](12.245833,45.665278){Treviso}
+\mapput[90](13.762500,45.643056){Trieste}
+\mapput[90](13.233333,46.059444){Udine}
+\mapput[90](8.800000,45.000000){Varese}
+\mapput[0](12.337500,45.433611){Venezia}
+\mapput[90](8.420833,45.329444){Vercelli}
+\mapput[90](10.995833,45.442500){Verona}
+\mapput[90](11.545833,45.546667){Vicenza}
+\mapput[90](12.104167,42.416389){Viterbo}
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/villesItalia3d.tex b/Master/texmf-dist/tex/generic/pst-geo/data/villesItalia3d.tex
new file mode 100644
index 00000000000..7dc95a95ddd
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/villesItalia3d.tex
@@ -0,0 +1,100 @@
+\mapputIIID[90](13.600000,37.296389){Agrigento}
+\mapputIIID[0](8.612500,44.914167){Alessandria}
+\mapputIIID[90](13.512500,43.623611){Ancona }
+\mapputIIID[90](7.316667,45.737500){Aosta}
+\mapputIIID[90](11.883333,43.466111){Arezzo}
+\mapputIIID[90](13.579167,42.852500){Ascoli Piceno}
+\mapputIIID[90](8.204167,44.900278){Asti}
+\mapputIIID[90](14.795833,40.914444){Avellino}
+\mapputIIID[90](16.879167,41.127500){Bari}
+\mapputIIID[90](12.216667,46.137222){Belluno}
+\mapputIIID[90](14.775000,41.131111){Benevento}
+\mapputIIID[70](9.662500,45.702778){Bergamo}
+\mapputIIID[-90](11.350000,44.498056){Bologna}
+\mapputIIID[90](11.354167,46.496944){Bolzano}
+\mapputIIID[90](10.225000,45.542500){Brescia}
+\mapputIIID[90](17.770833,40.653889){Brindisi}
+\mapputIIID[90](9.116667,39.220833){Cagliari}
+\mapputIIID[90](14.062500,37.470000){Caltanissetta}
+\mapputIIID[90](14.654167,41.563056){Campobasso}
+\mapputIIID[-180](15.066667,37.033333){Canicattini}% (mon pays)
+\mapputIIID[90](14.329167,41.072500){Caserta}
+\mapputIIID[90](15.087500,37.503611){Catania}
+\mapputIIID[90](16.591667,38.904444){Catanzaro}
+\mapputIIID[90](14.166667,42.350556){Chieti}
+\mapputIIID[90](9.258333,45.793611){Como}
+\mapputIIID[90](16.258333,39.285278){Cosenza}
+\mapputIIID[90](10.025000,45.133333){Cremona}
+\mapputIIID[90](7.550000,44.392500){Cuneo}
+\mapputIIID[90](14.287500,37.541667){Enna}
+\mapputIIID[90](11.596111,44.842778){Ferrara}
+\mapputIIID[90](11.254167,43.753889){Firenze}
+\mapputIIID[90](15.545833,41.462500){Foggia}
+\mapputIIID[90](12.037500,44.222500){Forli}
+\mapputIIID[90](13.354167,41.639167){Frosinone}
+\mapputIIID[90](8.920833,44.418889){Genova}
+\mapputIIID[90](13.625000,45.941667){Gorizia}
+\mapputIIID[90](11.112500,42.759167){Grosseto}
+\mapputIIID[90](8.016667,43.875000){Imperia}
+\mapputIIID[90](14.250000,41.400000){Isernia}
+\mapputIIID[90](9.816667,44.090556){La Spezia}
+\mapputIIID[90](13.400000,42.350278){L'Aquila}
+\mapputIIID[90](12.904167,41.466389){Latina}
+\mapputIIID[90](18.170833,40.350833){Lecce}
+\mapputIIID[90](10.308333,43.526944){Livorno}
+\mapputIIID[90](10.504167,43.842778){Lucca}
+\mapputIIID[90](13.425000,43.295833){Macerata}
+\mapputIIID[90](10.795833,45.159167){Mantova}
+\mapputIIID[0](12.45,37.78){Marsala}
+\mapputIIID[90](10.133333,44.022222){Massa}
+\mapputIIID[90](16.612500,40.665833){Matera}
+\mapputIIID[90](15.575000,38.192778){Messina}
+\mapputIIID[90](9.191944,45.466389){Milano}
+\mapputIIID[-90](10.883333,44.645833){Modena}
+\mapputIIID[90](14.254167,40.862778){Napoli}
+\mapputIIID[90](8.616667,45.448333){Novara}
+\mapputIIID[90](9.337500,40.319722){Nuoro}
+\mapputIIID[90](8.600000,39.900000){Oristano}
+\mapputIIID[90](11.870833,45.400278){Padova}
+\mapputIIID[90](13.379167,38.136667){Palermo}
+\mapputIIID[90](12.000000,36.800000){Pantelleria}
+\mapputIIID[90](10.333333,44.802222){Parma}
+\mapputIIID[90](9.151389,45.184444){Pavia}
+\mapputIIID[90](12.391667,43.112222){Perugia}
+\mapputIIID[0](12.912500,43.908611){Pesaro}
+\mapputIIID[90](14.212500,42.459444){Pescara}
+\mapputIIID[90](9.695833,45.050000){Piacenza}
+\mapputIIID[90](10.395833,43.722222){Pisa}
+\mapputIIID[90](10.916667,43.932778){Pistoia}
+\mapputIIID[90](12.645833,45.958056){Pordenone}
+\mapputIIID[90](15.808333,40.639167){Potenza}
+\mapputIIID[0](14.754167,36.940556){Ragusa}
+\mapputIIID[90](12.200000,44.418611){Ravenna}
+\mapputIIID[0](15.645833,38.106389){Reggio Calabria}
+\mapputIIID[50](10.629167,44.695833){Reggio Emilia}
+\mapputIIID[90](12.858333,42.401667){Rieti}
+% ROMA 12.454167,41.923611
+\mapputIIID[90](12.483333,41.883333){Rome}
+\mapputIIID[90](11.791667,45.072500){Rovigo}
+\mapputIIID[90](14.762500,40.679444){Salerno}
+\mapputIIID[90](8.562500,40.724444){Sassari}
+\mapputIIID[90](8.483333,44.304444){Savona}
+\mapputIIID[90](11.333333,43.317500){Siena}
+\mapputIIID[0](15.308333,37.063333){Siracusa}
+\mapputIIID[90](9.870833,46.171111){Sondrio}
+\mapputIIID[90](17.229167,40.475000){Taranto}
+\mapputIIID[90](13.733333,42.657500){Teramo}
+\mapputIIID[90](12.645833,42.561111){Terni}
+\mapputIIID[90](7.683333,45.070556){Torino}
+\mapputIIID[90](12.508333,38.031389){Trapani}
+\mapputIIID[90](11.120833,46.066389){Trento}
+\mapputIIID[90](12.245833,45.665278){Treviso}
+\mapputIIID[90](13.762500,45.643056){Trieste}
+\mapputIIID[90](13.233333,46.059444){Udine}
+\mapputIIID[90](8.800000,45.000000){Varese}
+\mapputIIID[0](12.337500,45.433611){Venezia}
+\mapputIIID[90](8.420833,45.329444){Vercelli}
+\mapputIIID[90](10.995833,45.442500){Verona}
+\mapputIIID[90](11.545833,45.546667){Vicenza}
+\mapputIIID[90](12.104167,42.416389){Viterbo}
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/wfraczon.dat b/Master/texmf-dist/tex/generic/pst-geo/data/wfraczon.dat
new file mode 100644
index 00000000000..3fb80ca2404
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/wfraczon.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/data/wmaglin.dat b/Master/texmf-dist/tex/generic/pst-geo/data/wmaglin.dat
new file mode 100644
index 00000000000..c0b0d40c37f
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/data/wmaglin.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/README b/Master/texmf-dist/tex/generic/pst-geo/dataII/README
new file mode 100644
index 00000000000..bd25910dd4e
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/README
@@ -0,0 +1,86 @@
+Project pst-geo-compress 2009-07-30
+========================
+
+Author: Heiko Oberdiek <oberdiek@uni-freiburg.de>
+License is LPPL 1.3c,
+ maintainance status: maintained
+ current maintainer: author
+
+Files:
+ README (this file)
+ pst-geo-compress.pl
+ pst-geo-decompress.pl
+
+Requirements: Ghostscript >= 8.56 (if prediction is used)
+
+`pst-geo' (CTAN:graphics/pstricks/contrib/pst-geo/) comes with
+huge data files:
+ CTAN:graphics/pstricks/contrib/pst-geo/data/data.tgz
+ CTAN:graphics/pstricks/contrib/pst-geo/dataII/dataII.tgz
+Unpacked the data files consume about 134 MB.
+
+The data files (files with extension `.dat') are PostScript files.
+PostScript supports compression and decompression via filter.
+The Perl script `pst-geo-compress.pl' compresses the data files
+using the /FlateEncode filter and adds code to decompresses the file,
+if read by a PostScript interpreter. Now the space requirements of
+the data files is about 24 MB.
+
+Caveat: Filters /FlateEncode and /FlateDecode require
+PostScript language level 3 (supported by ghostscript).
+(LZW compression don't need language level 3, but
+the compression is less effective.)
+
+Size reduction details:
+* Much unnecessary white space is removed.
+* Some comments are removed (especially number comments
+ in .dat files of data.tgz), the remaining comments are preserved
+ (especially city names).
+* /FlateEncode filter.
+* PNG prediction (method `up') is used for most of the files.
+ Spaces at line ends are added to fill the space up to
+ to the columns count. This improves the prediction,
+ because these files contains long lists of sorted coordinate pairs.
+ The prediction columns count is also the maximal line length,
+ because of a ghostscript bug:
+
+Ghostscript has a bug regarding prediction, it is fixed in
+version 8.56 (2007-03-14):
+
+| 2006-12-11T17:30:53.980862Z L. Peter Deutsch
+|
+| Fixes bug: the PNG predictor filters produced incorrect data for the last
+| pixel of each row. (The encoder and decoder had matching bugs, so
+| encode+decode produced the correct result!) Fixes a diff in PS3 CET
+| 23-12U-1.
+
+By having each line at the same length, the last byte of a row
+has always the same value (end of line character). This does
+not trigger this bug (tested with gs 7.07/8.64).
+
+After compression the files aren't human-readable any more.
+The Perl script `pst-geo-decompress.pl' can be used to
+decompress a data file.
+
+Both scripts know option -h that prints a short usage screen.
+Option --gscmd allows to configure the ghostscript programm call,
+if the automatic ghostscript isn't sufficient.
+
+`pst-geo-compress.pl' is called inside the directory where
+the data files are present. Options `-1' and `-2' choose
+between the files from `data.tgz' and `dataII.tgz'.
+
+`pst-geo-decompress.pl' expects the data file to decompress.
+If an output file is given, the result is stored there. Otherwise
+standard output is used.
+
+History:
+ 2009-07-30 v1.0 First release
+ 2009-07-30 v1.1:
+ * Workaround for ghostscript bug added:
+ * Files that are compressed with prediction have
+ equal line length.
+ * Removing comments (except for city data files)
+ * Obsolete option --prediction is therefore removed
+ * Adding standalone test mode (option `--test').
+
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-bdy.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-bdy.dat
new file mode 100644
index 00000000000..b9431a079eb
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-bdy.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-cil.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-cil.dat
new file mode 100644
index 00000000000..d7736053baf
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-cil.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-riv.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-riv.dat
new file mode 100644
index 00000000000..fd1f33180fc
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/africa-riv.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-bdy.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-bdy.dat
new file mode 100644
index 00000000000..7001f12c475
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-bdy.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-cil.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-cil.dat
new file mode 100644
index 00000000000..94a995292f1
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-cil.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-isl.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-isl.dat
new file mode 100644
index 00000000000..7ecf8eac79b
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-isl.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-riv.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-riv.dat
new file mode 100644
index 00000000000..4e5d0838259
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/asia-riv.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/c-cap.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/c-cap.dat
new file mode 100644
index 00000000000..27e4e77adb1
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/c-cap.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/c-sub.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/c-sub.dat
new file mode 100644
index 00000000000..10f9bf0280e
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/c-sub.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/citycapitals.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/citycapitals.dat
new file mode 100644
index 00000000000..692ad8410dd
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/citycapitals.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/citysub.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/citysub.dat
new file mode 100644
index 00000000000..7b562e138d7
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/citysub.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-bdy.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-bdy.dat
new file mode 100644
index 00000000000..00c1ee3dc4c
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-bdy.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-cil.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-cil.dat
new file mode 100644
index 00000000000..ebfd49d03d6
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-cil.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-riv.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-riv.dat
new file mode 100644
index 00000000000..5b9c648645a
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/europe-riv.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-bdy.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-bdy.dat
new file mode 100644
index 00000000000..3df82e7c3a7
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-bdy.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-cil.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-cil.dat
new file mode 100644
index 00000000000..721aadcfeea
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-cil.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-pby.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-pby.dat
new file mode 100644
index 00000000000..bd8a7cb22bf
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-pby.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-riv.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-riv.dat
new file mode 100644
index 00000000000..f774bbbbf73
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/namer-riv.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-arc.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-arc.dat
new file mode 100644
index 00000000000..e317838e234
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-arc.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-bdy.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-bdy.dat
new file mode 100644
index 00000000000..297edec94d1
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-bdy.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-cil.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-cil.dat
new file mode 100644
index 00000000000..91233dbc076
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-cil.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-riv.dat b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-riv.dat
new file mode 100644
index 00000000000..dd22d8f1b8e
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pst-geo/dataII/samer-riv.dat
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex
index fa44efba13f..367bf05b7f3 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex
+++ b/Master/texmf-dist/tex/generic/pst-geo/pst-map2d.tex
@@ -9,7 +9,7 @@
%% Giuseppe Matarazzo <joematara@hotmail.com> (Italy)
%% Herbert Voss <voss@perce.de> (Germany)
%%
-%% May 09, 2004
+%% September 26, 2008
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -32,8 +32,8 @@
\pst@addfams{pst-map2d}% added 2004-09-29 hv
%
-\def\fileversion{1.08}
-\def\filedate{2008/04/05}
+\def\fileversion{1.10}
+\def\filedate{2009/08/28}
\message{`PST-map2d' v\fileversion, \filedate\space (ML/GM/HV)}
%
\SpecialCoor
@@ -46,7 +46,7 @@
\define@key[psset]{pst-map2d}{level}{\edef\psk@WorldMap@level{#1}}
\psset{level=1}
%
-\define@key[psset]{pst-map2d}{type}{\edef\psk@WorldMap@type{#1}}
+\define@key[psset]{pst-map2d}{type}{\def\psk@WorldMap@type{#1}}
\psset{type=1}
% type=1 ==> Mercator
% type=2 ==> Lambert
@@ -56,58 +56,59 @@
% type=6 ==> Babinet
% type=7 ==> Collignon
% type=8 ==> Bonne
-\define@key[psset]{pst-map2d}{n}{\edef\psk@WorldMap@n{#1}}
+\define@key[psset]{pst-map2d}{n}{\def\psk@WorldMap@n{#1}}
\psset{n=1.77245} % sqrt(pi) % pour Collignon
%
-\define@key[psset]{pst-map2d}{limiteL}{\edef\psk@WorldMap@limiteL{#1}}
+\define@key[psset]{pst-map2d}{limiteL}{\def\psk@WorldMap@limiteL{#1}}
\psset{limiteL=180} % longitude limite
%
-\define@key[psset]{pst-map2d}{latitude0}{\edef\psk@WorldMap@latitudeO{#1}}
+\define@key[psset]{pst-map2d}{latitude0}{\def\psk@WorldMap@latitudeO{#1}}
\psset{latitude0=45} % pour Bonne latitude 0
%
-\define@key[psset]{pst-map2d}{longitude0}{\edef\psk@WorldMap@longitudeO{#1}}
+\define@key[psset]{pst-map2d}{longitude0}{\def\psk@WorldMap@longitudeO{#1}}
\psset{longitude0=0} % pour Bonne longitude 0
%
-\define@key[psset]{pst-map2d}{increment}{\edef\psk@WorldMap@increment{#1}}
+\define@key[psset]{pst-map2d}{increment}{\def\psk@WorldMap@increment{#1}}
\psset{increment=10}
%
-\define@key[psset]{pst-map2d}{MapFillColor}{\edef\psk@WorldMap@Fillcolor{#1}} % couleur des continents
-\psset{MapFillColor= 0.99 0.95 0.7 }
+\define@key[psset]{pst-map2d}{MapFillColor}{\pst@getcolor{#1}\psk@WorldMap@Fillcolor} % couleur des continents
+\psset{MapFillColor={[rgb]{0.99, 0.95, 0.7}}}
+\define@key[psset]{pst-map2d}{SeaFillColor}{\pst@getcolor{#1}\psk@WorldMap@Seacolor} % sea color
+\psset{SeaFillColor={[rgb]{0.5, 0.8, 0.8}}}
+\define@key[psset]{pst-map2d}{LakeFillColor}{\pst@getcolor{#1}\psk@WorldMap@Lakecolor} % lake color
+\psset{LakeFillColor={[rgb]{0.2, 0.2, 0.9}}}
+\define@key[psset]{pst-map2d}{RiverFillColor}{\pst@getcolor{#1}\psk@WorldMap@Rivercolor} % river color
+\psset{RiverFillColor={[rgb]{0, 0, 1}}}
%
+%\define@boolkey[psset]{pst-3dplot}[Pst@]{Debug}[true]{}%
\newif\ifPst@WorldMap@capitals
\define@key[psset]{pst-map2d}{capital}[false]{\@nameuse{Pst@WorldMap@capitals#1}}
\psset{capital=false}
%
-\newif\ifPst@WorldMap@city
-\define@key[psset]{pst-map2d}{city}[false]{\@nameuse{Pst@WorldMap@city#1}}
-\psset{city=false}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{city}[false]{}
+\psset{city}
%
\newif\ifPst@WorldMap@Rivers
\define@key[psset]{pst-map2d}{rivers}[true]{\@nameuse{Pst@WorldMap@Rivers#1}}
-\psset{rivers=true}
+\psset{rivers}
%
\newif\ifPst@WorldMap@Borders
\define@key[psset]{pst-map2d}{borders}[true]{\@nameuse{Pst@WorldMap@Borders#1}}
\psset{borders=false}
%
-\newif\ifPst@WorldMap@maillage
-\define@key[psset]{pst-map2d}{maillage}[true]{\@nameuse{Pst@WorldMap@maillage#1}}
-\psset{maillage=true}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{maillage}[true]{}
+\psset{maillage}
%
-\newif\ifPst@WorldMap@Fill
-\define@key[psset]{pst-map2d}{Fill}[true]{\@nameuse{Pst@WorldMap@Fill#1}}
-\psset{Fill=true}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{Fill}[true]{}
+\psset{Fill}
%
-\newif\ifPst@WorldMap@USA
-\define@key[psset]{pst-map2d}{USA}[false]{\@nameuse{Pst@WorldMap@USA#1}}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{USA}[false]{}
\psset{USA=false}
%
-\newif\ifPst@WorldMap@AUS
-\define@key[psset]{pst-map2d}{AUS}[false]{\@nameuse{Pst@WorldMap@AUS#1}}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{AUS}[false]{}
\psset{AUS=false}
%
-\newif\ifPst@WorldMap@MEX
-\define@key[psset]{pst-map2d}{MEX}[false]{\@nameuse{Pst@WorldMap@MEX#1}}
+\define@boolkey[psset]{pst-map2d}[Pst@WorldMap@]{MEX}[false]{}
\psset{MEX=false}
%
\def\geo@variablesMap{%
@@ -210,8 +211,9 @@
X CoeffX xunit Y CoeffY yunit lineto
} for
closepath
- /Color {0.5 0.8 0.8} def
- Color setrgbcolor
+% /Color {\psk@WorldMap@Seacolor} def
+% Color setrgbcolor
+ \pst@usecolor\psk@WorldMap@Seacolor
fill
grestore
\fi
@@ -239,7 +241,8 @@
closepath
% Colour in earth's surfaces
gsave
- Color setrgbcolor
+% Color setrgbcolor
+ Color
fill
grestore
\fi
@@ -251,8 +254,7 @@
\else
coasts
\fi
-%/Color {0.5 0.8 0.5} def
-/Color {\psk@WorldMap@Fillcolor} def
+/Color { \pst@usecolor\psk@WorldMap@Fillcolor } def
Draw
islands
Draw
@@ -268,18 +270,19 @@ usa
australia
Draw
\fi
-/Color {0.5 0.8 0.8} def
+/Color { \pst@usecolor\psk@WorldMap@Lakecolor } def
lake
Draw
% les rivières
\ifPst@WorldMap@Rivers
/DrawRivers {
- {
-CalculsPoints
-0 0 1 setrgbcolor
-stroke
-} forall
-}def
+ {
+ CalculsPoints
+ \pst@usecolor\psk@WorldMap@Rivercolor
+ stroke
+ } forall
+} def
+%
river
DrawRivers
\fi
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex
index 9e16370f270..794832b1b98 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex
+++ b/Master/texmf-dist/tex/generic/pst-geo/pst-map2dII.tex
@@ -28,8 +28,8 @@
\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
%
%
-\def\fileversion{0.82}
-\def\filedate{2008/04/05}
+\def\fileversion{0.83}
+\def\filedate{2009/08/28}
\message{`PST-map2dII v\fileversion, \filedate\space (ML/GM/HV)}
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex
index 7f0fcdd5008..4e4344ad592 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex
+++ b/Master/texmf-dist/tex/generic/pst-geo/pst-map3d.tex
@@ -7,15 +7,16 @@
%%
%% Manuel Luque <Mluque5130@aol.com> (France)
%% Giuseppe Matarazzo <joematara@hotmail.com> (Italy)
+%% Herbert Voss <hvoss@tug.org> (Germany)
%%
-%% May 29, 2008
+%% August 9, 2009
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
%% in directory macros/latex/base/lppl.txt.
%%
%% DESCRIPTION:
-%% `pst-map2dII' is a PSTricks package to create geographical objects
+%% `pst-map3d' is a PSTricks package to create geographical objects
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% nouvelle version de pst-map3d %
@@ -29,8 +30,8 @@
\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
-\def\fileversion{2.0}
-\def\filedate{2008/03/05}
+\def\fileversion{2.03}
+\def\filedate{2009/08/28}
\message{`PST-map3d v\fileversion, \filedate}
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -40,144 +41,108 @@
\definecolor{darkgreen}{cmyk}{1,0,1,0.5}
\SpecialCoor
%
-\define@key[psset]{pst-map3d}{path}{\edef\psk@WorldMap@Path{#1}} % chemin des données
+\define@key[psset]{pst-map3d}{path}{\def\psk@WorldMap@Path{#1}} % chemin des données
\psset{path=data}
%
\pstheader{pst-map3d.pro}
-\define@key[psset]{pst-map3d}{RotX}{\edef\psk@TroisD@RotX{#1}} % rotation autour de Ox en degrés
-\define@key[psset]{pst-map3d}{RotY}{\edef\psk@TroisD@RotY{#1}} % rotation autour de Oy en degrés
-\define@key[psset]{pst-map3d}{RotZ}{\edef\psk@TroisD@RotZ{#1}} % rotation autour de OZ en degrés
-\define@key[psset]{pst-map3d}{Radius}{\edef\psk@TroisD@Radius{#1}} % rayon de la sphère
+\define@key[psset]{pst-map3d}{RotX}{\def\psk@TroisD@RotX{#1}} % rotation autour de Ox en degrés
+\define@key[psset]{pst-map3d}{RotY}{\def\psk@TroisD@RotY{#1}} % rotation autour de Oy en degrés
+\define@key[psset]{pst-map3d}{RotZ}{\def\psk@TroisD@RotZ{#1}} % rotation autour de OZ en degrés
+\define@key[psset]{pst-map3d}{Radius}{\def\psk@TroisD@Radius{#1}} % rayon de la sphère
%
-\define@key[psset]{pst-map3d}{THETA}{\edef\psk@TroisD@Theta{#1}}
-\define@key[psset]{pst-map3d}{PHI}{\edef\psk@TroisD@Phi{#1}}
-\define@key[psset]{pst-map3d}{Dobs}{\edef\psk@TroisD@Dobs{#1}}
-\define@key[psset]{pst-map3d}{Decran}{\edef\psk@TroisD@Ecran{#1}}
-\psset{THETA=0,PHI=45,Dobs=20,Decran=25}
+\define@key[psset]{pst-map3d}{THETA}{\def\psk@TroisD@Theta{#1}}
+\define@key[psset]{pst-map3d}{PHI}{\def\psk@TroisD@Phi{#1}}
+\define@key[psset]{pst-map3d}{Dobs}{\def\psk@TroisD@Dobs{#1}}
+\define@key[psset]{pst-map3d}{Decran}{\def\psk@TroisD@Ecran{#1}}
+\psset[pst-map3d]{THETA=0,PHI=45,Dobs=20,Decran=25}
%
-\psset{RotX=0,RotY=0,RotZ=0,Radius=5}
+\psset[pst-map3d]{RotX=0,RotY=0,RotZ=0,Radius=5}
%
\define@key[psset]{pst-map3d}{Day}{\def\psk@WorldMap@J{#1}}
\define@key[psset]{pst-map3d}{Month}{\def\psk@WorldMap@M{#1}}
\define@key[psset]{pst-map3d}{Year}{\def\psk@WorldMap@A{#1}}
-\psset{Day=\number\day,Month=\number\month,Year=\number\year}
-\define@key[psset]{pst-map3d}{hour}{\edef\psk@WorldMap@hour{#1}}
-\psset{hour=12} % en heures
+\psset[pst-map3d]{Day=\number\day,Month=\number\month,Year=\number\year}
+\define@key[psset]{pst-map3d}{hour}{\def\psk@WorldMap@hour{#1}}
+\psset[pst-map3d]{hour=12} % en heures
%
-\define@key[psset]{pst-map3d}{gridmapdiv}{\edef\psk@WorldMap@mapgriddiv{#1}}
-\psset{gridmapdiv=10}
+\define@key[psset]{pst-map3d}{gridmapdiv}{\def\psk@WorldMap@mapgriddiv{#1}}
+\psset[pst-map3d]{gridmapdiv=10}
%
-\define@key[psset]{pst-map3d}{longitudeMeridien}{\edef\psk@WorldMap@longitudeMeridien{#1}}
-\psset{longitudeMeridien=0}
+\define@key[psset]{pst-map3d}{longitudeMeridien}{\def\psk@WorldMap@longitudeMeridien{#1}}
+\psset[pst-map3d]{longitudeMeridien=0}
%
\newdimen\psmeridienwidth
-\def\psset@meridienwidth#1{\pssetlength\psmeridienwidth{#1}}
-\psset@meridienwidth{1pt}
+\define@key[psset]{pst-map3d}{meridienwidth}[1pt]{\pssetlength\psmeridienwidth{#1}}
+\psset[pst-map3d]{meridienwidth=1pt}
%
-\define@key[psset]{pst-map3d}{meridiencolor}{%
-\pst@getcolor{#1}\psmeridiencolor}
+\define@key[psset]{pst-map3d}{meridiencolor}[red]{\pst@getcolor{#1}\psmeridiencolor}
\psset[pst-map3d]{meridiencolor=red}
%
-\define@key[psset]{pst-map3d}{latitudeParallel}{\edef\psk@WorldMap@latitudeParallel{#1}}
-\psset{latitudeParallel=0}
+\define@key[psset]{pst-map3d}{latitudeParallel}[0]{\def\psk@WorldMap@latitudeParallel{#1}}
+\psset[pst-map3d]{latitudeParallel=0}
%
\newdimen\psparallelwidth
-\def\psset@parallelwidth#1{\pssetlength\psparallelwidth{#1}}
-\psset@parallelwidth{1pt}
+\define@key[psset]{pst-map3d}{parallelwidth}[1pt]{\pssetlength\psparallelwidth{#1}}
+\psset[pst-map3d]{parallelwidth=1pt}
%
-\define@key[psset]{pst-map3d}{parallelcolor}{%
-\pst@getcolor{#1}\psparallelcolor}
+\define@key[psset]{pst-map3d}{parallelcolor}{\pst@getcolor{#1}\psparallelcolor}
\psset[pst-map3d]{parallelcolor=red}
%
-
\definecolor{terre}{rgb}{0.99,0.95,0.7}
\definecolor{mer}{rgb}{0.5,0.8,0.8}
\definecolor{darkblue}{cmyk}{1,1,0,0.7}
-\define@key[psset]{pst-map3d}{mapcolor}{%
-\pst@getcolor{#1}\psmapcolor}
+\define@key[psset]{pst-map3d}{mapcolor}{\pst@getcolor{#1}\psmapcolor}
\psset[pst-map3d]{mapcolor=terre}
-
-\define@key[psset]{pst-map3d}{bordercolor}{%
-\pst@getcolor{#1}\psbordercolor}
+\define@key[psset]{pst-map3d}{bordercolor}{\pst@getcolor{#1}\psbordercolor}
\psset[pst-map3d]{bordercolor=black}
-
-\define@key[psset]{pst-map3d}{islandcolor}{%
-\pst@getcolor{#1}\psislandcolor}
+\define@key[psset]{pst-map3d}{islandcolor}{\pst@getcolor{#1}\psislandcolor}
\psset[pst-map3d]{islandcolor=black}
-
-\define@key[psset]{pst-map3d}{coastcolor}{%
-\pst@getcolor{#1}\pscoastcolor}
+\define@key[psset]{pst-map3d}{coastcolor}{\pst@getcolor{#1}\pscoastcolor}
\psset[pst-map3d]{coastcolor=black}
-
-\define@key[psset]{pst-map3d}{oceancolor}{%
-\pst@getcolor{#1}\psoceancolor}
+\define@key[psset]{pst-map3d}{oceancolor}{\pst@getcolor{#1}\psoceancolor}
\psset[pst-map3d]{oceancolor=mer}
-
-\define@key[psset]{pst-map3d}{rivercolor}{%
-\pst@getcolor{#1}\psrivercolor}
+\define@key[psset]{pst-map3d}{rivercolor}{\pst@getcolor{#1}\psrivercolor}
\psset[pst-map3d]{rivercolor=blue}
-
-\define@key[psset]{pst-map3d}{wfraczoncolor}{%
-\pst@getcolor{#1}\pswfraczoncolor}
+\define@key[psset]{pst-map3d}{wfraczoncolor}{\pst@getcolor{#1}\pswfraczoncolor}
\psset[pst-map3d]{wfraczoncolor=red}
-
-\define@key[psset]{pst-map3d}{wmaglincolor}{%
-\pst@getcolor{#1}\pswmaglincolor}
+\define@key[psset]{pst-map3d}{wmaglincolor}{\pst@getcolor{#1}\pswmaglincolor}
\psset[pst-map3d]{wmaglincolor=darkblue}
-
-\define@key[psset]{pst-map3d}{ridgecolor}{%
-\pst@getcolor{#1}\psridgecolor}
+\define@key[psset]{pst-map3d}{ridgecolor}{\pst@getcolor{#1}\psridgecolor}
\psset[pst-map3d]{ridgecolor=red}
-
-\define@key[psset]{pst-map3d}{transfrmcolor}{%
-\pst@getcolor{#1}\pstransfrmcolor}
+\define@key[psset]{pst-map3d}{transfrmcolor}{\pst@getcolor{#1}\pstransfrmcolor}
\psset[pst-map3d]{transfrmcolor=orange}
-
-\define@key[psset]{pst-map3d}{trenchcolor}{%
-\pst@getcolor{#1}\pstrenchcolor}
+\define@key[psset]{pst-map3d}{trenchcolor}{\pst@getcolor{#1}\pstrenchcolor}
\psset[pst-map3d]{trenchcolor=darkgreen}
-
-\define@key[psset]{pst-map3d}{gridmapcolor}{%
-\pst@getcolor{#1}\psgridmapcolor}
+\define@key[psset]{pst-map3d}{gridmapcolor}{\pst@getcolor{#1}\psgridmapcolor}
\psset[pst-map3d]{gridmapcolor=black}
-
-\define@key[psset]{pst-map3d}{circlecolor}{%
-\pst@getcolor{#1}\pscirclecolor}
+\define@key[psset]{pst-map3d}{circlecolor}{\pst@getcolor{#1}\pscirclecolor}
\psset[pst-map3d]{circlecolor=blue}
-
-\define@key[psset]{pst-map3d}{circlesep}{\edef\psk@WorldMap@circlesep{#1}}
-\psset{circlesep=2} % en degres
-
+\define@key[psset]{pst-map3d}{circlesep}{\def\psk@WorldMap@circlesep{#1}}
+\psset[pst-map3d]{circlesep=2} % en degres
\newdimen\pscirclewidth
-\def\psset@circlewidth#1{\pssetlength\pscirclewidth{#1}}
-\psset@circlewidth{.5pt}
-
+\define@key[psset]{pst-map3d}{circlewidth}{\pssetlength\pscirclewidth{#1}}
+\psset[pst-map3d]{circlewidth=.5pt}
\newdimen\psgridmapwidth
-\def\psset@gridmapwidth#1{\pssetlength\psgridmapwidth{#1}}
-\psset@gridmapwidth{.8pt}
-
+\define@key[psset]{pst-map3d}{gridmapwidth}[0.8pt]{\pssetlength\psgridmapwidth{#1}}
+\psset[pst-map3d]{gridmapwidth=.8pt}
\newdimen\psborderwidth
-\def\psset@borderwidth#1{\pssetlength\psborderwidth{#1}}
-\psset@borderwidth{.8pt}
-
+\define@key[psset]{pst-map3d}{borderwidth}[0.8pt]{\pssetlength\psborderwidth{#1}}
+\psset[pst-map3d]{borderwidth=.8pt}
\newdimen\pscoastwidth
-\def\psset@coastwidth#1{\pssetlength\pscoastwidth{#1}}
-\psset@coastwidth{.8pt}
-
+\define@key[psset]{pst-map3d}{coastwidth}[0.8pt]{\pssetlength\pscoastwidth{#1}}
+\psset[pst-map3d]{coastwidth=.8pt}
\newdimen\pswfraczonwidth
-\def\psset@wfraczonwidth#1{\pssetlength\pswfraczonwidth{#1}}
-\psset@wfraczonwidth{.8pt}
-
+\define@key[psset]{pst-map3d}{wfraczonwidth}[0.8pt]{\pssetlength\pswfraczonwidth{#1}}
+\psset[pst-map3d]{wfraczonwidth=.8pt}
\newdimen\pswmaglinwidth
-\def\psset@wmaglinwidth#1{\pssetlength\pswmaglinwidth{#1}}
-\psset@wmaglinwidth{.8pt}
-
+\define@key[psset]{pst-map3d}{wmaglinwidth}[0.8pt]{\pssetlength\pswmaglinwidth{#1}}
+\psset[pst-map3d]{wmaglinwidth=.8pt}
\newdimen\psridgewidth
-\def\psset@ridgewidth#1{\pssetlength\psridgewidth{#1}}
-\psset@ridgewidth{2pt}
+\define@key[psset]{pst-map3d}{ridgewidth}[2pt]{\pssetlength\psridgewidth{#1}}
+\psset[pst-map3d]{ridgewidth=2pt}
-\def\variablesTroisD{%
+\def\variablesIIID@map3d{%
/RotX \psk@TroisD@RotX\space def
/RotY \psk@TroisD@RotY\space def
/RotZ \psk@TroisD@RotZ\space def
@@ -278,7 +243,7 @@
\begin@ClosedObj%
\addto@pscode{%
/increment \psk@WorldMap@mapgriddiv\space def
- \variablesTroisD
+ \variablesIIID@map3d
/mapcolor {\pst@usecolor\psmapcolor currentrgbcolor} def
/bordercolor {\pst@usecolor\psbordercolor currentrgbcolor} def
/coastcolor {\pst@usecolor\pscoastcolor currentrgbcolor} def
@@ -620,8 +585,8 @@ end}%
\def\pnodeMapIIID{\pst@object{pnodeMapIIID}}
\def\pnodeMapIIID@i(#1,#2)#3{%
\begin@SpecialObj%
- \pnode( !
- \variablesTroisD
+ \pnode(!
+ \variablesIIID@map3d
tx@map3DDict begin
MatriceTransformationZXY
/Xpoint {#2 cos #1 cos mul Rsphere mul} def
@@ -667,14 +632,14 @@ formulesTroisD
\fi%
\fi%
}}
-\def\mapputIIID@v[#1](#2,#3)[#4]#5{{%
+\def\mapputIIID@v[#1](#2,#3)[#4]#5{%
\pnodeMapIIID(#2,#3){#4}
-% \typeout{Node: #4}
\pst@dima=\psk@WorldMap@nodeWidth
\pscircle[style=psNodeMapStyle](#4){\pst@dima}
\pscircle*(#4){0.5\pst@dima}
- \uput{1.2\pst@dima}[#1](#4){\psframebox[style=NodeLabelStyle]{\sf#5}}%
-}}
+ \ifx\relax#5\relax\else
+ \uput{1.2\pst@dima}[#1](#4){\psframebox[style=NodeLabelStyle]{#5}}%
+ \fi}
%
% dessiner un méridien de longitude donnée
% longitude en degrés
@@ -684,7 +649,7 @@ formulesTroisD
\begingroup
\begin@SpecialObj%
\addto@pscode{%
- \variablesTroisD
+ \variablesIIID@map3d
/longitude_meridien #1 def
/meridienwidth {\pst@number\psmeridienwidth SLW} def
/meridiencolor {\pst@usecolor\psmeridiencolor currentrgbcolor} def
@@ -710,10 +675,10 @@ formulesTroisD
\begingroup
\begin@SpecialObj%
\addto@pscode{%
- \variablesTroisD
- /latitude_parallel #1 def
- /parallelwidth {\pst@number\psparallelwidth SLW} def
- /parallelcolor {\pst@usecolor\psparallelcolor currentrgbcolor} def
+ \variablesIIID@map3d
+ /latitude_parallel #1 def
+ /parallelwidth {\pst@number\psparallelwidth SLW} def
+ /parallelcolor {\pst@usecolor\psparallelcolor currentrgbcolor} def
tx@map3DDict begin
MatriceTransformationZXY
\ifPst@WorldMap@visibility
@@ -773,24 +738,24 @@ formulesTroisD
\def\psepicenter{\pst@object{psepicenter}}
\def\psepicenter@i(#1,#2)#3{%
- \begin@SpecialObj%
- \addto@pscode{%
- \variablesTroisD
- /longitude #1 def
- /latitude #2 def
- /nbre \psk@WorldMap@waves\space def
- /dphi \psk@WorldMap@Rmax\space 0.008983 mul def
- /circlecolor {\pst@usecolor\pscirclecolor currentrgbcolor} def
- /circlewidth {\pst@number\pscirclewidth SLW} def
- tx@map3DDict begin
- circlecolor
- circlewidth
- nbre dphi longitude latitude
- ondes
- end}%
- \mapputIIID(#1,#2){#3}
- \end@SpecialObj%
- \ignorespaces%
-}
+ \begin@ClosedObj%
+ \addto@pscode{
+ \variablesIIID@map3d
+ /longitude #1 def
+ /latitude #2 def
+ /nbre \psk@WorldMap@waves\space def
+ /dphi \psk@WorldMap@Rmax\space 0.008983 mul def
+ /circlecolor {\pst@usecolor\pscirclecolor currentrgbcolor} def
+ /circlewidth {\pst@number\pscirclewidth SLW} def
+ tx@map3DDict begin
+ circlecolor
+ circlewidth
+ nbre dphi longitude latitude
+ ondes
+ end }%
+ \ifx\relax#3\relax\else\mapputIIID(#1,#2){#3}\fi%
+ \end@ClosedObj%
+ \ignorespaces}
+%
\catcode`\@=\PstAtCode\relax
\endinput
diff --git a/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex b/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex
index 9f9cae4d6d6..6728202d4a5 100644
--- a/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex
+++ b/Master/texmf-dist/tex/generic/pst-geo/pst-map3dII.tex
@@ -27,34 +27,34 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey\fi
-\def\fileversion{0.24}
-\def\filedate{2008/04/05}
+\def\fileversion{0.26}
+\def\filedate{2009/08/28}
\message{`PST-mapThreeDII v\fileversion, \filedate\space (ML/GM/HV)}
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
\pst@addfams{pst-map3dII}
-\pstheader{map3dII.pro}
+\pstheader{pst-map3dII.pro}
\SpecialCoor
%
\define@key[psset]{pst-map3dII}{path}{\edef\psk@WorldMap@Path{#1}} % chemin des données
\psset{path=.}
%
-\define@key[psset]{pst-map3dII}{RotX}{\edef\psk@TroisD@RotX{#1}} % rotation autour de Ox en degrés
-\define@key[psset]{pst-map3dII}{RotY}{\edef\psk@TroisD@RotY{#1}} % rotation autour de Oy en degrés
-\define@key[psset]{pst-map3dII}{RotZ}{\edef\psk@TroisD@RotZ{#1}} % rotation autour de OZ en degrés
-\define@key[psset]{pst-map3dII}{Radius}{\edef\psk@TroisD@Radius{#1}} % rayon de la sphère
+\define@key[psset]{pst-map3dII}{RotX}{\def\psk@TroisD@RotX{#1}} % rotation autour de Ox en degrés
+\define@key[psset]{pst-map3dII}{RotY}{\def\psk@TroisD@RotY{#1}} % rotation autour de Oy en degrés
+\define@key[psset]{pst-map3dII}{RotZ}{\def\psk@TroisD@RotZ{#1}} % rotation autour de OZ en degrés
+\define@key[psset]{pst-map3dII}{Radius}{\def\psk@TroisD@Radius{#1}} % rayon de la sphère
%
-\define@key[psset]{pst-map3dII}{THETA}{\edef\psk@TroisD@Theta{#1}}
-\define@key[psset]{pst-map3dII}{PHI}{\edef\psk@TroisD@Phi{#1}}
-\define@key[psset]{pst-map3dII}{Dobs}{\edef\psk@TroisD@Dobs{#1}}
-\define@key[psset]{pst-map3dII}{Decran}{\edef\psk@TroisD@Ecran{#1}}
+\define@key[psset]{pst-map3dII}{THETA}{\def\psk@TroisD@Theta{#1}}
+\define@key[psset]{pst-map3dII}{PHI}{\def\psk@TroisD@Phi{#1}}
+\define@key[psset]{pst-map3dII}{Dobs}{\def\psk@TroisD@Dobs{#1}}
+\define@key[psset]{pst-map3dII}{Decran}{\def\psk@TroisD@Ecran{#1}}
\psset{THETA=0,PHI=45,Dobs=20,Decran=25,Radius=5}
\psset{RotX=0,RotY=0,RotZ=0}
%
-\define@key[psset]{pst-map3dII}{increment}{\edef\psk@WorldMapII@increment{#1}}
+\define@key[psset]{pst-map3dII}{increment}{\def\psk@WorldMapII@increment{#1}}
\psset{increment=10}
%
-\define@key[psset]{pst-map3dII}{level}{\edef\psk@WorldMapII@level{#1}}% hv 2004-05-05
+\define@key[psset]{pst-map3dII}{level}{\def\psk@WorldMapII@level{#1}}% hv 2004-05-05
\psset{level=5}
%
\def\geo@variablesIIID{%
diff --git a/Master/texmf-dist/tex/latex/pst-geo/pst-map3d.sty b/Master/texmf-dist/tex/latex/pst-geo/pst-map3d.sty
index 13fe0a7c877..4094b6d8114 100644
--- a/Master/texmf-dist/tex/latex/pst-geo/pst-map3d.sty
+++ b/Master/texmf-dist/tex/latex/pst-geo/pst-map3d.sty
@@ -2,9 +2,5 @@
\ProvidesPackage{pst-map3d}[2004/01/05 package wrapper for PSTricks pst-map3d.tex (hv)]
\input{pst-map3d.tex}
\ProvidesFile{pst-map3d.tex}
- [\filedate\space v\fileversion\space `PST-map3d' (ml,jm,hv)]
-\IfFileExists{pst-map3d.pro}{%
- \ProvidesFile{pst-map3d.pro}
- [2008/03/22 v. 1.0, PostScript prologue file (ml)]
-\@addtofilelist{pst-map3d.pro}}{}%
+ [\filedate\space v\fileversion\space `PST-map3d' (mljm,hv)]
\endinput
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index efbe40d4a4e..3048cb8c7e9 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -451,7 +451,8 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'pst-fun', "&MAKEpst",
'pst-func', "&MAKEpst",
'pst-gantt', "&MAKEpst",
- 'pst-geo', "&MAKEpstgeo",
+ 'pst-geo', "&MAKEpst",
+ 'pst-geo-compress', "die 'skipping, in pst-geo, check with hvoss'",
'pst-ghsb', "&MAKEpst",
'pst-gr3d', "&MAKEpst",
'pst-grad', "&MAKEpst",
@@ -609,15 +610,16 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'impatient' => '&POSTimpatient',
'interactiveworkbook' => '&POSTinteractiveworkbook',
'knuth' => '&POSTknuth',
- 'koma-script' => '&POSTkoma',
+ 'koma-script' => '&POSTkomascript',
'latex2man' => '&POSTlatex2man',
'lithuanian' => '&POSTlithuanian',
'montex' => '&POSTmontex',
'pgf' => '&POSTpgf',
'pst-cox' => '&POSTpstcox',
+ 'pst-geo' => '&POSTpstgeo',
'splitindex' => '&POSTsplitindex',
'xecyr' => '&POSTxecyr',
- 'xetex-pstricks' => '&POSTxetex_pstricks',
+ 'xetex-pstricks' => '&POSTxetexpstricks',
'zhspacing' => '&POSTzhspacing',
'zhmetrics' => '&POSTzhmetrics',
);
@@ -1255,7 +1257,6 @@ $standardmakeindex='\.ist';
'pst-circ', '.*-e\.tex|doc-.*.tex|pst-circ-doc.tex',
'pst-fr3d', 'doc-.*.tex|pst-fr3d-doc',
'pst-func', '.*-e\.tex|doc-.*.tex|pst-func-doc',
- 'pst-geo', '.*-e\.tex|doc-.*.tex|pst-geo-doc.tex',
'pst-ghsb', '.*-e\.tex|doc-.*.tex|pst-ghsb-doc.tex',
'pst-gr3d', '.*-e\.tex|doc-.*.tex|pst-gr3d-doc.tex',
'pst-jftree', '.*-e\.tex|doc-.*.tex|pst-jftree-doc.tex',
@@ -3283,6 +3284,7 @@ sub MAKEbeebe {
&SYSTEM("rm *");
}
+
# pstricks packages usually support both plain and latex.
#
sub MAKEpst
@@ -3310,40 +3312,11 @@ sub MAKEpst
&SYSTEM("mv $DEST/tex/generic/$package/*sty $DEST/tex/latex/$package");
&SYSTEM("mv $DEST/doc/generic/$package/*cfg $DEST/tex/latex/$package")
unless $package eq "pst-pad"; # its showexpl.cfg is for the doc
-}
-sub MAKEpstgeo
-{
- print "\t SPECIAL pst-geo $package starts\n";
- $standardtex = qq{^$package(Obj)?\.(tex|sty)}; # for pst-laboObj.tex
- $whichformat='generic';
- $whichdocformat='generic';
- $specialsourcefmt{$package}='generic';
- &setup;
- &xchdir("$DEST/doc/$whichdocformat/$package");
- -d <*/*/*/*/*/.> && &SYSTEM("$MV -f */*/*/*/* .");
- -d <*/*/*/*/.> && &SYSTEM("$MV -f */*/*/* .");
- -d <*/*/*/.> && &SYSTEM("$MV -f */*/* .");
- -d <*/*/.> && &SYSTEM("$MV -f */*/* .");
- -d <*/.> && &SYSTEM("$MV -f */* .");
- &SYSTEM("find -type d -print | xargs rmdir 2>/dev/null");
- &SYSTEM("find -type f -print >/tmp/find");
- &buildfilelist;
-
- $inspatt=$standardins if ! $inspatt;
- &runins($inspatt);
- &buildfilelist;
- &dosource;
- &dotex;
- &dotype1;
- killfiles($standardclean);
- &SYSTEM("mkdir -p $DEST/tex/latex/$package");
- &SYSTEM("mv $DEST/tex/generic/$package/*sty $DEST/tex/latex/$package");
- &SYSTEM("mv $DEST/doc/generic/$package/*sty $DEST/tex/latex/$package");
- &SYSTEM("mv $DEST/doc/generic/$package/*cfg $DEST/tex/latex/$package");
+ my $postaction = $posthook{$package};
+ eval ($postaction) if $postaction;
}
-
sub MAKEfontinst
{
&xchdir ($packagedir);
@@ -3677,7 +3650,7 @@ sub POSTknuth
&SYSTEM ("rm -rf etc mf mfware tex/tex.web tex/trip* texware web/*.web");
}
-sub POSTkoma
+sub POSTkomascript
{
print "POST$package - removing symlinks\n";
&SYSTEM ("find $DEST -type l | xargs --no-run-if-empty rm");
@@ -3731,15 +3704,6 @@ sub POSTpgf
&SYSTEM ("$RM $DEST/README");
}
-# has to be post instead of specialman because we use the tds.zip.
-sub POSTsplitindex
-{
- print "POST$package - mv man page\n";
- my $mydest = "$TOPDEST/texmf/doc/man/man1/";
- &xmkdir ($mydest);
- &SYSTEM ("$MV doc/latex/splitindex/$package.1 $mydest");
-}
-
sub POSTpstcox
{
print "POST$package - mv latex .sty, doc Gallery\n";
@@ -3753,6 +3717,24 @@ sub POSTpstcox
&SYSTEM ("mv -v pst-coxcoor?* pst-coxcoor");
}
+sub POSTpstgeo
+{
+ print "POST$package - mv data, doc\n";
+ &SYSTEM ("$MV data/pst*compress.pl .");
+ &SYSTEM ("$RM dataII/pst*compress.pl");
+ &SYSTEM ("$MV data dataII $DEST/tex/generic/pst-geo/");
+ &SYSTEM ("$MV doc/* .");
+}
+
+# has to be post instead of specialman because we use the tds.zip.
+sub POSTsplitindex
+{
+ print "POST$package - mv man page\n";
+ my $mydest = "$TOPDEST/texmf/doc/man/man1/";
+ &xmkdir ($mydest);
+ &SYSTEM ("$MV doc/latex/splitindex/$package.1 $mydest");
+}
+
sub POSTxecyr
{
print "POST$package - handling bat, moving language.dat.add from runtime\n";
@@ -3764,7 +3746,7 @@ sub POSTxecyr
&SYSTEM ("$MV $DEST/bin/xecyr/*.bat $wdir/");
}
-sub POSTxetex_pstricks
+sub POSTxetexpstricks
{
print "POST$package - need tex/ level\n";
&xchdir ($DEST);