Removed the wrmap tag, that is not needed anymore (replaced by wrgmap)

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/trunk/extensions/wrmap@392 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wrmap.body.php b/wrmap.body.php
index 6b2cbca28814ffca3c49ba0a59b08c926863f161..afd1a9e30fc7d805438f66e1fae70293e2764945 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -4,7 +4,6 @@ function wrMapParserFirstCallInit() {
        global $wgParser;
        global $wgGoogleMapsKey;
        $wrGoogleMaps = new WrGoogleMaps($wgGoogleMapsKey);
-       $wgParser->setHook('wrmap', 'wrmapParserHook');
        $wgParser->setHook('wrgmap', array($wrGoogleMaps, 'render'));
        return true;
 }
@@ -138,55 +137,4 @@ class WrGoogleMaps {
 }
 
 
-/// Format inside <wrmap>...</wrmap> has to be like this:
-///
-/// <wrmap>
-/// Rodelbahn|47.143241 N 11.208959 E|Birgitzer Alm
-/// ...
-/// </wrmap>
-///
-/// The extension produces a format like this:
-/// <googlemap version="0.9" lat="47.241016" lon="11.56517" zoom="11">
-/// 47.241731, 11.358994, Birgitzer Alm
-/// Die Birgitzer Alm ist nett
-/// 47.17607, 11.542763, Naviser Hütte
-/// Die Naviser Hütte
-/// </googlemap>
-function wrmapParserHook($input, $args, $parser) {
-       $debug = (isset($args['debug']) && $args['debug'] != '0');
-
-       $output = '';
-       $lines = explode("\n", $input);
-       $latitudes = array();
-       $longitudes = array();
-       foreach ($lines as $line) {
-               try {
-                       $l = trim($line);
-                       if (strlen($l) == 0) continue;
-                       $columns = explode('|', $line);
-                       if (count($columns) != 3) throw new Exception(sprintf(utf8_encode('Die Anzahl der Spalten ist nicht 3 sondern %d'), count($columns)));
-                       $columns = list($type, $geo, $name) = $columns;
-                       if (strlen(trim($geo)) == 0) continue;
-                       list($latitude, $longitude) = wrGeoStringToGeo($geo);
-                       $latitudes[] = $latitude;
-                       $longitudes[] = $longitude;
-                       $output .= sprintf("%F, %F, %s\n", $latitude, $longitude, htmlspecialchars($name));
-               } catch (Exception $e) {
-                       return sprintf(utf8_encode('Ungültige Zeile in der Koordinatenliste: <em>%s</em>. %s'), htmlspecialchars($line), htmlspecialchars($e->getMessage()));
-               }
-       }
-       if (count($latitudes) == 0) return utf8_encode('Keine Koordinaten eingetragen');
-       $minLatitude = min($latitudes);
-       $centerLat = $minLatitude + (max($latitudes) - $minLatitude) / 2;
-       $minLongitude = min($longitudes);
-       $centerLon = $minLongitude + (max($longitudes) - $minLongitude) / 2;
-
-       // TODO: Varable zoom level
-       $output = '<googlemap version="0.9" lat="' . $centerLat . '" lon="' . $centerLon . '" type="terrain" zoom="9">'. "\n" . $output . "</googlemap>\n";
-
-       if ($debug) return "<pre><nowiki>$output</nowiki></pre>\n";
-       return $parser->recursiveTagParse($output);
-}
-
-
 ?>

diff --git a/wrmap.php b/wrmap.php
index b00924bb6ed92f294a25c8374c2d53bd65322c3d..38e1da7b7816fbc7d7aa2430b3c6fffe2eab422a 100644 (file)
--- a/wrmap.php
+++ b/wrmap.php
@@ -8,7 +8,7 @@ $wgExtensionCredits['parserhook'][] = array(
        'version' => '1.2.0',
        'author' =>'Philipp Spitzer', 
        'url' => 'http://www.winterrodeln.org/trac/wiki/WrMap', 
-       'description' => 'This extension creates a map from coordinates and uses the GoogleMaps extension to do so.'
+       'description' => 'This extension creates a map with GoogleMaps to show sledding routes.'
 );