mprins / dokuwiki-plugin-geotag

syntax/geotag.php

Indentation +231 added lines, -231 removed lines

@@ -27,248 +27,248 @@
  */
 class syntax_plugin_geotag_geotag extends DokuWiki_Syntax_Plugin
 {
-    /**
-     *
-     * @see DokuWiki_Syntax_Plugin::getType()
-     */
-    public function getType(): string
-    {
-        return 'substition';
-    }
+	/**
+	 *
+	 * @see DokuWiki_Syntax_Plugin::getType()
+	 */
+	public function getType(): string
+	{
+		return 'substition';
+	}
 
-    /**
-     *
-     * @see DokuWiki_Syntax_Plugin::getPType()
-     */
-    public function getPType(): string
-    {
-        return 'block';
-    }
+	/**
+	 *
+	 * @see DokuWiki_Syntax_Plugin::getPType()
+	 */
+	public function getPType(): string
+	{
+		return 'block';
+	}
 
-    /**
-     *
-     * @see Doku_Parser_Mode::getSort()
-     */
-    public function getSort(): int
-    {
-        return 305;
-    }
+	/**
+	 *
+	 * @see Doku_Parser_Mode::getSort()
+	 */
+	public function getSort(): int
+	{
+		return 305;
+	}
 
-    /**
-     *
-     * @see Doku_Parser_Mode::connectTo()
-     */
-    public function connectTo($mode)
-    {
-        $this->Lexer->addSpecialPattern('\{\{geotag>.*?\}\}', $mode, 'plugin_geotag_geotag');
-    }
+	/**
+	 *
+	 * @see Doku_Parser_Mode::connectTo()
+	 */
+	public function connectTo($mode)
+	{
+		$this->Lexer->addSpecialPattern('\{\{geotag>.*?\}\}', $mode, 'plugin_geotag_geotag');
+	}
 
-    /**
-     *
-     * @see DokuWiki_Syntax_Plugin::handle()
-     */
-    public function handle($match, $state, $pos, Doku_Handler $handler): array
-    {
-        $tags = trim(substr($match, 9, -2));
-        // parse geotag content
-        preg_match("(lat[:|=]-?\d*\.\d*)", $tags, $lat);
-        preg_match("(lon[:|=]-?\d*\.\d*)", $tags, $lon);
-        preg_match("(alt[:|=]-?\d*\.?\d*)", $tags, $alt);
-        preg_match("/(region[:|=][\p{L}\s\w'-]*)/u", $tags, $region);
-        preg_match("/(placename[:|=][\p{L}\s\w'-]*)/u", $tags, $placename);
-        preg_match("/(country[:|=][\p{L}\s\w'-]*)/u", $tags, $country);
-        preg_match("(hide|unhide)", $tags, $hide);
+	/**
+	 *
+	 * @see DokuWiki_Syntax_Plugin::handle()
+	 */
+	public function handle($match, $state, $pos, Doku_Handler $handler): array
+	{
+		$tags = trim(substr($match, 9, -2));
+		// parse geotag content
+		preg_match("(lat[:|=]-?\d*\.\d*)", $tags, $lat);
+		preg_match("(lon[:|=]-?\d*\.\d*)", $tags, $lon);
+		preg_match("(alt[:|=]-?\d*\.?\d*)", $tags, $alt);
+		preg_match("/(region[:|=][\p{L}\s\w'-]*)/u", $tags, $region);
+		preg_match("/(placename[:|=][\p{L}\s\w'-]*)/u", $tags, $placename);
+		preg_match("/(country[:|=][\p{L}\s\w'-]*)/u", $tags, $country);
+		preg_match("(hide|unhide)", $tags, $hide);
 
-        $showlocation = $this->getConf('geotag_location_prefix');
-        if ($this->getConf('geotag_showlocation')) {
-            $showlocation = trim(substr($placename [0], 10));
-            if (strlen($showlocation) < 1) {
-                $showlocation = $this->getConf('geotag_location_prefix');
-            }
-        }
-        // read config for system setting
-        $style = '';
-        if ($this->getConf('geotag_hide')) {
-            $style = ' style="display: none;"';
-        }
-        // override config for the current tag
-        if (array_key_exists(0, $hide) && trim($hide [0]) == 'hide') {
-            $style = ' style="display: none;"';
-        } elseif (array_key_exists(0, $hide) && trim($hide [0]) == 'unhide') {
-            $style = '';
-        }
+		$showlocation = $this->getConf('geotag_location_prefix');
+		if ($this->getConf('geotag_showlocation')) {
+			$showlocation = trim(substr($placename [0], 10));
+			if (strlen($showlocation) < 1) {
+				$showlocation = $this->getConf('geotag_location_prefix');
+			}
+		}
+		// read config for system setting
+		$style = '';
+		if ($this->getConf('geotag_hide')) {
+			$style = ' style="display: none;"';
+		}
+		// override config for the current tag
+		if (array_key_exists(0, $hide) && trim($hide [0]) == 'hide') {
+			$style = ' style="display: none;"';
+		} elseif (array_key_exists(0, $hide) && trim($hide [0]) == 'unhide') {
+			$style = '';
+		}
 
-        $geohash = "";
-        try {
-            $geohash = $this->geohash(substr($lat[0], 4), substr($lon[0], 4));
-        } catch (Exception $e) {
-            Logger::debug("failed to create geohash for $lat[0], $lon[0]");
-        }
-        return array(
-            hsc(trim(substr($lat[0], 4))),
-            hsc(trim(substr($lon[0], 4))),
-            hsc(trim(substr(($alt[0] ?? ''), 4))),
-            $geohash,
-            hsc(trim(substr(($region[0] ?? ''), 7))),
-            hsc(trim(substr(($placename[0] ?? ''), 10))),
-            hsc(trim(substr(($country[0] ?? ''), 8))),
-            hsc($showlocation),
-            $style
-        );
-    }
+		$geohash = "";
+		try {
+			$geohash = $this->geohash(substr($lat[0], 4), substr($lon[0], 4));
+		} catch (Exception $e) {
+			Logger::debug("failed to create geohash for $lat[0], $lon[0]");
+		}
+		return array(
+			hsc(trim(substr($lat[0], 4))),
+			hsc(trim(substr($lon[0], 4))),
+			hsc(trim(substr(($alt[0] ?? ''), 4))),
+			$geohash,
+			hsc(trim(substr(($region[0] ?? ''), 7))),
+			hsc(trim(substr(($placename[0] ?? ''), 10))),
+			hsc(trim(substr(($country[0] ?? ''), 8))),
+			hsc($showlocation),
+			$style
+		);
+	}
 
-    /**
-     * Calculate the geohash for this lat/lon pair.
-     *
-     * @param float $lat
-     * @param float $lon
-     * @return string tha calculated geohas; can be an empty string
-     * @throws Exception when parsing a point geometry fails
-     */
-    private function geohash(float $lat, float $lon): string
-    {
-        if (!$geophp = plugin_load('helper', 'geophp')) {
-            Logger::debug('syntax_plugin_geotag_geotag::geohash: geophp plugin is not available.', $geophp);
-            return "";
-        }
-        $geometry = new Point($lon, $lat);
-        return $geometry->out('geohash');
-    }
+	/**
+	 * Calculate the geohash for this lat/lon pair.
+	 *
+	 * @param float $lat
+	 * @param float $lon
+	 * @return string tha calculated geohas; can be an empty string
+	 * @throws Exception when parsing a point geometry fails
+	 */
+	private function geohash(float $lat, float $lon): string
+	{
+		if (!$geophp = plugin_load('helper', 'geophp')) {
+			Logger::debug('syntax_plugin_geotag_geotag::geohash: geophp plugin is not available.', $geophp);
+			return "";
+		}
+		$geometry = new Point($lon, $lat);
+		return $geometry->out('geohash');
+	}
 
-    /**
-     *
-     * @see DokuWiki_Syntax_Plugin::render()
-     */
-    public function render($format, Doku_Renderer $renderer, $data): bool
-    {
-        if ($data === false) {
-            return false;
-        }
-        list ($lat, $lon, $alt, $geohash, $region, $placename, $country, $showlocation, $style) = $data;
-        $ddlat = $lat;
-        $ddlon = $lon;
-        if ($this->getConf('displayformat') === 'DMS') {
-            $lat = $this->convertLat($lat);
-            $lon = $this->convertLon($lon);
-        } else {
-            $lat .= 'º';
-            $lon .= 'º';
-        }
+	/**
+	 *
+	 * @see DokuWiki_Syntax_Plugin::render()
+	 */
+	public function render($format, Doku_Renderer $renderer, $data): bool
+	{
+		if ($data === false) {
+			return false;
+		}
+		list ($lat, $lon, $alt, $geohash, $region, $placename, $country, $showlocation, $style) = $data;
+		$ddlat = $lat;
+		$ddlon = $lon;
+		if ($this->getConf('displayformat') === 'DMS') {
+			$lat = $this->convertLat($lat);
+			$lon = $this->convertLon($lon);
+		} else {
+			$lat .= 'º';
+			$lon .= 'º';
+		}
 
-        if ($format == 'xhtml') {
-            if ($this->getConf('geotag_prevent_microformat_render')) {
-                return true;
-            }
-            $searchPre  = '';
-            $searchPost = '';
-            if ($this->getConf('geotag_showsearch')) {
-                if ($spHelper = plugin_load('helper', 'spatialhelper_search')) {
-                    $title      = $this->getLang('findnearby') . '&nbsp;' . $placename;
-                    $url        = wl(
-                        getID(),
-                        array(
-                            'do'  => 'findnearby',
-                            'lat' => $ddlat,
-                            'lon' => $ddlon
-                        )
-                    );
-                    $searchPre  = '<a href="' . $url . '" title="' . $title . '">';
-                    $searchPost = '<span class="a11y">' . $title . '</span></a>';
-                }
-            }
+		if ($format == 'xhtml') {
+			if ($this->getConf('geotag_prevent_microformat_render')) {
+				return true;
+			}
+			$searchPre  = '';
+			$searchPost = '';
+			if ($this->getConf('geotag_showsearch')) {
+				if ($spHelper = plugin_load('helper', 'spatialhelper_search')) {
+					$title      = $this->getLang('findnearby') . '&nbsp;' . $placename;
+					$url        = wl(
+						getID(),
+						array(
+							'do'  => 'findnearby',
+							'lat' => $ddlat,
+							'lon' => $ddlon
+						)
+					);
+					$searchPre  = '<a href="' . $url . '" title="' . $title . '">';
+					$searchPost = '<span class="a11y">' . $title . '</span></a>';
+				}
+			}
 
-            // render geotag microformat/schema.org microdata
-            $renderer->doc .= '<span class="geotagPrint">' . $this->getLang('geotag_desc') . '</span>';
-            $renderer->doc .= '<div class="h-geo geo"' . $style . ' title="' . $this->getLang('geotag_desc')
-                . $placename . '" itemscope itemtype="https://schema.org/Place">';
-            $renderer->doc .= '<span itemprop="name">' . $showlocation . '</span>:&nbsp;' . $searchPre;
-            $renderer->doc .= '<span itemprop="geo" itemscope itemtype="https://schema.org/GeoCoordinates">';
-            $renderer->doc .= '<span class="p-latitude latitude" itemprop="latitude" data-latitude="' . $ddlat . '">'
-                . $lat . '</span>;';
-            $renderer->doc .= '<span class="p-longitude longitude" itemprop="longitude" data-longitude="' . $ddlon
-                . '">' . $lon . '</span>';
-            if (!empty ($alt)) {
-                $renderer->doc .= ', <span class="p-altitude altitude" itemprop="elevation" data-altitude="' . $alt
-                    . '">' . $alt . 'm</span>';
-            }
-            $renderer->doc .= '</span>' . $searchPost . '</div>' . DOKU_LF;
-            return true;
-        } elseif ($format == 'metadata') {
-            // render metadata (our action plugin will put it in the page head)
-            $renderer->meta['geo']['lat']       = $ddlat;
-            $renderer->meta['geo']['lon']       = $ddlon;
-            $renderer->meta['geo']['placename'] = $placename;
-            $renderer->meta['geo']['region']    = $region;
-            $renderer->meta['geo']['country']   = $country;
-            $renderer->meta['geo']['geohash']   = $geohash;
-            $renderer->meta['geo']['alt']       = $alt;
-            return true;
-        } elseif ($format == 'odt') {
-            if (!empty ($alt)) {
-                $alt = ', ' . $alt . 'm';
-            }
-            $renderer->p_open();
-            $renderer->_odtAddImage(DOKU_PLUGIN . 'geotag/images/geotag.png', null, null, 'left', '');
-            $renderer->cdata($this->getLang('geotag_desc') . ' ' . $placename);
-            $renderer->monospace_open();
-            $renderer->cdata($lat . ';' . $lon . $alt);
-            $renderer->monospace_close();
-            $renderer->p_close();
-            return true;
-        }
-        return false;
-    }
+			// render geotag microformat/schema.org microdata
+			$renderer->doc .= '<span class="geotagPrint">' . $this->getLang('geotag_desc') . '</span>';
+			$renderer->doc .= '<div class="h-geo geo"' . $style . ' title="' . $this->getLang('geotag_desc')
+				. $placename . '" itemscope itemtype="https://schema.org/Place">';
+			$renderer->doc .= '<span itemprop="name">' . $showlocation . '</span>:&nbsp;' . $searchPre;
+			$renderer->doc .= '<span itemprop="geo" itemscope itemtype="https://schema.org/GeoCoordinates">';
+			$renderer->doc .= '<span class="p-latitude latitude" itemprop="latitude" data-latitude="' . $ddlat . '">'
+				. $lat . '</span>;';
+			$renderer->doc .= '<span class="p-longitude longitude" itemprop="longitude" data-longitude="' . $ddlon
+				. '">' . $lon . '</span>';
+			if (!empty ($alt)) {
+				$renderer->doc .= ', <span class="p-altitude altitude" itemprop="elevation" data-altitude="' . $alt
+					. '">' . $alt . 'm</span>';
+			}
+			$renderer->doc .= '</span>' . $searchPost . '</div>' . DOKU_LF;
+			return true;
+		} elseif ($format == 'metadata') {
+			// render metadata (our action plugin will put it in the page head)
+			$renderer->meta['geo']['lat']       = $ddlat;
+			$renderer->meta['geo']['lon']       = $ddlon;
+			$renderer->meta['geo']['placename'] = $placename;
+			$renderer->meta['geo']['region']    = $region;
+			$renderer->meta['geo']['country']   = $country;
+			$renderer->meta['geo']['geohash']   = $geohash;
+			$renderer->meta['geo']['alt']       = $alt;
+			return true;
+		} elseif ($format == 'odt') {
+			if (!empty ($alt)) {
+				$alt = ', ' . $alt . 'm';
+			}
+			$renderer->p_open();
+			$renderer->_odtAddImage(DOKU_PLUGIN . 'geotag/images/geotag.png', null, null, 'left', '');
+			$renderer->cdata($this->getLang('geotag_desc') . ' ' . $placename);
+			$renderer->monospace_open();
+			$renderer->cdata($lat . ';' . $lon . $alt);
+			$renderer->monospace_close();
+			$renderer->p_close();
+			return true;
+		}
+		return false;
+	}
 
-    /**
-     * convert latitude in decimal degrees to DMS+hemisphere.
-     *
-     * @param float $decimaldegrees
-     * @return string
-     * @todo move this into a shared library
-     */
-    private function convertLat(float $decimaldegrees): string
-    {
-        if (strpos($decimaldegrees, '-') !== false) {
-            $latPos = "S";
-        } else {
-            $latPos = "N";
-        }
-        $dms = $this->convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $latPos);
-    }
+	/**
+	 * convert latitude in decimal degrees to DMS+hemisphere.
+	 *
+	 * @param float $decimaldegrees
+	 * @return string
+	 * @todo move this into a shared library
+	 */
+	private function convertLat(float $decimaldegrees): string
+	{
+		if (strpos($decimaldegrees, '-') !== false) {
+			$latPos = "S";
+		} else {
+			$latPos = "N";
+		}
+		$dms = $this->convertDDtoDMS(abs($decimaldegrees));
+		return hsc($dms . $latPos);
+	}
 
