mprins / dokuwiki-plugin-spatialhelper

helper/search.php

Indentation +164 added lines, -164 removed lines

@@ -22,180 +22,180 @@
  * @author  Mark Prins
  */
 class helper_plugin_spatialhelper_search extends DokuWiki_Plugin {
-    /**
-     * spatial index.
-     *
-     * @var array
-     */
-    protected $spatial_idx = array();
-    /**
-     * handle to the geoPHP plugin.
-     */
-    protected $geophp;
-    /**
-     * Precision, Distance of Adjacent Cell in Meters.
-     *
-     * @see https://stackoverflow.com/questions/13836416/geohash-and-max-distance
-     *
-     * @var float
-     */
-    private $precision = array(
-        5003530,
-        625441,
-        123264,
-        19545,
-        3803,
-        610,
-        118,
-        19,
-        3.7,
-        0.6
-    );
+	/**
+	 * spatial index.
+	 *
+	 * @var array
+	 */
+	protected $spatial_idx = array();
+	/**
+	 * handle to the geoPHP plugin.
+	 */
+	protected $geophp;
+	/**
+	 * Precision, Distance of Adjacent Cell in Meters.
+	 *
+	 * @see https://stackoverflow.com/questions/13836416/geohash-and-max-distance
+	 *
+	 * @var float
+	 */
+	private $precision = array(
+		5003530,
+		625441,
+		123264,
+		19545,
+		3803,
+		610,
+		118,
+		19,
+		3.7,
+		0.6
+	);
 
-    /**
-     * constructor; initialize/load spatial index.
-     */
-    public function __construct() {
-        // parent::__construct ();
-        global $conf;
+	/**
+	 * constructor; initialize/load spatial index.
+	 */
+	public function __construct() {
+		// parent::__construct ();
+		global $conf;
 
-        if(!$geophp = plugin_load('helper', 'geophp')) {
-            $message = 'helper_plugin_spatialhelper_search::spatialhelper_search: geophp plugin is not available.';
-            msg($message, -1);
-        }
+		if(!$geophp = plugin_load('helper', 'geophp')) {
+			$message = 'helper_plugin_spatialhelper_search::spatialhelper_search: geophp plugin is not available.';
+			msg($message, -1);
+		}
 
-        $idx_dir = $conf ['indexdir'];
-        if(!@file_exists($idx_dir . '/spatial.idx')) {
-            $indexer = plugin_load('helper', 'spatialhelper_index');
-        }
+		$idx_dir = $conf ['indexdir'];
+		if(!@file_exists($idx_dir . '/spatial.idx')) {
+			$indexer = plugin_load('helper', 'spatialhelper_index');
+		}
 
-        $this->spatial_idx = unserialize(io_readFile($fn = $idx_dir . '/spatial.idx', false));
-    }
+		$this->spatial_idx = unserialize(io_readFile($fn = $idx_dir . '/spatial.idx', false));
+	}
 
-    /**
-     * Find locations based on the coordinate pair.
-     *
-     * @param float $lat
-     *          The y coordinate (or latitude)
-     * @param float $lon
-     *          The x coordinate (or longitude)
-     */
-    public function findNearbyLatLon(float $lat, float $lon): array {
-        $geometry = new geoPHP\Geometry\Point($lon, $lat);
-        return $this->findNearby($geometry->out('geohash'), $geometry);
-    }
+	/**
+	 * Find locations based on the coordinate pair.
+	 *
+	 * @param float $lat
+	 *          The y coordinate (or latitude)
+	 * @param float $lon
+	 *          The x coordinate (or longitude)
+	 */
+	public function findNearbyLatLon(float $lat, float $lon): array {
+		$geometry = new geoPHP\Geometry\Point($lon, $lat);
+		return $this->findNearby($geometry->out('geohash'), $geometry);
+	}
 
-    /**
-     * finds nearby elements in the index based on the geohash.
-     * returns a list of documents and the bunding box.
-     *
-     * @param string $geohash
-     * @param geoPHP\Geometry\Point  $p
-     *          optional point
-     * @return array of ...
-     */
-    public function findNearby(string $geohash, geoPHP\Geometry\Point $p = null): array {
-        $_geohashClass = new geoPHP\Adapter\Geohash();
-        if(!$p) {
-            $decodedPoint = $_geohashClass->read($geohash);
-        } else {
-            $decodedPoint = $p;
-        }
+	/**
+	 * finds nearby elements in the index based on the geohash.
+	 * returns a list of documents and the bunding box.
+	 *
+	 * @param string $geohash
+	 * @param geoPHP\Geometry\Point  $p
+	 *          optional point
+	 * @return array of ...
+	 */
+	public function findNearby(string $geohash, geoPHP\Geometry\Point $p = null): array {
+		$_geohashClass = new geoPHP\Adapter\Geohash();
+		if(!$p) {
+			$decodedPoint = $_geohashClass->read($geohash);
+		} else {
+			$decodedPoint = $p;
+		}
 
-        // find adjacent blocks
-        $adjacent                 = array();
-        $adjacent ['center']      = $geohash;
-        $adjacent ['top']         = $_geohashClass->adjacent($adjacent ['center'], 'top');
-        $adjacent ['bottom']      = $_geohashClass->adjacent($adjacent ['center'], 'bottom');
-        $adjacent ['right']       = $_geohashClass->adjacent($adjacent ['center'], 'right');
-        $adjacent ['left']        = $_geohashClass->adjacent($adjacent ['center'], 'left');
-        $adjacent ['topleft']     = $_geohashClass->adjacent($adjacent ['left'], 'top');
-        $adjacent ['topright']    = $_geohashClass->adjacent($adjacent ['right'], 'top');
-        $adjacent ['bottomright'] = $_geohashClass->adjacent($adjacent ['right'], 'bottom');
-        $adjacent ['bottomleft']  = $_geohashClass->adjacent($adjacent ['left'], 'bottom');
-        dbglog($adjacent, "adjacent geo hashes:");
+		// find adjacent blocks
+		$adjacent                 = array();
+		$adjacent ['center']      = $geohash;
+		$adjacent ['top']         = $_geohashClass->adjacent($adjacent ['center'], 'top');
+		$adjacent ['bottom']      = $_geohashClass->adjacent($adjacent ['center'], 'bottom');
+		$adjacent ['right']       = $_geohashClass->adjacent($adjacent ['center'], 'right');
+		$adjacent ['left']        = $_geohashClass->adjacent($adjacent ['center'], 'left');
+		$adjacent ['topleft']     = $_geohashClass->adjacent($adjacent ['left'], 'top');
+		$adjacent ['topright']    = $_geohashClass->adjacent($adjacent ['right'], 'top');
+		$adjacent ['bottomright'] = $_geohashClass->adjacent($adjacent ['right'], 'bottom');
+		$adjacent ['bottomleft']  = $_geohashClass->adjacent($adjacent ['left'], 'bottom');
+		dbglog($adjacent, "adjacent geo hashes:");
 
-        // 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) {
-                        // dbglog ( "Found adjacent geo hash: $adjHash in $_geohash" );
-                        // if $adjHash similar to geohash
-                        $docIds = array_merge($docIds, $_docIds);
-                    }
-                }
-            }
-        }
-        $docIds = array_unique($docIds);
-        dbglog($docIds, "found docIDs");
+		// 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) {
+						// dbglog ( "Found adjacent geo hash: $adjHash in $_geohash" );
+						// if $adjHash similar to geohash
+						$docIds = array_merge($docIds, $_docIds);
+					}
+				}
+			}
+		}
+		$docIds = array_unique($docIds);
+		dbglog($docIds, "found docIDs");
 
