Upgrade to iTag v3.0.18

jjrom · Apr 19, 2018 · f973475 · f973475
1 parent a7ef168
commit f973475
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 8 deletions.
diff --git a/lib/iTag/Taggers/Tagger_Always.php b/lib/iTag/Taggers/Tagger_Always.php
@@ -256,4 +256,4 @@ private function hasResults($query) {
         }
         return true;
     }
-}
+}
diff --git a/lib/iTag/Taggers/Tagger_Generic.php b/lib/iTag/Taggers/Tagger_Generic.php
@@ -55,6 +55,13 @@ public function tag($metadata, $options = array()) {
     protected function process($footprint, $options) {
 
         $result = array();
+
+        /*
+         * Superseed areaLimit
+         */
+        if (isset($options['areaLimit']) && $this->area > $options['areaLimit']) {
+            return $result;
+        }
 
         /*
          * Process required classes

diff --git a/lib/iTag/Taggers/Tagger_LandCover.php b/lib/iTag/Taggers/Tagger_LandCover.php
@@ -105,17 +105,27 @@ public function __construct($dbh, $config) {
      */
     public function tag($metadata, $options = array()) {
         parent::tag($metadata, $options);
-        return $this->process($metadata['footprint']);
+        return $this->process($metadata['footprint'], $options);
     }
 
     /**
      *
      * Compute land cover from input WKT footprint
      *
      * @param string $footprint
+     * @param array $options
      *
      */
-    private function process($footprint) {
+    private function process($footprint, $options) {
+
+        /*
+         * Superseed areaLimit
+         */
+        if (isset($options['areaLimit']) && $this->area > $options['areaLimit']) {
+            return array(
+                'landCover' => array()
+            );
+        }
 
         /*
          * Do not process if footprint area is greater

diff --git a/lib/iTag/Taggers/Tagger_LandCover2009.php b/lib/iTag/Taggers/Tagger_LandCover2009.php
@@ -106,17 +106,27 @@ public function __construct($dbh, $config) {
      */
     public function tag($metadata, $options = array()) {
         parent::tag($metadata, $options);
-        return $this->process($metadata['footprint']);
+        return $this->process($metadata['footprint'], $options);
     }
 
     /**
      *
      * Compute land cover from input WKT footprint
      *
      * @param string $footprint
-     *
+     * @param array $options
+     * 
      */
-    private function process($footprint) {
+    private function process($footprint, $options) {
+
+        /*
+         * Superseed areaLimit
+         */
+        if (isset($options['areaLimit']) && $this->area > $options['areaLimit']) {
+            return array(
+                'landCover' => array()
+            );
+        }
 
         /*
          * Do not process if footprint area is greater

diff --git a/lib/iTag/Taggers/Tagger_Political.php b/lib/iTag/Taggers/Tagger_Political.php
@@ -75,6 +75,15 @@ public function tag($metadata, $options = array()) {
      */
     private function process($footprint, $options) {
 
+        /*
+         * Superseed areaLimit
+         */
+        if (isset($options['areaLimit']) && $this->area > $options['areaLimit']) {
+            return array(
+                'political' => array()
+            );
+        }
+
         /*
          * Toponyms
          */

diff --git a/lib/iTag/Taggers/Tagger_Population.php b/lib/iTag/Taggers/Tagger_Population.php
@@ -49,16 +49,27 @@ public function __construct($dbh, $config) {
      */
     public function tag($metadata, $options = array()) {
         parent::tag($metadata, $options);
-        return $this->process($metadata['footprint']);
+        return $this->process($metadata['footprint'], $options);
     }
 
     /**
      * Return the estimated population for a given footprint
      *
      * @param string $footprint
+     * @param  array $options
      * @return integer
      */
-    public function process($footprint) {
+    public function process($footprint, $options) {
+
+        /*
+         * Superseed areaLimit
+         */
+        if (isset($options['areaLimit']) && $this->area > $options['areaLimit']) {
+            return array(
+                'population' => array()
+            );
+        }
+
         $prequery = 'WITH prequery AS (SELECT ' . $this->postgisGeomFromText($footprint) . ' AS corrected_geometry)';
         $query = $prequery . ' SELECT pcount FROM prequery, gpw.' . $this->getTableName() . ' WHERE ST_intersects(footprint, corrected_geometry)';
         $results = $this->query($query);
-Original file line number
+Diff line change
@@ Expand Up / @@ -256,4 +256,4 @@ private function hasResults($query) { @@
             }
             return true;
         }
-    }
+    }