X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/278b4498840082f0c123174c952f489f905fc130..cd51e403dcff5028eb0cdfc72d08f7c9ecf0bea3:/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn

diff --git a/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn b/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
index 332ef2d84..3496cff68 100644
--- a/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
+++ b/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
@@ -1,5 +1,5 @@
 [[!template  id=gitbranch branch=anarcat/osm_kml_formatting author="[[anarcat]]"]]
-[[!template  id=gitbranch branch=anarcat/osm_openlayers_misc author="[[anarcat]]"]]
+[[!template  id=gitbranch branch=anarcat/attic/osm_emacs_indent author="[[anarcat]]"]]
 
 I have accumulated a small series of patches to the OSM plugin along with the [[other|todo/osm_arbitrary_layers]] [[fixes|bugs/osm_KML_maps_do_not_display_properly_on_google_maps]] I have submitted here. They have lived in a tangled mess on my master branch so far, but not anymore!
 
@@ -8,7 +8,11 @@ I have two main branches that need merging (on top of [[todo/osm_arbitrary_layer
  * `osm_kml_formatting` - indentation of the KML, optimisation: remove duplicate style declarations, folders support (even though [[it's not supported by openlayers just yet|https://trac.osgeo.org/openlayers/ticket/2195]])
 
 > If it's not supported yet, does it break something? Seems it must be hard
-> to the change at least if it's not supported. --[[Joey]]
+> to test the change at least if it's not supported. --[[Joey]]
+
+> > Good point. Maybe that can be skipped for now, it sure doesn't look like it will be merged any time soon anyways. I do think that the optimisation needs to be merged, it's quite important because if halves the size of the resulting KML file. --[[anarcat]]
+
+> > > The merge you just did is fine, the only thing missing is folder support, I'll keep it in a separate branch for now, maybe it will be useful later! This is [[done]]. --[[anarcat]]
 
  * `osm_openlayers_misc` - do not override the sorting of layers (so that the order defined in [[todo/osm_arbitrary_layers]] takes effect) and tell Emacs about the non-default indentation policies of the file.
 
@@ -16,6 +20,8 @@ I have two main branches that need merging (on top of [[todo/osm_arbitrary_layer
 > doubly for files served over the network. Cherry-picked the layer sorting
 > change. --[[Joey]]
 
+> > Alright, I am fine with that, thanks. I moved my branch to the attic. -- [[anarcat]]
+
 Those two branches are also merged directly on my master branch... along with [[todo/osm_arbitrary_layers]].
 
 I am filing this as one todo to simplify matter, but I can also split it further if needs be. --[[anarcat]]