-        // create associative array of pages + calculate distance
-        $pages   = array();
-        $media   = array();
-        $indexer = plugin_load('helper', 'spatialhelper_index');
+		// create associative array of pages + calculate distance
+		$pages   = array();
+		$media   = array();
+		$indexer = plugin_load('helper', 'spatialhelper_index');
 
-        foreach($docIds as $id) {
-            if(strpos($id, 'media__', 0) === 0) {
-                $id = substr($id, strlen('media__'));
-                if(auth_quickaclcheck($id) >= /*AUTH_READ*/ 1) {
-                    $point    = $indexer->getCoordsFromExif($id);
-                    $line     = new geoPHP\Geometry\LineString(
-                        [
-                            $decodedPoint,
-                            $point
-                        ]
-                    );
-                    $media [] = array(
-                        'id'       => $id,
-                        '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) {
-                    $geotags  = p_get_metadata($id, 'geo');
-                    $point    = new geoPHP\Geometry\Point($geotags ['lon'], $geotags ['lat']);
-                    $line     = new geoPHP\Geometry\LineString(
-                        [
-                            $decodedPoint,
-                            $point
-                        ]
-                    );
-                    $pages [] = array(
-                        'id'          => $id,
-                        'distance'    => (int) ($line->greatCircleLength()),
-                        'description' => p_get_metadata($id, 'description')['abstract'],
-                        'lat'         => $geotags ['lat'],
-                        'lon'         => $geotags ['lon']
-                        // optionally add other meta such as tag...
-                    );
-                }
-            }
-        }
+		foreach($docIds as $id) {
+			if(strpos($id, 'media__', 0) === 0) {
+				$id = substr($id, strlen('media__'));
+				if(auth_quickaclcheck($id) >= /*AUTH_READ*/ 1) {
+					$point    = $indexer->getCoordsFromExif($id);
+					$line     = new geoPHP\Geometry\LineString(
+						[
+							$decodedPoint,
+							$point
+						]
+					);
+					$media [] = array(
+						'id'       => $id,
+						'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) {
+					$geotags  = p_get_metadata($id, 'geo');
+					$point    = new geoPHP\Geometry\Point($geotags ['lon'], $geotags ['lat']);
+					$line     = new geoPHP\Geometry\LineString(
+						[
+							$decodedPoint,
+							$point
+						]
+					);
+					$pages [] = array(
+						'id'          => $id,
+						'distance'    => (int) ($line->greatCircleLength()),
+						'description' => p_get_metadata($id, 'description')['abstract'],
+						'lat'         => $geotags ['lat'],
+						'lon'         => $geotags ['lon']
+						// optionally add other meta such as tag...
+					);
+				}
+			}
+		}
 
-        // sort all the pages/media using distance
-        usort(
-            $pages, static function ($a, $b) {
-            return strnatcmp($a ['distance'], $b ['distance']);
-        }
-        );
-        usort(
-            $media, static function ($a, $b) {
-            return strnatcmp($a ['distance'], $b ['distance']);
-        }
-        );
+		// sort all the pages/media using distance
+		usort(
+			$pages, static function ($a, $b) {
+			return strnatcmp($a ['distance'], $b ['distance']);
+		}
+		);
+		usort(
+			$media, static function ($a, $b) {
+			return strnatcmp($a ['distance'], $b ['distance']);
+		}
+		);
 
-        return array(
-            'pages'     => $pages,
-            'media'     => $media,
-            'lat'       => $decodedPoint->y(),
-            'lon'       => $decodedPoint->x(),
-            'geohash'   => $geohash,
-            'precision' => $this->precision [strlen($geohash)]
-        );
-    }
+		return array(
+			'pages'     => $pages,
+			'media'     => $media,
+			'lat'       => $decodedPoint->y(),
+			'lon'       => $decodedPoint->x(),
+			'geohash'   => $geohash,
+			'precision' => $this->precision [strlen($geohash)]
+		);
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -59,13 +59,13 @@ 
         // parent::__construct ();
         global $conf;
 
-        if(!$geophp = plugin_load('helper', 'geophp')) {
+        if (!$geophp = plugin_load('helper', 'geophp')) {
             $message = 'helper_plugin_spatialhelper_search::spatialhelper_search: 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')) {
             $indexer = plugin_load('helper', 'spatialhelper_index');
         }
 
@@ -96,7 +96,7 @@ 
      */
     public function findNearby(string $geohash, geoPHP\Geometry\Point $p = null): array {
         $_geohashClass = new geoPHP\Adapter\Geohash();
-        if(!$p) {
+        if (!$p) {
             $decodedPoint = $_geohashClass->read($geohash);
         } else {
             $decodedPoint = $p;
@@ -117,10 +117,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);
@@ -136,10 +136,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 geoPHP\Geometry\LineString(
                         [
@@ -149,14 +149,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 geoPHP\Geometry\Point($geotags ['lon'], $geotags ['lat']);
                     $line     = new geoPHP\Geometry\LineString(
@@ -167,7 +167,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']
@@ -179,12 +179,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

Indentation +259 added lines, -259 removed lines

@@ -22,284 +22,284 @@
  * @author  Mark Prins
  */
 class helper_plugin_spatialhelper_index extends DokuWiki_Plugin {
-    /**
-     * directory for index files.
-     *
-     * @var string
-     */
-    protected $idx_dir = '';
+	/**
+	 * directory for index files.
+	 *
+	 * @var string
+	 */
+	protected $idx_dir = '';
 
-    /**
-     * spatial index, well lookup list/array so we can do spatial queries.
-     * entries should be: array("geohash" => {"id1","id3",})
-     *
-     * @var array
-     */
-    protected $spatial_idx = array();
+	/**
+	 * spatial index, well lookup list/array so we can do spatial queries.
+	 * entries should be: array("geohash" => {"id1","id3",})
+	 *
+	 * @var array
+	 */
+	protected $spatial_idx = array();
 
-    /**
-     * handle to the geoPHP plugin.
-     */
-    protected $geophp;
+	/**
+	 * handle to the geoPHP plugin.
+	 */
+	protected $geophp;
 
-    /**
-     * Constructor, initialises the spatial index.
-     */
-    public function __construct() {
-        if(!$geophp = plugin_load('helper', 'geophp')) {
-            $message = 'helper_plugin_spatialhelper_index::spatialhelper_index: geophp plugin is not available.';
-            msg($message, -1);
-        }
+	/**
+	 * Constructor, initialises the spatial index.
+	 */
+	public function __construct() {
+		if(!$geophp = plugin_load('helper', 'geophp')) {
+			$message = 'helper_plugin_spatialhelper_index::spatialhelper_index: geophp plugin is not available.';
+			msg($message, -1);
+		}
 
-        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')) {
-            // creates and stores the index
-            $this->generateSpatialIndex();
-        } else {
-            $this->spatial_idx = unserialize(io_readFile($this->idx_dir . '/spatial.idx', false));
-            dbglog($this->spatial_idx, 'done loading spatial index');
-        }
-    }
+		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')) {
+			// creates and stores the index
+			$this->generateSpatialIndex();
+		} else {
+			$this->spatial_idx = unserialize(io_readFile($this->idx_dir . '/spatial.idx', false));
+			dbglog($this->spatial_idx, 'done loading spatial index');
+		}
+	}
 
-    /**
-     * (re-)Generates the spatial index by running through all the pages in the wiki.
-     *
-     * @todo add an option to erase the old index
-     */
-    public function generateSpatialIndex(): bool {
-        global $conf;
-        require_once(DOKU_INC . 'inc/search.php');
-        $pages = array();
-        search($pages, $conf ['datadir'], 'search_allpages', array());
-        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']) {
-                $this->indexImage($medium);
-            }
-        }
-        return true;
-    }
+	/**
+	 * (re-)Generates the spatial index by running through all the pages in the wiki.
+	 *
+	 * @todo add an option to erase the old index
+	 */
+	public function generateSpatialIndex(): bool {
+		global $conf;
+		require_once(DOKU_INC . 'inc/search.php');
+		$pages = array();
+		search($pages, $conf ['datadir'], 'search_allpages', array());
+		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']) {
+				$this->indexImage($medium);
+			}
+		}
+		return true;
+	}
 
-    /**
-     * Update the spatial index for the page.
-     *
-     * @param string $id
-     *          the document ID
-     * @throws Exception
-     */
-    public function updateSpatialIndex(string $id): bool {
-        $geotags = p_get_metadata($id, 'geo');
-        if(empty ($geotags)) {
-            return false;
-        }
-        if(empty ($geotags ['lon']) || empty ($geotags ['lat'])) {
-            return false;
-        }
-        dbglog($geotags, "Geo metadata found for page $id");
-        $geometry = new geoPHP\Geometry\Point($geotags ['lon'], $geotags ['lat']);
-        $geohash  = $geometry->out('geohash');
-        dbglog('Update index for geohash: ' . $geohash);
-        return $this->addToIndex($geohash, $id);
-    }
+	/**
+	 * Update the spatial index for the page.
+	 *
+	 * @param string $id
+	 *          the document ID
+	 * @throws Exception
+	 */
+	public function updateSpatialIndex(string $id): bool {
+		$geotags = p_get_metadata($id, 'geo');
+		if(empty ($geotags)) {
+			return false;
+		}
+		if(empty ($geotags ['lon']) || empty ($geotags ['lat'])) {
+			return false;
+		}
+		dbglog($geotags, "Geo metadata found for page $id");
+		$geometry = new geoPHP\Geometry\Point($geotags ['lon'], $geotags ['lat']);
+		$geohash  = $geometry->out('geohash');
+		dbglog('Update index for geohash: ' . $geohash);
+		return $this->addToIndex($geohash, $id);
+	}
 
-    /**
-     * Store the hash/id entry in the index.
-     *
-     * @param string $geohash
-     * @param string $id
-     *          page or media id
-     * @return bool true when succesful
-     */
-    private function addToIndex(string $geohash, string $id): bool {
-        $pageIds = array();
-        // check index for key/geohash
-        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)) {
-                dbglog("No index record found for document $id, just add");
-                $pageIds    = $this->spatial_idx [$geohash];
-                $pageIds [] = $id;
-            }
-            // TODO shortcut, need to make sure there is only one element, if not the index is corrupt
-            $knownHash = $knownHashes [0];
+	/**
+	 * Store the hash/id entry in the index.
+	 *
+	 * @param string $geohash
+	 * @param string $id
+	 *          page or media id
+	 * @return bool true when succesful
+	 */
+	private function addToIndex(string $geohash, string $id): bool {
+		$pageIds = array();
+		// check index for key/geohash
+		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)) {
+				dbglog("No index record found for document $id, just add");
+				$pageIds    = $this->spatial_idx [$geohash];
+				$pageIds [] = $id;
+			}
+			// TODO shortcut, need to make sure there is only one element, if not the index is corrupt
+			$knownHash = $knownHashes [0];
 