-    /**
-     * Convert decimal degrees to degrees, minutes, seconds format
-     *
-     * @param float $decimaldegrees
-     * @return string dms
-     * @todo move this into a shared library
-     */
-    private function convertDDtoDMS(float $decimaldegrees): string
-    {
-        $dms  = floor($decimaldegrees);
-        $secs = ($decimaldegrees - $dms) * 3600;
-        $min  = floor($secs / 60);
-        $sec  = round($secs - ($min * 60), 3);
-        $dms  .= 'º' . $min . '\'' . $sec . '"';
-        return $dms;
-    }
+	/**
+	 * Convert decimal degrees to degrees, minutes, seconds format
+	 *
+	 * @param float $decimaldegrees
+	 * @return string dms
+	 * @todo move this into a shared library
+	 */
+	private function convertDDtoDMS(float $decimaldegrees): string
+	{
+		$dms  = floor($decimaldegrees);
+		$secs = ($decimaldegrees - $dms) * 3600;
+		$min  = floor($secs / 60);
+		$sec  = round($secs - ($min * 60), 3);
+		$dms  .= 'º' . $min . '\'' . $sec . '"';
+		return $dms;
+	}
 
-    /**
-     * convert longitude in decimal degrees to DMS+hemisphere.
-     *
-     * @param float $decimaldegrees
-     * @return string
-     * @todo move this into a shared library
-     */
-    private function convertLon(float $decimaldegrees): string
-    {
-        if (strpos($decimaldegrees, '-') !== false) {
-            $lonPos = "W";
-        } else {
-            $lonPos = "E";
-        }
-        $dms = $this->convertDDtoDMS(abs($decimaldegrees));
-        return hsc($dms . $lonPos);
-    }
+	/**
+	 * convert longitude in decimal degrees to DMS+hemisphere.
+	 *
+	 * @param float $decimaldegrees
+	 * @return string
+	 * @todo move this into a shared library
+	 */
+	private function convertLon(float $decimaldegrees): string
+	{
+		if (strpos($decimaldegrees, '-') !== false) {
+			$lonPos = "W";
+		} else {
+			$lonPos = "E";
+		}
+		$dms = $this->convertDDtoDMS(abs($decimaldegrees));
+		return hsc($dms . $lonPos);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
         $secs = ($decimaldegrees - $dms) * 3600;
         $min  = floor($secs / 60);
         $sec  = round($secs - ($min * 60), 3);
-        $dms  .= 'º' . $min . '\'' . $sec . '"';
+        $dms .= 'º' . $min . '\'' . $sec . '"';
         return $dms;
     }
 

