X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3867f038a79784119e67ad36a191b64d2f574a3b..917cdb7ade640c1e88f26d99acb42cff55a4c6fc:/IkiWiki/Plugin/osm.pm
diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index 41202b4ef..661f72bab 100644
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -154,18 +154,15 @@ sub process_waypoint {
$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::cgiurl(
@@ -292,10 +289,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);
}
@@ -436,7 +430,7 @@ Sample style:
$writer->endTag();
$writer->end();
- writefile("pois.kmp", $config{destdir} . "/$map", $output);
+ writefile("pois.kml", $config{destdir} . "/$map", $output);
}
}
@@ -484,7 +478,7 @@ sub format (@) {
return $params{content};
}
-sub prefered_format() {
+sub preferred_format() {
if (!defined($config{'osm_format'}) || !$config{'osm_format'}) {
$config{'osm_format'} = 'KML';
}
@@ -492,19 +486,21 @@ 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}});
}
}
}
@@ -536,7 +532,15 @@ sub cgi($) {
print "";
print "";
print embed_map_code();
- print "";
+ print "";
print "";
exit 0;
@@ -549,4 +553,28 @@ sub embed_map_code(;$) {
'" type="text/javascript" charset="utf-8">'."\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;