-            if($knownHash === $geohash) {
-                dbglog("Document $id was found in index and has the same geohash, nothing to do.");
-                return true;
-            }
+			if($knownHash === $geohash) {
+				dbglog("Document $id was found in index and has the same geohash, nothing to do.");
+				return true;
+			}
 
-            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:");
-                // remove it from the old geohash element
-                $i = array_search($id, $knownIds);
-                dbglog('Unsetting:' . $knownIds [$i]);
-                unset ($knownIds [$i]);
-                $this->spatial_idx [$knownHash] = $knownIds;
-                // set on new geohash element
-                $pageIds    = $this->spatial_idx [$geohash];
-                $pageIds [] = $id;
-            }
-        }
-        // store and save
-        $this->spatial_idx [$geohash] = $pageIds;
-        return $this->saveIndex();
-    }
+			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:");
+				// remove it from the old geohash element
+				$i = array_search($id, $knownIds);
+				dbglog('Unsetting:' . $knownIds [$i]);
+				unset ($knownIds [$i]);
+				$this->spatial_idx [$knownHash] = $knownIds;
+				// set on new geohash element
+				$pageIds    = $this->spatial_idx [$geohash];
+				$pageIds [] = $id;
+			}
+		}
+		// store and save
+		$this->spatial_idx [$geohash] = $pageIds;
+		return $this->saveIndex();
+	}
 
