poll: Added postvote and posttrail options for better multi-page polls.

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

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index b8255bb135f7c3c868dad302719970f610f3723b..27db31af583994fc8da9c1a062b8b6518daa5dba 100644 (file)
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -14,7 +14,7 @@ sub import {
        hook(type => "format", id => "osm", call => \&format);
        hook(type => "preprocess", id => "osm", call => \&preprocess);
        hook(type => "preprocess", id => "waypoint", call => \&process_waypoint);
-       hook(type => "savestate", id => "waypoint", call => \&savestate);
+       hook(type => "changes", id => "waypoint", call => \&changes);
        hook(type => "cgi", id => "osm", call => \&cgi);
 }
 
@@ -233,7 +233,7 @@ sub get_tag_icon($) {
        my $tag = shift;
        # look for an icon attached to the tag
        my $attached = $tag . '/' . $config{'osm_tag_default_icon'};
-       if (srcfile($attached)) {
+       if (srcfile($attached, 1)) {
                return $attached;
        }
        else {
@@ -280,7 +280,7 @@ sub scrub_lonlat($$$) {
        return ($lon, $lat);
 }
 
-sub savestate {
+sub changes {
        my %waypoints = ();
        my %linestrings = ();
 
@@ -589,6 +589,7 @@ sub map_setup_code($;@) {
        }
         $options{'layers'} = $config{osm_layers};
 
+       $name=~s/'//g; # $name comes from user input
        return "mapsetup('mapdiv-$name', " . to_json(\%options) . ");";
 }