Merge pull request #11 from ghislainv/dev

Remove year attribute, keep only date
ghislainv · Mar 12, 2021 · 18ef11d · 18ef11d
2 parents 9b0e2b5 + 66e16a6
commit 18ef11d
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 65 deletions.
diff --git a/docs/_images/notebooks_get_started_10_1.png b/docs/_images/notebooks_get_started_10_1.png
diff --git a/docs/_modules/pywdpa/get_wdpa.html b/docs/_modules/pywdpa/get_wdpa.html
@@ -148,7 +148,7 @@ <h1>Source code for pywdpa.get_wdpa</h1><div class="highlight"><pre>
     <span class="n">response</span> <span class="o">=</span> <span class="n">json</span><span class="o">.</span><span class="n">loads</span><span class="p">(</span><span class="n">response</span><span class="o">.</span><span class="n">text</span><span class="p">)</span>  <span class="c1"># Equivalent to response.json()</span>
 
     <span class="n">pas_count</span> <span class="o">=</span> <span class="n">response</span><span class="p">[</span><span class="s2">&quot;country&quot;</span><span class="p">][</span><span class="s2">&quot;pas_count&quot;</span><span class="p">]</span>
-    <span class="n">pages</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">range</span><span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">int</span><span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">ceil</span><span class="p">(</span><span class="n">pas_count</span> <span class="o">/</span> <span class="mf">50.0</span><span class="p">))))</span>
+    <span class="n">pages</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">range</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">ceil</span><span class="p">(</span><span class="n">pas_count</span> <span class="o">/</span> <span class="mf">50.0</span><span class="p">))))</span>
 
     <span class="k">if</span> <span class="n">pas_count</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
 
@@ -173,7 +173,6 @@ <h1>Source code for pywdpa.get_wdpa</h1><div class="highlight"><pre>
         <span class="n">layer</span><span class="o">.</span><span class="n">CreateField</span><span class="p">(</span><span class="n">ogr</span><span class="o">.</span><span class="n">FieldDefn</span><span class="p">(</span><span class="s2">&quot;iucn_cat&quot;</span><span class="p">,</span> <span class="n">ogr</span><span class="o">.</span><span class="n">OFTString</span><span class="p">))</span>
         <span class="n">layer</span><span class="o">.</span><span class="n">CreateField</span><span class="p">(</span><span class="n">ogr</span><span class="o">.</span><span class="n">FieldDefn</span><span class="p">(</span><span class="s2">&quot;status&quot;</span><span class="p">,</span> <span class="n">ogr</span><span class="o">.</span><span class="n">OFTString</span><span class="p">))</span>
         <span class="n">layer</span><span class="o">.</span><span class="n">CreateField</span><span class="p">(</span><span class="n">ogr</span><span class="o">.</span><span class="n">FieldDefn</span><span class="p">(</span><span class="s2">&quot;date&quot;</span><span class="p">,</span> <span class="n">ogr</span><span class="o">.</span><span class="n">OFTString</span><span class="p">))</span>
-        <span class="n">layer</span><span class="o">.</span><span class="n">CreateField</span><span class="p">(</span><span class="n">ogr</span><span class="o">.</span><span class="n">FieldDefn</span><span class="p">(</span><span class="s2">&quot;year&quot;</span><span class="p">,</span> <span class="n">ogr</span><span class="o">.</span><span class="n">OFTString</span><span class="p">))</span>
 
         <span class="c1"># API</span>
         <span class="n">category</span> <span class="o">=</span> <span class="s2">&quot;v3/protected_areas/search/&quot;</span>