-    /**
-     * Looks up the geohash(es) for the document in the index.
-     *
-     * @param String $id
-     *          document ID
-     * @param array  $index
-     *          spatial index
-     */
-    public function findHashesForId(string $id, array $index): array {
-        $hashes = array();
-        foreach($index as $hash => $docIds) {
-            if(in_array($id, $docIds, false)) {
-                $hashes [] = $hash;
-            }
-        }
-        dbglog($hashes, "Found the following hashes for $id (should only be 1)");
-        return $hashes;
-    }
+	/**
+	 * Looks up the geohash(es) for the document in the index.
+	 *
+	 * @param String $id
+	 *          document ID
+	 * @param array  $index
+	 *          spatial index
+	 */
+	public function findHashesForId(string $id, array $index): array {
+		$hashes = array();
+		foreach($index as $hash => $docIds) {
+			if(in_array($id, $docIds, false)) {
+				$hashes [] = $hash;
+			}
+		}
+		dbglog($hashes, "Found the following hashes for $id (should only be 1)");
+		return $hashes;
+	}
 
-    /**
-     * Save spatial index.
-     */
-    private function saveIndex(): bool {
-        return io_saveFile($this->idx_dir . '/spatial.idx', serialize($this->spatial_idx));
-    }
+	/**
+	 * Save spatial index.
+	 */
+	private function saveIndex(): bool {
+		return io_saveFile($this->idx_dir . '/spatial.idx', serialize($this->spatial_idx));
+	}
 
