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);
},
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,
},
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,
},
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) {
}
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'}) {
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&lon=$lon&zoom=$zoom";
+ $href =~ s!&!&!g;
}
$pagestate{$page}{'osm'}{$map}{'waypoints'}{$name} = {
page => $page,
$output .= preprocess(%params);
}
if (!$hidden) {
- $href =~ s!&!&!g;
$output .= "<a href=\"$href\"><img class=\"img\" src=\"$icon\" $alt /></a>";
}
return $output;
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;
}
"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));
}
}
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:
=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");
}
$writer->endTag();
$writer->end();
- $output->close();
+
+ writefile("pois.kmp", $config{destdir} . "/$map", $output);
}
}
$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);
}
}
}
}
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 '';
return unless defined $cgi->param('do') &&
$cgi->param("do") eq "osm";
+
+ IkiWiki::loadindex();
IkiWiki::decode_cgi_utf8($cgi);
print ("\r\n");
print "<html><body>";
print "<div id=\"mapdiv-$map\"></div>";
- print embed_map_code($map);
+ print embed_map_code();
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 "</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%';
- }
- 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()); });
- }
-}
-</script>
-EOF
+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";
}
1;
sipb-www / ikiwiki.git / blobdiff