_test/syntax.test.php

Indentation +121 added lines, -121 removed lines

@@ -24,125 +24,125 @@
 class syntax_plugin_geotag_test extends DokuWikiTest
 {
 
-    protected $pluginsEnabled = array('geotag');
-
-    /**
-     * copy data and add pages to the index.
-     */
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
-        global $conf;
-        $conf['allowdebug'] = 1;
-
-        TestUtils::rcopy(TMP_DIR, dirname(__FILE__) . '/data/');
-
-        Logger::debug("set up class syntax_plugin_geotag_test");
-    }
-
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        global $conf;
-        $conf['allowdebug'] = 1;
-        $conf['cachetime']  = -1;
-
-        $data = array();
-        search($data, $conf['datadir'], 'search_allpages', array('skipacl' => true));
-
-        $verbose = false;
-        $force   = false;
-        foreach ($data as $val) {
-            idx_addPage($val['id'], $verbose, $force);
-        }
-        if ($conf['allowdebug']) {
-            touch(DOKU_TMP_DATA . 'cache/debug.log');
-        }
-    }
-
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        global $conf;
-        // try to get the debug log after running the test, print and clear
-        if ($conf['allowdebug']) {
-            print "\n";
-            readfile(DOKU_TMP_DATA . 'cache/debug.log');
-            unlink(DOKU_TMP_DATA . 'cache/debug.log');
-        }
-    }
-
-    public function test_geotag(): void
-    {
-        $request  = new TestRequest();
-        $response = $request->get(array('id' => 'minimalgeotag'), '/doku.php');
-
-        $this->assertEquals(
-            'minimalgeotag',
-            $response->queryHTML('meta[name="keywords"]')->attr('content')
-        );
-        $this->assertEquals(
-            '51.565696;5.324596',
-            $response->queryHTML('meta[name="geo.position"]')->attr('content')
-        );
-        $this->assertEquals(
-            '51.565696, 5.324596',
-            $response->queryHTML('meta[name="ICBM"]')->attr('content')
-        );
-
-        $this->assertTrue(
-            strpos($response->getContent(), 'Geotag (location) for:') !== false,
-            '"Geotag (location) for:" was not in the output'
-        );
-    }
-
-    public function test_fullgeotag(): void
-    {
-        $request  = new TestRequest();
-        $response = $request->get(array('id' => 'fullgeotag'), '/doku.php');
-
-        $this->assertEquals(
-            'fullgeotag',
-            $response->queryHTML('meta[name="keywords"]')->attr('content')
-        );
-        $this->assertEquals(
-            '52.132633;5.291266;9',
-            $response->queryHTML('meta[name="geo.position"]')->attr('content')
-        );
-        $this->assertEquals(
-            '52.132633, 5.291266',
-            $response->queryHTML('meta[name="ICBM"]')->attr('content')
-        );
-
-        $this->assertTrue(
-            strpos($response->getContent(), 'Geotag (location) for:') !== false,
-            '"Geotag (location) for:" was not in the output'
-        );
-    }
-
-    public function test_fullgeotagnegativecoords(): void
-    {
-        $request  = new TestRequest();
-        $response = $request->get(array('id' => 'fullgeotagnegativecoords'), '/doku.php');
-
-        $this->assertEquals(
-            'fullgeotagnegativecoords',
-            $response->queryHTML('meta[name="keywords"]')->attr('content')
-        );
-        $this->assertEquals(
-            '-52.132633;-5.291266;-9',
-            $response->queryHTML('meta[name="geo.position"]')->attr('content')
-        );
-        $this->assertEquals(
-            '-52.132633, -5.291266',
-            $response->queryHTML('meta[name="ICBM"]')->attr('content')
-        );
-
-        $this->assertTrue(
-            strpos($response->getContent(), 'Geotag (location) for:') !== false,
-            '"Geotag (location) for:" was not in the output'
-        );
-    }
+	protected $pluginsEnabled = array('geotag');
+
+	/**
+	 * copy data and add pages to the index.
+	 */
+	public static function setUpBeforeClass(): void
+	{
+		parent::setUpBeforeClass();
+		global $conf;
+		$conf['allowdebug'] = 1;
+
+		TestUtils::rcopy(TMP_DIR, dirname(__FILE__) . '/data/');
+
+		Logger::debug("set up class syntax_plugin_geotag_test");
+	}
+
+	public function setUp(): void
+	{
+		parent::setUp();
+
+		global $conf;
+		$conf['allowdebug'] = 1;
+		$conf['cachetime']  = -1;
+
+		$data = array();
+		search($data, $conf['datadir'], 'search_allpages', array('skipacl' => true));
+
+		$verbose = false;
+		$force   = false;
+		foreach ($data as $val) {
+			idx_addPage($val['id'], $verbose, $force);
+		}
+		if ($conf['allowdebug']) {
+			touch(DOKU_TMP_DATA . 'cache/debug.log');
+		}
+	}
+
+	public function tearDown(): void
+	{
+		parent::tearDown();
+
+		global $conf;
+		// try to get the debug log after running the test, print and clear
+		if ($conf['allowdebug']) {
+			print "\n";
+			readfile(DOKU_TMP_DATA . 'cache/debug.log');
+			unlink(DOKU_TMP_DATA . 'cache/debug.log');
+		}
+	}
+
+	public function test_geotag(): void
+	{
+		$request  = new TestRequest();
+		$response = $request->get(array('id' => 'minimalgeotag'), '/doku.php');
+
+		$this->assertEquals(
+			'minimalgeotag',
+			$response->queryHTML('meta[name="keywords"]')->attr('content')
+		);
+		$this->assertEquals(
+			'51.565696;5.324596',
+			$response->queryHTML('meta[name="geo.position"]')->attr('content')
+		);
+		$this->assertEquals(
+			'51.565696, 5.324596',
+			$response->queryHTML('meta[name="ICBM"]')->attr('content')
+		);
+
+		$this->assertTrue(
+			strpos($response->getContent(), 'Geotag (location) for:') !== false,
+			'"Geotag (location) for:" was not in the output'
+		);
+	}
+
+	public function test_fullgeotag(): void
+	{
+		$request  = new TestRequest();
+		$response = $request->get(array('id' => 'fullgeotag'), '/doku.php');
+
+		$this->assertEquals(
+			'fullgeotag',
+			$response->queryHTML('meta[name="keywords"]')->attr('content')
+		);
+		$this->assertEquals(
+			'52.132633;5.291266;9',
+			$response->queryHTML('meta[name="geo.position"]')->attr('content')
+		);
+		$this->assertEquals(
+			'52.132633, 5.291266',
+			$response->queryHTML('meta[name="ICBM"]')->attr('content')
+		);
+
+		$this->assertTrue(
+			strpos($response->getContent(), 'Geotag (location) for:') !== false,
+			'"Geotag (location) for:" was not in the output'
+		);
+	}
+
+	public function test_fullgeotagnegativecoords(): void
+	{
+		$request  = new TestRequest();
+		$response = $request->get(array('id' => 'fullgeotagnegativecoords'), '/doku.php');
+
+		$this->assertEquals(
+			'fullgeotagnegativecoords',
+			$response->queryHTML('meta[name="keywords"]')->attr('content')
+		);
+		$this->assertEquals(
+			'-52.132633;-5.291266;-9',
+			$response->queryHTML('meta[name="geo.position"]')->attr('content')
+		);
+		$this->assertEquals(
+			'-52.132633, -5.291266',
+			$response->queryHTML('meta[name="ICBM"]')->attr('content')
+		);
+
+		$this->assertTrue(
+			strpos($response->getContent(), 'Geotag (location) for:') !== false,
+			'"Geotag (location) for:" was not in the output'
+		);
+	}
 }