-    /**
-     * Add an index entry for this file having EXIF / IPTC data.
-     *
-     * @param $img
-     *          a Dokuwiki image
-     * @return bool true when image was succesfully added to the index.
-     * @throws Exception
-     * @see http://www.php.net/manual/en/function.iptcparse.php
-     * @see http://php.net/manual/en/function.exif-read-data.php
-     *
-     */
-    public function indexImage($img): bool {
-        // test for supported files (jpeg only)
-        if(
-            (substr($img ['file'], -strlen('.jpg')) !== '.jpg') &&
-            (substr($img ['file'], -strlen('.jpeg')) !== '.jpeg')) {
-            return false;
-        }
+	/**
+	 * Add an index entry for this file having EXIF / IPTC data.
+	 *
+	 * @param $img
+	 *          a Dokuwiki image
+	 * @return bool true when image was succesfully added to the index.
+	 * @throws Exception
+	 * @see http://www.php.net/manual/en/function.iptcparse.php
+	 * @see http://php.net/manual/en/function.exif-read-data.php
+	 *
+	 */
+	public function indexImage($img): bool {
+		// test for supported files (jpeg only)
+		if(
+			(substr($img ['file'], -strlen('.jpg')) !== '.jpg') &&
+			(substr($img ['file'], -strlen('.jpeg')) !== '.jpeg')) {
+			return false;
+		}
 
-        $geometry = $this->getCoordsFromExif($img ['id']);
-        if(!$geometry) {
-            return false;
-        }
-        $geohash = $geometry->out('geohash');
-        // TODO truncate the geohash to something reasonable, otherwise they are
-        // useless as an indexing mechanism eg. u1h73weckdrmskdqec3c9 is far too
-        // precise, limit at ~9 as most GPS are not submeter accurate
-        return $this->addToIndex($geohash, 'media__' . $img ['id']);
-    }
+		$geometry = $this->getCoordsFromExif($img ['id']);
+		if(!$geometry) {
+			return false;
+		}
+		$geohash = $geometry->out('geohash');
+		// TODO truncate the geohash to something reasonable, otherwise they are
+		// useless as an indexing mechanism eg. u1h73weckdrmskdqec3c9 is far too
+		// precise, limit at ~9 as most GPS are not submeter accurate
+		return $this->addToIndex($geohash, 'media__' . $img ['id']);
+	}
 
