bump version to 2.1.0; update changelog; rebuild docs

pyproj4 · Mar 14, 2019 · 464e67f · 464e67f
1 parent f551cf2
commit 464e67f
Show file tree

Hide file tree

Showing 34 changed files with 1,924 additions and 610 deletions.
diff --git a/docs/html/.buildinfo b/docs/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: aa0b88875957541b0fa609ffec6ca3cb
+config: dc4c6dd9056e51120300fe2569b099d4
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/html/_modules/index.html b/docs/html/_modules/index.html
@@ -6,13 +6,14 @@
   <head>
     <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Overview: module code &#8212; pyproj 2.0.1 documentation</title>
+    <title>Overview: module code &#8212; pyproj 2.1.0 documentation</title>
     <link rel="stylesheet" href="../_static/nature.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
     <script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
     <script type="text/javascript" src="../_static/jquery.js"></script>
     <script type="text/javascript" src="../_static/underscore.js"></script>
     <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/language_data.js"></script>
     <link rel="index" title="Index" href="../genindex.html" />
     <link rel="search" title="Search" href="../search.html" /> 
   </head><body>
@@ -22,7 +23,7 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="../genindex.html" title="General Index"
              accesskey="I">index</a></li>
-        <li class="nav-item nav-item-0"><a href="../index.html">pyproj 2.0.1 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="../index.html">pyproj 2.1.0 documentation</a> &#187;</li> 
       </ul>
     </div>  
 
@@ -37,6 +38,8 @@ <h1>All modules for which code is available</h1>
 <li><a href="pyproj/crs.html">pyproj.crs</a></li>
 <li><a href="pyproj/datadir.html">pyproj.datadir</a></li>
 <li><a href="pyproj/geod.html">pyproj.geod</a></li>
+<li><a href="pyproj/proj.html">pyproj.proj</a></li>
+<li><a href="pyproj/transformer.html">pyproj.transformer</a></li>
 </ul></ul>
 
           </div>
@@ -66,12 +69,12 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="../genindex.html" title="General Index"
              >index</a></li>
-        <li class="nav-item nav-item-0"><a href="../index.html">pyproj 2.0.1 documentation</a> &#187;</li> 
+        <li class="nav-item nav-item-0"><a href="../index.html">pyproj 2.1.0 documentation</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
         &#169; Copyright 2019, Jeffrey Whitaker.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.7.6.
+      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.4.
     </div>
   </body>
 </html>
diff --git a/docs/html/_modules/pyproj.html b/docs/html/_modules/pyproj.html
@@ -6,13 +6,14 @@
   <head>
     <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>pyproj &#8212; pyproj 2.0.1 documentation</title>
+    <title>pyproj &#8212; pyproj 2.1.0 documentation</title>
     <link rel="stylesheet" href="../_static/nature.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
     <script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
     <script type="text/javascript" src="../_static/jquery.js"></script>
     <script type="text/javascript" src="../_static/underscore.js"></script>
     <script type="text/javascript" src="../_static/doctools.js"></script>
+    <script type="text/javascript" src="../_static/language_data.js"></script>
     <link rel="index" title="Index" href="../genindex.html" />
     <link rel="search" title="Search" href="../search.html" /> 
   </head><body>
@@ -22,7 +23,7 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="../genindex.html" title="General Index"
              accesskey="I">index</a></li>
-        <li class="nav-item nav-item-0"><a href="../index.html">pyproj 2.0.1 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">pyproj 2.1.0 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="index.html" accesskey="U">Module code</a> &#187;</li> 
       </ul>
     </div>  
@@ -82,7 +83,7 @@ <h1>Source code for pyproj</h1><div class="highlight"><pre>
 <span class="sd">LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,</span>
 <span class="sd">NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN</span>
 <span class="sd">CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. &quot;&quot;&quot;</span>
-<span class="n">__version__</span> <span class="o">=</span> <span class="s2">&quot;2.0.1&quot;</span>
+<span class="n">__version__</span> <span class="o">=</span> <span class="s2">&quot;2.0.2&quot;</span>
 <span class="n">__all__</span> <span class="o">=</span> <span class="p">[</span><span class="s2">&quot;Proj&quot;</span><span class="p">,</span> <span class="s2">&quot;Geod&quot;</span><span class="p">,</span> <span class="s2">&quot;CRS&quot;</span><span class="p">,</span> <span class="s2">&quot;transform&quot;</span><span class="p">,</span> <span class="s2">&quot;itransform&quot;</span><span class="p">,</span> <span class="s2">&quot;pj_ellps&quot;</span><span class="p">,</span> <span class="s2">&quot;pj_list&quot;</span><span class="p">]</span>
 
 <span class="kn">import</span> <span class="nn">re</span>
@@ -312,7 +313,7 @@ <h1>Source code for pyproj</h1><div class="highlight"><pre>
 <span class="sd">        **kwargs:</span>
 <span class="sd">            proj.4 projection parameters.</span>
 
-<span class="sd"> </span>
+
 <span class="sd">        Example usage:</span>
 
 <span class="sd">        &gt;&gt;&gt; from pyproj import Proj</span>
