The wrmap tag may basically work now but needs further improvements.

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

diff --git a/wrmap.body.php b/wrmap.body.php
index 7188e4b5322cf6f43bb22d3304b26e5c8790fee5..f864714ca72d6d1a029534c46e20e135ed544206 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -11,11 +11,19 @@ function wrMapParserFirstCallInit() {
 /// Format inside <wrmap>...</wrmap> has to be like this:
 ///
 /// <wrmap>
-/// Rodelbahn|47.143241,11.208959|Birgitzer Alm
+/// 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) {
-       $output = '<googlemap>';
+       $output = '<googlemap version="0.9" lat="47.452237" lon="11.208801" type="terrain" zoom="9">'; // TODO: Varable coordinates
        $lines = explode("\n", $input);
        foreach ($lines as $line) {
                try {
@@ -25,22 +33,22 @@ function wrmapParserHook($input, $args, $parser) {
                        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;
                        list($latitude, $longitude) = wrGeoStringToGeo($geo);
-                       $output .= sprintf("%F,%F\n", $latitude, $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()));
                }
        }
        $output = $output .= "</googlemap>\n";
        /*
-        global $wgTitle, $wgUser; 
+       global $wgTitle, $wgUser; 
        $parser = new Parser();
-        $parserOptions = new ParserOptions();
-        $parserOptions->initialiseFromUser($wgUser);
-        $result = $parser->parse($output, $wgTitle, $parserOptions); // TODO: Make this call less complicated
-       */
-        $result = $parser->recursiveTagParse($output); // TODO: Maybe this is already the solution?
-
+       $parserOptions = new ParserOptions();
+       $parserOptions->initialiseFromUser($wgUser);
+       $result = $parser->parse($output, $wgTitle, $parserOptions); // TODO: Make this call less complicated
        return $result->getText();
+       */
+       $result = $parser->recursiveTagParse($output); // TODO: Maybe this is already the solution?
+       return $result;
 }