X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/636e04a13a96f11c67d82aebfb4ee9fd51b61110..61f4dbb8bec4c39a4c48aa67493e34205a3f3b06:/IkiWiki/Plugin/osm.pm

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index 2c555f372..c9650d014 100644
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -69,7 +69,7 @@ sub getsetup () {
 		},
 		osm_layers => {
 			type => "string",
-			example => { 'OSM', 'GoogleSattelite' },
+			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,
@@ -192,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} = {
@@ -359,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}}) {