@@ -451,7 +452,7 @@ <h1>Source code for pyproj</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">Proj</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">crs</span><span class="o">.</span><span class="n">to_geodetic</span><span class="p">())</span></div></div>
 
 
-<div class="viewcode-block" id="transform"><a class="viewcode-back" href="../api/proj.html#pyproj.transform">[docs]</a><span class="k">def</span> <span class="nf">transform</span><span class="p">(</span><span class="n">p1</span><span class="p">,</span> <span class="n">p2</span><span class="p">,</span> <span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">,</span> <span class="n">z</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
+<div class="viewcode-block" id="transform"><a class="viewcode-back" href="../api/proj.html#pyproj.transform">[docs]</a><span class="k">def</span> <span class="nf">transform</span><span class="p">(</span><span class="n">p1</span><span class="p">,</span> <span class="n">p2</span><span class="p">,</span> <span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">,</span> <span class="n">z</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">radians</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">    x2, y2, z2 = transform(p1, p2, x1, y1, z1)</span>
 
@@ -462,7 +463,10 @@ <h1>Source code for pyproj</h1><div class="highlight"><pre>
 <span class="sd">    transformed to x2,y2,z2 in the coordinate system defined by p2.</span>
 
 <span class="sd">    z1 is optional, if it is not set it is assumed to be zero (and</span>
-<span class="sd">    only x2 and y2 are returned).</span>
+<span class="sd">    only x2 and y2 are returned). If the optional keyword </span>
+<span class="sd">    &#39;radians&#39; is True (default is False), then all input and </span>
+<span class="sd">    output coordinates will be in radians instead of the default </span>
+<span class="sd">    of degrees for geographic input/output projections.</span>
 
 <span class="sd">    In addition to converting between cartographic and geographic</span>
 <span class="sd">    projection coordinates, this function can take care of datum</span>
@@ -524,6 +528,11 @@ <h1>Source code for pyproj</h1><div class="highlight"><pre>
 <span class="sd">    &gt;&gt;&gt; x3, y3 = transform(&quot;epsg:4326&quot;, &quot;epsg:3857&quot;, 33, 98)</span>
 <span class="sd">    &gt;&gt;&gt; &quot;%.3f  %.3f&quot; % (x3, y3)</span>
 <span class="sd">    &#39;10909310.098  3895303.963&#39;</span>
+<span class="sd">    &gt;&gt;&gt; pj = Proj(init=&quot;epsg:4214&quot;)</span>
+<span class="sd">    &gt;&gt;&gt; pjx, pjy = pj(116.366, 39.867)</span>
+<span class="sd">    &gt;&gt;&gt; xr, yr = transform(pj, Proj(4326), pjx, pjy, radians=True)</span>
+<span class="sd">    &gt;&gt;&gt; &quot;%.3f %.3f&quot; % (xr, yr)</span>
+<span class="sd">    &#39;2.031 0.696&#39;</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="c1"># check that p1 and p2 are valid</span>
     <span class="k">if</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">p1</span><span class="p">,</span> <span class="n">Proj</span><span class="p">):</span>
@@ -539,7 +548,7 @@ <h1>Source code for pyproj</h1><div class="highlight"><pre>
     <span class="k">else</span><span class="p">:</span>
         <span class="n">inz</span> <span class="o">=</span> <span class="kc">None</span>
     <span class="c1"># call pj_transform.  inx,iny,inz buffers modified in place.</span>
-    <span class="n">_proj</span><span class="o">.</span><span class="n">_transform</span><span class="p">(</span><span class="n">p1</span><span class="p">,</span> <span class="n">p2</span><span class="p">,</span> <span class="n">inx</span><span class="p">,</span> <span class="n">iny</span><span class="p">,</span> <span class="n">inz</span><span class="p">)</span>
+    <span class="n">_proj</span><span class="o">.</span><span class="n">_transform</span><span class="p">(</span><span class="n">p1</span><span class="p">,</span> <span class="n">p2</span><span class="p">,</span> <span class="n">inx</span><span class="p">,</span> <span class="n">iny</span><span class="p">,</span> <span class="n">inz</span><span class="p">,</span> <span class="n">radians</span><span class="p">)</span>
     <span class="c1"># if inputs were lists, tuples or floats, convert back.</span>
     <span class="n">outx</span> <span class="o">=</span> <span class="n">_convertback</span><span class="p">(</span><span class="n">xisfloat</span><span class="p">,</span> <span class="n">xislist</span><span class="p">,</span> <span class="n">xistuple</span><span class="p">,</span> <span class="n">inx</span><span class="p">)</span>
     <span class="n">outy</span> <span class="o">=</span> <span class="n">_convertback</span><span class="p">(</span><span class="n">yisfloat</span><span class="p">,</span> <span class="n">yislist</span><span class="p">,</span> <span class="n">xistuple</span><span class="p">,</span> <span class="n">iny</span><span class="p">)</span>
@@ -550,7 +559,7 @@ <h1>Source code for pyproj</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="n">outx</span><span class="p">,</span> <span class="n">outy</span></div>
 
 
-<div class="viewcode-block" id="itransform"><a class="viewcode-back" href="../api/proj.html#pyproj.itransform">[docs]</a><span class="k">def</span> <span class="nf">itransform</span><span class="p">(</span><span class="n">p1</span><span class="p">,</span> <span class="n">p2</span><span class="p">,</span> <span class="n">points</span><span class="p">,</span> <span class="n">switch</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
+<div class="viewcode-block" id="itransform"><a class="viewcode-back" href="../api/proj.html#pyproj.itransform">[docs]</a><span class="k">def</span> <span class="nf">itransform</span><span class="p">(</span><span class="n">p1</span><span class="p">,</span> <span class="n">p2</span><span class="p">,</span> <span class="n">points</span><span class="p">,</span> <span class="n">switch</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">radians</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">    points2 = transform(p1, p2, points1)</span>
 <span class="sd">    Iterator/generator version of the function pyproj.transform.</span>
@@ -569,7 +578,9 @@ <h1>Source code for pyproj</h1><div class="highlight"><pre>
 <span class="sd">        - a generator of coordinates (xi,yi) for 2d points or (xi,yi,zi) for 3d</span>
 
 <span class="sd">    If optional keyword &#39;switch&#39; is True (default is False) then x, y or lon,lat coordinates</span>
-<span class="sd">    of points are switched to y, x or lat, lon.</span>
+<span class="sd">    of points are switched to y, x or lat, lon. If the optional keyword &#39;radians&#39; is True</span>
+<span class="sd">    (default is False), then all input and output coordinates will be in radians instead</span>
+<span class="sd">    of the default of degrees for geographic input/output projections.</span>
 
 
 <span class="sd">    Example usage:</span>
@@ -590,6 +601,10 @@ <h1>Source code for pyproj</h1><div class="highlight"><pre>
 <span class="sd">    &#39;2221638.801 2637034.372&#39;</span>
 <span class="sd">    &#39;2212924.125 2619851.898&#39;</span>
 <span class="sd">    &#39;2238294.779 2703763.736&#39;</span>
+<span class="sd">    &gt;&gt;&gt; pj = Proj(init=&quot;epsg:4214&quot;)</span>
+<span class="sd">    &gt;&gt;&gt; pjx, pjy = pj(116.366, 39.867)</span>
+<span class="sd">    &gt;&gt;&gt; for pt in itransform(pj, Proj(4326), [(pjx, pjy)]): &#39;{:.3f} {:.3f}&#39;.format(*pt)</span>
+<span class="sd">    &#39;2.031 0.696&#39;</span>
 <span class="sd">    &quot;&quot;&quot;</span>
     <span class="k">if</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">p1</span><span class="p">,</span> <span class="n">Proj</span><span class="p">):</span>
         <span class="n">p1</span> <span class="o">=</span> <span class="n">CRS</span><span class="o">.</span><span class="n">from_user_input</span><span class="p">(</span><span class="n">p1</span><span class="p">)</span>
@@ -617,7 +632,7 @@ <h1>Source code for pyproj</h1><div class="highlight"><pre>
         <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">buff</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
             <span class="k">break</span>
 
-        <span class="n">_proj</span><span class="o">.</span><span class="n">_transform_sequence</span><span class="p">(</span><span class="n">p1</span><span class="p">,</span> <span class="n">p2</span><span class="p">,</span> <span class="n">stride</span><span class="p">,</span> <span class="n">buff</span><span class="p">,</span> <span class="n">switch</span><span class="p">)</span>
+        <span class="n">_proj</span><span class="o">.</span><span class="n">_transform_sequence</span><span class="p">(</span><span class="n">p1</span><span class="p">,</span> <span class="n">p2</span><span class="p">,</span> <span class="n">stride</span><span class="p">,</span> <span class="n">buff</span><span class="p">,</span> <span class="n">switch</span><span class="p">,</span> <span class="n">radians</span><span class="p">)</span>
 
         <span class="k">for</span> <span class="n">pt</span> <span class="ow">in</span> <span class="nb">zip</span><span class="p">(</span><span class="o">*</span><span class="p">([</span><span class="nb">iter</span><span class="p">(</span><span class="n">buff</span><span class="p">)]</span> <span class="o">*</span> <span class="n">stride</span><span class="p">)):</span>
             <span class="k">yield</span> <span class="n">pt</span></div>
@@ -667,13 +682,13 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="../genindex.html" title="General Index"
              >index</a></li>
-        <li class="nav-item nav-item-0"><a href="../index.html">pyproj 2.0.1 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">pyproj 2.1.0 documentation</a> &#187;</li>
           <li class="nav-item nav-item-1"><a href="index.html" >Module code</a> &#187;</li> 
       </ul>
     </div>
     <div class="footer" role="contentinfo">
         &#169; Copyright 2019, Jeffrey Whitaker.
-      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.7.6.
+      Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.4.
     </div>
   </body>
 </html>