X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/081fd3863698a273eb468cceec84cc0cffb10261..049d7c970e52561bcf2cbe7bfc85dae542137939:/IkiWiki/Plugin/osm.pm

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index 4c50fec53..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);
 }
 
@@ -69,17 +69,8 @@ sub getsetup () {
 		},
 		osm_layers => {
 			type => "string",
-			example => { OSM => 1,
-				     Google => 'Hybrid',
-			},
-			description => "Layers to use in the map. If the value is 1, use the default for the map, otherwise the argument is a URL (for OSM layers, e.g. http://a.tile.stamen.com/toner/\${z}/\${x}/\${y}.png) or a type option for Google maps (Normal, Satellite, Hybrid or Physical).",
-			safe => 0,
-			rebuild => 1,
-		},
-		osm_layers_order => {
-			type => "string",
-			example => { 'OSM', 'Google' },
-			description => "Display order for the layers. The first layer is the default layer, must match exactly the left side of the osm_layers hash.",
+			example => { 'OSM', 'GoogleSatellite' },
+			description => "Layers to use in the map. Can be either the 'OSM' string or a type option for Google maps (GoogleNormal, GoogleSatellite, GoogleHybrid or GooglePhysical). It can also be an arbitrary URL in a syntax acceptable for OpenLayers.Layer.OSM.url parameter.",
 			safe => 0,
 			rebuild => 1,
 		},
@@ -201,6 +192,7 @@ sub process_waypoint {
 		}
 	}
 	$icon = urlto($icon, $dest, 1);
+	$icon =~ s!/*$!!; # hack - urlto shouldn't be appending a slash in the first place
 	$tag = '' unless $tag;
 	register_rendered_files($map, $page, $dest);
 	$pagestate{$page}{'osm'}{$map}{'waypoints'}{$name} = {
@@ -241,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 {
@@ -288,7 +280,7 @@ sub scrub_lonlat($$$) {
 	return ($lon, $lat);
 }
 
-sub savestate {
+sub changes {
 	my %waypoints = ();
 	my %linestrings = ();
 
@@ -368,23 +360,29 @@ sub writekml($;$) {
 	foreach my $map (keys %waypoints) {
 		my $output;
 		my $writer = XML::Writer->new( OUTPUT => \$output,
-			DATA_MODE => 1, ENCODING => 'UTF-8');
+			DATA_MODE => 1, DATA_INDENT => ' ', ENCODING => 'UTF-8');
 		$writer->xmlDecl();
 		$writer->startTag("kml", "xmlns" => "http://www.opengis.net/kml/2.2");
 		$writer->startTag("Document");
 
 		# first pass: get the icons
+		my %tags_map = (); # keep track of tags seen
 		foreach my $name (keys %{$waypoints{$map}}) {
 			my %options = %{$waypoints{$map}{$name}};
-			$writer->startTag("Style", id => $options{tag});
-			$writer->startTag("IconStyle");
-			$writer->startTag("Icon");
-			$writer->startTag("href");
-			$writer->characters($options{icon});
-			$writer->endTag();
-			$writer->endTag();
-			$writer->endTag();
-			$writer->endTag();
+			if (!$tags_map{$options{tag}}) {
+			    debug("found new style " . $options{tag});
+			    $tags_map{$options{tag}} = ();
+			    $writer->startTag("Style", id => $options{tag});
+			    $writer->startTag("IconStyle");
+			    $writer->startTag("Icon");
+			    $writer->startTag("href");
+			    $writer->characters($options{icon});
+			    $writer->endTag();
+			    $writer->endTag();
+			    $writer->endTag();
+			    $writer->endTag();
+			}
+			$tags_map{$options{tag}}{$name} = \%options;
 		}
 	
 		foreach my $name (keys %{$waypoints{$map}}) {
@@ -509,7 +507,7 @@ sub include_javascript ($) {
 		}
 	}
 	if ($loader) {
-		return embed_map_code($page) . "<script type=\"text/javascript\" charset=\"utf-8\">$loader</script>";
+		return embed_map_code($page) . "<script type=\"text/javascript\">$loader</script>";
 	}
 	else {
         	return '';
@@ -536,7 +534,7 @@ sub cgi($) {
 	print "<html><body>";
 	print "<div id=\"mapdiv-$map\"></div>";
 	print embed_map_code();
-	print "<script type=\"text/javascript\" charset=\"utf-8\">";
+	print "<script type=\"text/javascript\">";
 	print map_setup_code($map, $map,
 		lat => "urlParams['lat']",
 		lon => "urlParams['lon']",
@@ -590,8 +588,8 @@ sub map_setup_code($;@) {
 		$options{'mapurl'} = $mapurl;
 	}
         $options{'layers'} = $config{osm_layers};
-        $options{'layers_order'} = $config{osm_layers_order};
 
+	$name=~s/'//g; # $name comes from user input
 	return "mapsetup('mapdiv-$name', " . to_json(\%options) . ");";
 }