OSM plugin: new config option to specify the url to fetch maps from

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

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index 6ba2524d81c25538671559fed0dcd19daa092b50..21d1dce3f2f9692373a4f582009e8570a8cf9311 100644 (file)
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -67,6 +67,13 @@ sub getsetup () {
                        safe => 0,
                        rebuild => 1,
                },
+               osm_map_url => {
+                       type => "string",
+                       example => "/tiles/\${z}/\${x}/\${y}.png",
+                       description => "Url to get map tiles from (if none specified, uses the openstreetmap server, see http://wiki.openstreetmap.org/wiki/Creating_your_own_tiles for more info on serving your own tiles)",
+                       safe => 0,
+                       rebuild => 1,
+               },
 
 }
 
@@ -348,6 +355,7 @@ sub writekml($;$) {
                        DATA_MODE => 1, ENCODING => 'UTF-8');
                $writer->xmlDecl();
                $writer->startTag("kml", "xmlns" => "http://www.opengis.net/kml/2.2");
+               $writer->startTag("Document");
 
                # first pass: get the icons
                foreach my $name (keys %{$waypoints{$map}}) {
@@ -407,6 +415,7 @@ sub writekml($;$) {
                        $writer->endTag();
                }
                $writer->endTag();
+               $writer->endTag();
                $writer->end();
 
                writefile("pois.kml", $config{destdir} . "/$map", $output);
@@ -538,6 +547,8 @@ sub map_setup_code($;@) {
        my $name=shift;
        my %options=@_;
 
+       my $mapurl = $config{osm_map_url};
+
        eval q{use JSON};
        error $@ if $@;
                                
@@ -554,6 +565,10 @@ sub map_setup_code($;@) {
                $options{'kmlurl'} = urlto($map."/pois.kml");
        }
 
+       if ($mapurl) {
+               $options{'mapurl'} = $mapurl;
+       }
+
        return "mapsetup('mapdiv-$name', " . to_json(\%options) . ");";
 }