Deploying to gh-pages from @ 1e2cd8b 🚀

_modules/forestatrisk/data/compute/compute_gadm.html

@@ -117,14 +117,14 @@ <h1>Source code for forestatrisk.data.compute.compute_gadm</h1><div class="highl
 <span class="k">def</span> <span class="nf">compute_gadm</span><span class="p">(</span><span class="n">ifile</span><span class="p">,</span> <span class="n">ofile</span><span class="p">,</span> <span class="n">proj</span><span class="p">,</span> <span class="n">verbose</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
 <span class="w">    </span><span class="sd">&quot;&quot;&quot;Processing GADM data.</span>
 
-<span class="sd">    Extract layers to a new GPKG file called &quot;aoi_latlong.gpkg&quot; and</span>
-<span class="sd">    reproject this file to output file. Layer names for country border</span>
-<span class="sd">    and subjurisdictions are &quot;aoi&quot; (for &quot;area of interest&quot;) and &quot;subj&quot;</span>
-<span class="sd">    respectively. The extent of the area of interest is returned with</span>
-<span class="sd">    a buffer of 5 km.</span>
+<span class="sd">    Extract layers to a new GPKG file called &quot;aoi_latlong.gpkg&quot; (if it</span>
+<span class="sd">    doesn&#39;t exist yet) and reproject this file to output file. Layer</span>
+<span class="sd">    names for country border and subjurisdictions are &quot;aoi&quot; (for &quot;area</span>
+<span class="sd">    of interest&quot;) and &quot;subj&quot; respectively. The extent of the area of</span>
+<span class="sd">    interest is returned with a buffer of 5 km.</span>
 
 <span class="sd">    :param input_file: Path to input GADM GPKG file.</span>
-<span class="sd">    :param output_file: Path to GPKG output file.</span>
+<span class="sd">    :param output_file: Path to aoi GPKG output file.</span>
 <span class="sd">    :param proj: Projection definition (EPSG, PROJ.4, WKT) as in</span>
 <span class="sd">        GDAL/OGR. Used for reprojecting data.</span>
 <span class="sd">    :param verbose: Logical. Whether to print messages or not. Default</span>
@@ -136,23 +136,26 @@ <h1>Source code for forestatrisk.data.compute.compute_gadm</h1><div class="highl
 
     <span class="n">cb</span> <span class="o">=</span> <span class="n">gdal</span><span class="o">.</span><span class="n">TermProgress</span> <span class="k">if</span> <span class="n">verbose</span> <span class="k">else</span> <span class="mi">0</span>
 
-    <span class="n">gdal</span><span class="o">.</span><span class="n">VectorTranslate</span><span class="p">(</span>
-        <span class="n">aoi_latlon_file</span><span class="p">,</span> <span class="n">ifile</span><span class="p">,</span>
-        <span class="nb">format</span><span class="o">=</span><span class="s2">&quot;GPKG&quot;</span><span class="p">,</span>
-        <span class="n">layers</span><span class="o">=</span><span class="s2">&quot;ADM_ADM_0&quot;</span><span class="p">,</span>
-        <span class="n">layerName</span><span class="o">=</span><span class="s2">&quot;aoi&quot;</span><span class="p">,</span>
-        <span class="n">callback</span><span class="o">=</span><span class="n">cb</span><span class="p">,</span>
-    <span class="p">)</span>
-
-    <span class="c1"># Use update access mode to not overwrite the file.</span>
-    <span class="n">gdal</span><span class="o">.</span><span class="n">VectorTranslate</span><span class="p">(</span>
-        <span class="n">aoi_latlon_file</span><span class="p">,</span> <span class="n">ifile</span><span class="p">,</span>
-        <span class="nb">format</span><span class="o">=</span><span class="s2">&quot;GPKG&quot;</span><span class="p">,</span>
-        <span class="n">layers</span><span class="o">=</span><span class="s2">&quot;ADM_ADM_1&quot;</span><span class="p">,</span>
-        <span class="n">layerName</span><span class="o">=</span><span class="s2">&quot;subj&quot;</span><span class="p">,</span>
-        <span class="n">accessMode</span><span class="o">=</span><span class="s2">&quot;update&quot;</span><span class="p">,</span>
-        <span class="n">callback</span><span class="o">=</span><span class="n">cb</span><span class="p">,</span>
-    <span class="p">)</span>
+    <span class="c1"># Change layer and file names</span>
+    <span class="k">if</span> <span class="ow">not</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isfile</span><span class="p">(</span><span class="n">aoi_latlon_file</span><span class="p">):</span>
+        <span class="c1"># Change layer ADM_ADM_0 and file name</span>
+        <span class="n">gdal</span><span class="o">.</span><span class="n">VectorTranslate</span><span class="p">(</span>
+            <span class="n">aoi_latlon_file</span><span class="p">,</span> <span class="n">ifile</span><span class="p">,</span>
+            <span class="nb">format</span><span class="o">=</span><span class="s2">&quot;GPKG&quot;</span><span class="p">,</span>
+            <span class="n">layers</span><span class="o">=</span><span class="s2">&quot;ADM_ADM_0&quot;</span><span class="p">,</span>
+            <span class="n">layerName</span><span class="o">=</span><span class="s2">&quot;aoi&quot;</span><span class="p">,</span>
+            <span class="n">callback</span><span class="o">=</span><span class="n">cb</span><span class="p">,</span>
+        <span class="p">)</span>
+        <span class="c1"># Change layer ADM_ADM_1</span>
+        <span class="c1"># NB: Use update access mode to not overwrite the file.</span>
+        <span class="n">gdal</span><span class="o">.</span><span class="n">VectorTranslate</span><span class="p">(</span>
+            <span class="n">aoi_latlon_file</span><span class="p">,</span> <span class="n">ifile</span><span class="p">,</span>
+            <span class="nb">format</span><span class="o">=</span><span class="s2">&quot;GPKG&quot;</span><span class="p">,</span>
+            <span class="n">layers</span><span class="o">=</span><span class="s2">&quot;ADM_ADM_1&quot;</span><span class="p">,</span>
+            <span class="n">layerName</span><span class="o">=</span><span class="s2">&quot;subj&quot;</span><span class="p">,</span>
+            <span class="n">accessMode</span><span class="o">=</span><span class="s2">&quot;update&quot;</span><span class="p">,</span>
+            <span class="n">callback</span><span class="o">=</span><span class="n">cb</span><span class="p">,</span>
+        <span class="p">)</span>
 
     <span class="c1"># Reproject AOI</span>
     <span class="n">param</span> <span class="o">=</span> <span class="n">gdal</span><span class="o">.</span><span class="n">VectorTranslateOptions</span><span class="p">(</span>

_modules/forestatrisk/data/download/download_srtm.html

@@ -102,7 +102,6 @@ <h1>Source code for forestatrisk.data.download.download_srtm</h1><div class="hig
 <span></span><span class="sd">&quot;&quot;&quot;Download SRTM data.&quot;&quot;&quot;</span>
 
 <span class="kn">import</span> <span class="nn">os</span>
-<span class="kn">from</span> <span class="nn">zipfile</span> <span class="kn">import</span> <span class="n">ZipFile</span>
 
 <span class="k">try</span><span class="p">:</span>
     <span class="kn">from</span> <span class="nn">urllib.request</span> <span class="kn">import</span> <span class="n">urlretrieve</span>  <span class="c1"># Python 3</span>
@@ -141,13 +140,17 @@ <h1>Source code for forestatrisk.data.download.download_srtm</h1><div class="hig
     <span class="c1"># Create directory</span>
     <span class="n">make_dir</span><span class="p">(</span><span class="n">output_dir</span><span class="p">)</span>
 
-    <span class="c1"># Check for existing data</span>
-    <span class="n">gpkg_name</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">output_dir</span><span class="p">,</span> <span class="s2">&quot;gadm41_&quot;</span> <span class="o">+</span> <span class="n">iso3</span> <span class="o">+</span> <span class="s2">&quot;_0.gpkg&quot;</span><span class="p">)</span>
-    <span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isfile</span><span class="p">(</span><span class="n">gpkg_name</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">True</span><span class="p">:</span>
-        <span class="n">download_gadm</span><span class="p">(</span><span class="n">iso3</span><span class="p">,</span> <span class="n">gpkg_name</span><span class="p">)</span>
+    <span class="c1"># Check for existing data (either gadm or aoi)</span>
+    <span class="n">gpkg_file</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">output_dir</span><span class="p">,</span> <span class="s2">&quot;gadm41_&quot;</span> <span class="o">+</span> <span class="n">iso3</span> <span class="o">+</span> <span class="s2">&quot;_0.gpkg&quot;</span><span class="p">)</span>
+    <span class="k">if</span> <span class="ow">not</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isfile</span><span class="p">(</span><span class="n">gpkg_file</span><span class="p">):</span>
+        <span class="n">aoi_file</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">output_dir</span><span class="p">,</span> <span class="s2">&quot;aoi_latlon.gpkg&quot;</span><span class="p">)</span>
+        <span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isfile</span><span class="p">(</span><span class="n">aoi_file</span><span class="p">):</span>
+            <span class="n">gpkg_file</span> <span class="o">=</span> <span class="n">aoi_file</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="n">download_gadm</span><span class="p">(</span><span class="n">iso3</span><span class="p">,</span> <span class="n">gpkg_file</span><span class="p">)</span>
 
     <span class="c1"># Compute extent and SRTM tiles</span>
-    <span class="n">extent_latlong</span> <span class="o">=</span> <span class="n">get_vector_extent</span><span class="p">(</span><span class="n">gpkg_name</span><span class="p">)</span>
+    <span class="n">extent_latlong</span> <span class="o">=</span> <span class="n">get_vector_extent</span><span class="p">(</span><span class="n">gpkg_file</span><span class="p">)</span>
     <span class="n">tiles_long</span><span class="p">,</span> <span class="n">tiles_lat</span> <span class="o">=</span> <span class="n">tiles_srtm</span><span class="p">(</span><span class="n">extent_latlong</span><span class="p">)</span>
     <span class="n">tiles_long</span> <span class="o">=</span> <span class="n">tiles_long</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s2">&quot;-&quot;</span><span class="p">)</span>
     <span class="n">tiles_lat</span> <span class="o">=</span> <span class="n">tiles_lat</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s2">&quot;-&quot;</span><span class="p">)</span>

python_api/forestatrisk.data.html

@@ -292,16 +292,16 @@ <h1>Compute<a class="headerlink" href="#compute" title="Link to this heading">¶
 <dt class="sig sig-object py" id="forestatrisk.data.compute.compute_gadm">
 <span class="sig-prename descclassname"><span class="pre">forestatrisk.data.compute.</span></span><span class="sig-name descname"><span class="pre">compute_gadm</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">ifile</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">ofile</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">proj</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">verbose</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">False</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../_modules/forestatrisk/data/compute/compute_gadm.html#compute_gadm"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#forestatrisk.data.compute.compute_gadm" title="Link to this definition">¶</a></dt>
 <dd><p>Processing GADM data.</p>
-<p>Extract layers to a new GPKG file called “aoi_latlong.gpkg” and
-reproject this file to output file. Layer names for country border
-and subjurisdictions are “aoi” (for “area of interest”) and “subj”
-respectively. The extent of the area of interest is returned with
-a buffer of 5 km.</p>
+<p>Extract layers to a new GPKG file called “aoi_latlong.gpkg” (if it
+doesn’t exist yet) and reproject this file to output file. Layer
+names for country border and subjurisdictions are “aoi” (for “area
+of interest”) and “subj” respectively. The extent of the area of
+interest is returned with a buffer of 5 km.</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters<span class="colon">:</span></dt>
 <dd class="field-odd"><ul class="simple">
 <li><p><strong>input_file</strong> – Path to input GADM GPKG file.</p></li>
-<li><p><strong>output_file</strong> – Path to GPKG output file.</p></li>
+<li><p><strong>output_file</strong> – Path to aoi GPKG output file.</p></li>
 <li><p><strong>proj</strong> – Projection definition (EPSG, PROJ.4, WKT) as in
 GDAL/OGR. Used for reprojecting data.</p></li>
 <li><p><strong>verbose</strong> – Logical. Whether to print messages or not. Default