X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8125cfa45b38b653266d03e6106a918f64a7d225..84a0b15eb68917829267bacac005f2bcefee914a:/IkiWiki/Plugin/osm.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index e47e83b07..c9c5646c4 100644
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -9,7 +9,7 @@ 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);
 	hook(type => "preprocess", id => "osm", call => \&preprocess);
@@ -34,8 +34,8 @@ sub getsetup () {
 		},
 		osm_default_icon => {
 			type => "string",
-			example => "img/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,
 		},
@@ -56,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,
 		},
@@ -74,33 +64,22 @@ sub getsetup () {
 
 sub preprocess {
 	my %params=@_;
-	my $page = $params{'page'};
-	my $dest = $params{'destpage'};
-	my $loc = $params{'loc'}; # sanitized below
-	my $lat = $params{'lat'}; # sanitized below
-	my $lon = $params{'lon'}; # sanitized below
-	my $href = $params{'href'};
+	my $page = $params{page};
+	my $dest = $params{destpage};
+	my $loc = $params{loc}; # sanitized below
+	my $lat = $params{lat}; # sanitized below
+	my $lon = $params{lon}; # sanitized below
+	my $href = $params{href};
 
-	my $fullscreen = defined($params{'fullscreen'}); # sanitized here
 	my ($width, $height, $float);
-	if ($fullscreen) {
-		$height = '100%';
-		$width = '100%';
-		$float = 0;
-	}
-	else {
-		$height = scrub($params{'height'} || "300px", $page, $dest); # sanitized here
-		$width = scrub($params{'width'} || "500px", $page, $dest); # sanitized here
-		$float = (defined($params{'right'}) && 'right') || (defined($params{'left'}) && 'left'); # sanitized here
-	}
+	$height = scrub($params{'height'} || "300px", $page, $dest); # sanitized here
+	$width = scrub($params{'width'} || "500px", $page, $dest); # sanitized here
+	$float = (defined($params{'right'}) && 'right') || (defined($params{'left'}) && 'left'); # sanitized here
+	
 	my $zoom = scrub($params{'zoom'} // $config{'osm_default_zoom'} // 15, $page, $dest); # sanitized below
 	my $map;
-	if ($fullscreen) {
-		$map = $params{'map'} || $page;
-	}
-	else {
-		$map = $params{'map'} || 'map';
-	}
+	$map = $params{'map'} || 'map';
+	
 	$map = scrub($map, $page, $dest); # sanitized here
 	my $name = scrub($params{'name'} || $map, $page, $dest);
 
@@ -111,12 +90,20 @@ sub preprocess {
 	if ($zoom !~ /^\d\d?$/ || $zoom < 2 || $zoom > 18) {
 		error("Bad zoom");
 	}
+
+	if (! defined $href || ! length $href) {
+		$href=IkiWiki::cgiurl(
+			do => "osm",
+			map => $map,
+		);
+	}
+
 	$pagestate{$page}{'osm'}{$map}{'displays'}{$name} = {
 		height => $height,
 		width => $width,
 		float => $float,
 		zoom => $zoom,
-		fullscreen => $fullscreen,
+		fullscreen => 0,
 		editable => defined($params{'editable'}),
 		lat => $lat,
 		lon => $lon,
@@ -137,7 +124,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'} || "img/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) {
@@ -150,46 +137,31 @@ 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 = "/img/unknown.png" unless $icon;
+	$icon = urlto($icon, $dest, 1);
 	$tag = '' unless $tag;
 	if ($page eq $dest) {
-		if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
-			$config{'osm_format'} = 'KML';
-		}
-		my %formats = map { $_ => 1 } split(/, */, $config{'osm_format'});
+		my %formats = get_formats();
 		if ($formats{'GeoJSON'}) {
-			will_render($page,$config{destdir} . "/$map/pois.json");
+			will_render($page, "$map/pois.json");
 		}
 		if ($formats{'CSV'}) {
-			will_render($page,$config{destdir} . "/$map/pois.txt");
+			will_render($page, "$map/pois.txt");
 		}
 		if ($formats{'KML'}) {
-			will_render($page,$config{destdir} . "/$map/pois.kml");
+			will_render($page, "$map/pois.kml");
 		}
 	}
-	my $href = "/ikiwiki.cgi?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";
-	}
 	$pagestate{$page}{'osm'}{$map}{'waypoints'}{$name} = {
 		page => $page,
 		desc => $desc,
@@ -197,19 +169,28 @@ sub process_waypoint {
 		tag => $tag,
 		lat => $lat,
 		lon => $lon,
-		# how to link back to the page from the map, not to be
+		# How to link back to the page from the map, not to be
 		# confused with the URL of the map itself sent to the
-		# embeded map below
-		href => urlto($page,$map),
+		# embeded map below. Note: used in generated KML etc file,
+		# so must be absolute.
+		href => urlto($page),
 	};
+
+	my $mapurl = IkiWiki::cgiurl(
+		do => "osm",
+		map => $map,
+		lat => $lat,
+		lon => $lon,
+		zoom => $zoom,
+	);
 	my $output = '';
 	if (defined($params{'embed'})) {
-		$params{'href'} = $href; # propagate down to embeded
-		$output .= preprocess(%params);
+		$output .= preprocess(%params,
+			href => $mapurl,
+		);
 	}
 	if (!$hidden) {
-		$href =~ s!&!&amp;!g;
-		$output .= "<a href=\"$href\"><img class=\"img\" src=\"$icon\" $alt /></a>";
+		$output .= "<a href=\"$mapurl\"><img class=\"img\" src=\"$icon\" $alt /></a>";
 	}
 	return $output;
 }
@@ -222,10 +203,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;
 	}
@@ -308,10 +285,7 @@ sub savestate {
 		}
 	}
 
-	if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
-		$config{'osm_format'} = 'KML';
-	}
-	my %formats = map { $_ => 1 } split(/, */, $config{'osm_format'});
+	my %formats = get_formats();
 	if ($formats{'GeoJSON'}) {
 		writejson(\%waypoints, \%linestrings);
 	}
