multiple osm fixes

[ikiwiki.git] / IkiWiki / Plugin / osm.pm

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index be499495c4f7e65722773c73974b12e8eba3fcb2..661f72bab0ef1a5cc6773b92ae0a37feca4bb4c8 100644 (file)
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -154,18 +154,15 @@ sub process_waypoint {
        $icon = urlto($icon, $dest, 1);
        $tag = '' unless $tag;
        if ($page eq $dest) {
        $icon = urlto($icon, $dest, 1);
        $tag = '' unless $tag;
        if ($page eq $dest) {

-               if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
-                       $config{'osm_format'} = 'KML';
-               }
-               my %formats = map { $_ => 1 } split(/, */, $config{'osm_format'});
+               my %formats = get_formats();

                if ($formats{'GeoJSON'}) {
                if ($formats{'GeoJSON'}) {

-                       will_render($page,$config{destdir} . "/$map/pois.json");
+                       will_render($page, "$map/pois.json");

                }
                if ($formats{'CSV'}) {
                }
                if ($formats{'CSV'}) {

-                       will_render($page,$config{destdir} . "/$map/pois.txt");
+                       will_render($page, "$map/pois.txt");

                }
                if ($formats{'KML'}) {
                }
                if ($formats{'KML'}) {

-                       will_render($page,$config{destdir} . "/$map/pois.kml");
+                       will_render($page, "$map/pois.kml");

                }
        }
        my $href = IkiWiki::cgiurl(
                }
        }
        my $href = IkiWiki::cgiurl(


@@ -292,10 +289,7 @@ sub savestate {
                }
        }
 
                }
        }
 

-       if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
-               $config{'osm_format'} = 'KML';
-       }
-       my %formats = map { $_ => 1 } split(/, */, $config{'osm_format'});
+       my %formats = get_formats();

        if ($formats{'GeoJSON'}) {
                writejson(\%waypoints, \%linestrings);
        }
        if ($formats{'GeoJSON'}) {
                writejson(\%waypoints, \%linestrings);
        }


@@ -436,7 +430,7 @@ Sample style:
                $writer->endTag();
                $writer->end();
 
                $writer->endTag();
                $writer->end();
 

-               writefile("pois.kmp", $config{destdir} . "/$map", $output);
+               writefile("pois.kml", $config{destdir} . "/$map", $output);

        }
 }
 
        }
 }
 


@@ -484,7 +478,7 @@ sub format (@) {
        return $params{content};
 }
 
        return $params{content};
 }
 

-sub prefered_format() {
+sub preferred_format() {

        if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
                $config{'osm_format'} = 'KML';
        }
        if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
                $config{'osm_format'} = 'KML';
        }


@@ -492,19 +486,21 @@ sub prefered_format() {
        return shift @spl;
 }
 
        return shift @spl;
 }
 

+sub get_formats() {
+       if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
+               $config{'osm_format'} = 'KML';
+       }
+       map { $_ => 1 } split(/, */, $config{'osm_format'});
+}
+

 sub include_javascript ($) {
        my $page=shift;
        my $loader;
 
 sub include_javascript ($) {
        my $page=shift;
        my $loader;
 

-       eval q{use JSON};
-       error $@ if $@;

        if (exists $pagestate{$page}{'osm'}) {
                foreach my $map (keys %{$pagestate{$page}{'osm'}}) {
                        foreach my $name (keys %{$pagestate{$page}{'osm'}{$map}{'displays'}}) {
        if (exists $pagestate{$page}{'osm'}) {
                foreach my $map (keys %{$pagestate{$page}{'osm'}}) {
                        foreach my $name (keys %{$pagestate{$page}{'osm'}{$map}{'displays'}}) {

-                               my %options = %{$pagestate{$page}{'osm'}{$map}{'displays'}{$name}};
-                               $options{'map'} = $map;
-                               $options{'format'} = prefered_format();
-                               $loader .= "mapsetup(\"mapdiv-$name\", " . to_json(\%options) . ");\n";
+                               $loader .= map_setup_code($map, $name, %{$pagestate{$page}{'osm'}{$map}{'displays'}{$name}});

                        }
                }
        }
                        }
                }
        }


@@ -521,6 +517,8 @@ sub cgi($) {
 
        return unless defined $cgi->param('do') &&
                $cgi->param("do") eq "osm";
 
        return unless defined $cgi->param('do') &&
                $cgi->param("do") eq "osm";

+       
+       IkiWiki::loadindex();

 
        IkiWiki::decode_cgi_utf8($cgi);
 
 
        IkiWiki::decode_cgi_utf8($cgi);
 


@@ -534,7 +532,15 @@ sub cgi($) {
        print "<html><body>";
        print "<div id=\"mapdiv-$map\"></div>";
        print embed_map_code();
        print "<html><body>";
        print "<div id=\"mapdiv-$map\"></div>";
        print embed_map_code();

-       print "<script type=\"text/javascript\" charset=\"utf-8\">mapsetup( 'mapdiv-$map', { 'map': '$map', 'lat': urlParams['lat'], 'lon': urlParams['lon'], 'zoom': urlParams['zoom'], 'fullscreen': 1, 'editable': 1, 'format': '" . prefered_format() . "'});</script>";
+       print "<script type=\"text/javascript\" charset=\"utf-8\">";
+       print map_setup_code($map, $map,
+               lat => "urlParams['lat']",
+               lon => "urlParams['lon']",
+               zoom => "urlParams['zoom']",
+               fullscreen => 1,
+               editable => 1,
+       );
+       print "</script>";

        print "</body></html>";
 
        exit 0;
        print "</body></html>";
 
        exit 0;


@@ -547,4 +553,28 @@ sub embed_map_code(;$) {
                '" type="text/javascript" charset="utf-8"></script>'."\n";
 }
 
                '" type="text/javascript" charset="utf-8"></script>'."\n";
 }
 

+sub map_setup_code($;@) {
+       my $map=shift;
+       my $name=shift;
+       my %options=@_;
+
+       eval q{use JSON};
+       error $@ if $@;
+                               
+       $options{'format'} = preferred_format();
+
+       my %formats = get_formats();
+       if ($formats{'GeoJSON'}) {
+               $options{'jsonurl'} = urlto($map."/pois.json");
+       }
+       if ($formats{'CSV'}) {
+               $options{'csvurl'} = urlto($map."/pois.txt");
+       }
+       if ($formats{'KML'}) {
+               $options{'kmlurl'} = urlto($map."/pois.kml");
+       }
+
+       return "mapsetup('mapdiv-$name', " . to_json(\%options) . ");";
+}
+

 1;
 1;