Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / plugins / osm.mdwn

diff --git a/doc/plugins/osm.mdwn b/doc/plugins/osm.mdwn
index d15dfbfd86bb5f90df46b1e94e4f4882b2fcdca9..cfeab595761d238f76c0de8578236814034dd93c 100644 (file)
--- a/doc/plugins/osm.mdwn
+++ b/doc/plugins/osm.mdwn
@@ -15,14 +15,29 @@ if the [[!cpan JSON]] perl module is installed.
 
 This provides the [[ikiwiki/directive/waypoint]] and [[ikiwiki/directive/osm]] directives.
 
 
 This provides the [[ikiwiki/directive/waypoint]] and [[ikiwiki/directive/osm]] directives.
 

+### Examples
+
+A [[basic set of examples|http://cbaines.net/osm-examples]] is available
+([[repository|http://git.cbaines.net/?p=ikiwiki/osm-examples.git;a=summary]]).
+Note that none of these will work without patching the plugin. With the
+following patches, most of the examples will work (while each patch is
+seperate, the branch includes all previous patches in the list, so the
+cbaines/osm-icon-fixes branch includes all patches).
+
+ - [[bugs/osm plugin error TypeError: mapProjection is null]]
+ - [[todo/osm plugin GeoJSON popup patch]]
+ - [[todo/osm plugin icon patch]]
+
+Even with these patches, the CSV examples do not work, and there are cosmetic
+issues with a few of the other examples.
+

 ---
 
 The plugin was originally written by
 [[the techno-viking|http://techno-viking.com/posts/ikiwiki-maps/]] and fixed up
 by [[anarcat]]. 
 
 ---
 
 The plugin was originally written by
 [[the techno-viking|http://techno-viking.com/posts/ikiwiki-maps/]] and fixed up
 by [[anarcat]]. 
 

-See [[the Mtl-mesh
-wiki|http://mesh.openisp.ca/nodes/anarcat]] for a sample of what this
+See [[the Reseaulibre.ca wiki|http://reseaulibre.ca/]] for a sample of what this

 plugin can do
 
 See also [[plugins/contrib/googlemaps]].
 plugin can do
 
 See also [[plugins/contrib/googlemaps]].