aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-08-25 10:13:04 -0400
committerJoey Hess <joey@kitenet.net>2012-08-25 10:13:22 -0400
commit93a12752ace90080fc62f4ea030a74f844ad09c8 (patch)
tree8250c9fff650e0582bc3e8d6512623b44d315531
parentcd755cacc67da2cadb30b3e76848057a51b3923a (diff)
downloadikiwiki-93a12752ace90080fc62f4ea030a74f844ad09c8.tar
ikiwiki-93a12752ace90080fc62f4ea030a74f844ad09c8.tar.gz
merged anarcat/osm_arbitrary_layers
-rw-r--r--IkiWiki/Plugin/osm.pm2
-rw-r--r--debian/changelog3
-rw-r--r--doc/todo/osm_arbitrary_layers.mdwn2
3 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index 2c555f372..f570f4032 100644
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -69,7 +69,7 @@ sub getsetup () {
},
osm_layers => {
type => "string",
- example => { 'OSM', 'GoogleSattelite' },
+ example => { 'OSM', 'GoogleSatellite' },
description => "Layers to use in the map. Can be either the 'OSM' string or a type option for Google maps (GoogleNormal, GoogleSatellite, GoogleHybrid or GooglePhysical). It can also be an arbitrary URL in a syntax acceptable for OpenLayers.Layer.OSM.url parameter.",
safe => 0,
rebuild => 1,
diff --git a/debian/changelog b/debian/changelog
index 40fd86ed0..5a6f7f437 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,8 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
Thanks, Philippe Gauthier and Antoine Beaupré
* osm: Add osm_openlayers_url configuration setting.
Thanks, Genevieve
- *
+ * osm: osm_layers can be used to configured the layers displayed on the map.
+ Thanks, Antoine Beaupré
-- Joey Hess <joeyh@debian.org> Thu, 19 Jul 2012 13:46:52 -0400
diff --git a/doc/todo/osm_arbitrary_layers.mdwn b/doc/todo/osm_arbitrary_layers.mdwn
index 94cc27bb1..4e579b54a 100644
--- a/doc/todo/osm_arbitrary_layers.mdwn
+++ b/doc/todo/osm_arbitrary_layers.mdwn
@@ -37,3 +37,5 @@ I got tired of hacking at the osm.pm every time I wanted to change the layers, s
>>>> Thanks for your time. -- [[anarcat]]
>>>>> I have implemented 1.b) and 2. (ie. it's a simple array now, and I split this stuff in different branches.) I'll open another todo for the other branches. --[[anarcat]]
+
+>>>>>> [[merged|done]] --[[Joey]]