@@ -341,8 +315,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));
 	}
 }
 
@@ -352,46 +325,9 @@ 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:
-
-<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2">
-  <Placemark>
-    <name>Simple placemark</name>
-    <description>Attached to the ground. Intelligently places itself 
-       at the height of the underlying terrain.</description>
-    <Point>
-      <coordinates>-122.0822035425683,37.42228990140251,0</coordinates>
-    </Point>
-  </Placemark>
-</kml>
-
-Sample style:
-
-
-        <Style id="sh_sunny_copy69">
-                <IconStyle>
-                        <scale>1.4</scale>
-                        <Icon>
-                                <href>http://waypoints.google.com/mapfiles/kml/shapes/sunny.png</href>
-                        </Icon>
-                        <hotSpot x="0.5" y="0.5" xunits="fraction" yunits="fraction"/>
-                </IconStyle>
-                <LabelStyle>
-                        <color>ff00aaff</color>
-                </LabelStyle>
-        </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");
 
@@ -454,7 +390,8 @@ Sample style:
 		}
 		$writer->endTag();
 		$writer->end();
-		$output->close();
+
+		writefile("pois.kml", $config{destdir} . "/$map", $output);
 	}
 }
 
@@ -472,8 +409,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);
 	}
 }
 
@@ -503,7 +439,7 @@ sub format (@) {
 	return $params{content};
 }
 
