mprins / dokuwiki-plugin-spatialhelper

syntax/findnearby.php

Spacing +8 added lines, -8 removed lines

@@ -70,18 +70,18 @@ 
     public function handle($match, $state, $pos, Doku_Handler $handler) {
         $data     = array();
         $data [0] = trim(substr($match, strlen('{{findnearby>'), -2));
-        if(strlen($data [0]) < 1) {
+        if (strlen($data [0]) < 1) {
             $data [0] = $this->getLang('search_findnearby');
         }
         $meta = p_get_metadata(getID(), 'geo');
-        if($meta) {
-            if($meta ['lat'] && $meta ['lon']) {
+        if ($meta) {
+            if ($meta ['lat'] && $meta ['lon']) {
                 $data [1] = array(
                     'do'  => 'findnearby',
                     'lat' => $meta ['lat'],
                     'lon' => $meta ['lon']
                 );
-            } elseif($meta ['geohash']) {
+            } elseif ($meta ['geohash']) {
                 $data [1] = array(
                     'do'      => 'findnearby',
                     'geohash' => $meta ['geohash']
@@ -98,16 +98,16 @@ 
      * @see DokuWiki_Syntax_Plugin::render()
      */
     public function render($format, Doku_Renderer $renderer, $data): bool {
-        if($data === false) {
+        if ($data === false) {
             return false;
         }
 
-        if($format === 'xhtml') {
+        if ($format === 'xhtml') {
             $renderer->doc .= '<a href="' . wl(getID(), $data [1]) . '" class="findnearby">' . hsc($data [0]) . '</a>';
             return true;
-        } elseif($format === 'metadata') {
+        } elseif ($format === 'metadata') {
             return false;
-        } elseif($format === 'odt') {
+        } elseif ($format === 'odt') {
             // don't render anything in ODT
             return false;
         }

admin/purge.php

Spacing +2 added lines, -2 removed lines

@@ -42,10 +42,10 @@
      * @see DokuWiki_Admin_Plugin::handle()
      */
     public function handle(): void {
-        if(isset ($_REQUEST ['purgeindex'])) {
+        if (isset ($_REQUEST ['purgeindex'])) {
             global $conf;
             $path = $conf ['indexdir'] . '/spatial.idx';
-            if(file_exists($path) && unlink($path)) {
+            if (file_exists($path) && unlink($path)) {
                 msg($this->getLang('admin_purged_tiles'), 0);
             }
         }

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]);
         }

helper/search.php

Spacing +15 added lines, -15 removed lines

@@ -59,14 +59,14 @@ 
         // 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');
         }
 
@@ -98,7 +98,7 @@ 
      */
     public function findNearby(string $geohash, Point $p = null): array {
         $_geohashClass = new Geohash();
-        if(!$p) {
+        if (!$p) {
             $decodedPoint = $_geohashClass->read($geohash);
         } else {
             $decodedPoint = $p;
@@ -119,10 +119,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);
@@ -138,10 +138,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(
                         [
@@ -151,14 +151,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(
@@ -169,7 +169,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']
@@ -181,12 +181,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/sitemap.php

Spacing +19 added lines, -19 removed lines

@@ -33,9 +33,9 @@ 
     public function __construct() {
         global $conf;
         $idx_dir = $conf['indexdir'];
-        if(!@file_exists($idx_dir . '/spatial.idx')) {
+        if (!@file_exists($idx_dir . '/spatial.idx')) {
             $indexer = plugin_load('helper', 'spatialhelper_index');
-            if($indexer !== null) {
+            if ($indexer !== null) {
                 $indexer->generateSpatialIndex();
             }
         }
@@ -85,7 +85,7 @@ 
         $RSSstart .= '<feed xmlns="http://www.w3.org/2005/Atom" xmlns:georss="http://www.georss.org/georss" ';
         $RSSstart .= 'xmlns:dc="http://purl.org/dc/elements/1.1/">' . DOKU_LF;
         $RSSstart .= '<title>' . $conf['title'] . ' spatial feed</title>' . DOKU_LF;
-        if(!empty($conf['tagline'])) {
+        if (!empty($conf['tagline'])) {
             $RSSstart .= '<subtitle>' . $conf['tagline'] . '</subtitle>' . DOKU_LF;
         }
         $RSSstart .= '<dc:publisher>' . $conf['title'] . '</dc:publisher>' . DOKU_LF;
@@ -104,12 +104,12 @@ 
         $fh = fopen(mediaFN($mediaID), 'wb');
         fwrite($fh, $RSSstart);
 
-        foreach($this->spatial_idx as $idxEntry) {
+        foreach ($this->spatial_idx as $idxEntry) {
             // get list of id's
-            foreach($idxEntry as $id) {
+            foreach ($idxEntry as $id) {
                 // for document item in the index
-                if(strpos($id, 'media__', 0) !== 0) {
-                    if($this->skipPage($id, $namespace)) {
+                if (strpos($id, 'media__', 0) !== 0) {
+                    if ($this->skipPage($id, $namespace)) {
                         continue;
                     }
 
@@ -123,11 +123,11 @@ 
                     $entry .= '  <summary>' . $desc . '</summary>' . DOKU_LF;
                     $entry .= '  <georss:point>' . $meta['geo']['lat'] . ' ' . $meta['geo']['lon']
                         . '</georss:point>' . DOKU_LF;
-                    if(!empty($meta['geo']['alt'])) {
+                    if (!empty($meta['geo']['alt'])) {
                         $entry .= '  <georss:elev>' . $meta['geo']['alt'] . '</georss:elev>' . DOKU_LF;
                     }
                     $entry .= '  <link href="' . wl($id) . '" rel="alternate" type="text/html" />' . DOKU_LF;
-                    if(empty($meta['creator'])) {
+                    if (empty($meta['creator'])) {
                         $meta['creator'] = $conf['title'];
                     }
                     $entry .= '  <author><name>' . $meta['creator'] . '</name></author>' . DOKU_LF;
@@ -150,16 +150,16 @@ 
      */
     private function skipPage(string $id, string $namespace): bool {
         dbglog("helper_plugin_spatialhelper_sitemap::skipPage, check for $id in $namespace");
-        if(isHiddenPage($id)) {
+        if (isHiddenPage($id)) {
             return true;
         }
-        if(auth_aclcheck($id, '', null) < AUTH_READ) {
+        if (auth_aclcheck($id, '', null) < AUTH_READ) {
             return true;
         }
 
-        if(!empty($namespace)) {
+        if (!empty($namespace)) {
             // only if id is in or below namespace
-            if(0 !== strpos(getNS($id), $namespace)) {
+            if (0 !== strpos(getNS($id), $namespace)) {
                 // dbglog("helper_plugin_spatialhelper_sitemap::skipPage, skipping $id, not in $namespace");
                 return true;
             }
@@ -199,12 +199,12 @@ 
         $fh = fopen(mediaFN($mediaID), 'wb');
         fwrite($fh, $KMLstart);
 
-        foreach($this->spatial_idx as $idxEntry) {
+        foreach ($this->spatial_idx as $idxEntry) {
             // get list of id's
-            foreach($idxEntry as $id) {
+            foreach ($idxEntry as $id) {
                 // for document item in the index
-                if(strpos($id, 'media__', 0) !== 0) {
-                    if($this->skipPage($id, $namespace)) {
+                if (strpos($id, 'media__', 0) !== 0) {
+                    if ($this->skipPage($id, $namespace)) {
                         continue;
                     }
 
@@ -220,7 +220,7 @@ 
                     // TODO escape quotes in: title="' . $meta['title'] . '"
                     $plcm .= '  <atom:link href="' . wl($id, '' . true) . '" rel="alternate" type="text/html" />'
                         . DOKU_LF;
-                    if(!empty($meta['creator'])) {
+                    if (!empty($meta['creator'])) {
                         $plcm .= '  <atom:author><atom:name>' . $meta['creator'] . '</atom:name></atom:author>'
                             . DOKU_LF;
                     }
@@ -229,7 +229,7 @@ 
                     $plcm .= '  <styleUrl>#icon</styleUrl>' . DOKU_LF;
 
                     $plcm .= '  <Point><coordinates>' . $meta['geo']['lon'] . ',' . $meta['geo']['lat'];
-                    if(!empty($meta['geo']['alt'])) {
+                    if (!empty($meta['geo']['alt'])) {
                         $plcm .= ',' . $meta['geo']['alt'];
                     }
                     $plcm .= '</coordinates></Point>' . DOKU_LF;

action.php

Spacing +28 added lines, -28 removed lines

@@ -102,18 +102,18 @@ 
         // $data[3] – rev: The page revision, false for current wiki pages.
 
         dbglog($event->data, "Event data in removeFromIndex.");
-        if(@file_exists($event->data [0] [0])) {
+        if (@file_exists($event->data [0] [0])) {
             // file not new
-            if(!$event->data [0] [1]) {
+            if (!$event->data [0] [1]) {
                 // file is empty, page is being deleted
-                if(empty ($event->data [1])) {
+                if (empty ($event->data [1])) {
                     // root namespace
                     $id = $event->data [2];
                 } else {
                     $id = $event->data [1] . ":" . $event->data [2];
                 }
                 $indexer = plugin_load('helper', 'spatialhelper_index');
-                if($indexer) {
+                if ($indexer) {
                     $indexer->deleteFromIndex($id);
                 }
             }
@@ -146,15 +146,15 @@ 
         // $event→data['items']: Array of SitemapItem instances, the array of sitemap items that already
         //      contains all public pages of the wiki
         // $event→data['sitemap']: The path of the file the sitemap will be saved to.
-        if($helper = plugin_load('helper', 'spatialhelper_sitemap')) {
+        if ($helper = plugin_load('helper', 'spatialhelper_sitemap')) {
             // dbglog($helper, "createSpatialSitemap loaded helper.");
 
             $kml = $helper->createKMLSitemap($this->getConf('media_kml'));
             $rss = $helper->createGeoRSSSitemap($this->getConf('media_georss'));
 
-            if(!empty ($this->getConf('sitemap_namespaces'))) {
+            if (!empty ($this->getConf('sitemap_namespaces'))) {
                 $namespaces = array_map('trim', explode("\n", $this->getConf('sitemap_namespaces')));
-                foreach($namespaces as $namespace) {
+                foreach ($namespaces as $namespace) {
                     $kmlN = $helper->createKMLSitemap($namespace . $this->getConf('media_kml'));
                     $rssN = $helper->createGeoRSSSitemap($namespace . $this->getConf('media_georss'));
                     dbglog(
@@ -179,7 +179,7 @@ 
      *          not used
      */
     public function handleActionActPreprocess(Doku_Event $event, $param): void {
-        if($event->data !== 'findnearby') {
+        if ($event->data !== 'findnearby') {
             return;
         }
         $event->preventDefault();
@@ -195,16 +195,16 @@ 
      *          'format'=> HTML | JSON
      */
     public function findnearby(Doku_Event $event, $param): void {
-        if($event->data !== 'findnearby') {
+        if ($event->data !== 'findnearby') {
             return;
         }
         $event->preventDefault();
         $results = array();
         global $INPUT;
-        if($helper = plugin_load('helper', 'spatialhelper_search')) {
-            if($INPUT->has('lat') && $INPUT->has('lon')) {
+        if ($helper = plugin_load('helper', 'spatialhelper_search')) {
+            if ($INPUT->has('lat') && $INPUT->has('lon')) {
                 $results = $helper->findNearbyLatLon($INPUT->param('lat'), $INPUT->param('lon'));
-            } elseif($INPUT->has('geohash')) {
+            } elseif ($INPUT->has('geohash')) {
                 $results = $helper->findNearby($INPUT->str('geohash'));
             } else {
                 $results = array(
@@ -215,7 +215,7 @@ 
 
         $showMedia = $INPUT->bool('showMedia', true);
 
-        switch($param['format']) {
+        switch ($param['format']) {
             case 'JSON' :
                 $this->printJSON($results);
                 break;
@@ -246,13 +246,13 @@ 
      * @param bool  $showMedia
      */
     private function printHTML(array $searchresults, bool $showMedia = true): void {
-        $pages   = (array) ($searchresults ['pages']);
-        $media   = (array) $searchresults ['media'];
-        $lat     = (float) $searchresults ['lat'];
-        $lon     = (float) $searchresults ['lon'];
-        $geohash = (string) $searchresults ['geohash'];
+        $pages   = ( array ) ($searchresults ['pages']);
+        $media   = ( array ) $searchresults ['media'];
+        $lat     = ( float ) $searchresults ['lat'];
+        $lon     = ( float ) $searchresults ['lon'];
+        $geohash = ( string ) $searchresults ['geohash'];
 
-        if(isset ($searchresults ['error'])) {
+        if (isset ($searchresults ['error'])) {
             print '<div class="level1"><p>' . hsc($searchresults ['error']) . '</p></div>';
             return;
         }
@@ -260,9 +260,9 @@ 
         // print a HTML list
         print '<h1>' . $this->getLang('results_header') . '</h1>' . DOKU_LF;
         print '<div class="level1">' . DOKU_LF;
-        if(!empty ($pages)) {
+        if (!empty ($pages)) {
             $pagelist = '<ol>' . DOKU_LF;
-            foreach($pages as $page) {
+            foreach ($pages as $page) {
                 $pagelist .= '<li>' . html_wikilink(
                         ':' . $page ['id'], useHeading('navigation') ? null :
                         noNS($page ['id'])
@@ -282,14 +282,14 @@ 
             print '<p>' . hsc($this->getLang('nothingfound')) . '</p>';
         }
 
-        if(!empty ($media) && $showMedia) {
+        if (!empty ($media) && $showMedia) {
             $pagelist = '<ol>' . DOKU_LF;
-            foreach($media as $m) {
+            foreach ($media as $m) {
                 $opts       = array();
                 $link       = ml($m ['id'], $opts, false, '&amp;', false);
                 $opts ['w'] = '100';
                 $src        = ml($m ['id'], $opts);
-                $pagelist   .= '<li><a href="' . $link . '"><img src="' . $src . '"></a> ('
+                $pagelist .= '<li><a href="' . $link . '"><img src="' . $src . '"></a> ('
                     . $this->getLang('results_distance_prefix') . $page ['distance'] . '&nbsp;m) ' . hsc($desc)
                     . '</li>' . DOKU_LF;
             }
@@ -304,7 +304,7 @@ 
             print '</div>' . DOKU_LF;
         }
         print '<p>' . $this->getLang('results_precision') . $searchresults ['precision'] . ' m. ';
-        if(strlen($geohash) > 1) {
+        if (strlen($geohash) > 1) {
             $url = wl(
                 getID(), array(
                            'do'      => 'findnearby',
@@ -335,9 +335,9 @@ 
 
         // check the list of mimetypes
         // if it's a supported type call appropriate index function
-        if(substr_compare($event->data [3], 'image/jpeg', 0)) {
+        if (substr_compare($event->data [3], 'image/jpeg', 0)) {
             $indexer = plugin_load('helper', 'spatialhelper_index');
-            if($indexer) {
+            if ($indexer) {
                 $indexer->indexImage($event->data [2]);
             }
         }
@@ -358,7 +358,7 @@ 
 
         // remove the media id from the index
         $indexer = plugin_load('helper', 'spatialhelper_index');
-        if($indexer) {
+        if ($indexer) {
             $indexer->deleteFromIndex('media__' . $event->data ['id']);
         }
     }