-    /**
-     * retrieve GPS decimal coordinates from exif.
-     *
-     * @param string $id
-     * @return geoPHP\Geometry\Point|false
-     * @throws Exception
-     */
-    public function getCoordsFromExif(string $id) {
-        $exif = exif_read_data(mediaFN($id), 0, true);
-        if(empty ($exif ['GPS'])) {
-            return false;
-        }
+	/**
+	 * retrieve GPS decimal coordinates from exif.
+	 *
+	 * @param string $id
+	 * @return geoPHP\Geometry\Point|false
+	 * @throws Exception
+	 */
+	public function getCoordsFromExif(string $id) {
+		$exif = exif_read_data(mediaFN($id), 0, true);
+		if(empty ($exif ['GPS'])) {
+			return false;
+		}
 
-        $lat = $this->convertDMStoD(
-            array(
-                $exif ['GPS'] ['GPSLatitude'] [0],
-                $exif ['GPS'] ['GPSLatitude'] [1],
-                $exif ['GPS'] ['GPSLatitude'] [2],
-                $exif ['GPS'] ['GPSLatitudeRef']
-            )
-        );
+		$lat = $this->convertDMStoD(
+			array(
+				$exif ['GPS'] ['GPSLatitude'] [0],
+				$exif ['GPS'] ['GPSLatitude'] [1],
+				$exif ['GPS'] ['GPSLatitude'] [2],
+				$exif ['GPS'] ['GPSLatitudeRef']
+			)
+		);
 
-        $lon = $this->convertDMStoD(
-            array(
-                $exif ['GPS'] ['GPSLongitude'] [0],
-                $exif ['GPS'] ['GPSLongitude'] [1],
-                $exif ['GPS'] ['GPSLongitude'] [2],
-                $exif ['GPS'] ['GPSLongitudeRef']
-            )
-        );
+		$lon = $this->convertDMStoD(
+			array(
+				$exif ['GPS'] ['GPSLongitude'] [0],
+				$exif ['GPS'] ['GPSLongitude'] [1],
+				$exif ['GPS'] ['GPSLongitude'] [2],
+				$exif ['GPS'] ['GPSLongitudeRef']
+			)
+		);
 
-        return new geoPHP\Geometry\Point($lon, $lat);
-    }
+		return new geoPHP\Geometry\Point($lon, $lat);
+	}
 
