mprins / dokuwiki-plugin-spatialhelper

_test/index.test.php

Indentation +45 added lines, -45 removed lines

@@ -14,49 +14,49 @@
 class index_test extends DokuWikiTest
 {
 
-    protected $pluginsEnabled = array('spatialhelper');
-
-    /**
-     * Testdata for @return array
-     * @see index_test::test_convertDMStoD
-     *
-     */
-    final public static function convertDMStoDTestdata(): array
-    {
-        return array(
-            array(
-                array(0 => '52/1', 1 => '31/1', 2 => '2/1', 3 => 'N',),
-                52.5172,
-                'Latitude in Europe'
-            ),
-            array(
-                array(0 => '13/1', 1 => '30/1', 2 => '38/1', 3 => 'E',),
-                13.5105,
-                'Longitude in Europe'
-            ),
-            array(
-                array(0 => '50/1', 1 => '34251480/1000000', 2 => '0/1', 3 => 'N',),
-                50.5708,
-                'Latitude in North America'
-            ),
-            array(
-                array(0 => '109/1', 1 => '28041300/1000000', 2 => '0/1', 3 => 'W',),
-                -109.4673,
-                'Longitude in North America'
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider convertDMStoDTestdata
-     */
-    final public function test_convertDMStoD(array $input, float $expected_output, string $msg): void
-    {
-        $index = plugin_load('helper', 'spatialhelper_index');
-        assert($index instanceof helper_plugin_spatialhelper_index);
-
-        $actual_output = $index->convertDMStoD($input);
-
-        self::assertEqualsWithDelta($expected_output, $actual_output, 0.0001, $msg);
-    }
+	protected $pluginsEnabled = array('spatialhelper');
+
+	/**
+	 * Testdata for @return array
+	 * @see index_test::test_convertDMStoD
+	 *
+	 */
+	final public static function convertDMStoDTestdata(): array
+	{
+		return array(
+			array(
+				array(0 => '52/1', 1 => '31/1', 2 => '2/1', 3 => 'N',),
+				52.5172,
+				'Latitude in Europe'
+			),
+			array(
+				array(0 => '13/1', 1 => '30/1', 2 => '38/1', 3 => 'E',),
+				13.5105,
+				'Longitude in Europe'
+			),
+			array(
+				array(0 => '50/1', 1 => '34251480/1000000', 2 => '0/1', 3 => 'N',),
+				50.5708,
+				'Latitude in North America'
+			),
+			array(
+				array(0 => '109/1', 1 => '28041300/1000000', 2 => '0/1', 3 => 'W',),
+				-109.4673,
+				'Longitude in North America'
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider convertDMStoDTestdata
+	 */
+	final public function test_convertDMStoD(array $input, float $expected_output, string $msg): void
+	{
+		$index = plugin_load('helper', 'spatialhelper_index');
+		assert($index instanceof helper_plugin_spatialhelper_index);
+
+		$actual_output = $index->convertDMStoD($input);
+
+		self::assertEqualsWithDelta($expected_output, $actual_output, 0.0001, $msg);
+	}
 }

action.php

Indentation +337 added lines, -337 removed lines

@@ -30,369 +30,369 @@
  */
 class action_plugin_spatialhelper extends ActionPlugin
 {
-    /**
-     * Register for events.
-     *
-     * @param EventHandler $controller
-     *          DokuWiki's event controller object.
-     */
-    final public function register(EventHandler $controller): void
-    {
-        // listen for page add / delete events
-        // http://www.dokuwiki.org/devel:event:indexer_page_add
-        $controller->register_hook('INDEXER_PAGE_ADD', 'BEFORE', $this, 'handleIndexerPageAdd');
-        $controller->register_hook('IO_WIKIPAGE_WRITE', 'BEFORE', $this, 'removeFromIndex');
+	/**
+	 * Register for events.
+	 *
+	 * @param EventHandler $controller
+	 *          DokuWiki's event controller object.
+	 */
+	final public function register(EventHandler $controller): void
+	{
+		// listen for page add / delete events
+		// http://www.dokuwiki.org/devel:event:indexer_page_add
+		$controller->register_hook('INDEXER_PAGE_ADD', 'BEFORE', $this, 'handleIndexerPageAdd');
+		$controller->register_hook('IO_WIKIPAGE_WRITE', 'BEFORE', $this, 'removeFromIndex');
 
-        // http://www.dokuwiki.org/devel:event:sitemap_generate
-        $controller->register_hook('SITEMAP_GENERATE', 'BEFORE', $this, 'handleSitemapGenerateBefore');
-        // using after will only trigger us if a sitemap was actually created
-        $controller->register_hook('SITEMAP_GENERATE', 'AFTER', $this, 'handleSitemapGenerateAfter');
+		// http://www.dokuwiki.org/devel:event:sitemap_generate
+		$controller->register_hook('SITEMAP_GENERATE', 'BEFORE', $this, 'handleSitemapGenerateBefore');
+		// using after will only trigger us if a sitemap was actually created
+		$controller->register_hook('SITEMAP_GENERATE', 'AFTER', $this, 'handleSitemapGenerateAfter');
 
-        // handle actions we know of
-        $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handleActionActPreprocess', []);
-        // handle HTML eg. /dokuwiki/doku.php?id=start&do=findnearby&geohash=u15vk4
-        $controller->register_hook(
-            'TPL_ACT_UNKNOWN',
-            'BEFORE',
-            $this,
-            'findnearby',
-            ['format' => 'HTML']
-        );
-        // handles AJAX/json eg: jQuery.post("/dokuwiki/lib/exe/ajax.php?id=start&call=findnearby&geohash=u15vk4");
-        $controller->register_hook(
-            'AJAX_CALL_UNKNOWN',
-            'BEFORE',
-            $this,
-            'findnearby',
-            ['format' => 'JSON']
-        );
+		// handle actions we know of
+		$controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handleActionActPreprocess', []);
+		// handle HTML eg. /dokuwiki/doku.php?id=start&do=findnearby&geohash=u15vk4
+		$controller->register_hook(
+			'TPL_ACT_UNKNOWN',
+			'BEFORE',
+			$this,
+			'findnearby',
+			['format' => 'HTML']
+		);
+		// handles AJAX/json eg: jQuery.post("/dokuwiki/lib/exe/ajax.php?id=start&call=findnearby&geohash=u15vk4");
+		$controller->register_hook(
+			'AJAX_CALL_UNKNOWN',
+			'BEFORE',
+			$this,
+			'findnearby',
+			['format' => 'JSON']
+		);
 
-        // listen for media uploads and deletes
-        $controller->register_hook('MEDIA_UPLOAD_FINISH', 'BEFORE', $this, 'handleMediaUploaded', []);
-        $controller->register_hook('MEDIA_DELETE_FILE', 'BEFORE', $this, 'handleMediaDeleted', []);
+		// listen for media uploads and deletes
+		$controller->register_hook('MEDIA_UPLOAD_FINISH', 'BEFORE', $this, 'handleMediaUploaded', []);
+		$controller->register_hook('MEDIA_DELETE_FILE', 'BEFORE', $this, 'handleMediaDeleted', []);
 
-        $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handleMetaheaderOutput');
-        $controller->register_hook('PLUGIN_POPULARITY_DATA_SETUP', 'AFTER', $this, 'popularity');
-    }
+		$controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handleMetaheaderOutput');
+		$controller->register_hook('PLUGIN_POPULARITY_DATA_SETUP', 'AFTER', $this, 'popularity');
+	}
 
-    /**
-     * Update the spatial index for the page.
-     *
-     * @param Event $event
-     *          event object
-     */
-    final  public function handleIndexerPageAdd(Event $event): void
-    {
-        // $event→data['page'] – the page id
-        // $event→data['body'] – empty, can be filled by additional content to index by your plugin
-        // $event→data['metadata'] – the metadata that shall be indexed. This is an array where the keys are the
-        //    metadata indexes and the value a string or an array of strings with the values.
-        //    title and relation_references will already be set.
-        $id = $event->data ['page'];
-        $indexer = plugin_load('helper', 'spatialhelper_index');
-        $indexer->updateSpatialIndex($id);
-    }
+	/**
+	 * Update the spatial index for the page.
+	 *
+	 * @param Event $event
+	 *          event object
+	 */
+	final  public function handleIndexerPageAdd(Event $event): void
+	{
+		// $event→data['page'] – the page id
+		// $event→data['body'] – empty, can be filled by additional content to index by your plugin
+		// $event→data['metadata'] – the metadata that shall be indexed. This is an array where the keys are the
+		//    metadata indexes and the value a string or an array of strings with the values.
+		//    title and relation_references will already be set.
+		$id = $event->data ['page'];
+		$indexer = plugin_load('helper', 'spatialhelper_index');
+		$indexer->updateSpatialIndex($id);
+	}
 
-    /**
-     * Update the spatial index, removing the page.
-     *
-     * @param Event $event
-     *          event object
-     */
-    final    public function removeFromIndex(Event $event): void
-    {
-        // event data:
-        // $data[0] – The raw arguments for io_saveFile as an array. Do not change file path.
-        // $data[0][0] – the file path.
-        // $data[0][1] – the content to be saved, and may be modified.
-        // $data[1] – ns: The colon separated namespace path minus the trailing page name. (false if root ns)
-        // $data[2] – page_name: The wiki page name.
-        // $data[3] – rev: The page revision, false for current wiki pages.
+	/**
+	 * Update the spatial index, removing the page.
+	 *
+	 * @param Event $event
+	 *          event object
+	 */
+	final    public function removeFromIndex(Event $event): void
+	{
+		// event data:
+		// $data[0] – The raw arguments for io_saveFile as an array. Do not change file path.
+		// $data[0][0] – the file path.
+		// $data[0][1] – the content to be saved, and may be modified.
+		// $data[1] – ns: The colon separated namespace path minus the trailing page name. (false if root ns)
+		// $data[2] – page_name: The wiki page name.
+		// $data[3] – rev: The page revision, false for current wiki pages.
 
-        Logger::debug("Event data in removeFromIndex.", $event->data);
-        if (@file_exists($event->data [0] [0])) {
-            // file not new
-            if (!$event->data [0] [1]) {
-                // file is empty, page is being deleted
-                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 !== null) {
-                    $indexer->deleteFromIndex($id);
-                }
-            }
-        }
-    }
+		Logger::debug("Event data in removeFromIndex.", $event->data);
+		if (@file_exists($event->data [0] [0])) {
+			// file not new
+			if (!$event->data [0] [1]) {
+				// file is empty, page is being deleted
+				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 !== null) {
+					$indexer->deleteFromIndex($id);
+				}
+			}
+		}
+	}
 
-    /**
-     * Add a new SitemapItem object that points to the KML of public geocoded pages.
-     *
-     * @param Event $event
-     */
-    final   public function handleSitemapGenerateBefore(Event $event): void
-    {
-        $path = mediaFN($this->getConf('media_kml'));
-        $lastmod = @filemtime($path);
-        $event->data ['items'] [] = new Item(ml($this->getConf('media_kml'), '', true, '&', true), $lastmod);
-    }
+	/**
+	 * Add a new SitemapItem object that points to the KML of public geocoded pages.
+	 *
+	 * @param Event $event
+	 */
+	final   public function handleSitemapGenerateBefore(Event $event): void
+	{
+		$path = mediaFN($this->getConf('media_kml'));
+		$lastmod = @filemtime($path);
+		$event->data ['items'] [] = new Item(ml($this->getConf('media_kml'), '', true, '&', true), $lastmod);
+	}
 
-    /**
-     * Create a spatial sitemap or attach the geo/kml map to the sitemap.
-     *
-     * @param Event $event
-     *          event object, not used
-     */
-    final   public function handleSitemapGenerateAfter(Event $event): bool
-    {
-        // $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')) !== null) {
-            $kml = $helper->createKMLSitemap($this->getConf('media_kml'));
-            $rss = $helper->createGeoRSSSitemap($this->getConf('media_georss'));
+	/**
+	 * Create a spatial sitemap or attach the geo/kml map to the sitemap.
+	 *
+	 * @param Event $event
+	 *          event object, not used
+	 */
+	final   public function handleSitemapGenerateAfter(Event $event): bool
+	{
+		// $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')) !== null) {
+			$kml = $helper->createKMLSitemap($this->getConf('media_kml'));
+			$rss = $helper->createGeoRSSSitemap($this->getConf('media_georss'));
 
-            if (!empty($this->getConf('sitemap_namespaces'))) {
-                $namespaces = array_map('trim', explode("\n", $this->getConf('sitemap_namespaces')));
-                foreach ($namespaces as $namespace) {
-                    $kmlN = $helper->createKMLSitemap($namespace . $this->getConf('media_kml'));
-                    $rssN = $helper->createGeoRSSSitemap($namespace . $this->getConf('media_georss'));
-                    Logger::debug(
-                        "handleSitemapGenerateAfter, created KML / GeoRSS sitemap in $namespace, succes: ",
-                        $kmlN && $rssN
-                    );
-                }
-            }
-            return $kml && $rss;
-        }
-        return false;
-    }
+			if (!empty($this->getConf('sitemap_namespaces'))) {
+				$namespaces = array_map('trim', explode("\n", $this->getConf('sitemap_namespaces')));
+				foreach ($namespaces as $namespace) {
+					$kmlN = $helper->createKMLSitemap($namespace . $this->getConf('media_kml'));
+					$rssN = $helper->createGeoRSSSitemap($namespace . $this->getConf('media_georss'));
+					Logger::debug(
+						"handleSitemapGenerateAfter, created KML / GeoRSS sitemap in $namespace, succes: ",
+						$kmlN && $rssN
+					);
+				}
+			}
+			return $kml && $rss;
+		}
+		return false;
+	}
 
-    /**
-     * trap findnearby action.
-     * This additional handler is required as described at: https://www.dokuwiki.org/devel:event:tpl_act_unknown
-     *
-     * @param Event $event
-     *          event object
-     */
-    final  public function handleActionActPreprocess(Event $event): void
-    {
-        if ($event->data !== 'findnearby') {
-            return;
-        }
-        $event->preventDefault();
-    }
+	/**
+	 * trap findnearby action.
+	 * This additional handler is required as described at: https://www.dokuwiki.org/devel:event:tpl_act_unknown
+	 *
+	 * @param Event $event
+	 *          event object
+	 */
+	final  public function handleActionActPreprocess(Event $event): void
+	{
+		if ($event->data !== 'findnearby') {
+			return;
+		}
+		$event->preventDefault();
+	}
 
-    /**
-     * handle findnearby action.
-     *
-     * @param Event $event
-     *          event object
-     * @param array $param
-     *          associative array with keys
-     *          'format'=> HTML | JSON
-     * @throws JsonException if anything goes wrong with JSON encoding
-     */
-    final  public function findnearby(Event $event, array $param): void
-    {
-        if ($event->data !== 'findnearby') {
-            return;
-        }
-        $event->preventDefault();
-        $results = [];
-        global $INPUT;
-        if (($helper = plugin_load('helper', 'spatialhelper_search')) !== null) {
-            if ($INPUT->has('lat') && $INPUT->has('lon')) {
-                $results = $helper->findNearbyLatLon($INPUT->param('lat'), $INPUT->param('lon'));
-            } elseif ($INPUT->has('geohash')) {
-                $results = $helper->findNearby($INPUT->str('geohash'));
-            } else {
-                $results = ['error' => hsc($this->getLang('invalidinput'))];
-            }
-        }
+	/**
+	 * handle findnearby action.
+	 *
+	 * @param Event $event
+	 *          event object
+	 * @param array $param
+	 *          associative array with keys
+	 *          'format'=> HTML | JSON
+	 * @throws JsonException if anything goes wrong with JSON encoding
+	 */
+	final  public function findnearby(Event $event, array $param): void
+	{
+		if ($event->data !== 'findnearby') {
+			return;
+		}
+		$event->preventDefault();
+		$results = [];
+		global $INPUT;
+		if (($helper = plugin_load('helper', 'spatialhelper_search')) !== null) {
+			if ($INPUT->has('lat') && $INPUT->has('lon')) {
+				$results = $helper->findNearbyLatLon($INPUT->param('lat'), $INPUT->param('lon'));
+			} elseif ($INPUT->has('geohash')) {
+				$results = $helper->findNearby($INPUT->str('geohash'));
+			} else {
+				$results = ['error' => hsc($this->getLang('invalidinput'))];
+			}
+		}
 
-        $showMedia = $INPUT->bool('showMedia', true);
+		$showMedia = $INPUT->bool('showMedia', true);
 
-        switch ($param['format']) {
-            case 'JSON':
-                $this->printJSON($results);
-                break;
-            case 'HTML':
-                // fall through to default
-            default:
-                $this->printHTML($results, $showMedia);
-                break;
-        }
-    }
+		switch ($param['format']) {
+			case 'JSON':
+				$this->printJSON($results);
+				break;
+			case 'HTML':
+				// fall through to default
+			default:
+				$this->printHTML($results, $showMedia);
+				break;
+		}
+	}
 
-    /**
-     * Print seachresults as HTML lists.
-     *
-     * @param array $searchresults
-     * @throws JsonException if anything goes wrong with JSON encoding
-     */
-    private function printJSON(array $searchresults): void
-    {
-        header('Content-Type: application/json');
-        echo json_encode($searchresults, JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT);
-    }
+	/**
+	 * Print seachresults as HTML lists.
+	 *
+	 * @param array $searchresults
+	 * @throws JsonException if anything goes wrong with JSON encoding
+	 */
+	private function printJSON(array $searchresults): void
+	{
+		header('Content-Type: application/json');
+		echo json_encode($searchresults, JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT);
+	}
 
-    /**
-     * Print seachresults as HTML lists.
-     *
-     * @param array $searchresults
-     * @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'];
+	/**
+	 * Print seachresults as HTML lists.
+	 *
+	 * @param array $searchresults
+	 * @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'];
 
-        if (isset($searchresults ['error'])) {
-            echo '<div class="level1"><p>' . hsc($searchresults ['error']) . '</p></div>';
-            return;
-        }
+		if (isset($searchresults ['error'])) {
+			echo '<div class="level1"><p>' . hsc($searchresults ['error']) . '</p></div>';
+			return;
+		}
 
-        // print a HTML list
-        echo '<h1>' . $this->getLang('results_header') . '</h1>' . DOKU_LF;
-        echo '<div class="level1">' . DOKU_LF;
-        if ($pages !== []) {
-            $pagelist = '<ol>' . DOKU_LF;
-            foreach ($pages as $page) {
-                $pagelist .= '<li>' . html_wikilink(
-                    ':' . $page ['id'],
-                    useHeading('navigation') ? null :
-                            noNS($page ['id'])
-                ) . ' (' . $this->getLang('results_distance_prefix')
-                    . $page ['distance'] . '&nbsp;m) ' . $page ['description'] . '</li>' . DOKU_LF;
-            }
-            $pagelist .= '</ol>' . DOKU_LF;
+		// print a HTML list
+		echo '<h1>' . $this->getLang('results_header') . '</h1>' . DOKU_LF;
+		echo '<div class="level1">' . DOKU_LF;
+		if ($pages !== []) {
+			$pagelist = '<ol>' . DOKU_LF;
+			foreach ($pages as $page) {
+				$pagelist .= '<li>' . html_wikilink(
+					':' . $page ['id'],
+					useHeading('navigation') ? null :
+							noNS($page ['id'])
+				) . ' (' . $this->getLang('results_distance_prefix')
+					. $page ['distance'] . '&nbsp;m) ' . $page ['description'] . '</li>' . DOKU_LF;
+			}
+			$pagelist .= '</ol>' . DOKU_LF;
 
-            echo '<h2>' . $this->getLang('results_pages') . hsc(
-                ' lat;lon: ' . $lat . ';' . $lon
-                    . ' (geohash: ' . $geohash . ')'
-            ) . '</h2>';
-            echo '<div class="level2">' . DOKU_LF;
-            echo $pagelist;
-            echo '</div>' . DOKU_LF;
-        } else {
-            echo '<p>' . hsc($this->getLang('nothingfound')) . '</p>';
-        }
+			echo '<h2>' . $this->getLang('results_pages') . hsc(
+				' lat;lon: ' . $lat . ';' . $lon
+					. ' (geohash: ' . $geohash . ')'
+			) . '</h2>';
+			echo '<div class="level2">' . DOKU_LF;
+			echo $pagelist;
+			echo '</div>' . DOKU_LF;
+		} else {
+			echo '<p>' . hsc($this->getLang('nothingfound')) . '</p>';
+		}
 
-        if ($media !== [] && $showMedia) {
-            $pagelist = '<ol>' . DOKU_LF;
-            foreach ($media as $m) {
-                $opts = [];
-                $link = ml($m ['id'], $opts, false);
-                $opts ['w'] = '100';
-                $src = ml($m ['id'], $opts);
-                $pagelist .= '<li><a href="' . $link . '"><img src="' . $src . '" alt=""></a> ('
-                    . $this->getLang('results_distance_prefix') . $m ['distance'] . '&nbsp;m) '
-                    . '</li>' . DOKU_LF;
-            }
-            $pagelist .= '</ol>' . DOKU_LF;
+		if ($media !== [] && $showMedia) {
+			$pagelist = '<ol>' . DOKU_LF;
+			foreach ($media as $m) {
+				$opts = [];
+				$link = ml($m ['id'], $opts, false);
+				$opts ['w'] = '100';
+				$src = ml($m ['id'], $opts);
+				$pagelist .= '<li><a href="' . $link . '"><img src="' . $src . '" alt=""></a> ('
+					. $this->getLang('results_distance_prefix') . $m ['distance'] . '&nbsp;m) '
+					. '</li>' . DOKU_LF;
+			}
+			$pagelist .= '</ol>' . DOKU_LF;
 
-            echo '<h2>' . $this->getLang('results_media') . hsc(
-                ' lat;lon: ' . $lat . ';' . $lon
-                    . ' (geohash: ' . $geohash . ')'
-            ) . '</h2>' . DOKU_LF;
-            echo '<div class="level2">' . DOKU_LF;
-            echo $pagelist;
-            echo '</div>' . DOKU_LF;
-        }
-        echo '<p>' . $this->getLang('results_precision') . $searchresults ['precision'] . ' m. ';
-        if (strlen($geohash) > 1) {
-            $url = wl(
-                getID(),
-                ['do' => 'findnearby', 'geohash' => substr($geohash, 0, -1)]
-            );
-            echo '<a href="' . $url . '" class="findnearby">' . $this->getLang('search_largerarea') . '</a>.</p>'
-                . DOKU_LF;
-        }
-        echo '</div>' . DOKU_LF;
-    }
+			echo '<h2>' . $this->getLang('results_media') . hsc(
+				' lat;lon: ' . $lat . ';' . $lon
+					. ' (geohash: ' . $geohash . ')'
+			) . '</h2>' . DOKU_LF;
+			echo '<div class="level2">' . DOKU_LF;
+			echo $pagelist;
+			echo '</div>' . DOKU_LF;
+		}
+		echo '<p>' . $this->getLang('results_precision') . $searchresults ['precision'] . ' m. ';
+		if (strlen($geohash) > 1) {
+			$url = wl(
+				getID(),
+				['do' => 'findnearby', 'geohash' => substr($geohash, 0, -1)]
+			);
+			echo '<a href="' . $url . '" class="findnearby">' . $this->getLang('search_largerarea') . '</a>.</p>'
+				. DOKU_LF;
+		}
+		echo '</div>' . DOKU_LF;
+	}
 
-    /**
-     * add media to spatial index.
-     *
-     * @param Event $event
-     */
-    final  public function handleMediaUploaded(Event $event): void
-    {
-        //data[0] path/to/new/media.file (normally read from $_FILES, potentially could come from elsewhere)
-        //data[1] file name of the file being uploaded
-        //data[2] future directory id of the file being uploaded
-        //data[3] the mime type of the file being uploaded
-        //data[4] true if the uploaded file exists already
-        //data[5] (since 2011-02-06) the PHP function used to move the file to the correct location
+	/**
+	 * add media to spatial index.
+	 *
+	 * @param Event $event
+	 */
+	final  public function handleMediaUploaded(Event $event): void
+	{
+		//data[0] path/to/new/media.file (normally read from $_FILES, potentially could come from elsewhere)
+		//data[1] file name of the file being uploaded
+		//data[2] future directory id of the file being uploaded
+		//data[3] the mime type of the file being uploaded
+		//data[4] true if the uploaded file exists already
+		//data[5] (since 2011-02-06) the PHP function used to move the file to the correct location
 
-        Logger::debug("handleMediaUploaded::event data", $event->data);
+		Logger::debug("handleMediaUploaded::event data", $event->data);
 
-        // check the list of mimetypes
-        // if it's a supported type call appropriate index function
-        if (str_contains($event->data [3], 'image/jpeg')) {
-            $indexer = plugin_load('helper', 'spatialhelper_index');
-            if ($indexer !== null) {
-                $indexer->indexImage($event->data [2]);
-            }
-        }
-        // TODO add image/tiff
-        // TODO kml, gpx, geojson...
-    }
+		// check the list of mimetypes
+		// if it's a supported type call appropriate index function
+		if (str_contains($event->data [3], 'image/jpeg')) {
+			$indexer = plugin_load('helper', 'spatialhelper_index');
+			if ($indexer !== null) {
+				$indexer->indexImage($event->data [2]);
+			}
+		}
+		// TODO add image/tiff
+		// TODO kml, gpx, geojson...
+	}
 
-    /**
-     * removes the media from the index.
-     * @param Event $event event object with data
-     */
-    final   public function handleMediaDeleted(Event $event): void
-    {
-        // data['id'] ID data['unl'] unlink return code
-        // data['del'] Namespace directory unlink return code
-        // data['name'] file name data['path'] full path to the file
-        // data['size'] file size
+	/**
+	 * removes the media from the index.
+	 * @param Event $event event object with data
+	 */
+	final   public function handleMediaDeleted(Event $event): void
+	{
+		// data['id'] ID data['unl'] unlink return code
+		// data['del'] Namespace directory unlink return code
+		// data['name'] file name data['path'] full path to the file
+		// data['size'] file size
 
-        // remove the media id from the index
-        $indexer = plugin_load('helper', 'spatialhelper_index');
-        if ($indexer !== null) {
-            $indexer->deleteFromIndex('media__' . $event->data ['id']);
-        }
-    }
+		// remove the media id from the index
+		$indexer = plugin_load('helper', 'spatialhelper_index');
+		if ($indexer !== null) {
+			$indexer->deleteFromIndex('media__' . $event->data ['id']);
+		}
+	}
 
-    /**
-     * add a link to the spatial sitemap files in the header.
-     *
-     * @param Event $event the DokuWiki event. $event->data is a two-dimensional array of all meta headers.
-     * The keys are meta, link and script.
-     *
-     * @see http://www.dokuwiki.org/devel:event:tpl_metaheader_output
-     */
-    final  public function handleMetaheaderOutput(Event $event): void
-    {
-        // TODO maybe test for exist
-        $event->data ["link"] [] = ["type" => "application/atom+xml", "rel" => "alternate",
-            "href" => ml($this->getConf('media_georss')), "title" => "Spatial ATOM Feed"];
-        $event->data ["link"] [] = ["type" => "application/vnd.google-earth.kml+xml", "rel" => "alternate",
-            "href" => ml($this->getConf('media_kml')), "title" => "KML Sitemap"];
-    }
+	/**
+	 * add a link to the spatial sitemap files in the header.
+	 *
+	 * @param Event $event the DokuWiki event. $event->data is a two-dimensional array of all meta headers.
+	 * The keys are meta, link and script.
+	 *
+	 * @see http://www.dokuwiki.org/devel:event:tpl_metaheader_output
+	 */
+	final  public function handleMetaheaderOutput(Event $event): void
+	{
+		// TODO maybe test for exist
+		$event->data ["link"] [] = ["type" => "application/atom+xml", "rel" => "alternate",
+			"href" => ml($this->getConf('media_georss')), "title" => "Spatial ATOM Feed"];
+		$event->data ["link"] [] = ["type" => "application/vnd.google-earth.kml+xml", "rel" => "alternate",
+			"href" => ml($this->getConf('media_kml')), "title" => "KML Sitemap"];
+	}
 
-    /**
-     * Add spatialhelper popularity data.
-     *
-     * @param Event $event
-     *          the DokuWiki event
-     */
-    final public function popularity(Event $event): void
-    {
-        $versionInfo = getVersionData();
-        $plugin_info = $this->getInfo();
-        $event->data['spatialhelper']['version'] = $plugin_info['date'];
-        $event->data['spatialhelper']['dwversion'] = $versionInfo['date'];
-        $event->data['spatialhelper']['combinedversion'] = $versionInfo['date'] . '_' . $plugin_info['date'];
-    }
+	/**
+	 * Add spatialhelper popularity data.
+	 *
+	 * @param Event $event
+	 *          the DokuWiki event
+	 */
+	final public function popularity(Event $event): void
+	{
+		$versionInfo = getVersionData();
+		$plugin_info = $this->getInfo();
+		$event->data['spatialhelper']['version'] = $plugin_info['date'];
+		$event->data['spatialhelper']['dwversion'] = $versionInfo['date'];
+		$event->data['spatialhelper']['combinedversion'] = $versionInfo['date'] . '_' . $plugin_info['date'];
+	}
 }

helper/index.php

Indentation +270 added lines, -270 removed lines

@@ -28,296 +28,296 @@
  */
 class helper_plugin_spatialhelper_index extends Plugin
 {
-    /**
-     * directory for index files.
-     *
-     * @var string
-     */
-    protected string $idx_dir = '';
+	/**
+	 * directory for index files.
+	 *
+	 * @var string
+	 */
+	protected string $idx_dir = '';
 
-    /**
-     * spatial index, we'll look up list/array so we can do spatial queries.
-     * entries should be: array("geohash" => {"id1","id3",})
-     *
-     * @var array
-     */
-    protected array $spatial_idx = [];
+	/**
+	 * spatial index, we'll look up list/array so we can do spatial queries.
+	 * entries should be: array("geohash" => {"id1","id3",})
+	 *
+	 * @var array
+	 */
+	protected array $spatial_idx = [];
 
-    /**
-     * Constructor, initialises the spatial index.
-     * @throws Exception
-     */
-    public function __construct()
-    {
-        if (plugin_load('helper', 'geophp') === null) {
-            $message = 'Required geophp plugin is not available';
-            msg($message, -1);
-        }
+	/**
+	 * Constructor, initialises the spatial index.
+	 * @throws Exception
+	 */
+	public function __construct()
+	{
+		if (plugin_load('helper', 'geophp') === null) {
+			$message = 'Required 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),
-                ['allowed_classes' => false]
-            );
-            Logger::debug('done loading spatial index', $this->spatial_idx);
-        }
-    }
+		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),
+				['allowed_classes' => false]
+			);
+			Logger::debug('done loading spatial index', $this->spatial_idx);
+		}
+	}
 
