From 022a1fa21defc64b236b3ae2d786e1e1147fe939 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 25 Mar 2019 20:47:51 +0000 Subject: getmap (25mar19) git-svn-id: svn://tug.org/texlive/trunk@50589 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/getmap/README.md | 9 ++++++--- Master/texmf-dist/doc/latex/getmap/getmap.dtx | 27 ++++++++++++++++++++------ Master/texmf-dist/doc/latex/getmap/getmap.pdf | Bin 1957796 -> 1972077 bytes Master/texmf-dist/scripts/getmap/getmapdl.lua | 4 ++-- Master/texmf-dist/tex/latex/getmap/getmap.sty | 2 +- 5 files changed, 30 insertions(+), 12 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/getmap/README.md b/Master/texmf-dist/doc/latex/getmap/README.md index fab8b627890..2ad837dc145 100644 --- a/Master/texmf-dist/doc/latex/getmap/README.md +++ b/Master/texmf-dist/doc/latex/getmap/README.md @@ -10,9 +10,12 @@ can use this script also from the command line. License: LPPL -Changes in v1.10: +Changes in v1.11: -* Workaround for module (socket.url) loading bug in luatex v1.0.7 +* Requests to Google Maps' Static Image API are no longer free -* Bugfix: fix for strange encoding problems when calling getmapdl.lua +added an API key, which allows + +2000req/day for Google Maps and +1000req/day for Google Street View diff --git a/Master/texmf-dist/doc/latex/getmap/getmap.dtx b/Master/texmf-dist/doc/latex/getmap/getmap.dtx index 8ec1d4b8dcb..e6a46ed07ba 100644 --- a/Master/texmf-dist/doc/latex/getmap/getmap.dtx +++ b/Master/texmf-dist/doc/latex/getmap/getmap.dtx @@ -16,12 +16,15 @@ can use this script also from the command line. License: LPPL -Changes in v1.10: +Changes in v1.11: -* Workaround for module (socket.url) loading bug in luatex v1.0.7 +* Requests to Google Maps' Static Image API are no longer free -* Bugfix: fix for strange encoding problems when calling getmapdl.lua + added an API key, which allows + 2000req/day for Google Maps and + 1000req/day for Google Street View + % %<*bibfile> @misc{bib:devmapquest, @@ -940,7 +943,7 @@ if MODE == "gm" then ULANGUAGE="&language=" .. LANGUAGE end UOFILE = OFILE .. "." .. IMAGETYPE - IMGURL = GMURL .. "?" .. ULOCATION .. USIZE .. UZOOM .. UMARKERS .. UTYPE .. USCALE .. UIMAGETYPE .. UVISIBLE .. UIPATH .. UFPATH .. ULANGUAGE .. "&sensor=false" + IMGURL = GMURL .. "?" .. ULOCATION .. USIZE .. UZOOM .. UMARKERS .. UTYPE .. USCALE .. UIMAGETYPE .. UVISIBLE .. UIPATH .. UFPATH .. ULANGUAGE .. "&sensor=false&key=AIzaSyDXlmAP7TENopGqgCkW9Ec3Wymno3a2cBg" elseif MODE == "gsv" then ULOCATION = "location=" .. url_escape(LOCATION) USIZE = "&size=" .. url_escape(SIZE) @@ -948,7 +951,7 @@ elseif MODE == "gsv" then UFOV = "&fov=" .. url_escape(FOV) UPITCH = "&pitch=" .. url_escape(PITCH) UOFILE = OFILE .. ".jpg" - IMGURL = GSVURL .. "?" .. ULOCATION .. USIZE .. UHEADING .. UFOV .. UPITCH .. "&sensor=false" + IMGURL = GSVURL .. "?" .. ULOCATION .. USIZE .. UHEADING .. UFOV .. UPITCH .. "&sensor=false&key=AIzaSyDXlmAP7TENopGqgCkW9Ec3Wymno3a2cBg" elseif MODE == "osm" then UKEY = "?key=" .. url_escape(KEY) ULOCATION = "&location=" .. url_escape(LOCATION) @@ -1127,6 +1130,7 @@ This work consists of all files listed in manifest.txt. \usepackage{makeidx} \usepackage{ragged2e} \usepackage{ccicons} +\usepackage{csquotes} \usepackage{tabularx} \usepackage{microtype}% \usepackage{listings} @@ -1433,6 +1437,14 @@ emph={}} % \subsubsection[\texttt{number}]{\texttt{number (\underline{1})}} % This option specifies the number of the marker. % \subsection{\texttt{gm} mode} +% From 2018 on, Google Maps APIs are no longer accessible without a key. +% Since \texttt{getmap.sty} is an open source project, it is impossible to finance an infinite number of requests, but Google allows a limited number of requests for \enquote{free}. +% As a consequence, the following restrictions arise: +% +% \begin{tabular}{rl} +% Google Maps & 2000 requests per day \\ +% Google Street View & 1000 requests per day +% \end{tabular} % \subsubsection[\texttt{scale}]{\texttt{scale (\underline{1})}} % For the free version of Google Maps the image size is limited to 640x640. % You can set \texttt{scale} to a value of 2, to get exactly the same map in doubled size in pixels. @@ -1475,6 +1487,7 @@ emph={}} % &markers=label:N|color:blue|52.520063,13.397525}% % ]{} % \begin{center}\includegraphics[width=10cm]{bmus1}\end{center} +% \clearpage % \iffalse %<*example> % \fi @@ -1511,6 +1524,7 @@ markers={&markers=size:mid|label:B|color:green|52.521847,13.394398% % &markers=label:N|color:blue|52.520063,13.397525}, % visible={Brandenburger Tor, Berlin|Reichstagsufer 1, Berlin}]{} % \begin{center}\includegraphics[width=10cm]{bmus2}\end{center} +% \clearpage % \iffalse %<*example> % \fi @@ -2090,13 +2104,14 @@ output = mucber.png % \changes{v1.8}{2014/10/07}{\texttt{getmapdl.lua}: added multi route support for \texttt{gps2epl} mode} % \changes{v1.8}{2014/10/07}{\texttt{getmapdl.lua}: added rounding of gps coordinates to \texttt{kml2gps} and \texttt{gpx2gps} modes} % \changes{v1.10}{2018/07/18}{\texttt{getmapdl.lua}: fix problem (unable to load socket.url module) caused by bug in luatex v1.0.7 (TeXLive2018)} +% \changes{v1.11}{2019/03/25}{\texttt{getmapdl.lua}: added API key for Google Maps API, which is no longer accessible without key} % \begin{macrocode} %<*package> % \end{macrocode} % First, we provide the \LaTeX\ package \package{getmap}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{getmap}[2018/07/18 v1.10 getmap.sty - Josef Kleber (C) 2014,2016,2018]% +\ProvidesPackage{getmap}[2019/03/25 v1.11 getmap.sty - Josef Kleber (C) 2014,2016,2018,2019]% % \end{macrocode} % We need a few packages! % \begin{macrocode} diff --git a/Master/texmf-dist/doc/latex/getmap/getmap.pdf b/Master/texmf-dist/doc/latex/getmap/getmap.pdf index b9436477bae..ba92a3c6ec0 100644 Binary files a/Master/texmf-dist/doc/latex/getmap/getmap.pdf and b/Master/texmf-dist/doc/latex/getmap/getmap.pdf differ diff --git a/Master/texmf-dist/scripts/getmap/getmapdl.lua b/Master/texmf-dist/scripts/getmap/getmapdl.lua index f0f366cc433..e264e0b7836 100755 --- a/Master/texmf-dist/scripts/getmap/getmapdl.lua +++ b/Master/texmf-dist/scripts/getmap/getmapdl.lua @@ -822,7 +822,7 @@ if MODE == "gm" then ULANGUAGE="&language=" .. LANGUAGE end UOFILE = OFILE .. "." .. IMAGETYPE - IMGURL = GMURL .. "?" .. ULOCATION .. USIZE .. UZOOM .. UMARKERS .. UTYPE .. USCALE .. UIMAGETYPE .. UVISIBLE .. UIPATH .. UFPATH .. ULANGUAGE .. "&sensor=false" + IMGURL = GMURL .. "?" .. ULOCATION .. USIZE .. UZOOM .. UMARKERS .. UTYPE .. USCALE .. UIMAGETYPE .. UVISIBLE .. UIPATH .. UFPATH .. ULANGUAGE .. "&sensor=false&key=AIzaSyDXlmAP7TENopGqgCkW9Ec3Wymno3a2cBg" elseif MODE == "gsv" then ULOCATION = "location=" .. url_escape(LOCATION) USIZE = "&size=" .. url_escape(SIZE) @@ -830,7 +830,7 @@ elseif MODE == "gsv" then UFOV = "&fov=" .. url_escape(FOV) UPITCH = "&pitch=" .. url_escape(PITCH) UOFILE = OFILE .. ".jpg" - IMGURL = GSVURL .. "?" .. ULOCATION .. USIZE .. UHEADING .. UFOV .. UPITCH .. "&sensor=false" + IMGURL = GSVURL .. "?" .. ULOCATION .. USIZE .. UHEADING .. UFOV .. UPITCH .. "&sensor=false&key=AIzaSyDXlmAP7TENopGqgCkW9Ec3Wymno3a2cBg" elseif MODE == "osm" then UKEY = "?key=" .. url_escape(KEY) ULOCATION = "&location=" .. url_escape(LOCATION) diff --git a/Master/texmf-dist/tex/latex/getmap/getmap.sty b/Master/texmf-dist/tex/latex/getmap/getmap.sty index 79831f5c171..a614a7c7377 100644 --- a/Master/texmf-dist/tex/latex/getmap/getmap.sty +++ b/Master/texmf-dist/tex/latex/getmap/getmap.sty @@ -27,7 +27,7 @@ %% This work consists of all files listed in manifest.txt. %% \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{getmap}[2018/07/18 v1.10 getmap.sty - Josef Kleber (C) 2014,2016,2018]% +\ProvidesPackage{getmap}[2019/03/25 v1.11 getmap.sty - Josef Kleber (C) 2014,2016,2018,2019]% \RequirePackage{xkeyval}% \RequirePackage{stringenc}% \RequirePackage{ifthen}% -- cgit v1.2.3