X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/733e9b454e6fc016a36874f81392bdf7c2017f9a..9fad75fd53c75b6c9f7729b6c7e6eccbc3cff39d:/IkiWiki/Plugin/osm.pm

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index d8db01dbb..be499495c 100644
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -9,7 +9,6 @@ use warnings;
 use IkiWiki 3.0;
 
 sub import {
-	add_underlay("javascript");
 	add_underlay("osm");
 	hook(type => "getsetup", id => "osm", call => \&getsetup);
 	hook(type => "format", id => "osm", call => \&format);
@@ -35,8 +34,8 @@ sub getsetup () {
 		},
 		osm_default_icon => {
 			type => "string",
-			example => "/ikiwiki/images/osm.png",
-			description => "the icon shon on links and on the main map",
+			example => "ikiwiki/images/osm.png",
+			description => "the icon shown on links and on the main map",
 			safe => 0,
 			rebuild => 1,
 		},
@@ -57,17 +56,7 @@ sub getsetup () {
 		osm_tag_default_icon => {
 			type => "string",
 			example => "icon.png",
-			description => "the icon attached to a tag so that pages tagged with that tag will have that icon on the map",
-			safe => 0,
-			rebuild => 1,
-		},
-		osm_tag_icons => {
-			type => "string",
-			example => {
-				'test' => '/img/test.png',
-				'trailer' => '/img/trailer.png'
-			},
-			description => "tag to icon mapping, leading slash is important!",
+			description => "the icon attached to a tag, displayed on the map for tagged pages",
 			safe => 0,
 			rebuild => 1,
 		},
@@ -138,7 +127,7 @@ sub process_waypoint {
 	my $name = scrub($params{'name'} || $p, $page, $dest); # sanitized here
 	my $desc = scrub($params{'desc'} || '', $page, $dest); # sanitized here
 	my $zoom = scrub($params{'zoom'} // $config{'osm_default_zoom'} // 15, $page, $dest); # sanitized below
-	my $icon = $config{'osm__default_icon'} || "/ikiwiki/images/osm.png"; # sanitized: we trust $config
+	my $icon = $config{'osm_default_icon'} || "ikiwiki/images/osm.png"; # sanitized: we trust $config
 	my $map = scrub($params{'map'} || 'map', $page, $dest); # sanitized here
 	my $alt = $config{'osm_alt'} ? "alt=\"$config{'osm_alt'}\"" : ''; # sanitized: we trust $config
 	if ($zoom !~ /^\d\d?$/ || $zoom < 2 || $zoom > 18) {
@@ -151,26 +140,18 @@ sub process_waypoint {
 	}
 
 	my $tag = $params{'tag'};
-	if ($tag) {
-		if (!defined($config{'osm_tag_icons'}->{$tag})) {
-			error("invalid tag specified, see osm_tag_icons configuration or don't specify any");
+	foreach my $t (keys %{$typedlinks{$page}{'tag'}}) {
+		if ($icon = get_tag_icon($t)) {
+			$tag = $t;
+			last;
 		}
-		$icon = $config{'osm_tag_icons'}->{$tag};
-	}
-	else {
-		foreach my $t (keys %{$typedlinks{$page}{'tag'}}) {
-			if ($icon = get_tag_icon($t)) {
-				$tag = $t;
-				last;
-			}
-			$t =~ s!/$config{'tagbase'}/!!;
-			if ($icon = get_tag_icon($t)) {
-				$tag = $t;
-				last;
-			}
+		$t =~ s!/$config{'tagbase'}/!!;
+		if ($icon = get_tag_icon($t)) {
+			$tag = $t;
+			last;
 		}
 	}
-	$icon = "/ikiwiki/images/osm.png" unless $icon;
+	$icon = urlto($icon, $dest, 1);
 	$tag = '' unless $tag;
 	if ($page eq $dest) {
 		if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
@@ -187,9 +168,16 @@ sub process_waypoint {
 			will_render($page,$config{destdir} . "/$map/pois.kml");
 		}
 	}
-	my $href = "/ikiwiki.cgi?do=osm&map=$map&lat=$lat&lon=$lon&zoom=$zoom";
+	my $href = IkiWiki::cgiurl(
+		do => "osm",
+		map => $map,
+		lat => $lat,
+		lon => $lon,
+		zoom => $zoom,
+	);
 	if (defined($destsources{htmlpage($map)})) {
-		$href = urlto($map,$page) . "?lat=$lat&lon=$lon&zoom=$zoom";
+		$href = urlto($map,$page) . "?lat=$lat&amp;lon=$lon&amp;zoom=$zoom";
+		$href =~ s!&!&amp;!g;
 	}
 	$pagestate{$page}{'osm'}{$map}{'waypoints'}{$name} = {
 		page => $page,
@@ -209,7 +197,6 @@ sub process_waypoint {
 		$output .= preprocess(%params);
 	}
 	if (!$hidden) {
-		$href =~ s!&!&amp;!g;
 		$output .= "<a href=\"$href\"><img class=\"img\" src=\"$icon\" $alt /></a>";
 	}
 	return $output;
@@ -223,10 +210,6 @@ sub get_tag_icon($) {
 	if (srcfile($attached)) {
 		return $attached;
 	}
-	# look for the old way: mappings
-	if ($config{'osm_tag_icons'}->{$tag}) {
-		return $config{'osm_tag_icons'}->{$tag};
-	}
 	else {
 		return undef;
 	}
@@ -342,8 +325,7 @@ sub writejson($;$) {
 				"geometry" => { "type" => "LineString", "coordinates" => $linestring });
 			push @{$geojson{'features'}}, \%json;
 		}
-		debug('writing pois file pois.json in ' . $config{destdir} . "/$map");
-		writefile("pois.json",$config{destdir} . "/$map",to_json(\%geojson));
+		writefile("pois.json", $config{destdir} . "/$map", to_json(\%geojson));
 	}
 }
 
@@ -353,7 +335,6 @@ sub writekml($;$) {
 	eval q{use XML::Writer};
 	error $@ if $@;
 	foreach my $map (keys %waypoints) {
-		debug("writing pois file pois.kml in " . $config{destdir} . "/$map");
 
 =pod
 Sample placemark:
@@ -389,10 +370,9 @@ Sample style:
 
 =cut
 
-		use IO::File;
-		my $output = IO::File->new(">".$config{destdir} . "/$map/pois.kml");
-
-		my $writer = XML::Writer->new( OUTPUT => $output, DATA_MODE => 1, ENCODING => 'UTF-8');
+		my $output;
+		my $writer = XML::Writer->new( OUTPUT => \$output,
+			DATA_MODE => 1, ENCODING => 'UTF-8');
 		$writer->xmlDecl();
 		$writer->startTag("kml", "xmlns" => "http://www.opengis.net/kml/2.2");
 
@@ -455,7 +435,8 @@ Sample style:
 		}
 		$writer->endTag();
 		$writer->end();
-		$output->close();
+
+		writefile("pois.kmp", $config{destdir} . "/$map", $output);
 	}
 }
 
@@ -473,8 +454,7 @@ sub writecsvs($;$) {
 				$options{'icon'} . "\n";
 			$poisf .= $line;
 		}
-		debug("writing pois file pois.txt in " . $config{destdir} . "/$map");
-		writefile("pois.txt",$config{destdir} . "/$map",$poisf);
+		writefile("pois.txt", $config{destdir} . "/$map", $poisf);
 	}
 }