-    /**
-     * (re-)Generates the spatial index by running through all the pages in the wiki.
-     *
-     * @throws Exception
-     * @todo add an option to erase the old index
-     */
-    final public function generateSpatialIndex(): bool
-    {
-        global $conf;
-        require_once(DOKU_INC . 'inc/search.php');
-        $pages = [];
-        search($pages, $conf ['datadir'], 'search_allpages', []);
-        foreach ($pages as $page) {
-            $this->updateSpatialIndex($page ['id']);
-        }
-        // media
-        $media = [];
-        search($media, $conf['mediadir'], 'search_media', []);
-        foreach ($media as $medium) {
-            if ($medium['isimg']) {
-                $this->indexImage($medium['id']);
-            }
-        }
-        return true;
-    }
+	/**
+	 * (re-)Generates the spatial index by running through all the pages in the wiki.
+	 *
+	 * @throws Exception
+	 * @todo add an option to erase the old index
+	 */
+	final public function generateSpatialIndex(): bool
+	{
+		global $conf;
+		require_once(DOKU_INC . 'inc/search.php');
+		$pages = [];
+		search($pages, $conf ['datadir'], 'search_allpages', []);
+		foreach ($pages as $page) {
+			$this->updateSpatialIndex($page ['id']);
+		}
+		// media
+		$media = [];
+		search($media, $conf['mediadir'], 'search_media', []);
+		foreach ($media as $medium) {
+			if ($medium['isimg']) {
+				$this->indexImage($medium['id']);
+			}
+		}
+		return true;
+	}
 
