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

_test/general.test.php

Indentation +32 added lines, -32 removed lines

@@ -24,41 +24,41 @@
 class general_plugin_spatialhelper_test extends DokuWikiTest
 {
 
-    protected $pluginsEnabled = array('spatialhelper');
+	protected $pluginsEnabled = array('spatialhelper');
 
-    /**
-     * Simple test to make sure the plugin.info.txt is in correct format.
-     */
-    final  public function test_plugininfo(): void
-    {
-        $file = __DIR__ . '/../plugin.info.txt';
-        self::assertFileExists($file);
+	/**
+	 * Simple test to make sure the plugin.info.txt is in correct format.
+	 */
+	final  public function test_plugininfo(): void
+	{
+		$file = __DIR__ . '/../plugin.info.txt';
+		self::assertFileExists($file);
 
-        $info = confToHash($file);
+		$info = confToHash($file);
 
-        self::assertArrayHasKey('base', $info);
-        self::assertArrayHasKey('author', $info);
-        self::assertArrayHasKey('email', $info);
-        self::assertArrayHasKey('date', $info);
-        self::assertArrayHasKey('name', $info);
-        self::assertArrayHasKey('desc', $info);
-        self::assertArrayHasKey('url', $info);
+		self::assertArrayHasKey('base', $info);
+		self::assertArrayHasKey('author', $info);
+		self::assertArrayHasKey('email', $info);
+		self::assertArrayHasKey('date', $info);
+		self::assertArrayHasKey('name', $info);
+		self::assertArrayHasKey('desc', $info);
+		self::assertArrayHasKey('url', $info);
 
-        self::assertEquals('spatialhelper', $info['base']);
-        self::assertRegExp('/^https?:\/\//', $info['url']);
-        self::assertTrue(mail_isvalid($info['email']));
-        self::assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
-        self::assertNotFalse(strtotime($info['date']));
-    }
+		self::assertEquals('spatialhelper', $info['base']);
+		self::assertRegExp('/^https?:\/\//', $info['url']);
+		self::assertTrue(mail_isvalid($info['email']));
+		self::assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
+		self::assertNotFalse(strtotime($info['date']));
+	}
 
-    /**
-     * test if plugin is loaded.
-     */
-    final  public function test_plugin_spatialhelper_isloaded(): void
-    {
-        global $plugin_controller;
-        self::assertContains(
-            'spatialhelper', $plugin_controller->getList(), "spatialhelper plugin is loaded"
-        );
-    }
+	/**
+	 * test if plugin is loaded.
+	 */
+	final  public function test_plugin_spatialhelper_isloaded(): void
+	{
+		global $plugin_controller;
+		self::assertContains(
+			'spatialhelper', $plugin_controller->getList(), "spatialhelper plugin is loaded"
+		);
+	}
 }

admin/purge.php

Indentation +53 added lines, -53 removed lines

