merged anarcat/osm_arbitrary_layers

master
Joey Hess 2012-08-25 10:13:04 -04:00
parent cd755cacc6
commit 93a12752ac
3 changed files with 5 additions and 2 deletions

View File

@ -69,7 +69,7 @@ sub getsetup () {
}, },
osm_layers => { osm_layers => {
type => "string", 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.", 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, safe => 0,
rebuild => 1, rebuild => 1,

3
debian/changelog vendored
View File

@ -8,7 +8,8 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
Thanks, Philippe Gauthier and Antoine Beaupré Thanks, Philippe Gauthier and Antoine Beaupré
* osm: Add osm_openlayers_url configuration setting. * osm: Add osm_openlayers_url configuration setting.
Thanks, Genevieve 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 -- Joey Hess <joeyh@debian.org> Thu, 19 Jul 2012 13:46:52 -0400

View File

@ -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]] >>>> 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]] >>>>> 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]]