_test/general.test.php

Indentation +33 added lines, -33 removed lines

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

action.php

Indentation +105 added lines, -105 removed lines

@@ -24,118 +24,118 @@
 class action_plugin_geotag extends DokuWiki_Action_Plugin
 {
 
-    /**
-     * Register for events.
-     *
-     * @param Doku_Event_Handler $controller
-     *          DokuWiki's event controller object. Also available as global $EVENT_HANDLER
-     */
-    public function register(Doku_Event_Handler $controller)
-    {
-        $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handleMetaheaderOutput');
-        if ($this->getConf('toolbar_icon')) {
-            $controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insertButton', array());
-        }
-    }
+	/**
+	 * Register for events.
+	 *
+	 * @param Doku_Event_Handler $controller
+	 *          DokuWiki's event controller object. Also available as global $EVENT_HANDLER
+	 */
+	public function register(Doku_Event_Handler $controller)
+	{
+		$controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'handleMetaheaderOutput');
+		if ($this->getConf('toolbar_icon')) {
+			$controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insertButton', array());
+		}
+	}
 
-    /**
-     * Retrieve metadata and add to the head of the page using appropriate meta tags.
-     *
-     * @param Doku_Event $event
-     *                          the DokuWiki event. $event->data is a two-dimensional
-     *                          array of all meta headers. The keys are meta, link and script.
-     * @param mixed      $param ignored
-     *
-     * @see http://www.dokuwiki.org/devel:event:tpl_metaheader_output
-     */
-    public function handleMetaheaderOutput(Doku_Event $event, $param)
-    {
-        global $ID;
-        $title     = p_get_metadata($ID, 'title', true);
-        $geotags   = p_get_metadata($ID, 'geo', true);
-        $region    = $geotags ['region'];
-        $lat       = $geotags ['lat'];
-        $lon       = $geotags ['lon'];
-        $alt       = $geotags ['alt'];
-        $country   = $geotags ['country'];
-        $placename = $geotags ['placename'];
-        $geohash   = $geotags ['geohash'];
+	/**
+	 * Retrieve metadata and add to the head of the page using appropriate meta tags.
+	 *
+	 * @param Doku_Event $event
+	 *                          the DokuWiki event. $event->data is a two-dimensional
+	 *                          array of all meta headers. The keys are meta, link and script.
+	 * @param mixed      $param ignored
+	 *
+	 * @see http://www.dokuwiki.org/devel:event:tpl_metaheader_output
+	 */
+	public function handleMetaheaderOutput(Doku_Event $event, $param)
+	{
+		global $ID;
+		$title     = p_get_metadata($ID, 'title', true);
+		$geotags   = p_get_metadata($ID, 'geo', true);
+		$region    = $geotags ['region'];
+		$lat       = $geotags ['lat'];
+		$lon       = $geotags ['lon'];
+		$alt       = $geotags ['alt'];
+		$country   = $geotags ['country'];
+		$placename = $geotags ['placename'];
+		$geohash   = $geotags ['geohash'];
 
-        if (!empty ($region)) {
-            $event->data ['meta'] [] = array(
-                'name'    => 'geo.region',
-                'content' => $region
-            );
-        }
-        if (!empty ($placename)) {
-            $event->data ['meta'] [] = array(
-                'name'    => 'geo.placename',
-                'content' => $placename
-            );
-        }
-        if (!(empty ($lat) && empty ($lon))) {
-            if (!empty ($alt)) {
-                $event->data ['meta'] [] = array(
-                    'name'    => 'geo.position',
-                    'content' => $lat . ';' . $lon . ';' . $alt
-                );
-            } else {
-                $event->data ['meta'] [] = array(
-                    'name'    => 'geo.position',
-                    'content' => $lat . ';' . $lon
-                );
-            }
-        }
-        if (!empty ($country)) {
-            $event->data ['meta'] [] = array(
-                'name'    => 'geo.country',
-                'content' => $country
-            );
-        }
-        if (!(empty ($lat) && empty ($lon))) {
-            $event->data ['meta'] [] = array(
-                'name'    => "ICBM",
-                'content' => $lat . ', ' . $lon
-            );
-            // icbm is generally useless without a DC.title,
-            // so we copy that from title unless it's empty...
-            if (!(empty ($title))) {
-                /*
+		if (!empty ($region)) {
+			$event->data ['meta'] [] = array(
+				'name'    => 'geo.region',
+				'content' => $region
+			);
+		}
+		if (!empty ($placename)) {
+			$event->data ['meta'] [] = array(
+				'name'    => 'geo.placename',
+				'content' => $placename
+			);
+		}
+		if (!(empty ($lat) && empty ($lon))) {
+			if (!empty ($alt)) {
+				$event->data ['meta'] [] = array(
+					'name'    => 'geo.position',
+					'content' => $lat . ';' . $lon . ';' . $alt
+				);
+			} else {
+				$event->data ['meta'] [] = array(
+					'name'    => 'geo.position',
+					'content' => $lat . ';' . $lon
+				);
+			}
+		}
+		if (!empty ($country)) {
+			$event->data ['meta'] [] = array(
+				'name'    => 'geo.country',
+				'content' => $country
+			);
+		}
+		if (!(empty ($lat) && empty ($lon))) {
+			$event->data ['meta'] [] = array(
+				'name'    => "ICBM",
+				'content' => $lat . ', ' . $lon
+			);
+			// icbm is generally useless without a DC.title,
+			// so we copy that from title unless it's empty...
+			if (!(empty ($title))) {
+				/*
                  * don't specify the DC namespace as this is incomplete; it should be done at the
                  * template level as it also needs a 'profile' attribute on the head/container,
                  * see: http://dublincore.org/documents/dc-html/#sect-3.1.1
                  * $event->data ['link'] [] = array ('rel' => 'schema.DC',
                  * 'href' => 'http://purl.org/dc/elements/1.1/');
                  */
-                $event->data ['meta'] [] = array(
-                    'name'    => "DC.title",
-                    'content' => $title
-                );
-            }
-        }
-        if (!empty ($geohash)) {
-            $event->data ['meta'] [] = array(
-                'name'    => 'geo.geohash',
-                'content' => $geohash
-            );
-        }
-    }
+				$event->data ['meta'] [] = array(
+					'name'    => "DC.title",
+					'content' => $title
+				);
+			}
+		}
+		if (!empty ($geohash)) {
+			$event->data ['meta'] [] = array(
+				'name'    => 'geo.geohash',
+				'content' => $geohash
+			);
+		}
+	}
 
-    /**
-     * Inserts the toolbar button.
-     *
-     * @param Doku_Event $event
-     *          the DokuWiki event
-     */
-    public function insertButton(Doku_Event $event, $param)
-    {
-        $event->data [] = array(
-            'type'   => 'format',
-            'title'  => $this->getLang('toolbar_desc'),
-            'icon'   => '../../plugins/geotag/images/geotag.png',
-            'open'   => '{{geotag>lat:',
-            'sample' => '52.2345',
-            'close'  => ', lon:7.521, alt: , placename: , country: , region: }}'
-        );
-    }
+	/**
+	 * Inserts the toolbar button.
+	 *
+	 * @param Doku_Event $event
+	 *          the DokuWiki event
+	 */
+	public function insertButton(Doku_Event $event, $param)
+	{
+		$event->data [] = array(
+			'type'   => 'format',
+			'title'  => $this->getLang('toolbar_desc'),
+			'icon'   => '../../plugins/geotag/images/geotag.png',
+			'open'   => '{{geotag>lat:',
+			'sample' => '52.2345',
+			'close'  => ', lon:7.521, alt: , placename: , country: , region: }}'
+		);
+	}
 }