@@ -27,63 +27,63 @@
  */
 class admin_plugin_spatialhelper_purge extends AdminPlugin
 {
-    /**
-     *
-     * @see DokuWiki_Admin_Plugin::getMenuSort()
-     */
-    final  public function getMenuSort(): int
-    {
-        return 801;
-    }
+	/**
+	 *
+	 * @see DokuWiki_Admin_Plugin::getMenuSort()
+	 */
+	final  public function getMenuSort(): int
+	{
+		return 801;
+	}
 
-    final  public function getMenuIcon(): string
-    {
-        $plugin = $this->getPluginName();
-        return DOKU_PLUGIN . $plugin . '/admin/purge.svg';
-    }
+	final  public function getMenuIcon(): string
+	{
+		$plugin = $this->getPluginName();
+		return DOKU_PLUGIN . $plugin . '/admin/purge.svg';
+	}
 
-    /**
-     * purge and regenerate the index and sitemaps.
-     *
-     * @see DokuWiki_Admin_Plugin::handle()
-     */
-    final  public function handle(): void
-    {
-        if (isset($_REQUEST ['purgeindex'])) {
-            global $conf;
-            $path = $conf ['indexdir'] . '/spatial.idx';
-            if (file_exists($path) && unlink($path)) {
-                msg($this->getLang('admin_purged_tiles'), 0);
-            }
-        }
+	/**
+	 * purge and regenerate the index and sitemaps.
+	 *
+	 * @see DokuWiki_Admin_Plugin::handle()
+	 */
+	final  public function handle(): void
+	{
+		if (isset($_REQUEST ['purgeindex'])) {
+			global $conf;
+			$path = $conf ['indexdir'] . '/spatial.idx';
+			if (file_exists($path) && unlink($path)) {
+				msg($this->getLang('admin_purged_tiles'), 0);
+			}
+		}
 
-        $indexer = plugin_load('helper', 'spatialhelper_index');
-        if (isset($indexer)) {
-            $indexer->generateSpatialIndex();
-        }
+		$indexer = plugin_load('helper', 'spatialhelper_index');
+		if (isset($indexer)) {
+			$indexer->generateSpatialIndex();
+		}
 
-        $sitemapper = plugin_load('helper', 'spatialhelper_sitemap');
-        if (isset($sitemapper)) {
-            $sitemapper->createKMLSitemap($this->getConf('media_kml'));
-            $sitemapper->createGeoRSSSitemap($this->getConf('media_georss'));
-        }
-    }
+		$sitemapper = plugin_load('helper', 'spatialhelper_sitemap');
+		if (isset($sitemapper)) {
+			$sitemapper->createKMLSitemap($this->getConf('media_kml'));
+			$sitemapper->createGeoRSSSitemap($this->getConf('media_georss'));
+		}
+	}
 
-    /**
-     * render the form for this plugin.
-     *
-     * @see DokuWiki_Admin_Plugin::html()
-     */
-    final  public function html(): void
-    {
-        echo $this->locale_xhtml('admin_purge_intro');
+	/**
+	 * render the form for this plugin.
+	 *
+	 * @see DokuWiki_Admin_Plugin::html()
+	 */
+	final  public function html(): void
+	{
+		echo $this->locale_xhtml('admin_purge_intro');
 
-        $form = new Form(
-            ['id' => 'spatialhelper__purgeform', 'method' => 'post']
-        );
-        $form->setHiddenField('purgeindex', 'true');
-        $form->addButton('submit', $this->getLang('admin_submit'))
-            ->attr('title', $this->getLang('admin_submit'));
-        echo $form->toHTML();
-    }
+		$form = new Form(
+			['id' => 'spatialhelper__purgeform', 'method' => 'post']
+		);
+		$form->setHiddenField('purgeindex', 'true');
+		$form->addButton('submit', $this->getLang('admin_submit'))
+			->attr('title', $this->getLang('admin_submit'));
+		echo $form->toHTML();
+	}
 }

helper/index.php

Indentation +259 added lines, -259 removed lines

@@ -28,285 +28,285 @@
  */
 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 = 'helper_plugin_spatialhelper_index::spatialhelper_index: 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 = 'helper_plugin_spatialhelper_index::spatialhelper_index: 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);
-            }
-        }
-        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);
+			}
+		}
+		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 $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
-     *
-     */
-    final  public function indexImage(array $img): bool
-    {
-        // test for supported files (jpeg only)
-        if (
-            (!str_ends_with($img ['file'], '.jpg')) &&
-            (!str_ends_with($img ['file'], '.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
+	 *
+	 */
+	final  public function indexImage(array $img): bool
+	{
+		// test for supported files (jpeg only)
+		if (
+			(!str_ends_with($img ['file'], '.jpg')) &&
+			(!str_ends_with($img ['file'], '.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 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();
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -236,7 +236,7 @@ 
      * @return Point|false
      * @throws Exception
      */
-    final  public function getCoordsFromExif(string $id): Point|false
+    final  public function getCoordsFromExif(string $id): Point | false
     {
         $exif = exif_read_data(mediaFN($id), 0, true);
         if (empty($exif ['GPS'])) {
@@ -277,11 +277,11 @@ 
     {
         // 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];
         }
 
-        return (float)$nums[0];
+        return ( float ) $nums[0];
     }
 
     /**