-    /**
-     * Update the spatial index for the page.
-     *
-     * @param string $id
-     *          the document ID
-     * @throws Exception
-     */
-    final 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;
-        }
-        Logger::debug("Geo metadata found for page $id", $geotags);
-        $geometry = new Point($geotags ['lon'], $geotags ['lat']);
-        $geohash = $geometry->out('geohash');
-        Logger::debug('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
+	 */
+	final 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;
+		}
+		Logger::debug("Geo metadata found for page $id", $geotags);
+		$geometry = new Point($geotags ['lon'], $geotags ['lat']);
+		$geohash = $geometry->out('geohash');
+		Logger::debug('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 = [];
-        // check index for key/geohash
-        if (!array_key_exists($geohash, $this->spatial_idx)) {
-            Logger::debug("Geohash $geohash not in index, just add $id.");
-            $pageIds [] = $id;
-        } else {
-            Logger::debug('Geohash for document is in index, find it.');
-            // check the index for document
-            $knownHashes = $this->findHashesForId($id, $this->spatial_idx);
-            if ($knownHashes === []) {
-                Logger::debug("No index record found for document $id, adding it to the index.");
-                $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 = [];
+		// check index for key/geohash
+		if (!array_key_exists($geohash, $this->spatial_idx)) {
+			Logger::debug("Geohash $geohash not in index, just add $id.");
+			$pageIds [] = $id;
+		} else {
+			Logger::debug('Geohash for document is in index, find it.');
+			// check the index for document
+			$knownHashes = $this->findHashesForId($id, $this->spatial_idx);
+			if ($knownHashes === []) {
+				Logger::debug("No index record found for document $id, adding it to the index.");
+				$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) {
-                Logger::debug("Document $id was found in index and has the same geohash, nothing to do.");
-                return true;
-            }
+			if ($knownHash === $geohash) {
+				Logger::debug("Document $id was found in index and has the same geohash, nothing to do.");
+				return true;
+			}
 
-            if (!empty($knownHash)) {
-                Logger::debug("Document/media $id was found in index but has different geohash (it moved).");
-                $knownIds = $this->spatial_idx [$knownHash];
-                Logger::debug("Known id's for this hash:", $knownIds);
-                // remove it from the old geohash element
-                $i = array_search($id, $knownIds);
-                Logger::debug('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)) {
+				Logger::debug("Document/media $id was found in index but has different geohash (it moved).");
+				$knownIds = $this->spatial_idx [$knownHash];
+				Logger::debug("Known id's for this hash:", $knownIds);
+				// remove it from the old geohash element
+				$i = array_search($id, $knownIds);
+				Logger::debug('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
-     */
-    final public function findHashesForId(string $id, array $index): array
-    {
-        $hashes = [];
-        foreach ($index as $hash => $docIds) {
-            if (in_array($id, $docIds)) {
-                $hashes [] = $hash;
-            }
-        }
-        Logger::debug("Found the following hashes for $id (should only be 1)", $hashes);
-        return $hashes;
-    }
+	/**
+	 * Looks up the geohash(es) for the document in the index.
+	 *
+	 * @param String $id
+	 *          document ID
+	 * @param array $index
+	 *          spatial index
+	 */
+	final public function findHashesForId(string $id, array $index): array
+	{
+		$hashes = [];
+		foreach ($index as $hash => $docIds) {
+			if (in_array($id, $docIds)) {
+				$hashes [] = $hash;
+			}
+		}
+		Logger::debug("Found the following hashes for $id (should only be 1)", $hashes);
+		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 $imgId
-     *          a Dokuwiki image id
-     * @return bool true when image was successfully 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
-     *
-     */
-    final public function indexImage(string $imgId): bool
-    {
-        // test for supported files (jpeg only)
-        if (
-            (!str_ends_with(strtolower($imgId), '.jpg')) &&
-            (!str_ends_with(strtolower($imgId), '.jpeg'))
-        ) {
-            Logger::debug("indexImage:: " . $imgId . " is not a supported image file.");
-            return false;
-        }
+	/**
+	 * Add an index entry for this file having EXIF / IPTC data.
+	 *
+	 * @param $imgId
+	 *          a Dokuwiki image id
+	 * @return bool true when image was successfully 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
+	 *
+	 */
+	final public function indexImage(string $imgId): bool
+	{
+		// test for supported files (jpeg only)
+		if (
+			(!str_ends_with(strtolower($imgId), '.jpg')) &&
+			(!str_ends_with(strtolower($imgId), '.jpeg'))
+		) {
+			Logger::debug("indexImage:: " . $imgId . " is not a supported image file.");
+			return false;
+		}
 
-        $geometry = $this->getCoordsFromExif($imgId);
-        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__' . $imgId);
-    }
+		$geometry = $this->getCoordsFromExif($imgId);
+		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__' . $imgId);
+	}
 
-    /**
-     * retrieve GPS decimal coordinates from exif.
-     *
-     * @param string $id
-     * @return Point|false
-     * @throws Exception
-     */
-    final public function getCoordsFromExif(string $id): Point|false
-    {
-        $exif = exif_read_data(mediaFN($id), 0, true);
-        if (empty($exif ['GPS'])) {
-            return false;
-        }
+	/**
+	 * retrieve GPS decimal coordinates from exif.
+	 *
+	 * @param string $id
+	 * @return Point|false
+	 * @throws Exception
+	 */
+	final public function getCoordsFromExif(string $id): Point|false
+	{
+		$exif = exif_read_data(mediaFN($id), 0, true);
+		if (empty($exif ['GPS'])) {
+			return false;
+		}
 
-        $lat = $this->convertDMStoD(
-            [
-                $exif ['GPS'] ['GPSLatitude'] [0],
-                $exif ['GPS'] ['GPSLatitude'] [1],
-                $exif ['GPS'] ['GPSLatitude'] [2],
-                $exif ['GPS'] ['GPSLatitudeRef']
-            ]
-        );
+		$lat = $this->convertDMStoD(
+			[
+				$exif ['GPS'] ['GPSLatitude'] [0],
+				$exif ['GPS'] ['GPSLatitude'] [1],
+				$exif ['GPS'] ['GPSLatitude'] [2],
+				$exif ['GPS'] ['GPSLatitudeRef']
+			]
+		);
 
-        $lon = $this->convertDMStoD(
-            [
-                $exif ['GPS'] ['GPSLongitude'] [0],
-                $exif ['GPS'] ['GPSLongitude'] [1],
-                $exif ['GPS'] ['GPSLongitude'] [2],
-                $exif ['GPS'] ['GPSLongitudeRef']
-            ]
-        );
+		$lon = $this->convertDMStoD(
+			[
+				$exif ['GPS'] ['GPSLongitude'] [0],
+				$exif ['GPS'] ['GPSLongitude'] [1],
+				$exif ['GPS'] ['GPSLongitude'] [2],
+				$exif ['GPS'] ['GPSLongitudeRef']
+			]
+		);
 
-        return new Point($lon, $lat);
-    }
+		return new Point($lon, $lat);
+	}
 
-    /**
-     * convert DegreesMinutesSeconds to Decimal degrees.
-     *
-     * @param array $param array of rational DMS
-     */
-    final  public function convertDMStoD(array $param): float
-    {
-        //        if (!(is_array($param))) {
-        //            $param = [$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;
+	/**
+	 * convert DegreesMinutesSeconds to Decimal degrees.
+	 *
+	 * @param array $param array of rational DMS
+	 */
+	final  public function convertDMStoD(array $param): float
+	{
+		//        if (!(is_array($param))) {
+		//            $param = [$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);
-    }
+		return $hem * ($deg + $min + $sec);
+	}
 
-    final public function convertRationaltoFloat(string $param): float
-    {
-        // rational64u
-        $nums = explode('/', $param);
-        if ((int)$nums[1] > 0) {
-            return (float)$nums[0] / (int)$nums[1];
-        }
+	final public function convertRationaltoFloat(string $param): float
+	{
+		// rational64u
+		$nums = explode('/', $param);
+		if ((int)$nums[1] > 0) {
+			return (float)$nums[0] / (int)$nums[1];
+		}
 
-        return (float)$nums[0];
-    }
+		return (float)$nums[0];
+	}
 
-    /**
-     * Deletes the page from the index.
-     *
-     * @param string $id document ID
-     */
-    final public function deleteFromIndex(string $id): void
-    {
-        // check the index for document
-        $knownHashes = $this->findHashesForId($id, $this->spatial_idx);
-        if ($knownHashes === []) {
-            return;
-        }
+	/**
+	 * Deletes the page from the index.
+	 *
+	 * @param string $id document ID
+	 */
+	final public function deleteFromIndex(string $id): void
+	{
+		// check the index for document
+		$knownHashes = $this->findHashesForId($id, $this->spatial_idx);
+		if ($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);
-        Logger::debug("removing: $knownIds[$i] from the index.");
-        unset($knownIds [$i]);
-        $this->spatial_idx [$knownHash] = $knownIds;
-        if (empty($this->spatial_idx [$knownHash])) {
-            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);
+		Logger::debug("removing: $knownIds[$i] from the index.");
+		unset($knownIds [$i]);
+		$this->spatial_idx [$knownHash] = $knownIds;
+		if (empty($this->spatial_idx [$knownHash])) {
+			unset($this->spatial_idx [$knownHash]);
+		}
+		$this->saveIndex();
+	}
 }