mprins / dokuwiki-plugin-spatialhelper

helper/search.php

Spacing +15 added lines, -15 removed lines

@@ -59,13 +59,13 @@ 
         // parent::__construct ();
         global $conf;
 
-        if(!plugin_load('helper', 'geophp', false, true)) {
+        if (!plugin_load('helper', 'geophp', false, true)) {
             $message = 'helper_plugin_spatialhelper_search::spatialhelper_search: required geophp plugin is not available.';
             msg($message, -1);
         }
 
         $idx_dir = $conf ['indexdir'];
-        if(!@file_exists($idx_dir . '/spatial.idx')) {
+        if (!@file_exists($idx_dir . '/spatial.idx')) {
             plugin_load('helper', 'spatialhelper_index');
         }
 
@@ -97,7 +97,7 @@ 
      */
     public function findNearby(string $geohash, Point $p = null): array {
         $_geohashClass = new Geohash();
-        if(!$p) {
+        if (!$p) {
             $decodedPoint = $_geohashClass->read($geohash);
         } else {
             $decodedPoint = $p;
@@ -118,10 +118,10 @@ 
 
         // find all the pages in the index that overlap with the adjacent hashes
         $docIds = array();
-        foreach($adjacent as $adjHash) {
-            if(is_array($this->spatial_idx)) {
-                foreach($this->spatial_idx as $_geohash => $_docIds) {
-                    if(strpos($_geohash, $adjHash) !== false) {
+        foreach ($adjacent as $adjHash) {
+            if (is_array($this->spatial_idx)) {
+                foreach ($this->spatial_idx as $_geohash => $_docIds) {
+                    if (strpos($_geohash, $adjHash) !== false) {
                         // dbglog ( "Found adjacent geo hash: $adjHash in $_geohash" );
                         // if $adjHash similar to geohash
                         $docIds = array_merge($docIds, $_docIds);
@@ -137,10 +137,10 @@ 
         $media   = array();
         $indexer = plugin_load('helper', 'spatialhelper_index');
 
-        foreach($docIds as $id) {
-            if(strpos($id, 'media__', 0) === 0) {
+        foreach ($docIds as $id) {
+            if (strpos($id, 'media__', 0) === 0) {
                 $id = substr($id, strlen('media__'));
-                if(auth_quickaclcheck($id) >= /*AUTH_READ*/ 1) {
+                if (auth_quickaclcheck($id) >= /*AUTH_READ*/ 1) {
                     $point    = $indexer->getCoordsFromExif($id);
                     $line     = new LineString(
                         [
@@ -150,14 +150,14 @@ 
                     );
                     $media [] = array(
                         'id'       => $id,
-                        'distance' => (int) ($line->greatCircleLength()),
+                        'distance' => ( int ) ($line->greatCircleLength()),
                         'lat'      => $point->y(),
                         'lon'      => $point->x()
                         // optionally add other meta such as tag, description...
                     );
                 }
             } else {
-                if(auth_quickaclcheck($id) >= /*AUTH_READ*/ 1) {
+                if (auth_quickaclcheck($id) >= /*AUTH_READ*/ 1) {
                     $geotags  = p_get_metadata($id, 'geo');
                     $point    = new Point($geotags ['lon'], $geotags ['lat']);
                     $line     = new LineString(
@@ -168,7 +168,7 @@ 
                     );
                     $pages [] = array(
                         'id'          => $id,
-                        'distance'    => (int) ($line->greatCircleLength()),
+                        'distance'    => ( int ) ($line->greatCircleLength()),
                         'description' => p_get_metadata($id, 'description')['abstract'],
                         'lat'         => $geotags ['lat'],
                         'lon'         => $geotags ['lon']
@@ -180,12 +180,12 @@ 
 
         // sort all the pages/media using distance
         usort(
-            $pages, static function ($a, $b) {
+            $pages, static function($a, $b) {
             return strnatcmp($a ['distance'], $b ['distance']);
         }
         );
         usort(
-            $media, static function ($a, $b) {
+            $media, static function($a, $b) {
             return strnatcmp($a ['distance'], $b ['distance']);
         }
         );

helper/index.php

Spacing +22 added lines, -22 removed lines

@@ -43,7 +43,7 @@ 
      * Constructor, initialises the spatial index.
      */
     public function __construct() {
-        if(!plugin_load('helper', 'geophp')) {
+        if (!plugin_load('helper', 'geophp')) {
           $message = 'helper_plugin_spatialhelper_index::spatialhelper_index: required geophp plugin is not available.';
           msg($message, -1);
         }
@@ -51,7 +51,7 @@ 
         global $conf;
         $this->idx_dir = $conf ['indexdir'];
         // test if there is a spatialindex, if not build one for the wiki
-        if(!@file_exists($this->idx_dir . '/spatial.idx')) {
+        if (!@file_exists($this->idx_dir . '/spatial.idx')) {
             // creates and stores the index
             $this->generateSpatialIndex();
         } else {
@@ -73,14 +73,14 @@ 
         require_once(DOKU_INC . 'inc/search.php');
         $pages = array();
         search($pages, $conf ['datadir'], 'search_allpages', array());
-        foreach($pages as $page) {
+        foreach ($pages as $page) {
             $this->updateSpatialIndex($page ['id']);
         }
         // media
         $media = array();
         search($media, $conf ['mediadir'], 'search_media', array());
-        foreach($media as $medium) {
-            if($medium ['isimg']) {
+        foreach ($media as $medium) {
+            if ($medium ['isimg']) {
                 $this->indexImage($medium);
             }
         }
@@ -96,10 +96,10 @@ 
      */
     public function updateSpatialIndex(string $id): bool {
         $geotags = p_get_metadata($id, 'geo');
-        if(empty ($geotags)) {
+        if (empty ($geotags)) {
             return false;
         }
-        if(empty ($geotags ['lon']) || empty ($geotags ['lat'])) {
+        if (empty ($geotags ['lon']) || empty ($geotags ['lat'])) {
             return false;
         }
         dbglog($geotags, "Geo metadata found for page $id");
@@ -120,14 +120,14 @@ 
     private function addToIndex(string $geohash, string $id): bool {
         $pageIds = array();
         // check index for key/geohash
-        if(!array_key_exists($geohash, $this->spatial_idx)) {
+        if (!array_key_exists($geohash, $this->spatial_idx)) {
             dbglog("Geohash $geohash not in index, just add $id.");
             $pageIds [] = $id;
         } else {
             dbglog('Geohash for document is in index, find it.');
             // check the index for document
             $knownHashes = $this->findHashesForId($id, $this->spatial_idx);
-            if(empty ($knownHashes)) {
+            if (empty ($knownHashes)) {
                 dbglog("No index record found for document $id, just add");
                 $pageIds    = $this->spatial_idx [$geohash];
                 $pageIds [] = $id;
@@ -135,12 +135,12 @@ 
             // TODO shortcut, need to make sure there is only one element, if not the index is corrupt
             $knownHash = $knownHashes [0];
 
-            if($knownHash === $geohash) {
+            if ($knownHash === $geohash) {
                 dbglog("Document $id was found in index and has the same geohash, nothing to do.");
                 return true;
             }
 
-            if(!empty ($knownHash)) {
+            if (!empty ($knownHash)) {
                 dbglog("Document/media $id was found in index but has different geohash (it moved).");
                 $knownIds = $this->spatial_idx [$knownHash];
                 dbglog($knownIds, "Known id's for this hash:");
@@ -169,8 +169,8 @@ 
      */
     public function findHashesForId(string $id, array $index): array {
         $hashes = array();
-        foreach($index as $hash => $docIds) {
-            if(in_array($id, $docIds, false)) {
+        foreach ($index as $hash => $docIds) {
+            if (in_array($id, $docIds, false)) {
                 $hashes [] = $hash;
             }
         }
@@ -198,14 +198,14 @@ 
      */
     public function indexImage($img): bool {
         // test for supported files (jpeg only)
-        if(
+        if (
             (substr($img ['file'], -strlen('.jpg')) !== '.jpg') &&
             (substr($img ['file'], -strlen('.jpeg')) !== '.jpeg')) {
             return false;
         }
 
         $geometry = $this->getCoordsFromExif($img ['id']);
-        if(!$geometry) {
+        if (!$geometry) {
             return false;
         }
         $geohash = $geometry->out('geohash');
@@ -224,7 +224,7 @@ 
      */
     public function getCoordsFromExif(string $id) {
         $exif = exif_read_data(mediaFN($id), 0, true);
-        if(empty ($exif ['GPS'])) {
+        if (empty ($exif ['GPS'])) {
             return false;
         }
 
@@ -256,7 +256,7 @@ 
      * @return float
      */
     public function convertDMStoD(array $param): float {
-        if(!is_array($param)) {
+        if (!is_array($param)) {
             $param = array($param);
         }
         $deg = $this->convertRationaltoFloat($param [0]);
@@ -270,10 +270,10 @@ 
     public function convertRationaltoFloat($param): float {
         // rational64u
         $nums = explode('/', $param);
-        if((int) $nums[1] > 0) {
-            return (float) $nums[0] / (int) $nums[1];
+        if (( int ) $nums[1] > 0) {
+            return ( float ) $nums[0] / ( int ) $nums[1];
         } else {
-            return (float) $nums[0];
+            return ( float ) $nums[0];
         }
     }
 
@@ -285,7 +285,7 @@ 
     public function deleteFromIndex(string $id): void {
         // check the index for document
         $knownHashes = $this->findHashesForId($id, $this->spatial_idx);
-        if(empty ($knownHashes)) {
+        if (empty ($knownHashes)) {
             return;
         }
 
@@ -296,7 +296,7 @@ 
         dbglog("removing: $knownIds[$i] from the index.");
         unset ($knownIds [$i]);
         $this->spatial_idx [$knownHash] = $knownIds;
-        if(empty ($this->spatial_idx [$knownHash])) {
+        if (empty ($this->spatial_idx [$knownHash])) {
             // dbglog ( "removing key: $knownHash from the index." );
             unset ($this->spatial_idx [$knownHash]);
         }