responsen

diff --git a/debian/changelog b/debian/changelog
index bf4ff9db1474594653aac445748f9155fb9a9039..40fd86ed0a3d1044437d68221b8021e031c9c19e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
     Thanks, Philippe Gauthier and Antoine Beaupré
   * osm: Add osm_openlayers_url configuration setting.
     Thanks, Genevieve
+  * 
 
  -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400
 

diff --git a/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn b/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn
index 66d71a2236c22595d5f566c6acb568882c20dd0d..9b1d4ce85d63c50a77d9ff5ef72b96e6918508a8 100644 (file)
--- a/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn
+++ b/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn
@@ -5,3 +5,8 @@ I know this sounds backwards, but it seems to me that the KML-generated map shou
 > The KML only needs a Document tag because it uses "shared styles" -- don't ask me what this is. Here is a [[patch]]: [[https://reseaulibre.deuxpi.ca/0001-Add-Document-tag-to-OSM-plugin-KML-output.patch]] --[[deuxpi]]
 
 > > I applied the patch to my master branch and tested it on the above URL: it works... mostly. The icons for the elements on the actual map seem incorrect (some are the proper icons, some others are the ugly default blue pin of google maps, weird) but I think this is a step in the right direction. Thus, this should be merged. -- [[anarcat]]
+
+>>> I've cherry-picked this patch, but from the description it does not
+>>> sound "fixed" enough to close this bug. (OTOH, perhaps only google can
+>>> fix it, so it people are happy with the state of affairs I won't insist
+>>> this bug be left open.) --[[Joey]]

diff --git a/doc/todo/custom_location_for_openlayers.mdwn b/doc/todo/custom_location_for_openlayers.mdwn
index c387a4cf5ed71ff076c954df142e156ad92b2e7f..d5054e4087a984cda18787b757fd7b1399f35046 100644 (file)
--- a/doc/todo/custom_location_for_openlayers.mdwn
+++ b/doc/todo/custom_location_for_openlayers.mdwn
@@ -10,3 +10,6 @@ For those reasons, I think the location of that script should be customizable. -
 There is now a [[patch]] for this, thanks to Genevieve, available in my master branch.
 
 Note that there's an update to the patch in my master branch, that allows changing the URL for tiles too.
+
+> There's a lot of stuff in your master branch. Which commit is it,
+> or if you want me to merge it, spin a branch I can merge. --[[Joey]]

diff --git a/doc/todo/osm_arbitrary_layers.mdwn b/doc/todo/osm_arbitrary_layers.mdwn
index 1f410eab5f4d23c7e70a7a27e949dc2345508697..df93aba0a8eb65675e35454efd64c63132763729 100644 (file)
--- a/doc/todo/osm_arbitrary_layers.mdwn
+++ b/doc/todo/osm_arbitrary_layers.mdwn
@@ -1,3 +1,15 @@
 [[!template  id=gitbranch branch=anarcat/master author="[[anarcat]]"]]
 
 I got tired of hacking at the osm.pm every time I wanted to change the layers, so I made it so the layers can be changed in the .setup file. In my master branch, there are now two new configuration settings: `osm_layers` and `osm_layers_order` which replace the hackish `osm_mapurl`. The variables are a hash and an array that allow the operator to define the list of URLs to be loaded as layers and also to change the order of layers. -- [[users/anarcat]]
+
+> I try to avoid adding hashes to config, because websetup does
+> not allow configuring hashes.
+> 
+> The example for `osm_layers_order` is confusing, it makes
+> it look like a perl hash, but it appears to really be a javascript
+> code fragement string, and one that is tightly bound to other
+> configuration too. Why not generate that javascript code from
+> data in a robust way?
+>
+> Does it even make sense to configure this stuff globally?
+> Could the layers be passed as parameters to the osm direction? --[[Joey]]