@@ -226,8 +225,6 @@ <h1>Source code for pywdpa.get_wdpa</h1><div class="highlight"><pre>
                     <span class="n">feature</span><span class="o">.</span><span class="n">SetField</span><span class="p">(</span><span class="s2">&quot;iucn_cat&quot;</span><span class="p">,</span> <span class="n">pa</span><span class="p">[</span><span class="s2">&quot;iucn_category&quot;</span><span class="p">][</span><span class="s2">&quot;name&quot;</span><span class="p">])</span>
                     <span class="n">feature</span><span class="o">.</span><span class="n">SetField</span><span class="p">(</span><span class="s2">&quot;status&quot;</span><span class="p">,</span> <span class="n">pa</span><span class="p">[</span><span class="s2">&quot;legal_status&quot;</span><span class="p">][</span><span class="s2">&quot;name&quot;</span><span class="p">])</span>
                     <span class="n">feature</span><span class="o">.</span><span class="n">SetField</span><span class="p">(</span><span class="s2">&quot;date&quot;</span><span class="p">,</span> <span class="n">pa</span><span class="p">[</span><span class="s2">&quot;legal_status_updated_at&quot;</span><span class="p">])</span>
-                    <span class="n">feature</span><span class="o">.</span><span class="n">SetField</span><span class="p">(</span>
-                        <span class="s2">&quot;year&quot;</span><span class="p">,</span> <span class="n">pa</span><span class="p">[</span><span class="s2">&quot;legal_status_updated_at&quot;</span><span class="p">][</span><span class="o">-</span><span class="mi">4</span><span class="p">:])</span>
                     <span class="c1"># Add feature to layer</span>
                     <span class="n">layer</span><span class="o">.</span><span class="n">CreateFeature</span><span class="p">(</span><span class="n">feature</span><span class="p">)</span>
                     <span class="c1"># Dereference the feature</span>

diff --git a/docs/_sources/notebooks/get_started.ipynb.txt b/docs/_sources/notebooks/get_started.ipynb.txt
diff --git a/docs/changelog.html b/docs/changelog.html
@@ -111,7 +111,7 @@ <h1>Changelog<a class="headerlink" href="#changelog" title="Permalink to this he
 <div class="section" id="pywdpa-0-1-5">
 <h2>pywdpa 0.1.5<a class="headerlink" href="#pywdpa-0-1-5" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
-<li><p>Including more attributes (in particular legal_status and legal_status_updated)</p></li>
+<li><p>Including more attributes (in particular status and date).</p></li>
 </ul>
 </div>
 <div class="section" id="pywdpa-0-1-4">

diff --git a/docs/notebooks/get_started.html b/docs/notebooks/get_started.html
diff --git a/docs/notebooks/get_started.ipynb b/docs/notebooks/get_started.ipynb
diff --git a/docs/searchindex.js b/docs/searchindex.js
diff --git a/docsrc/notebooks/get_started.ipynb b/docsrc/notebooks/get_started.ipynb
diff --git a/docsrc/notebooks/pa_REU.dbf b/docsrc/notebooks/pa_REU.dbf
diff --git a/docsrc/notebooks/pa_REU.shp b/docsrc/notebooks/pa_REU.shp
diff --git a/docsrc/notebooks/pa_REU.shx b/docsrc/notebooks/pa_REU.shx
diff --git a/pywdpa/get_wdpa.py b/pywdpa/get_wdpa.py
@@ -73,7 +73,6 @@ def get_wdpa(iso3, output_dir="."):
         layer.CreateField(ogr.FieldDefn("iucn_cat", ogr.OFTString))
         layer.CreateField(ogr.FieldDefn("status", ogr.OFTString))
         layer.CreateField(ogr.FieldDefn("date", ogr.OFTString))
-        layer.CreateField(ogr.FieldDefn("year", ogr.OFTString))
 
         # API
         category = "v3/protected_areas/search/"
@@ -126,8 +125,6 @@ def get_wdpa(iso3, output_dir="."):
                     feature.SetField("iucn_cat", pa["iucn_category"]["name"])
                     feature.SetField("status", pa["legal_status"]["name"])
                     feature.SetField("date", pa["legal_status_updated_at"])
-                    feature.SetField(
-                        "year", pa["legal_status_updated_at"][-4:])
                     # Add feature to layer
                     layer.CreateFeature(feature)
                     # Dereference the feature