Omitting empty coordinate lines because I found no way to exclude them in the DLP...

[philipp/winterrodeln/mediawiki_extensions/wrmap.git] / wrmap.body.php

diff --git a/wrmap.body.php b/wrmap.body.php
index da1a7f074744899d8ec21278a8fbf2b1d505008d..b380e9bcc413d6afc7da5edd6d694dc341d28d02 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -23,7 +23,7 @@ function wrMapParserFirstCallInit() {
 /// Die Naviser Hütte
 /// </googlemap>
 function wrmapParserHook($input, $args, $parser) {
-       $debug = (isset($args['debug']));
+       $debug = (isset($args['debug']) && $args['debug'] != '0');
 
        $output = '';
        $lines = explode("\n", $input);
@@ -36,6 +36,7 @@ function wrmapParserHook($input, $args, $parser) {
                        $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;
@@ -53,20 +54,8 @@ function wrmapParserHook($input, $args, $parser) {
        // TODO: Varable zoom level
        $output = '<googlemap version="0.9" lat="' . $centerLat . '" lon="' . $centerLon . '" type="terrain" zoom="9">'. "\n" . $output . "</googlemap>\n";
 
-       if ($debug) return $output = "<pre><nowiki>$output</nowiki></pre>";
-
-       /*
-       global $wgTitle, $wgUser; 
-       $parser = new Parser();
-       $parserOptions = new ParserOptions();
-       $parserOptions->initialiseFromUser($wgUser);
-       $result = $parser->parse($output, $wgTitle, $parserOptions); // TODO: Make this call less complicated
-       return $result->getText();
-       */
-       
-       $output = $parser->recursiveTagParse($output); // TODO: Maybe this is already the solution?
-
-       return $output;
+       if ($debug) return "<pre><nowiki>$output</nowiki></pre>\n";
+       return $parser->recursiveTagParse($output);
 }