aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-08-25 10:43:37 -0400
committerJoey Hess <joey@kitenet.net>2012-08-25 10:43:37 -0400
commit5fa605beada972eb32ca781ee420cc69e1732e20 (patch)
treea9295da319d5909c8f5d39fc37a743760a578ae4
parenta3c1768e109f5f125ca3b9f4e8e2adbd4c2e5abc (diff)
parent45c31be7dbf81517e854304237bb95d53657b27d (diff)
downloadikiwiki-5fa605beada972eb32ca781ee420cc69e1732e20.tar
ikiwiki-5fa605beada972eb32ca781ee420cc69e1732e20.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info
-rw-r--r--doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn4
1 files changed, 4 insertions, 0 deletions
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 008a1119b..002b2a22c 100644
--- a/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
+++ b/doc/todo/osm__95__optimisations__95__and__95__fixes.mdwn
@@ -10,12 +10,16 @@ I have two main branches that need merging (on top of [[todo/osm_arbitrary_layer
> If it's not supported yet, does it break something? Seems it must be hard
> 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]]
+
* `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.
> I prefer not to pollute files with editor-specific garbage, and that goes
> doubly for files served over the network. Cherry-picked the layer sorting
> change. --[[Joey]]
+> > Alright, I am fine with that, thanks. -- [[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]]