-sub prefered_format() {
+sub preferred_format() {
 	if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
 		$config{'osm_format'} = 'KML';
 	}
@@ -511,24 +447,26 @@ sub prefered_format() {
 	return shift @spl;
 }
 
+sub get_formats() {
+	if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
+		$config{'osm_format'} = 'KML';
+	}
+	map { $_ => 1 } split(/, */, $config{'osm_format'});
+}
+
 sub include_javascript ($) {
 	my $page=shift;
 	my $loader;
 
-	eval q{use JSON};
-	error $@ if $@;
 	if (exists $pagestate{$page}{'osm'}) {
 		foreach my $map (keys %{$pagestate{$page}{'osm'}}) {
 			foreach my $name (keys %{$pagestate{$page}{'osm'}{$map}{'displays'}}) {
-				my %options = %{$pagestate{$page}{'osm'}{$map}{'displays'}{$name}};
-				$options{'map'} = $map;
-				$options{'format'} = prefered_format();
-				$loader .= "mapsetup(\"mapdiv-$name\", " . to_json(\%options) . ");\n";
+				$loader .= map_setup_code($map, $name, %{$pagestate{$page}{'osm'}{$map}{'displays'}{$name}});
 			}
 		}
 	}
 	if ($loader) {
-		return embed_map_code() . "<script type=\"text/javascript\" charset=\"utf-8\">$loader</script>";
+		return embed_map_code($page) . "<script type=\"text/javascript\" charset=\"utf-8\">$loader</script>";
 	}
 	else {
         	return '';
@@ -540,6 +478,8 @@ sub cgi($) {
 
 	return unless defined $cgi->param('do') &&
 		$cgi->param("do") eq "osm";
+	
+	IkiWiki::loadindex();
 
 	IkiWiki::decode_cgi_utf8($cgi);
 
@@ -552,147 +492,50 @@ sub cgi($) {
 	print ("\r\n");
 	print "<html><body>";
 	print "<div id=\"mapdiv-$map\"></div>";
-	print embed_map_code($map);
-	print "<script type=\"text/javascript\" charset=\"utf-8\">mapsetup( 'mapdiv-$map', { 'map': '$map', 'lat': urlParams['lat'], 'lon': urlParams['lon'], 'zoom': urlParams['zoom'], 'fullscreen': 1, 'editable': 1, 'format': '" . prefered_format() . "'});</script>";
+	print embed_map_code();
+	print "<script type=\"text/javascript\" charset=\"utf-8\">";
+	print map_setup_code($map, $map,
+		lat => "urlParams['lat']",
+		lon => "urlParams['lon']",
+		zoom => "urlParams['zoom']",
+		fullscreen => 1,
+		editable => 1,
+	);
+	print "</script>";
 	print "</body></html>";
 
 	exit 0;
 }
 
-sub embed_map_code() {
-	return <<EOF;
-<script src="http://www.openlayers.org/api/OpenLayers.js"></script>
-<script>
-// taken from http://stackoverflow.com/questions/901115/get-query-string-values-in-javascript
-var urlParams = {};
-(function () {
-	var e,
-	a = /\\+/g,  // Regex for replacing addition symbol with a space
-	r = /([^&=]+)=?([^&]*)/g,
-	d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-	q = window.location.search.substring(1);
-
-	while (e = r.exec(q))
-	urlParams[d(e[1])] = d(e[2]);
-})();
-
-function mapsetup(divname, options) {
-	div = document.getElementById(divname);
-	if (options.fullscreen) {
-		permalink = 'permalink';
-		div.style.top = 0;
-		div.style.left = 0;
-		div.style.position = 'absolute';
-		div.style.width = '100%';
-		div.style.height = '100%';
+sub embed_map_code(;$) {
+	my $page=shift;
+	return '<script src="http://www.openlayers.org/api/OpenLayers.js" type="text/javascript" charset="utf-8"></script>'.
+		'<script src="'.urlto("ikiwiki/osm.js", $page).
+		'" type="text/javascript" charset="utf-8"></script>'."\n";
+}
+
+sub map_setup_code($;@) {
+	my $map=shift;
+	my $name=shift;
+	my %options=@_;
+
+	eval q{use JSON};
+	error $@ if $@;
+				
+	$options{'format'} = preferred_format();
+
+	my %formats = get_formats();
+	if ($formats{'GeoJSON'}) {
+		$options{'jsonurl'} = urlto($map."/pois.json");
 	}
-	else {
-		div.style.height = options.height;
-		div.style.width = options.width;
-		div.style.float = options.float;
-		permalink = {base: options.href, title: "View larger map"};
-	}
-	map = new OpenLayers.Map(divname, {
-		controls: [
-			new OpenLayers.Control.Navigation(),
-			new OpenLayers.Control.ScaleLine(),
-			new OpenLayers.Control.Permalink(permalink)
-		],
-		displayProjection: new OpenLayers.Projection("EPSG:4326"),
-		numZoomLevels: 18
-	});
-
-
-	map.addLayer(new OpenLayers.Layer.OSM());
-	if (options.format == 'CSV') {
-		pois = new OpenLayers.Layer.Text( "CSV",
-			{ location:"/" + options.map + "/pois.txt",
-			  projection: map.displayProjection
-			});
-	} else if (options.format == 'GeoJSON') {
-		pois = new OpenLayers.Layer.Vector("GeoJSON", {
-			protocol: new OpenLayers.Protocol.HTTP({
-				url: "/" + options.map + "/pois.json",
-				format: new OpenLayers.Format.GeoJSON()
-			}),
-			strategies: [new OpenLayers.Strategy.Fixed()]
-		});
-	} else {
-		pois = new OpenLayers.Layer.Vector("KML", {
-			protocol: new OpenLayers.Protocol.HTTP({
-				url: "/" + options.map + "/pois.kml",
-				format: new OpenLayers.Format.KML({
-					extractStyles: true,
-					extractAttributes: true
-				})
-			}),
-		strategies: [new OpenLayers.Strategy.Fixed()]});
-	}
-	map.addLayer(pois);
-	select = new OpenLayers.Control.SelectFeature(pois);
-	map.addControl(select);
-	select.activate();
-
-	pois.events.on({
-		"featureselected": function (event) {
-			var feature = event.feature;
-			var content = '<h2><a href="' + feature.attributes.href + '">' +feature.attributes.name + "</a></h2>" + feature.attributes.description;
-			popup = new OpenLayers.Popup.FramedCloud("chicken",
-				feature.geometry.getBounds().getCenterLonLat(),
-				new OpenLayers.Size(100,100),
-				content,
-				null, true, function () {select.unselectAll()});
-			feature.popup = popup;
-			map.addPopup(popup);
-		},
-		"featureunselected": function (event) {
-			var feature = event.feature;
-			if (feature.popup) {
-				map.removePopup(feature.popup);
-				feature.popup.destroy();
-				delete feature.popup;
-			}
-		}
-	});
-
-	if (options.editable) {
-		vlayer = new OpenLayers.Layer.Vector( "Editable" );
-		map.addControl(new OpenLayers.Control.EditingToolbar(vlayer));
-		map.addLayer(vlayer);
-	}
-
-	if (options.fullscreen) {
-		map.addControl(new OpenLayers.Control.PanZoomBar());
-		map.addControl(new OpenLayers.Control.LayerSwitcher({'ascending':false}));
-		map.addControl(new OpenLayers.Control.MousePosition());
-		map.addControl(new OpenLayers.Control.KeyboardDefaults());
-	} else {
-		map.addControl(new OpenLayers.Control.ZoomPanel());
-	}
-
-	//Set start centrepoint and zoom    
-	if (!options.lat || !options.lon) {
-		options.lat = urlParams['lat'];
-		options.lon = urlParams['lon'];
-	}
-	if (!options.zoom) {
-		options.zoom = urlParams['zoom'];
-	}
-	if (options.lat && options.lon) {
-		var lat = options.lat;
-		var lon = options.lon;
-		var zoom= options.zoom || 10;
-		center = new OpenLayers.LonLat( lon, lat ).transform(
-			new OpenLayers.Projection("EPSG:4326"), // transform from WGS 1984
-			map.getProjectionObject() // to Spherical Mercator Projection
-		);
-		map.setCenter (center, zoom);
-	} else {
-		pois.events.register("loadend", this, function () { map.zoomToExtent(pois.getDataExtent()); });
+	if ($formats{'CSV'}) {
+		$options{'csvurl'} = urlto($map."/pois.txt");
 	}
-}
-</script>
-EOF
+	if ($formats{'KML'}) {
+		$options{'kmlurl'} = urlto($map."/pois.kml");
+	}
+
+	return "mapsetup('mapdiv-$name', " . to_json(\%options) . ");";
 }
 
 1;