-    /**
-     * convert DegreesMinutesSeconds to Decimal degrees.
-     *
-     * @param array $param array of rational DMS
-     * @return float
-     */
-    public function convertDMStoD(array $param): float {
-        if(!is_array($param)) {
-            $param = array($param);
-        }
-        $deg = $this->convertRationaltoFloat($param [0]);
-        $min = $this->convertRationaltoFloat($param [1]) / 60;
-        $sec = $this->convertRationaltoFloat($param [2]) / 60 / 60;
-        // Hemisphere (N, S, W or E)
-        $hem = ($param [3] === 'N' || $param [3] === 'E') ? 1 : -1;
-        return $hem * ($deg + $min + $sec);
-    }
+	/**
+	 * convert DegreesMinutesSeconds to Decimal degrees.
+	 *
+	 * @param array $param array of rational DMS
+	 * @return float
+	 */
+	public function convertDMStoD(array $param): float {
+		if(!is_array($param)) {
+			$param = array($param);
+		}
+		$deg = $this->convertRationaltoFloat($param [0]);
+		$min = $this->convertRationaltoFloat($param [1]) / 60;
+		$sec = $this->convertRationaltoFloat($param [2]) / 60 / 60;
+		// Hemisphere (N, S, W or E)
+		$hem = ($param [3] === 'N' || $param [3] === 'E') ? 1 : -1;
+		return $hem * ($deg + $min + $sec);
+	}
 
-    public function convertRationaltoFloat($param): float {
-        // rational64u
-        $nums = explode('/', $param);
-        if((int) $nums[1] > 0) {
-            return (float) $nums[0] / (int) $nums[1];
-        } else {
-            return (float) $nums[0];
-        }
-    }
+	public function convertRationaltoFloat($param): float {
+		// rational64u
+		$nums = explode('/', $param);
+		if((int) $nums[1] > 0) {
+			return (float) $nums[0] / (int) $nums[1];
+		} else {
+			return (float) $nums[0];
+		}
+	}
 
-    /**
-     * Deletes the page from the index.
-     *
-     * @param string $id document ID
-     */
-    public function deleteFromIndex(string $id): void {
-        // check the index for document
-        $knownHashes = $this->findHashesForId($id, $this->spatial_idx);
-        if(empty ($knownHashes)) {
-            return;
-        }
+	/**
+	 * Deletes the page from the index.
+	 *
+	 * @param string $id document ID
+	 */
+	public function deleteFromIndex(string $id): void {
+		// check the index for document
+		$knownHashes = $this->findHashesForId($id, $this->spatial_idx);
+		if(empty ($knownHashes)) {
+			return;
+		}
 
-        // TODO shortcut, need to make sure there is only one element, if not the index is corrupt
-        $knownHash = $knownHashes [0];
-        $knownIds  = $this->spatial_idx [$knownHash];
-        $i         = array_search($id, $knownIds);
-        dbglog("removing: $knownIds[$i] from the index.");
-        unset ($knownIds [$i]);
-        $this->spatial_idx [$knownHash] = $knownIds;
-        if(empty ($this->spatial_idx [$knownHash])) {
-            // dbglog ( "removing key: $knownHash from the index." );
-            unset ($this->spatial_idx [$knownHash]);
-        }
-        $this->saveIndex();
-    }
+		// TODO shortcut, need to make sure there is only one element, if not the index is corrupt
+		$knownHash = $knownHashes [0];
+		$knownIds  = $this->spatial_idx [$knownHash];
+		$i         = array_search($id, $knownIds);
+		dbglog("removing: $knownIds[$i] from the index.");
+		unset ($knownIds [$i]);
+		$this->spatial_idx [$knownHash] = $knownIds;
+		if(empty ($this->spatial_idx [$knownHash])) {
+			// dbglog ( "removing key: $knownHash from the index." );
+			unset ($this->spatial_idx [$knownHash]);
+		}
+		$this->saveIndex();
+	}
 }