},
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,
},
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 $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);
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,
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) {
}
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'}) {
- $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";
+ 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,
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 $output = '';
if (defined($params{'embed'})) {
$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;
}
}
}
- 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);
}
$writer->endTag();
$writer->end();
- writefile("pois.kmp", $config{destdir} . "/$map", $output);
+ writefile("pois.kml", $config{destdir} . "/$map", $output);
}
}
return $params{content};
}
-sub prefered_format() {
+sub preferred_format() {
if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
$config{'osm_format'} = 'KML';
}
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}});
}
}
}
return unless defined $cgi->param('do') &&
$cgi->param("do") eq "osm";
+
+ IkiWiki::loadindex();
IkiWiki::decode_cgi_utf8($cgi);
print "<html><body>";
print "<div id=\"mapdiv-$map\"></div>";
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 "<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;
'" 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");
+ }
+ if ($formats{'CSV'}) {
+ $options{'csvurl'} = urlto($map."/pois.txt");
+ }
+ if ($formats{'KML'}) {
+ $options{'kmlurl'} = urlto($map."/pois.kml");
+ }
+
+ return "mapsetup('mapdiv-$name', " . to_json(\%options) . ");";
+}
+
1;
sipb-www / ikiwiki.git / blobdiff