aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--Makefile13
-rw-r--r--README37
-rw-r--r--custom-icon/index.mdwn4
-rw-r--r--custom-icon/marker-icon.pngbin0 -> 1747 bytes
-rw-r--r--icon-csv.setup70
-rw-r--r--icon-geojson.setup70
-rw-r--r--icon-kml.setup76
-rw-r--r--simple-csv.setup76
-rw-r--r--simple-geojson.setup76
-rw-r--r--simple-kml.setup76
-rw-r--r--simple/index.mdwn5
-rw-r--r--tags-csv.setup76
-rw-r--r--tags-geojson.setup76
-rw-r--r--tags-kml.setup77
-rw-r--r--tags/cats.mdwn6
-rw-r--r--tags/dogs.mdwn6
-rw-r--r--tags/icon.pngbin0 -> 1747 bytes
-rw-r--r--tags/index.mdwn5
-rw-r--r--tags/tag/cats.mdwn4
-rw-r--r--tags/tag/cats/icon.pngbin0 -> 1865 bytes
-rw-r--r--tags/tag/dogs.mdwn4
-rw-r--r--tags/tag/dogs/icon.pngbin0 -> 1747 bytes
-rw-r--r--tags/tag/fur.mdwn4
24 files changed, 768 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c8ec35b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+dest
+ikiwiki
+ikiwiki-dest
+
+.ikiwiki
+
+basic/.ikiwiki
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ad0fd19
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,13 @@
+
+ikiwiki:
+ git clone -b osm-icon-fixes git://git.cbaines.net/ikiwiki
+
+ikiwiki-dest: ikiwiki
+ cd ikiwiki && perl Makefile.PL PREFIX=../ikiwiki-dest && make && make install
+
+all: ikiwiki-dest
+ export PERL5LIB=`pwd`/ikiwiki && PATH=ikiwiki-dest/bin:$(PATH); find . -maxdepth 1 -name "*\.setup" -exec ikiwiki --setup {} \;
+
+clean:
+ rm -rf ikiwiki-dest
+ rm -rf dest
diff --git a/README b/README
new file mode 100644
index 0000000..5eb92bb
--- /dev/null
+++ b/README
@@ -0,0 +1,37 @@
+# OSM examples for ikiwiki
+
+This repository contains a number of examples for the ikiwiki osm
+(OpenStreetMap) plugin.
+
+The osm plugin is included in Ikiwiki, but at the time of writing this README,
+none of the included examples will work without patching the plugin. The
+Makefile will build the examples using a patched version of Ikiwiki, that will
+get most of them working.
+
+## Known Issues
+
+ - The icon on the map for the icon-kml is distorted (compare with the
+ icon-geojson example)
+ - The simple-csv example does not work
+ - There are no map icons in the tags-geojson example
+ - The (non square) map icon is distorted in the tags-kml example
+
+## Build Details
+
+Unless each example is viewed at the root of the webserver, the example will
+not work. You must set the url option in each of the setup files to the correct
+url. For example, if you symlink the dest directory to osm-examples in the
+public_html of "username", then this would be the valid url for the
+osm-icon-geojson.setup file.
+
+ url: 'http://localhost/~username/osm-examples/icon-geojson/'
+
+The included makefile will download ikiwiki, build it, and then use it to
+build all of the examples.
+
+The examples will end up in dest.
+
+You may need some packages to build ikiwiki, running the following will
+probably work:
+
+ apt-get build-dep ikiwiki
diff --git a/custom-icon/index.mdwn b/custom-icon/index.mdwn
new file mode 100644
index 0000000..9900c90
--- /dev/null
+++ b/custom-icon/index.mdwn
@@ -0,0 +1,4 @@
+Uses a custom marker icon.
+
+[[!osm ]]
+[[!waypoint lat="45°30N" lon="73°40W" name="My city" desc="Description" tag="city" icon="marker-icon.png"]]
diff --git a/custom-icon/marker-icon.png b/custom-icon/marker-icon.png
new file mode 100644
index 0000000..e2e9f75
--- /dev/null
+++ b/custom-icon/marker-icon.png
Binary files differ
diff --git a/icon-csv.setup b/icon-csv.setup
new file mode 100644
index 0000000..eff75e9
--- /dev/null
+++ b/icon-csv.setup
@@ -0,0 +1,70 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# name of the wiki
+wikiname: icon-csv
+# where the source of the wiki is located
+srcdir: custom-icon
+# where to build the wiki
+destdir: dest/icon-csv
+# base url to the wiki
+url: 'http://localhost/~chris/ikiwiki/osm-examples/icon-geojson/'
+# plugins to add to the default configuration
+add_plugins:
+ - osm
+# plugins to disable
+disable_plugins: []
+# additional directory to search for template files
+templatedir: ikiwiki/templates
+# base wiki source location
+underlaydir: ikiwiki-dest/share/ikiwiki/basewiki
+underlaydirbase: ikiwiki-dest/share/ikiwiki
+# display verbose messages?
+verbose: 1
+# log to syslog?
+#syslog: 1
+# create output files named page/index.html?
+usedirs: 1
+# use '!'-prefixed preprocessor directives?
+prefix_directives: 1
+# use page/index.mdwn source files
+indexpages: 0
+# name of Discussion pages
+discussionpage: Discussion
+# generate HTML5?
+html5: 0
+# extension to use for new pages
+default_pageext: mdwn
+# extension to use for html files
+htmlext: html
+# UTF-8 locale to use
+#locale: en_US.UTF-8
+# put user pages below specified page
+userdir: ''
+# how many backlinks to show before hiding excess (0 to show all)
+numbacklinks: 10
+# attempt to hardlink source files? (optimisation for large files)
+hardlink: 0
+
+######################################################################
+# special-purpose plugins
+# (osm, underlay)
+######################################################################
+
+# osm plugin
+# the default zoom when you click on the map link
+#osm_default_zoom: 15
+# the icon shown on links and on the main map
+#osm_default_icon: ikiwiki/images/osm.png
+# the alt tag of links, defaults to empty
+#osm_alt: ''
+# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+osm_format: CSV
+# the icon attached to a tag, displayed on the map for tagged pages
+#osm_tag_default_icon: icon.png
+# Url for the OpenLayers.js file
+#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js
+# 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.
+#osm_layers:
+# OSM: GoogleSatellite
+# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+#osm_google_apikey: ''
diff --git a/icon-geojson.setup b/icon-geojson.setup
new file mode 100644
index 0000000..4089886
--- /dev/null
+++ b/icon-geojson.setup
@@ -0,0 +1,70 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# name of the wiki
+wikiname: icon-geojson
+# where the source of the wiki is located
+srcdir: custom-icon
+# where to build the wiki
+destdir: dest/icon-geojson
+# base url to the wiki
+url: 'http://localhost/~chris/ikiwiki/osm-examples/icon-geojson/'
+# plugins to add to the default configuration
+add_plugins:
+ - osm
+# plugins to disable
+disable_plugins: []
+# additional directory to search for template files
+templatedir: ikiwiki/templates
+# base wiki source location
+underlaydir: ikiwiki-dest/share/ikiwiki/basewiki
+underlaydirbase: ikiwiki-dest/share/ikiwiki
+# display verbose messages?
+verbose: 1
+# log to syslog?
+#syslog: 1
+# create output files named page/index.html?
+usedirs: 1
+# use '!'-prefixed preprocessor directives?
+prefix_directives: 1
+# use page/index.mdwn source files
+indexpages: 0
+# name of Discussion pages
+discussionpage: Discussion
+# generate HTML5?
+html5: 0
+# extension to use for new pages
+default_pageext: mdwn
+# extension to use for html files
+htmlext: html
+# UTF-8 locale to use
+#locale: en_US.UTF-8
+# put user pages below specified page
+userdir: ''
+# how many backlinks to show before hiding excess (0 to show all)
+numbacklinks: 10
+# attempt to hardlink source files? (optimisation for large files)
+hardlink: 0
+
+######################################################################
+# special-purpose plugins
+# (osm, underlay)
+######################################################################
+
+# osm plugin
+# the default zoom when you click on the map link
+#osm_default_zoom: 15
+# the icon shown on links and on the main map
+#osm_default_icon: ikiwiki/images/osm.png
+# the alt tag of links, defaults to empty
+#osm_alt: ''
+# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+osm_format: GeoJSON
+# the icon attached to a tag, displayed on the map for tagged pages
+#osm_tag_default_icon: icon.png
+# Url for the OpenLayers.js file
+#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js
+# 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.
+#osm_layers:
+# OSM: GoogleSatellite
+# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+#osm_google_apikey: ''
diff --git a/icon-kml.setup b/icon-kml.setup
new file mode 100644
index 0000000..7284bd6
--- /dev/null
+++ b/icon-kml.setup
@@ -0,0 +1,76 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# name of the wiki
+wikiname: icon-kml
+# where the source of the wiki is located
+srcdir: custom-icon
+# where to build the wiki
+destdir: dest/icon-kml
+# base url to the wiki
+url: 'http://localhost/~chris/ikiwiki/osm-examples/icon-kml/'
+# plugins to add to the default configuration
+add_plugins:
+ - osm
+# plugins to disable
+disable_plugins: []
+# additional directory to search for template files
+templatedir: ikiwiki/templates
+# base wiki source location
+underlaydir: ikiwiki-dest/share/ikiwiki/basewiki
+underlaydirbase: ikiwiki-dest/share/ikiwiki
+# display verbose messages?
+verbose: 1
+# log to syslog?
+#syslog: 1
+# create output files named page/index.html?
+usedirs: 1
+# use '!'-prefixed preprocessor directives?
+prefix_directives: 1
+# use page/index.mdwn source files
+indexpages: 0
+# enable Discussion pages?
+discussion: 1
+# name of Discussion pages
+discussionpage: Discussion
+# generate HTML5?
+html5: 0
+# only send cookies over SSL connections?
+sslcookie: 0
+# extension to use for new pages
+default_pageext: mdwn
+# extension to use for html files
+htmlext: html
+# strftime format string to display date
+timeformat: '%c'
+# UTF-8 locale to use
+#locale: en_US.UTF-8
+# put user pages below specified page
+userdir: ''
+# how many backlinks to show before hiding excess (0 to show all)
+numbacklinks: 10
+# attempt to hardlink source files? (optimisation for large files)
+hardlink: 0
+
+######################################################################
+# special-purpose plugins
+# (osm, underlay)
+######################################################################
+
+# osm plugin
+# the default zoom when you click on the map link
+#osm_default_zoom: 15
+# the icon shown on links and on the main map
+#osm_default_icon: ikiwiki/images/osm.png
+# the alt tag of links, defaults to empty
+#osm_alt: ''
+# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+osm_format: KML
+# the icon attached to a tag, displayed on the map for tagged pages
+#osm_tag_default_icon: icon.png
+# Url for the OpenLayers.js file
+#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js
+# 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.
+#osm_layers:
+# OSM: GoogleSatellite
+# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+#osm_google_apikey: ''
diff --git a/simple-csv.setup b/simple-csv.setup
new file mode 100644
index 0000000..bd0951a
--- /dev/null
+++ b/simple-csv.setup
@@ -0,0 +1,76 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# name of the wiki
+wikiname: simple-csv
+# where the source of the wiki is located
+srcdir: simple
+# where to build the wiki
+destdir: dest/simple-csv
+# base url to the wiki
+url: 'http://localhost/~chris/ikiwiki/osm-examples/simple-csv'
+# plugins to add to the default configuration
+add_plugins:
+ - osm
+# plugins to disable
+disable_plugins: []
+# additional directory to search for template files
+templatedir: ikiwiki/templates
+# base wiki source location
+underlaydir: ikiwiki-dest/share/ikiwiki/basewiki
+underlaydirbase: ikiwiki-dest/share/ikiwiki
+# display verbose messages?
+verbose: 1
+# log to syslog?
+#syslog: 1
+# create output files named page/index.html?
+usedirs: 1
+# use '!'-prefixed preprocessor directives?
+prefix_directives: 1
+# use page/index.mdwn source files
+indexpages: 0
+# enable Discussion pages?
+discussion: 1
+# name of Discussion pages
+discussionpage: Discussion
+# generate HTML5?
+html5: 0
+# only send cookies over SSL connections?
+sslcookie: 0
+# extension to use for new pages
+default_pageext: mdwn
+# extension to use for html files
+htmlext: html
+# strftime format string to display date
+timeformat: '%c'
+# UTF-8 locale to use
+#locale: en_US.UTF-8
+# put user pages below specified page
+userdir: ''
+# how many backlinks to show before hiding excess (0 to show all)
+numbacklinks: 10
+# attempt to hardlink source files? (optimisation for large files)
+hardlink: 0
+
+######################################################################
+# special-purpose plugins
+# (osm, underlay)
+######################################################################
+
+# osm plugin
+# the default zoom when you click on the map link
+#osm_default_zoom: 15
+# the icon shown on links and on the main map
+#osm_default_icon: ikiwiki/images/osm.png
+# the alt tag of links, defaults to empty
+#osm_alt: ''
+# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+osm_format: CSV
+# the icon attached to a tag, displayed on the map for tagged pages
+#osm_tag_default_icon: icon.png
+# Url for the OpenLayers.js file
+#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js
+# 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.
+#osm_layers:
+# OSM: GoogleSatellite
+# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+#osm_google_apikey: ''
diff --git a/simple-geojson.setup b/simple-geojson.setup
new file mode 100644
index 0000000..02401a7
--- /dev/null
+++ b/simple-geojson.setup
@@ -0,0 +1,76 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# name of the wiki
+wikiname: simple-geojson
+# where the source of the wiki is located
+srcdir: simple
+# where to build the wiki
+destdir: dest/simple-geojson
+# base url to the wiki
+url: 'http://localhost/~chris/ikiwiki/osm-examples/simple-geojson'
+# plugins to add to the default configuration
+add_plugins:
+ - osm
+# plugins to disable
+disable_plugins: []
+# additional directory to search for template files
+templatedir: ikiwiki/templates
+# base wiki source location
+underlaydir: ikiwiki-dest/share/ikiwiki/basewiki
+underlaydirbase: ikiwiki-dest/share/ikiwiki
+# display verbose messages?
+verbose: 1
+# log to syslog?
+#syslog: 1
+# create output files named page/index.html?
+usedirs: 1
+# use '!'-prefixed preprocessor directives?
+prefix_directives: 1
+# use page/index.mdwn source files
+indexpages: 0
+# enable Discussion pages?
+discussion: 1
+# name of Discussion pages
+discussionpage: Discussion
+# generate HTML5?
+html5: 0
+# only send cookies over SSL connections?
+sslcookie: 0
+# extension to use for new pages
+default_pageext: mdwn
+# extension to use for html files
+htmlext: html
+# strftime format string to display date
+timeformat: '%c'
+# UTF-8 locale to use
+#locale: en_US.UTF-8
+# put user pages below specified page
+userdir: ''
+# how many backlinks to show before hiding excess (0 to show all)
+numbacklinks: 10
+# attempt to hardlink source files? (optimisation for large files)
+hardlink: 0
+
+######################################################################
+# special-purpose plugins
+# (osm, underlay)
+######################################################################
+
+# osm plugin
+# the default zoom when you click on the map link
+#osm_default_zoom: 15
+# the icon shown on links and on the main map
+#osm_default_icon: ikiwiki/images/osm.png
+# the alt tag of links, defaults to empty
+#osm_alt: ''
+# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+osm_format: GeoJSON
+# the icon attached to a tag, displayed on the map for tagged pages
+#osm_tag_default_icon: icon.png
+# Url for the OpenLayers.js file
+#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js
+# 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.
+#osm_layers:
+# OSM: GoogleSatellite
+# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+#osm_google_apikey: ''
diff --git a/simple-kml.setup b/simple-kml.setup
new file mode 100644
index 0000000..2d5caeb
--- /dev/null
+++ b/simple-kml.setup
@@ -0,0 +1,76 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# name of the wiki
+wikiname: simple-kml
+# where the source of the wiki is located
+srcdir: simple
+# where to build the wiki
+destdir: dest/simple-kml
+# base url to the wiki
+url: 'http://localhost/~chris/ikiwiki/osm-examples/simple-kml'
+# plugins to add to the default configuration
+add_plugins:
+ - osm
+# plugins to disable
+disable_plugins: []
+# additional directory to search for template files
+templatedir: ikiwiki/templates
+# base wiki source location
+underlaydir: ikiwiki-dest/share/ikiwiki/basewiki
+underlaydirbase: ikiwiki-dest/share/ikiwiki
+# display verbose messages?
+verbose: 1
+# log to syslog?
+#syslog: 1
+# create output files named page/index.html?
+usedirs: 1
+# use '!'-prefixed preprocessor directives?
+prefix_directives: 1
+# use page/index.mdwn source files
+indexpages: 0
+# enable Discussion pages?
+discussion: 1
+# name of Discussion pages
+discussionpage: Discussion
+# generate HTML5?
+html5: 0
+# only send cookies over SSL connections?
+sslcookie: 0
+# extension to use for new pages
+default_pageext: mdwn
+# extension to use for html files
+htmlext: html
+# strftime format string to display date
+timeformat: '%c'
+# UTF-8 locale to use
+#locale: en_US.UTF-8
+# put user pages below specified page
+userdir: ''
+# how many backlinks to show before hiding excess (0 to show all)
+numbacklinks: 10
+# attempt to hardlink source files? (optimisation for large files)
+hardlink: 0
+
+######################################################################
+# special-purpose plugins
+# (osm, underlay)
+######################################################################
+
+# osm plugin
+# the default zoom when you click on the map link
+#osm_default_zoom: 15
+# the icon shown on links and on the main map
+#osm_default_icon: ikiwiki/images/osm.png
+# the alt tag of links, defaults to empty
+#osm_alt: ''
+# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+osm_format: KML
+# the icon attached to a tag, displayed on the map for tagged pages
+#osm_tag_default_icon: icon.png
+# Url for the OpenLayers.js file
+#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js
+# 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.
+#osm_layers:
+# OSM: GoogleSatellite
+# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+#osm_google_apikey: ''
diff --git a/simple/index.mdwn b/simple/index.mdwn
new file mode 100644
index 0000000..22667e4
--- /dev/null
+++ b/simple/index.mdwn
@@ -0,0 +1,5 @@
+This example just a single page (this one) with a single map and waypoint
+directive.
+
+[[!osm ]]
+[[!waypoint lat="45°30N" lon="73°40W" name="My city" desc="Description"]]
diff --git a/tags-csv.setup b/tags-csv.setup
new file mode 100644
index 0000000..3f18c9f
--- /dev/null
+++ b/tags-csv.setup
@@ -0,0 +1,76 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# name of the wiki
+wikiname: tags-csv
+# where the source of the wiki is located
+srcdir: tags
+# where to build the wiki
+destdir: dest/tags-csv
+# base url to the wiki
+url: 'http://localhost/~chris/ikiwiki/osm-examples/tags-geojson'
+# plugins to add to the default configuration
+add_plugins:
+ - osm
+ - tag
+# plugins to disable
+disable_plugins: []
+# additional directory to search for template files
+templatedir: /home/chris/Projects/ikiwiki/ikiwiki/templates
+# base wiki source location
+underlaydir: /usr/share/ikiwiki/basewiki
+# display verbose messages?
+verbose: 1
+# log to syslog?
+#syslog: 1
+# create output files named page/index.html?
+usedirs: 1
+# use '!'-prefixed preprocessor directives?
+prefix_directives: 1
+# use page/index.mdwn source files
+indexpages: 0
+# enable Discussion pages?
+discussion: 1
+# name of Discussion pages
+discussionpage: Discussion
+# generate HTML5?
+html5: 0
+# only send cookies over SSL connections?
+sslcookie: 0
+# extension to use for new pages
+default_pageext: mdwn
+# extension to use for html files
+htmlext: html
+# strftime format string to display date
+timeformat: '%c'
+# UTF-8 locale to use
+#locale: en_US.UTF-8
+# put user pages below specified page
+userdir: ''
+# how many backlinks to show before hiding excess (0 to show all)
+numbacklinks: 10
+# attempt to hardlink source files? (optimisation for large files)
+hardlink: 0
+
+######################################################################
+# special-purpose plugins
+# (osm, underlay)
+######################################################################
+
+# osm plugin
+# the default zoom when you click on the map link
+#osm_default_zoom: 15
+# the icon shown on links and on the main map
+#osm_default_icon: ikiwiki/images/osm.png
+# the alt tag of links, defaults to empty
+#osm_alt: ''
+# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+osm_format: CSV
+# the icon attached to a tag, displayed on the map for tagged pages
+#osm_tag_default_icon: icon.png
+# Url for the OpenLayers.js file
+#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js
+# 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.
+#osm_layers:
+# OSM: GoogleSatellite
+# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+#osm_google_apikey: ''
diff --git a/tags-geojson.setup b/tags-geojson.setup
new file mode 100644
index 0000000..bd77066
--- /dev/null
+++ b/tags-geojson.setup
@@ -0,0 +1,76 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# name of the wiki
+wikiname: tags-geojson
+# where the source of the wiki is located
+srcdir: tags
+# where to build the wiki
+destdir: dest/tags-geojson
+# base url to the wiki
+url: 'http://localhost/~chris/ikiwiki/osm-examples/tags-geojson'
+# plugins to add to the default configuration
+add_plugins:
+ - osm
+ - tag
+# plugins to disable
+disable_plugins: []
+# additional directory to search for template files
+templatedir: /home/chris/Projects/ikiwiki/ikiwiki/templates
+# base wiki source location
+underlaydir: /usr/share/ikiwiki/basewiki
+# display verbose messages?
+verbose: 1
+# log to syslog?
+#syslog: 1
+# create output files named page/index.html?
+usedirs: 1
+# use '!'-prefixed preprocessor directives?
+prefix_directives: 1
+# use page/index.mdwn source files
+indexpages: 0
+# enable Discussion pages?
+discussion: 1
+# name of Discussion pages
+discussionpage: Discussion
+# generate HTML5?
+html5: 0
+# only send cookies over SSL connections?
+sslcookie: 0
+# extension to use for new pages
+default_pageext: mdwn
+# extension to use for html files
+htmlext: html
+# strftime format string to display date
+timeformat: '%c'
+# UTF-8 locale to use
+#locale: en_US.UTF-8
+# put user pages below specified page
+userdir: ''
+# how many backlinks to show before hiding excess (0 to show all)
+numbacklinks: 10
+# attempt to hardlink source files? (optimisation for large files)
+hardlink: 0
+
+######################################################################
+# special-purpose plugins
+# (osm, underlay)
+######################################################################
+
+# osm plugin
+# the default zoom when you click on the map link
+#osm_default_zoom: 15
+# the icon shown on links and on the main map
+#osm_default_icon: ikiwiki/images/osm.png
+# the alt tag of links, defaults to empty
+#osm_alt: ''
+# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+osm_format: GeoJSON
+# the icon attached to a tag, displayed on the map for tagged pages
+#osm_tag_default_icon: icon.png
+# Url for the OpenLayers.js file
+#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js
+# 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.
+#osm_layers:
+# OSM: GoogleSatellite
+# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+#osm_google_apikey: ''
diff --git a/tags-kml.setup b/tags-kml.setup
new file mode 100644
index 0000000..eaa1dad
--- /dev/null
+++ b/tags-kml.setup
@@ -0,0 +1,77 @@
+# IkiWiki::Setup::Yaml - YAML formatted setup file
+#
+# name of the wiki
+wikiname: tags-kml
+# where the source of the wiki is located
+srcdir: tags
+# where to build the wiki
+destdir: dest/tags-kml
+# base url to the wiki
+url: 'http://localhost/~chris/ikiwiki/osm-examples/tags-kml'
+# plugins to add to the default configuration
+add_plugins:
+ - osm
+ - tag
+# plugins to disable
+disable_plugins: []
+# additional directory to search for template files
+templatedir: ikiwiki/templates
+# base wiki source location
+underlaydir: ikiwiki-dest/share/ikiwiki/basewiki
+underlaydirbase: ikiwiki-dest/share/ikiwiki
+# display verbose messages?
+verbose: 1
+# log to syslog?
+#syslog: 1
+# create output files named page/index.html?
+usedirs: 1
+# use '!'-prefixed preprocessor directives?
+prefix_directives: 1
+# use page/index.mdwn source files
+indexpages: 0
+# enable Discussion pages?
+discussion: 1
+# name of Discussion pages
+discussionpage: Discussion
+# generate HTML5?
+html5: 0
+# only send cookies over SSL connections?
+sslcookie: 0
+# extension to use for new pages
+default_pageext: mdwn
+# extension to use for html files
+htmlext: html
+# strftime format string to display date
+timeformat: '%c'
+# UTF-8 locale to use
+#locale: en_US.UTF-8
+# put user pages below specified page
+userdir: ''
+# how many backlinks to show before hiding excess (0 to show all)
+numbacklinks: 10
+# attempt to hardlink source files? (optimisation for large files)
+hardlink: 0
+
+######################################################################
+# special-purpose plugins
+# (osm, underlay)
+######################################################################
+
+# osm plugin
+# the default zoom when you click on the map link
+#osm_default_zoom: 15
+# the icon shown on links and on the main map
+#osm_default_icon: ikiwiki/images/osm.png
+# the alt tag of links, defaults to empty
+#osm_alt: ''
+# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+osm_format: KML
+# the icon attached to a tag, displayed on the map for tagged pages
+#osm_tag_default_icon: icon.png
+# Url for the OpenLayers.js file
+#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js
+# 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.
+#osm_layers:
+# OSM: GoogleSatellite
+# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+#osm_google_apikey: ''
diff --git a/tags/cats.mdwn b/tags/cats.mdwn
new file mode 100644
index 0000000..b10e056
--- /dev/null
+++ b/tags/cats.mdwn
@@ -0,0 +1,6 @@
+All About Cats
+==============
+
+[[!waypoint lat="43°30N" lon="70°40W" name="Cat" desc="Description"]]
+
+[[!tag cats fur]]
diff --git a/tags/dogs.mdwn b/tags/dogs.mdwn
new file mode 100644
index 0000000..d3d03b7
--- /dev/null
+++ b/tags/dogs.mdwn
@@ -0,0 +1,6 @@
+All About Dogs
+==============
+
+[[!waypoint lat="45°30N" lon="70°40W" name="Dog" desc="Description" tag="dogs"]]
+
+[[!tag dogs fur]]
diff --git a/tags/icon.png b/tags/icon.png
new file mode 100644
index 0000000..e2e9f75
--- /dev/null
+++ b/tags/icon.png
Binary files differ
diff --git a/tags/index.mdwn b/tags/index.mdwn
new file mode 100644
index 0000000..65c4ec8
--- /dev/null
+++ b/tags/index.mdwn
@@ -0,0 +1,5 @@
+This example uses both a waypoint on this page, but also two other pages,
+[[cats]] and [[dogs]] which both have tags and waypoints.
+
+[[!osm ]]
+[[!waypoint lat="45°30N" lon="73°40W" name="My city" desc="Description" tag="city" icon="icon.png"]]
diff --git a/tags/tag/cats.mdwn b/tags/tag/cats.mdwn
new file mode 100644
index 0000000..1bb83be
--- /dev/null
+++ b/tags/tag/cats.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged cats"]]
+
+[[!inline pages="tagged(cats)" actions="no" archive="yes"
+feedshow=10]]
diff --git a/tags/tag/cats/icon.png b/tags/tag/cats/icon.png
new file mode 100644
index 0000000..b0c6362
--- /dev/null
+++ b/tags/tag/cats/icon.png
Binary files differ
diff --git a/tags/tag/dogs.mdwn b/tags/tag/dogs.mdwn
new file mode 100644
index 0000000..b5dd5ea
--- /dev/null
+++ b/tags/tag/dogs.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged dogs"]]
+
+[[!inline pages="tagged(dogs)" actions="no" archive="yes"
+feedshow=10]]
diff --git a/tags/tag/dogs/icon.png b/tags/tag/dogs/icon.png
new file mode 100644
index 0000000..e2e9f75
--- /dev/null
+++ b/tags/tag/dogs/icon.png
Binary files differ
diff --git a/tags/tag/fur.mdwn b/tags/tag/fur.mdwn
new file mode 100644
index 0000000..38a966b
--- /dev/null
+++ b/tags/tag/fur.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged fur"]]
+
+[[!inline pages="tagged(fur)" actions="no" archive="yes"
+feedshow=10]]