X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bfc13b9070981ba3cd73b901af9c29a50ca0114d..649fc3f3f408550651f43145da8e0fd320fee5c2:/IkiWiki/Plugin/osm.pm

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index b8255bb13..27db31af5 100644
--- 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) . ");";
 }