Merge lp:~noskcaj/ubuntu/trusty/libchamplain/0.12.7 into lp:ubuntu/trusty/libchamplain

[Jackson Doak]

New upstream bugfix release

[Sebastien Bacher (seb128)]

thanks for the work

review: Approve

[Sebastien Bacher (seb128)]

https://launchpad.net/ubuntu/+source/libchamplain/0.12.7-0ubuntu1

=== modified file 'ChangeLog'
--- ChangeLog	2013-09-21 15:31:58 +0000
+++ ChangeLog	2014-02-16 21:01:35 +0000
@@ -1,25 +1,119 @@
 # Generated by Makefile. Do not edit.
 
-commit cb8ba9df01b1d4f3682c1a273852bb239f89ee31
-Author: Jiří Techet <[e-mail]>
-Date:   Mon Sep 16 23:10:32 2013 +0200
-
-    0.12.5
-
-commit 0c66efb6aa38596857d512fda25a58a1994cbb14
+commit 058199a9d8c85263506dce444bfe6fb874fa6857
+Author: Jiří Techet <[e-mail]>
+Date:   Thu Feb 6 20:46:17 2014 +0100
+
+    0.12.7
+
+commit d03dabc9e35d0cd3ba6c0546eb8202fe5d57b75e
+Author: Jiří Techet <[e-mail]>
+Date:   Thu Feb 6 20:26:02 2014 +0100
+
+    Use correct Since release
+
+commit 0f0e09686846c7b68df5ea25223c0ac3e78a5419
+Author: Zeeshan Ali (Khattak) <[e-mail]>
+Date:   Tue Feb 4 15:43:11 2014 +0000
+
+    Release 0.12.6
+
+commit 367a96baa631f79e482fdef2431d4d99ffa83cf3
+Author: Zeeshan Ali (Khattak) <[e-mail]>
+Date:   Tue Feb 4 15:28:39 2014 +0000
+
+    Merge all NEWS entries from 0.12 branch
+
+commit 5de9dd2aece22a419c42a8b4df25bc24471044ab
+Author: Zeeshan Ali (Khattak) <[e-mail]>
+Date:   Tue Feb 4 14:51:02 2014 +0000
+
+    Remove generated files from VCS
+    
+    These files are generated by autogen.sh and therefore its a bad idea to
+    keep them in VCS. You end up having redundant diffs to deal with when
+    using different versions of autotoools.
+
+commit 13a4a9b869ab6c6ead99970b72e44fce320ecbc2
+Author: Jonas Danielsson <[e-mail]>
+Date:   Thu Jan 30 13:06:01 2014 +0100
+
+    view: Add get_bounding_box_for_zoom_level
+    
+    This function is useful for determining what zoom-level to
+    use for the view.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=723279
+
+commit 74317aa8db53d16fd1e602d918ea14630687cc33
+Author: William Jon McCann <[e-mail]>
+Date:   Wed Dec 18 06:11:20 2013 -0500
+
+    Update project homepage
+
+commit 6c26dc2a7f07550c5dc960c32b31de398975c01e
+Author: Jonas Danielsson <[e-mail]>
+Date:   Wed Dec 4 13:51:28 2013 +0100
+
+    view: notify max/min-zoom-level on set_map_source
+    
+    When setting a new map_source we change the vie max/min-zoom-level
+    but we do not make sure they get notified.
+    
+    This patchs sets them using champlain_view_set_[max|min]_zoom_level
+    to ensure this.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=719840
+
+commit 9033f82ff09a426ec393a33b7befff3c7f22130c
+Author: Jiří Techet <[e-mail]>
+Date:   Fri Dec 6 00:51:49 2013 +0100
+
+    Add checks if adjustments exist when stopping animation
+    
+    Necessary when dispose() is called before the stop method when destroying
+    the objects.
+
+commit 0bd28ea1cc6aac6954185fc6e884162a15eda733
+Author: Jiří Techet <[e-mail]>
+Date:   Mon Sep 30 00:19:51 2013 +0200
+
+    Don't use memphis for distcheck
+    
+    libmemphis support is currently not actively maintained and the local
+    rendering is experimental (mostly due to missing vector tile service
+    and not 100% perfect output of libmemphis). For this reason it's not
+    production-ready and there's no reason to depend on it for distcheck.
+
+commit 8ea259864ad9d9367461dd5ceef6498eed31bdee
+Author: Jiří Techet <[e-mail]>
+Date:   Sun Sep 29 17:13:12 2013 +0200
+
+    Name parameters consistently with headers to avoid warnings
+
+commit 04d18bfe6b82b07c68553b2da7958f8f53208610
+Author: Jiří Techet <[e-mail]>
+Date:   Sun Sep 29 17:11:52 2013 +0200
+
+    Make sure Maemo is disabled when --disable-maemo is used
+
+commit f5840211fe413609e4006a22d212776f9e1aec70
+Author: Jiří Techet <[e-mail]>
+Date:   Sun Sep 29 16:50:26 2013 +0200
+
+    Add the new weather map sources for Maemo builds as well
+
+commit 34dbea4ccf1541d322a431692fa9c236ed287152
 Author: Jiří Techet <[e-mail]>
 Date:   Mon Sep 16 23:09:20 2013 +0200
 
     Update autogenerated files
 
-commit 919b3a2cc0301ba261c687051de0312c94814bfa
-Merge: 25f0038 cf985ac
+commit c7c19912b1691e08639a588ff1c76b706593ceaa
 Author: Jiří Techet <[e-mail]>
-Date:   Mon Sep 16 22:50:22 2013 +0200
+Date:   Mon Sep 16 23:14:21 2013 +0200
 
-    Merge the changes from master for release
-    
-    Merge branch 'master' into libchamplain-0-12
+    Post-release version bump
 
 commit cf985ac8299beb8927af3193cc1e390ea71e7ccb
 Author: Colin Walters <[e-mail]>
@@ -173,44 +267,6 @@
 
     path-layer: Correct version since dashed lines are supported
 
-commit 25f0038ec5b207eedf8c43e1c3eecaa255d9a701
-Author: Jiří Techet <[e-mail]>
-Date:   Thu May 16 20:45:19 2013 +0200
-
-    Post-release version bump
-
-commit 4ee5dca5d940bc9c75fe7e78c637325b9af28b50
-Author: Jiří Techet <[e-mail]>
-Date:   Thu May 16 19:49:11 2013 +0200
-
-    0.12.4
-
-commit 0631f5f06142839814ff886d9a9a515faed7d6c5
-Author: Jiří Techet <[e-mail]>
-Date:   Thu May 16 19:04:52 2013 +0200
-
-    path-layer: Correct version since dashed lines are supported
-
-commit ca218c19eb6b6edee49ad63071a8ef49d81b21e4
-Merge: 8075e85 0ef0b54
-Author: Jiří Techet <[e-mail]>
-Date:   Thu May 16 18:24:27 2013 +0200
-
-    Merge branch 'master' into libchamplain-0-12
-    
-    Conflicts:
-    	configure.ac
-
-commit 8075e85088f8c94763ead14920499f236635cd00
-Merge: 8d8cdc9 0b79829
-Author: Jiří Techet <[e-mail]>
-Date:   Thu May 16 18:22:58 2013 +0200
-
-    Merge commit '0b79829e2c56c37755006588cb557351315c63c7' into libchamplain-0-12
-    
-    Conflicts:
-    	NEWS
-
 commit 0ef0b5465be1ce8dc9721c1ad8d25e14df7e1fdc
 Author: Jiří Techet <[e-mail]>
 Date:   Thu May 16 17:51:34 2013 +0200
@@ -858,33 +914,6 @@
 
     Added the possibility to use TMS correct y-axis.
 
-commit 8d8cdc9380c92a1316d67569bbac5b9bfd269527
-Author: Jiří Techet <[e-mail]>
-Date:   Mon Aug 13 15:26:41 2012 +0200
-
-    Disable clutter depreciation warnings for now
-    
-    TODO: Once libchamplain's dependency is updated to newer clutter
-    version, update libchamplain sources and remove the macros.
-
-commit 63fa8f4bd289834e09e22d1d62c41a16eef985fc
-Author: Jiří Techet <[e-mail]>
-Date:   Mon Aug 13 15:02:37 2012 +0200
-
-    Add documentation for TMSY coordinate
-
-commit 2450ad876cf372b6952869410c4da00a7ee2184f
-Author: Samuel Gyger <[e-mail]>
-Date:   Sat Jul 21 18:44:12 2012 +0200
-
-    Added the possibility to use TMS correct y-axis.
-
-commit f407a9b825b4a78e42db7d803ad98ce90b6956d5
-Author: Evan Nemerson <[e-mail]>
-Date:   Mon Aug 6 17:01:47 2012 -0700
-
-    Fix symbol name referred to in ChamplainFileCache:size-limit docs
-
 commit 78f7c4c02edb9796dc65854b1b67c472caca9439
 Author: Evan Nemerson <[e-mail]>
 Date:   Mon Aug 6 17:01:47 2012 -0700
@@ -897,36 +926,6 @@
 
     Update demos makefile
 
-commit fe1fa2ae8977bcec4ccf43adc91da54e932c6ae2
-Author: Jiří Techet <[e-mail]>
-Date:   Sat Jul 14 23:12:00 2012 +0200
-
-    0.12.3
-
-commit 0313f980bee319b87f881153b0cf649fa959f202
-Author: Jiří Techet <[e-mail]>
-Date:   Sat Jul 14 23:25:23 2012 +0200
-
-    Update demos makefile
-
-commit 9b3a35b43cb4850ebc793d5eb3813400e08f5f9c
-Author: Jiří Techet <[e-mail]>
-Date:   Sat Jul 14 22:38:11 2012 +0200
-
-    Merge launcher-gtk.py and markers.py
-
-commit b4e95b0228038ada9d304db49b7ca1733f405c63
-Author: Pablo Castellano <[e-mail]>
-Date:   Mon Jul 9 22:19:31 2012 +0200
-
-    [demos] Added polygons.py (similar to polygons.c)
-
-commit 0dd0bbbecf3b4960dbfe2b85de11cb5865b5f933
-Author: Pablo Castellano <[e-mail]>
-Date:   Mon Jun 18 14:27:43 2012 +0200
-
-    Minor changes
-
 commit 2002cb15dd5952dbdbcefb2698b881f046a35259
 Author: Jiří Techet <[e-mail]>
 Date:   Sat Jul 14 22:38:11 2012 +0200
@@ -951,42 +950,12 @@
 
     fix osm cycle map source
 
-commit 8cd9347ad42abe7812983ab75d3706f1234636eb
-Author: Thomas Bechtold <[e-mail]>
-Date:   Sun Jul 8 10:27:59 2012 +0200
-
-    fix osm cycle map source
-
-commit 5169e770c3fb3047badec0ffdcebf8fdb29599e3
-Author: Jiří Techet <[e-mail]>
-Date:   Fri Jun 29 00:30:26 2012 +0200
-
-    Resize containing clutter actor together with the point
-
 commit 8c769a60905b7655ac5087ca0f63f6b6d8a4779e
 Author: Jiří Techet <[e-mail]>
 Date:   Fri Jun 29 00:30:26 2012 +0200
 
     Resize containing clutter actor together with the point
 
-commit dc1d0ba2fdc2aca99dd9a32f05a5fec9b8a0a19b
-Author: Pablo Castellano <[e-mail]>
-Date:   Sun May 27 01:28:30 2012 +0200
-
-    Improvements in several files
-
-commit 223769f060394b09ec85220fe278fb03a9064fe9
-Author: Pablo Castellano <[e-mail]>
-Date:   Sat May 26 19:54:07 2012 +0200
-
-    Fixed call to unexisting get_coords() method in launcher-gtk.py
-
-commit d79049c49f5931ace5559c8612b1da6ad88947ae
-Author: Pablo Castellano <[e-mail]>
-Date:   Sun May 27 19:53:45 2012 +0200
-
-    Fixed typo. Closes bug #676892
-
 commit 8bf1dc266a2a7ac44960274f55bbcddbad522f8f
 Author: Pablo Castellano <[e-mail]>
 Date:   Sun May 27 01:28:30 2012 +0200
@@ -1005,12 +974,6 @@
 
     Fixed typo. Closes bug #676892
 
-commit 3b8b2937732e00d281f512ab7a8e3393dfda5844
-Author: Jiří Techet <[e-mail]>
-Date:   Wed Apr 4 22:52:44 2012 +0200
-
-    Correct comment in minimal-gtk demo
-
 commit 05527352d0e1666067d789412c98d49cfa13f343
 Author: Jiří Techet <[e-mail]>
 Date:   Wed Apr 4 22:52:44 2012 +0200
@@ -1028,43 +991,6 @@
     There is no API break at the moment so it's not necessary
     to change the library version.
 
-commit f81ed70babd5728c70705ead24ca2194ec4fea0c
-Author: Jiří Techet <[e-mail]>
-Date:   Mon Mar 12 00:21:19 2012 +0100
-
-    0.12.2
-
-commit 37dab62a739ab6f68cd0b046cb1f370938b015b8
-Author: Jiří Techet <[e-mail]>
-Date:   Mon Mar 12 00:00:29 2012 +0100
-
-    Don't generate vapi files during make distcheck
-    
-    Due to some missing vapi files in vala 0.14.2 libchamplain's
-    vapi files cannot be generated with this version. Because
-    this vala version is commonly deployed, make distcheck often
-    fails. As a workaround, use the pregenerated vapi files instead.
-
-commit 6b75d8d8fca469e9d549d497a5e39996cca37a87
-Author: Jiří Techet <[e-mail]>
-Date:   Mon Mar 12 00:04:55 2012 +0100
-
-    Use vapi file generated by vala 0.15.2
-
-commit 7de169268624c87909b5d6bc679ddc7e0b158166
-Author: Alexandre Rostovtsev <[e-mail]>
-Date:   Sat Feb 4 16:51:53 2012 -0500
-
-    Call vapigen with --pkg cogl-pango-1.0
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=669378
-
-commit 270db8f130c955254bf64f12e680d7d2f4e15c3d
-Author: Jiří Techet <[e-mail]>
-Date:   Thu Dec 29 18:55:05 2011 +0100
-
-    It's the time of the year again...
-
 commit 77ce038a1cd67d742c42497a864e7917daffcc64
 Author: Jiří Techet <[e-mail]>
 Date:   Mon Mar 12 00:00:29 2012 +0100
@@ -1122,44 +1048,12 @@
     
     Thanks to Nicolas Évrard!
 
-commit fde678863582fa0cbf3103d43be04b5378c78e86
-Author: Jiří Techet <[e-mail]>
-Date:   Thu Dec 29 01:44:22 2011 +0100
-
-    Add auxiliary script containing all the needed parameters to make a distribution
-
-commit 1be2ad0059ebfbd4761e21f7b815702d4b90163b
-Author: Jiří Techet <[e-mail]>
-Date:   Thu Dec 29 01:43:36 2011 +0100
-
-    Distribute the python demos and marker images
-
-commit bd9a31502429be162ffc8832b9ad771da5869dcb
-Author: Jiří Techet <[e-mail]>
-Date:   Wed Dec 28 23:44:08 2011 +0100
-
-    Minor changes/cleanups in Python demos
-
-commit 8a29e4244351d48ed9aaa3a1afcd6028126b2042
-Author: Jiří Techet <[e-mail]>
-Date:   Tue Dec 27 15:34:58 2011 +0100
-
-    Add Python champlain-gtk demo with markers
-    
-    Thanks to Nicolas Évrard!
-
 commit 42e3cfccae78e56db4427eed47b30c9f5f09b68a
 Author: Jiří Techet <[e-mail]>
 Date:   Tue Dec 20 02:06:41 2011 +0100
 
     Update NEWS file
 
-commit 2218bf3e82c3ddafb202da18afe0b8c0d3622d70
-Author: Jiří Techet <[e-mail]>
-Date:   Tue Dec 20 02:05:41 2011 +0100
-
-    0.12.1
-
 commit 74a2d1f1463edd5f59325902a01d2aa73b357e52
 Author: Jiří Techet <[e-mail]>
 Date:   Tue Dec 20 01:52:45 2011 +0100
@@ -1172,126 +1066,6 @@
 
     Update libchamplain-sections with new functions
 
-commit cb3f5d7280130ffa01d3165f0bcc72a3dac967b6
-Author: Jiří Techet <[e-mail]>
-Date:   Tue Dec 20 01:43:03 2011 +0100
-
-    Update vapi file
-
-commit de7a9fcdb2afeb3a0a436676eed9509d02ae6f0c
-Author: Jiří Techet <[e-mail]>
-Date:   Tue Dec 20 01:42:12 2011 +0100
-
-    Update libchamplain-sections with new functions
-
-commit a6601ecd8343e878b32050f1e63c9eda089904ab
-Author: Jiří Techet <[e-mail]>
-Date:   Mon Dec 19 23:21:51 2011 +0100
-
-    Fix wrong zoom actor placement at low zoom levels
-
-commit 4b51f4e7699f784cc756239163b5378344a66a6d
-Author: Jiří Techet <[e-mail]>
-Date:   Sat Nov 26 00:44:29 2011 +0100
-
-    Don't use (transfer full) for initially unowned objects
-    
-    Transfer full says that the caller should unref the object but
-    in the case of initially unowned objects this means one
-    extra unref and object destruction.
-    
-    More details here:
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=638542
-
-commit 21f2a2a053c5d5cc24651a8aefd8c24357a85223
-Author: Jiří Techet <[e-mail]>
-Date:   Mon Nov 21 13:16:29 2011 +0100
-
-    Add description how to run the python demo
-
-commit 294557ea2581b7cd7b26ecf9b2bef0e75c1df826
-Author: Jiří Techet <[e-mail]>
-Date:   Mon Nov 21 13:16:10 2011 +0100
-
-    Add dashed line drawing to path layers
-
-commit 074f227ecc5b2b8ac6ba0e04677a5bd8dcfcb4af
-Author: Jiří Techet <[e-mail]>
-Date:   Sun Nov 20 18:42:23 2011 +0100
-
-    Get rid of clutter_stage_get_default()
-    
-    It is deprecated in clutter now.
-
-commit 6117e0da34a24b8532067b0a0981e8584c7b2870
-Author: Jiří Techet <[e-mail]>
-Date:   Sun Nov 20 16:03:17 2011 +0100
-
-    Replace some deprecated functions
-
-commit 8ca190812387ed370f89677734b9d12e8f8d232d
-Author: Jiří Techet <[e-mail]>
-Date:   Sun Nov 20 15:06:43 2011 +0100
-
-    In idle functions check whether ClutterActor was destroyed
-    
-    Clutter actor can be destroyed using clutter_actor_destroy()
-    which causes immediate call of dispose no matter how many
-    refs the given object has. In idle functions we have to check
-    whether this happened to current object (by checking whether
-    some of the referenced objects is NULL) and if so, return from
-    the idle function immediately.
-    
-    This commit also adds one testing example which quickly creates
-    and destroys ChamplainView, which can easily verify the presence
-    of the original bug.
-
-commit 83b363fbef08325ae5561323e7c051f64e36d3e3
-Author: Jiří Techet <[e-mail]>
-Date:   Sun Nov 20 00:16:07 2011 +0100
-
-    Don't use idle function when animating markers
-    
-    Use of idle functions is dangerous in clutter because actors
-    can be destroyed by clutter_actor_destroy() even if they are
-    reffed.
-
-commit 366f84b961ab77291fead567b7eedfe8fd0e2b85
-Author: Jiří Techet <[e-mail]>
-Date:   Fri Nov 18 02:43:21 2011 +0100
-
-    Some more g_thread_init() removal
-
-commit c117a917f1b4e1dbf0ee375d7ffa01bfce2d86d1
-Author: Jiří Techet <[e-mail]>
-Date:   Fri Nov 18 02:34:40 2011 +0100
-
-    Add other dependencies CFLAGS to champlain-gtk AM_CPPFLAGS
-
-commit af4a63486d822f59c05efaae75bbc6b24489aed5
-Author: Jiří Techet <[e-mail]>
-Date:   Fri Nov 18 01:21:25 2011 +0100
-
-    Add missing redraws when path properties change
-
-commit 6afb0c5016cd67d86bf3654bda0f596d55b67eb6
-Author: Colin Walters <[e-mail]>
-Date:   Thu Nov 3 22:29:37 2011 -0400
-
-    demos: Don't call g_thread_init
-    
-    Doing so now requires linking -lgthread, but it's been pointless
-    since GLib 2.18, which is ancient history now.
-
-commit 7c0da5cbfc8b6570595ade3ef576d1ac07f7537e
-Author: Jiří Techet <[e-mail]>
-Date:   Fri Oct 7 00:06:59 2011 +0200
-
-    When re-creating scale, remove all actors first
-    
-    Otherwise the previously inserted actors are still used for redrawing.
-
 commit fd5e4232d30d39951552e1353f5b09ba637b4940
 Author: Jiří Techet <[e-mail]>
 Date:   Mon Dec 19 23:21:51 2011 +0100

=== modified file 'INSTALL'
--- INSTALL	2012-03-29 20:25:19 +0000
+++ INSTALL	2014-02-16 21:01:35 +0000
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended

=== modified file 'Makefile.am'
--- Makefile.am	2012-03-29 20:25:19 +0000
+++ Makefile.am	2014-02-16 21:01:35 +0000
@@ -11,21 +11,14 @@
 other_pcfiles += champlain-gtk-@[e-mail]
 endif
 
-if ENABLE_MEMPHIS
-pcfiles += champlain-memphis-@CHAMPLAIN_API_VERSION@.pc
-other_pcfiles += champlain-memphis-@[e-mail]
-endif
-
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
 
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-gtk --enable-introspection --enable-vala-demos --enable-memphis
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-gtk --enable-introspection --enable-vala-demos --disable-memphis
 
 EXTRA_DIST = \
 	champlain-gtk.pc.in \
 	champlain-gtk-uninstalled.pc.in \
-	champlain-memphis.pc.in \
-	champlain-memphis-uninstalled.pc.in \
 	champlain.pc.in \
 	champlain-uninstalled.pc.in
 

=== modified file 'Makefile.in'
--- Makefile.in	2013-09-21 15:31:58 +0000
+++ Makefile.in	2014-02-16 21:01:35 +0000
@@ -54,15 +54,11 @@
 @ENABLE_GTK_TRUE@am__append_1 = champlain-gtk
 @ENABLE_GTK_TRUE@am__append_2 = champlain-gtk-@CHAMPLAIN_API_VERSION@.pc
 @ENABLE_GTK_TRUE@am__append_3 = champlain-gtk-@[e-mail]
-@ENABLE_MEMPHIS_TRUE@am__append_4 = champlain-memphis-@CHAMPLAIN_API_VERSION@.pc
-@ENABLE_MEMPHIS_TRUE@am__append_5 = champlain-memphis-@[e-mail]
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in \
 	$(srcdir)/champlain-gtk-uninstalled.pc.in \
 	$(srcdir)/champlain-gtk.pc.in \
-	$(srcdir)/champlain-memphis-uninstalled.pc.in \
-	$(srcdir)/champlain-memphis.pc.in \
 	$(srcdir)/champlain-uninstalled.pc.in \
 	$(srcdir)/champlain.pc.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
@@ -346,18 +342,15 @@
 # Have the demos build at the end as they depend on optional parts
 SUBDIRS = build champlain $(am__append_1) docs demos
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-pcfiles = champlain-@CHAMPLAIN_API_VERSION@.pc $(am__append_2) \
-	$(am__append_4)
+pcfiles = champlain-@CHAMPLAIN_API_VERSION@.pc $(am__append_2)
 other_pcfiles = champlain-@[e-mail] \
-	$(am__append_3) $(am__append_5)
+	$(am__append_3)
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-gtk --enable-introspection --enable-vala-demos --enable-memphis
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-gtk --enable-introspection --enable-vala-demos --disable-memphis
 EXTRA_DIST = \
 	champlain-gtk.pc.in \
 	champlain-gtk-uninstalled.pc.in \
-	champlain-memphis.pc.in \
-	champlain-memphis-uninstalled.pc.in \
 	champlain.pc.in \
 	champlain-uninstalled.pc.in
 

=== modified file 'NEWS'
--- NEWS	2013-09-21 15:31:58 +0000
+++ NEWS	2014-02-16 21:01:35 +0000
@@ -1,3 +1,28 @@
+libchamplain 0.12.7 (2014-02-06)
+================================
+
+Stable release
+
+Changes:
+
+* Use correct LIBRARY_VERSION string
+
+libchamplain 0.12.6 (2014-02-04)
+================================
+
+Stable release
+
+Changes:
+
+- Make sure Maemo is disabled when --disable-maemo is used.
+- Add the new weather map sources for Maemo builds as well.
+- ChamplainView
+  - More reliable notifications for max/min-zoom-level properties.
+  - Add API to determine appropriate zoom-level for a particular
+    bounding box.
+- Update project homepage link.
+- Fixes to build.
+
 libchamplain 0.12.5 (2013-09-16)
 ===============================
 

=== modified file 'README'
--- README	2013-09-01 17:18:52 +0000
+++ README	2014-02-16 21:01:35 +0000
@@ -32,7 +32,7 @@
 directory.
 
 The official website is:
-   http://projects.gnome.org/libchamplain
+   https://wiki.gnome.org/Projects/libchamplain
 
 The official mailing list archive is:
    http://mail.gnome.org/mailman/listinfo/libchamplain-list

=== removed file 'champlain-memphis-uninstalled.pc.in'
--- champlain-memphis-uninstalled.pc.in	2010-10-10 15:59:25 +0000
+++ champlain-memphis-uninstalled.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=
-exec_prefix=
-abs_top_srcdir=@abs_top_srcdir@
-abs_top_builddir=@abs_top_builddir@
-
-Name: libchamplain-memphis (uninstalled copy)
-Description: libmemphis support for libchamplain
-Version: @VERSION@
-Libs: ${abs_top_builddir}/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
-Requires: champlain-@CHAMPLAIN_API_VERSION@-uninstalled memphis-0.2

=== removed file 'champlain-memphis.pc.in'
--- champlain-memphis.pc.in	2010-06-29 00:34:56 +0000
+++ champlain-memphis.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libchamplain-memphis
-Description: libmemphis support for libchamplain
-Version: @VERSION@
-Libs: -L${libdir} -lchamplain-@CHAMPLAIN_API_VERSION@
-Cflags: -I${includedir}/libchamplain-@CHAMPLAIN_API_VERSION@
-Requires: champlain-@CHAMPLAIN_API_VERSION@ memphis-0.2

=== modified file 'champlain/champlain-0.12.vapi'
--- champlain/champlain-0.12.vapi	2013-09-21 15:31:58 +0000
+++ champlain/champlain-0.12.vapi	2014-02-16 21:01:35 +0000
@@ -303,25 +303,6 @@
 		public void set_size_limit (uint size_limit);
 		public uint size_limit { get; set construct; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_memphis_renderer_get_type ()")]
-	public class MemphisRenderer : Champlain.Renderer {
-		[CCode (has_construct_function = false)]
-		protected MemphisRenderer ();
-		[CCode (has_construct_function = false)]
-		public MemphisRenderer.full (uint tile_size);
-		public Clutter.Color get_background_color ();
-		public Champlain.BoundingBox get_bounding_box ();
-		public GLib.List<string> get_rule_ids ();
-		public uint get_tile_size ();
-		public void load_rules (string rules_path);
-		public void remove_rule (string id);
-		public void set_background_color (Clutter.Color color);
-		public void set_rule (Champlain.MemphisRule rule);
-		public void set_tile_size (uint size);
-		[NoAccessorMethod]
-		public Champlain.BoundingBox bounding_box { owned get; set; }
-		public uint tile_size { get; set; }
-	}
 	[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_network_bbox_tile_source_get_type ()")]
 	public class NetworkBboxTileSource : Champlain.TileSource {
 		[CCode (has_construct_function = false)]
@@ -509,6 +490,7 @@
 		public bool get_animate_zoom ();
 		public unowned Clutter.Content get_background_pattern ();
 		public Champlain.BoundingBox get_bounding_box ();
+		public Champlain.BoundingBox get_bounding_box_for_zoom_level (uint zoom_level);
 		public double get_center_latitude ();
 		public double get_center_longitude ();
 		public double get_deceleration ();
@@ -597,39 +579,11 @@
 		[NoAccessorMethod]
 		public abstract double longitude { get; set; }
 	}
-	[CCode (cheader_filename = "champlain/champlain.h", has_type_id = false)]
-	public struct MemphisRule {
-		public weak string keys;
-		public weak string values;
-		public Champlain.MemphisRuleType type;
-		public Champlain.MemphisRuleAttr polygon;
-		public Champlain.MemphisRuleAttr line;
-		public Champlain.MemphisRuleAttr border;
-		public Champlain.MemphisRuleAttr text;
-	}
-	[CCode (cheader_filename = "champlain/champlain.h", has_type_id = false)]
-	public struct MemphisRuleAttr {
-		public uint8 z_min;
-		public uint8 z_max;
-		public uint8 color_red;
-		public uint8 color_green;
-		public uint8 color_blue;
-		public uint8 color_alpha;
-		public weak string style;
-		public double size;
-	}
 	[CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_MAP_PROJECTION_", has_type_id = false)]
 	public enum MapProjection {
 		[CCode (cname = "CHAMPLAIN_MAP_PROJECTION_MERCATOR")]
 		MAP_PROJECTION_MERCATOR
 	}
-	[CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_MEMPHIS_RULE_TYPE_", has_type_id = false)]
-	public enum MemphisRuleType {
-		UNKNOWN,
-		NODE,
-		WAY,
-		RELATION
-	}
 	[CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_SELECTION_", has_type_id = false)]
 	public enum SelectionMode {
 		NONE,

=== modified file 'champlain/champlain-map-source-factory.h'
--- champlain/champlain-map-source-factory.h	2013-09-21 15:31:58 +0000
+++ champlain/champlain-map-source-factory.h	2014-02-16 21:01:35 +0000
@@ -180,6 +180,7 @@
  * OpenWeatherMap temperature
  */
 #define CHAMPLAIN_MAP_SOURCE_OWM_TEMPERATURE "owm-temperature"
+
 #else
 #define CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK "OpenStreetMap I"
 #define CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER "OpenStreetMap II"
@@ -189,6 +190,11 @@
 #define CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP "Public Transport"
 #define CHAMPLAIN_MAP_SOURCE_OAM "OpenAerialMap"
 #define CHAMPLAIN_MAP_SOURCE_MFF_RELIEF "MapsForFree Relief"
+#define CHAMPLAIN_MAP_SOURCE_OWM_CLOUDS "OpenWeatherMap Clouds"
+#define CHAMPLAIN_MAP_SOURCE_OWM_PRECIPITATION "OpenWeatherMap Precipitation"
+#define CHAMPLAIN_MAP_SOURCE_OWM_PRESSURE "OpenWeatherMap Pressure"
+#define CHAMPLAIN_MAP_SOURCE_OWM_WIND "OpenWeatherMap Wind"
+#define CHAMPLAIN_MAP_SOURCE_OWM_TEMPERATURE "OpenWeatherMap Temperature"
 #endif
 
 #ifdef CHAMPLAIN_HAS_MEMPHIS

=== modified file 'champlain/champlain-version.h'
--- champlain/champlain-version.h	2013-09-21 15:31:58 +0000
+++ champlain/champlain-version.h	2014-02-16 21:01:35 +0000
@@ -49,14 +49,14 @@
  *
  * The micro version of libchamplain (3, if %CHAMPLAIN_VERSION is 1.2.3)
  */
-#define CHAMPLAIN_MICRO_VERSION   (5)
+#define CHAMPLAIN_MICRO_VERSION   (7)
 
 /**
  * CHAMPLAIN_VERSION:
  *
  * The full version of libchamplain, like 1.2.3
  */
-#define CHAMPLAIN_VERSION         0.12.5
+#define CHAMPLAIN_VERSION         0.12.7
 
 /**
  * CHAMPLAIN_VERSION_S:
@@ -64,7 +64,7 @@
  * The full version of libchamplain, in string form (suited for
  * string concatenation)
  */
-#define CHAMPLAIN_VERSION_S       "0.12.5"
+#define CHAMPLAIN_VERSION_S       "0.12.7"
 
 /**
  * CHAMPLAIN_VERSION_HEX:

=== modified file 'champlain/champlain-view.c'
--- champlain/champlain-view.c	2013-09-21 15:31:58 +0000
+++ champlain/champlain-view.c	2014-02-16 21:01:35 +0000
@@ -251,6 +251,16 @@
     guint duration);
 static gboolean redraw_timeout_cb(gpointer view);
 static void remove_all_tiles (ChamplainView *view);
+static void get_x_y_for_zoom_level (ChamplainView *view,
+    guint zoom_level,
+    gint offset_x,
+    gint offset_y,
+    gdouble *new_x,
+    gdouble *new_y);
+static ChamplainBoundingBox *get_bounding_box (ChamplainView *view,
+    guint zoom_level,
+    gdouble x,
+    gdouble y);
 
 
 static void
@@ -2185,6 +2195,8 @@
       CHAMPLAIN_IS_MAP_SOURCE (source));
 
   ChamplainViewPrivate *priv = view->priv;
+  guint source_min_zoom;
+  guint source_max_zoom;
 
   if (priv->map_source == source)
     return;
@@ -2195,8 +2207,10 @@
   g_list_free_full (priv->overlay_sources, g_object_unref);
   priv->overlay_sources = NULL;
 
-  priv->min_zoom_level = champlain_map_source_get_min_zoom_level (priv->map_source);
-  priv->max_zoom_level = champlain_map_source_get_max_zoom_level (priv->map_source);
+  source_min_zoom = champlain_map_source_get_min_zoom_level (priv->map_source);
+  champlain_view_set_min_zoom_level (view, source_min_zoom);
+  source_max_zoom = champlain_map_source_get_max_zoom_level (priv->map_source);
+  champlain_view_set_max_zoom_level (view, source_max_zoom);
 
   /* Keep same zoom level if the new map supports it */
   if (priv->zoom_level > priv->max_zoom_level)
@@ -2632,6 +2646,22 @@
     clutter_actor_set_scale (zoom_actor, deltazoom, deltazoom);
 }
 
+static void
+get_x_y_for_zoom_level (ChamplainView *view,
+                        guint zoom_level,
+                        gint offset_x,
+                        gint offset_y,
+                        gdouble *new_x,
+                        gdouble *new_y)
+{
+  ChamplainViewPrivate *priv = view->priv;
+  gdouble deltazoom;
+
+  deltazoom = pow (2, (gdouble) zoom_level - (gdouble) priv->zoom_level);
+
+  *new_x = (priv->viewport_x + offset_x) * deltazoom - offset_x;
+  *new_y = (priv->viewport_y + offset_y) * deltazoom - offset_y;
+}
 
 /* Sets the zoom level, leaving the (x, y) at the exact same point in the view */
 static gboolean
@@ -2647,7 +2677,6 @@
   gdouble new_x, new_y;
   gdouble offset_x = x;
   gdouble offset_y = y;
-  gdouble deltazoom;
 
   if (zoom_level == priv->zoom_level || ZOOM_LEVEL_OUT_OF_RANGE (priv, zoom_level))
     return FALSE;
@@ -2664,11 +2693,8 @@
   if (CLUTTER_ACTOR_IS_REALIZED (view))
     show_zoom_actor (view, zoom_level, offset_x, offset_y);
 
-  deltazoom = pow (2, (gdouble)zoom_level - (gdouble)priv->zoom_level);
+  get_x_y_for_zoom_level (view, zoom_level, offset_x, offset_y, &new_x, &new_y);
 
-  new_x = (priv->viewport_x + offset_x) * deltazoom - offset_x;
-  new_y = (priv->viewport_y + offset_y) * deltazoom - offset_y;
-  
   priv->zoom_level = zoom_level;
 
   if (CLUTTER_ACTOR_IS_REALIZED (view))
@@ -3017,50 +3043,88 @@
   return view->priv->state;
 }
 
-/**
- * champlain_view_get_bounding_box:
- * @view: a #ChamplainView
- *
- * Gets the bounding box for view @view at current zoom-level.
- *
- * Returns: (transfer full): the bounding box
- *
- * Since: 0.12.4
- */
-ChamplainBoundingBox *
-champlain_view_get_bounding_box (ChamplainView *view)
+static ChamplainBoundingBox *
+get_bounding_box (ChamplainView *view,
+                  guint zoom_level,
+                  gdouble x,
+                  gdouble y)
 {
-  DEBUG_LOG ()
-
   ChamplainViewPrivate *priv = view->priv;
   ChamplainBoundingBox *bbox;
 
-  g_return_val_if_fail (CHAMPLAIN_IS_VIEW (view), NULL);
-
   bbox = champlain_bounding_box_new ();
 
   bbox->top = champlain_map_source_get_latitude (priv->map_source,
-    priv->zoom_level,
-    priv->viewport_y);
+                                                 zoom_level,
+                                                 y);
   bbox->bottom = champlain_map_source_get_latitude (priv->map_source,
-    priv->zoom_level,
-    priv->viewport_y + priv->viewport_height);
-
+                                                    zoom_level,
+                                                    y + priv->viewport_height);
   bbox->left = champlain_map_source_get_longitude (priv->map_source,
-    priv->zoom_level,
-    priv->viewport_x);
+                                                   zoom_level,
+                                                   x);
   bbox->right = champlain_map_source_get_longitude (priv->map_source,
-    priv->zoom_level,
-    priv->viewport_x + priv->viewport_width);
-
+                                                    zoom_level,
+                                                    x + priv->viewport_width);
   return bbox;
 }
 
+/**
+ * champlain_view_get_bounding_box_for_zoom_level:
+ * @view: a #ChamplainView
+ * @zoom_level: the level of zoom, a guint between 1 and 20
+ *
+ * Gets the bounding box for view @view at @zoom_level.
+ *
+ * Returns: (transfer full): the bounding box for the view at @zoom_level.
+ *
+ * Since: 0.12.6
+ */
+ChamplainBoundingBox *
+champlain_view_get_bounding_box_for_zoom_level (ChamplainView *view,
+                                                guint zoom_level)
+{
+  ChamplainViewPrivate *priv = view->priv;
+  gdouble x, y;
+  gdouble offset_x, offset_y;
+
+  g_return_val_if_fail (CHAMPLAIN_IS_VIEW (view), NULL);
+
+  offset_x = priv->viewport_width / 2.0;
+  offset_y = priv->viewport_height / 2.0;
+
+  get_x_y_for_zoom_level (view, zoom_level, offset_x, offset_y, &x, &y);
+
+  return get_bounding_box (view, zoom_level, x, y);
+}
+
+/**
+ * champlain_view_get_bounding_box:
+ * @view: a #ChamplainView
+ *
+ * Gets the bounding box for view @view at current zoom-level.
+ *
+ * Returns: (transfer full): the bounding box
+ *
+ * Since: 0.12.4
+ */
+ChamplainBoundingBox *
+champlain_view_get_bounding_box (ChamplainView *view)
+{
+  DEBUG_LOG ()
+
+  ChamplainViewPrivate *priv = view->priv;
+
+  g_return_val_if_fail (CHAMPLAIN_IS_VIEW (view), NULL);
+
+  return get_bounding_box (view, priv->zoom_level, priv->viewport_x, priv->viewport_y);
+}
+
 
 /**
  * champlain_view_add_overlay_source:
  * @view: a #ChamplainView
- * @source: a #ChamplainMapSource
+ * @map_source: a #ChamplainMapSource
  * @opacity: opacity to use
  *
  * Adds a new overlay map source to render tiles with the supplied opacity on top 
@@ -3070,7 +3134,7 @@
  */
 void
 champlain_view_add_overlay_source (ChamplainView *view,
-    ChamplainMapSource *source,
+    ChamplainMapSource *map_source,
     guint8 opacity)
 {
   DEBUG_LOG ()
@@ -3078,12 +3142,12 @@
   ChamplainViewPrivate *priv;
 
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
-  g_return_if_fail (CHAMPLAIN_IS_MAP_SOURCE (source));
+  g_return_if_fail (CHAMPLAIN_IS_MAP_SOURCE (map_source));
 
   priv = view->priv;
-  g_object_ref (source);
-  priv->overlay_sources = g_list_append (priv->overlay_sources, source);
-  g_object_set_data (G_OBJECT (source), "opacity", GINT_TO_POINTER (opacity));
+  g_object_ref (map_source);
+  priv->overlay_sources = g_list_append (priv->overlay_sources, map_source);
+  g_object_set_data (G_OBJECT (map_source), "opacity", GINT_TO_POINTER (opacity));
   g_object_notify (G_OBJECT (view), "map-source");
 
   champlain_view_reload_tiles (view);
@@ -3093,7 +3157,7 @@
 /**
  * champlain_view_remove_overlay_source:
  * @view: a #ChamplainView
- * @source: a #ChamplainMapSource
+ * @map_source: a #ChamplainMapSource
  *
  * Removes an overlay source from #ChamplainView.
  *
@@ -3101,18 +3165,18 @@
  */
 void
 champlain_view_remove_overlay_source (ChamplainView *view,
-    ChamplainMapSource *source)
+    ChamplainMapSource *map_source)
 {
   DEBUG_LOG ()
 
   ChamplainViewPrivate *priv;
 
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
-  g_return_if_fail (CHAMPLAIN_IS_MAP_SOURCE (source));
+  g_return_if_fail (CHAMPLAIN_IS_MAP_SOURCE (map_source));
 
   priv = view->priv;
-  priv->overlay_sources = g_list_remove (priv->overlay_sources, source);
-  g_object_unref (source);
+  priv->overlay_sources = g_list_remove (priv->overlay_sources, map_source);
+  g_object_unref (map_source);
   g_object_notify (G_OBJECT (view), "map-source");
 
   champlain_view_reload_tiles (view);

=== modified file 'champlain/champlain-view.h'
--- champlain/champlain-view.h	2013-09-21 15:31:58 +0000
+++ champlain/champlain-view.h	2014-02-16 21:01:35 +0000
@@ -168,6 +168,8 @@
 ChamplainLicense *champlain_view_get_license_actor (ChamplainView *view);
 
 ChamplainBoundingBox *champlain_view_get_bounding_box (ChamplainView *view);
+ChamplainBoundingBox *champlain_view_get_bounding_box_for_zoom_level (ChamplainView *view,
+    guint zoom_level);
 
 G_END_DECLS
 

=== modified file 'champlain/champlain-viewport.c'
--- champlain/champlain-viewport.c	2013-09-01 17:18:52 +0000
+++ champlain/champlain-viewport.c	2014-02-16 21:01:35 +0000
@@ -151,8 +151,11 @@
 {
   ChamplainViewportPrivate *priv = CHAMPLAIN_VIEWPORT (viewport)->priv;
 
-  champlain_adjustment_interpolate_stop (priv->hadjustment);
-  champlain_adjustment_interpolate_stop (priv->vadjustment);
+  if (priv->hadjustment)
+    champlain_adjustment_interpolate_stop (priv->hadjustment);
+    
+  if (priv->vadjustment)
+    champlain_adjustment_interpolate_stop (priv->vadjustment);
 }
 
 

=== modified file 'configure'
--- configure	2013-09-21 15:31:58 +0000
+++ configure	2014-02-16 21:01:35 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libchamplain 0.12.5.
+# Generated by GNU Autoconf 2.69 for libchamplain 0.12.7.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain>.
 #
@@ -651,10 +651,10 @@
 # Identity of this package.
 PACKAGE_NAME='libchamplain'
 PACKAGE_TARNAME='libchamplain'
-PACKAGE_VERSION='0.12.5'
-PACKAGE_STRING='libchamplain 0.12.5'
+PACKAGE_VERSION='0.12.7'
+PACKAGE_STRING='libchamplain 0.12.7'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain'
-PACKAGE_URL='http://projects.gnome.org/libchamplain/'
+PACKAGE_URL='https://wiki.gnome.org/Projects/libchamplain'
 
 ac_unique_file="champlain/champlain.h"
 # Factoring default headers for most tests.
@@ -1470,7 +1470,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libchamplain 0.12.5 to adapt to many kinds of systems.
+\`configure' configures libchamplain 0.12.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1540,7 +1540,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libchamplain 0.12.5:";;
+     short | recursive ) echo "Configuration of libchamplain 0.12.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1622,7 +1622,7 @@
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain>.
-libchamplain home page: <http://projects.gnome.org/libchamplain/>.
+libchamplain home page: <https://wiki.gnome.org/Projects/libchamplain>.
 _ACEOF
 ac_status=$?
 fi
@@ -1685,7 +1685,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libchamplain configure 0.12.5
+libchamplain configure 0.12.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1963,7 +1963,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libchamplain $as_me 0.12.5, which was
+It was created by libchamplain $as_me 0.12.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2783,7 +2783,7 @@
 
 # Define the identity of the package.
  PACKAGE='libchamplain'
- VERSION='0.12.5'
+ VERSION='0.12.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12238,13 +12238,13 @@
 # - If binary compatibility has been broken (eg removed or changed interfaces)
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
-LIBRARY_VERSION=3:2:3
+LIBRARY_VERSION=4:2:4
 CHAMPLAIN_API_VERSION=0.12
 CHAMPLAIN_API_VERSION_NORM=0_12
 CHAMPLAIN_MAJOR_VERSION=0
 CHAMPLAIN_MINOR_VERSION=12
-CHAMPLAIN_MICRO_VERSION=5
-CHAMPLAIN_VERSION=0.12.5
+CHAMPLAIN_MICRO_VERSION=7
+CHAMPLAIN_VERSION=0.12.7
 CHAMPLAIN_MAJORMINOR=0.12
 
 
@@ -13782,7 +13782,9 @@
 
 # Check whether --enable-maemo was given.
 if test "${enable_maemo+set}" = set; then :
-  enableval=$enable_maemo; enable_maemo=yes
+  enableval=$enable_maemo; enable_maemo=$enableval
+else
+  enable_maemo=no
 fi
 
 
@@ -13938,83 +13940,11 @@
 if test "${enable_memphis+set}" = set; then :
   enableval=$enable_memphis; enable_memphis=$enableval
 else
-  enable_memphis="auto"
-fi
-
-
-if test "x$enable_memphis" = "xauto"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEMPHIS" >&5
-$as_echo_n "checking for MEMPHIS... " >&6; }
-
-if test -n "$MEMPHIS_CFLAGS"; then
-    pkg_cv_MEMPHIS_CFLAGS="$MEMPHIS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"memphis-0.2 >= 0.2.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "memphis-0.2 >= 0.2.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_MEMPHIS_CFLAGS=`$PKG_CONFIG --cflags "memphis-0.2 >= 0.2.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$MEMPHIS_LIBS"; then
-    pkg_cv_MEMPHIS_LIBS="$MEMPHIS_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"memphis-0.2 >= 0.2.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "memphis-0.2 >= 0.2.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_MEMPHIS_LIBS=`$PKG_CONFIG --libs "memphis-0.2 >= 0.2.1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        MEMPHIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "memphis-0.2 >= 0.2.1" 2>&1`
-        else
-	        MEMPHIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "memphis-0.2 >= 0.2.1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$MEMPHIS_PKG_ERRORS" >&5
-
-	enable_memphis="no"
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	enable_memphis="no"
-else
-	MEMPHIS_CFLAGS=$pkg_cv_MEMPHIS_CFLAGS
-	MEMPHIS_LIBS=$pkg_cv_MEMPHIS_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	enable_memphis="yes"
-fi
-elif test "x$enable_memphis" = "xyes"; then
+  enable_memphis=no
+fi
+
+
+if test "x$enable_memphis" = "xyes"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEMPHIS" >&5
@@ -14296,7 +14226,7 @@
 
 # ----------------------------------------------------------
 
-ac_config_files="$ac_config_files Makefile build/Makefile champlain/Makefile champlain/champlain-version.h demos/Makefile demos/icons/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference-gtk/Makefile docs/reference-gtk/version.xml champlain-$CHAMPLAIN_API_VERSION.pc:champlain.pc.in champlain-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-uninstalled.pc.in champlain-gtk-$CHAMPLAIN_API_VERSION.pc:champlain-gtk.pc.in champlain-gtk-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-gtk-uninstalled.pc.in champlain-gtk/Makefile champlain-memphis-$CHAMPLAIN_API_VERSION.pc:champlain-memphis.pc.in champlain-memphis-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-memphis-uninstalled.pc.in"
+ac_config_files="$ac_config_files Makefile build/Makefile champlain/Makefile champlain/champlain-version.h demos/Makefile demos/icons/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference-gtk/Makefile docs/reference-gtk/version.xml champlain-$CHAMPLAIN_API_VERSION.pc:champlain.pc.in champlain-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-uninstalled.pc.in champlain-gtk-$CHAMPLAIN_API_VERSION.pc:champlain-gtk.pc.in champlain-gtk-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-gtk-uninstalled.pc.in champlain-gtk/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14868,7 +14798,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libchamplain $as_me 0.12.5, which was
+This file was extended by libchamplain $as_me 0.12.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14929,13 +14859,13 @@
 $config_commands
 
 Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain>.
-libchamplain home page: <http://projects.gnome.org/libchamplain/>."
+libchamplain home page: <https://wiki.gnome.org/Projects/libchamplain>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libchamplain config.status 0.12.5
+libchamplain config.status 0.12.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -15364,8 +15294,6 @@
     "champlain-gtk-$CHAMPLAIN_API_VERSION.pc") CONFIG_FILES="$CONFIG_FILES champlain-gtk-$CHAMPLAIN_API_VERSION.pc:champlain-gtk.pc.in" ;;
     "champlain-gtk-$CHAMPLAIN_API_VERSION-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES champlain-gtk-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-gtk-uninstalled.pc.in" ;;
     "champlain-gtk/Makefile") CONFIG_FILES="$CONFIG_FILES champlain-gtk/Makefile" ;;
-    "champlain-memphis-$CHAMPLAIN_API_VERSION.pc") CONFIG_FILES="$CONFIG_FILES champlain-memphis-$CHAMPLAIN_API_VERSION.pc:champlain-memphis.pc.in" ;;
-    "champlain-memphis-$CHAMPLAIN_API_VERSION-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES champlain-memphis-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-memphis-uninstalled.pc.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

=== modified file 'configure.ac'
--- configure.ac	2013-09-21 15:31:58 +0000
+++ configure.ac	2014-02-16 21:01:35 +0000
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 m4_define([champlain_major_version], [0])
 m4_define([champlain_minor_version], [12])
-m4_define([champlain_micro_version], [5])
+m4_define([champlain_micro_version], [7])
 m4_define([champlain_version],
           [champlain_major_version.champlain_minor_version.champlain_micro_version])
 m4_define([champlain_minor_api_version], [m4_eval(champlain_minor_version + champlain_minor_version%2)])
@@ -13,7 +13,7 @@
         [champlain_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain],
         [libchamplain],
-        [http://projects.gnome.org/libchamplain/])
+        [https://wiki.gnome.org/Projects/libchamplain])
 AC_CONFIG_SRCDIR([champlain/champlain.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -36,7 +36,7 @@
 # - If binary compatibility has been broken (eg removed or changed interfaces)
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
-LIBRARY_VERSION=3:2:3
+LIBRARY_VERSION=4:2:4
 CHAMPLAIN_API_VERSION=champlain_api_version
 CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_api_version
 CHAMPLAIN_MAJOR_VERSION=champlain_major_version
@@ -125,7 +125,7 @@
 
 AC_ARG_ENABLE(maemo,
   AS_HELP_STRING([--enable-maemo],[compile with maemo optimizations]),
-    [enable_maemo=yes])
+    enable_maemo=$enableval, enable_maemo=no)
 
 # -----------------------------------------------------------
 # Enable gtk
@@ -153,11 +153,9 @@
 
 AC_ARG_ENABLE(memphis,
   AS_HELP_STRING([--disable-memphis],[Disable support of local rendering using libmemphis]),
-    enable_memphis=$enableval, enable_memphis="auto")
+    enable_memphis=$enableval, enable_memphis=no)
 
-if test "x$enable_memphis" = "xauto"; then
-  PKG_CHECK_MODULES(MEMPHIS, [memphis-0.2 >= 0.2.1], enable_memphis="yes", enable_memphis="no")
-elif test "x$enable_memphis" = "xyes"; then
+if test "x$enable_memphis" = "xyes"; then
   PKG_CHECK_MODULES(MEMPHIS, [memphis-0.2 >= 0.2.1])
 fi
 
@@ -244,9 +242,7 @@
                  champlain-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-uninstalled.pc.in
                  champlain-gtk-$CHAMPLAIN_API_VERSION.pc:champlain-gtk.pc.in
                  champlain-gtk-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-gtk-uninstalled.pc.in
-                 champlain-gtk/Makefile
-                 champlain-memphis-$CHAMPLAIN_API_VERSION.pc:champlain-memphis.pc.in
-                 champlain-memphis-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-memphis-uninstalled.pc.in])
+                 champlain-gtk/Makefile])
 AC_OUTPUT
 
 echo ""

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-14 21:58:12 +0000
+++ debian/changelog	2014-02-16 21:01:35 +0000
@@ -1,3 +1,10 @@
+libchamplain (0.12.7-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release.
+  * Update symbols
+
+ -- Jackson Doak <[e-mail]>  Mon, 17 Feb 2014 07:45:36 +1100
+
 libchamplain (0.12.5-1ubuntu2) trusty; urgency=medium
 
   * No-change rebuild for new cogl

=== modified file 'debian/libchamplain-0.12-0.symbols'
--- debian/libchamplain-0.12-0.symbols	2013-09-21 15:31:58 +0000
+++ debian/libchamplain-0.12-0.symbols	2014-02-16 21:01:35 +0000
@@ -282,6 +282,7 @@
  champlain_view_get_animate_zoom@Base 0.11.0
  champlain_view_get_background_pattern@Base 0.12.4
  champlain_view_get_bounding_box@Base 0.12.4
+ champlain_view_get_bounding_box_for_zoom_level@Base 0.12.7
  champlain_view_get_center_latitude@Base 0.11.0
  champlain_view_get_center_longitude@Base 0.11.0
  champlain_view_get_deceleration@Base 0.11.0

=== modified file 'docs/reference-gtk/html/index.html'
--- docs/reference-gtk/html/index.html	2013-09-21 15:31:58 +0000
+++ docs/reference-gtk/html/index.html	2014-02-16 21:01:35 +0000
@@ -16,7 +16,7 @@
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libchamplain-gtk Reference Manual</p></th></tr></table></div>
 <div>
 <p class="releaseinfo">
-      for libchamplain-gtk 0.12.5
+      for libchamplain-gtk 0.12.7
 
       </p>
 <p>
@@ -28,7 +28,7 @@
 </div>
 <div><p class="copyright">Copyright © 2008-2013 libchamplain contributors</p></div>
 <div><div class="legalnotice">
-<a name="idp163520"></a><p>
+<a name="idp54399056"></a><p>
         Permission is granted to copy, distribute and/or modify this
         document under the terms of the <em class="citetitle">GNU Free
         Documentation License</em>, Version 1.1 or any later

=== modified file 'docs/reference-gtk/html/pt01.html'
--- docs/reference-gtk/html/pt01.html	2013-09-21 15:31:58 +0000
+++ docs/reference-gtk/html/pt01.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="idp170640"></a>Part I. API Reference</h1></div></div></div>
+<a name="idp54259408"></a>Part I. API Reference</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>

=== modified file 'docs/reference-gtk/version.xml'
--- docs/reference-gtk/version.xml	2013-09-21 15:31:58 +0000
+++ docs/reference-gtk/version.xml	2014-02-16 21:01:35 +0000
@@ -1,1 +1,1 @@
-0.12.5
+0.12.7

=== modified file 'docs/reference/html/ChamplainErrorTileRenderer.html'
--- docs/reference/html/ChamplainErrorTileRenderer.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ChamplainErrorTileRenderer.html	2014-02-16 21:01:35 +0000
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
 <link rel="home" href="index.html" title="libchamplain Reference Manual">
 <link rel="up" href="pt05.html" title="Part V. Renderer API">
-<link rel="prev" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer">
+<link rel="prev" href="ChamplainImageRenderer.html" title="ChamplainImageRenderer">
 <link rel="next" href="pt06.html" title="Part VI. Others">
 <meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
@@ -14,7 +14,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
 <tr valign="middle">
-<td><a accesskey="p" href="ChamplainMemphisRenderer.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="ChamplainImageRenderer.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td><a accesskey="u" href="pt05.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libchamplain Reference Manual</th>

=== modified file 'docs/reference/html/ChamplainImageRenderer.html'
--- docs/reference/html/ChamplainImageRenderer.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ChamplainImageRenderer.html	2014-02-16 21:01:35 +0000
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="libchamplain Reference Manual">
 <link rel="up" href="pt05.html" title="Part V. Renderer API">
 <link rel="prev" href="ChamplainRenderer.html" title="ChamplainRenderer">
-<link rel="next" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer">
+<link rel="next" href="ChamplainErrorTileRenderer.html" title="ChamplainErrorTileRenderer">
 <meta name="generator" content="GTK-Doc V1.18 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -18,7 +18,7 @@
 <td><a accesskey="u" href="pt05.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libchamplain Reference Manual</th>
-<td><a accesskey="n" href="ChamplainMemphisRenderer.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="ChamplainErrorTileRenderer.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr>
 <tr><td colspan="5" class="shortcuts">
 <a href="#ChamplainImageRenderer.synopsis" class="shortcut">Top</a>

=== modified file 'docs/reference/html/ChamplainMapSourceFactory.html'
--- docs/reference/html/ChamplainMapSourceFactory.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ChamplainMapSourceFactory.html	2014-02-16 21:01:35 +0000
@@ -72,8 +72,6 @@
 #define             <a class="link" href="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-OWM-PRESSURE:CAPS" title="CHAMPLAIN_MAP_SOURCE_OWM_PRESSURE">CHAMPLAIN_MAP_SOURCE_OWM_PRESSURE</a>
 #define             <a class="link" href="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-OWM-TEMPERATURE:CAPS" title="CHAMPLAIN_MAP_SOURCE_OWM_TEMPERATURE">CHAMPLAIN_MAP_SOURCE_OWM_TEMPERATURE</a>
 #define             <a class="link" href="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-OWM-WIND:CAPS" title="CHAMPLAIN_MAP_SOURCE_OWM_WIND">CHAMPLAIN_MAP_SOURCE_OWM_WIND</a>
-#define             <a class="link" href="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-MEMPHIS-LOCAL:CAPS" title="CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL">CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL</a>
-#define             <a class="link" href="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-MEMPHIS-NETWORK:CAPS" title="CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK">CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK</a>
 </pre>
 </div>
 <div class="refsect1">
@@ -436,24 +434,6 @@
 OpenWeatherMap wind
 </p>
 </div>
-<hr>
-<div class="refsect2">
-<a name="CHAMPLAIN-MAP-SOURCE-MEMPHIS-LOCAL:CAPS"></a><h3>CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL</h3>
-<pre class="programlisting">#define CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL "memphis-local"
-</pre>
-<p>
-OpenStreetMap Memphis Local Map
-</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="CHAMPLAIN-MAP-SOURCE-MEMPHIS-NETWORK:CAPS"></a><h3>CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK</h3>
-<pre class="programlisting">#define CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK "memphis-network"
-</pre>
-<p>
-OpenStreetMap Memphis Network Map
-</p>
-</div>
 </div>
 </div>
 <div class="footer">

=== removed file 'docs/reference/html/ChamplainMemphisRenderer.html'
--- docs/reference/html/ChamplainMemphisRenderer.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ChamplainMemphisRenderer.html	1970-01-01 00:00:00 +0000
@@ -1,574 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ChamplainMemphisRenderer</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
-<link rel="home" href="index.html" title="libchamplain Reference Manual">
-<link rel="up" href="pt05.html" title="Part V. Renderer API">
-<link rel="prev" href="ChamplainImageRenderer.html" title="ChamplainImageRenderer">
-<link rel="next" href="ChamplainErrorTileRenderer.html" title="ChamplainErrorTileRenderer">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="ChamplainImageRenderer.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="pt05.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">libchamplain Reference Manual</th>
-<td><a accesskey="n" href="ChamplainErrorTileRenderer.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#ChamplainMemphisRenderer.synopsis" class="shortcut">Top</a>
-                   | 
-                  <a href="#ChamplainMemphisRenderer.description" class="shortcut">Description</a>
-                   | 
-                  <a href="#ChamplainMemphisRenderer.object-hierarchy" class="shortcut">Object Hierarchy</a>
-                   | 
-                  <a href="#ChamplainMemphisRenderer.properties" class="shortcut">Properties</a>
-</td></tr>
-</table>
-<div class="refentry">
-<a name="ChamplainMemphisRenderer"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="ChamplainMemphisRenderer.top_of_page"></a>ChamplainMemphisRenderer</span></h2>
-<p>ChamplainMemphisRenderer — A renderer that renders tiles from OSM vector XML data</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv">
-<a name="ChamplainMemphisRenderer.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">struct              <a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer-struct" title="struct ChamplainMemphisRenderer">ChamplainMemphisRenderer</a>;
-struct              <a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule" title="struct ChamplainMemphisRule">ChamplainMemphisRule</a>;
-struct              <a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleAttr" title="struct ChamplainMemphisRuleAttr">ChamplainMemphisRuleAttr</a>;
-enum                <a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleType" title="enum ChamplainMemphisRuleType">ChamplainMemphisRuleType</a>;
-<a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="returnvalue">ChamplainMemphisRenderer</span></a> * <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-new-full" title="champlain_memphis_renderer_new_full ()">champlain_memphis_renderer_new_full</a>
-                                                        (<em class="parameter"><code><span class="type">guint</span> tile_size</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-load-rules" title="champlain_memphis_renderer_load_rules ()">champlain_memphis_renderer_load_rules</a>
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *rules_path</code></em>);
-<span class="returnvalue">ClutterColor</span> *      <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-background-color" title="champlain_memphis_renderer_get_background_color ()">champlain_memphis_renderer_get_background_color</a>
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-background-color" title="champlain_memphis_renderer_set_background_color ()">champlain_memphis_renderer_set_background_color</a>
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">ClutterColor</span> *color</code></em>);
-<span class="returnvalue">GList</span> *             <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-rule-ids" title="champlain_memphis_renderer_get_rule_ids ()">champlain_memphis_renderer_get_rule_ids</a>
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-rule" title="champlain_memphis_renderer_set_rule ()">champlain_memphis_renderer_set_rule</a> (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule" title="struct ChamplainMemphisRule"><span class="type">ChamplainMemphisRule</span></a> *rule</code></em>);
-<a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule" title="struct ChamplainMemphisRule"><span class="returnvalue">ChamplainMemphisRule</span></a> * <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-rule" title="champlain_memphis_renderer_get_rule ()">champlain_memphis_renderer_get_rule</a>
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *id</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-remove-rule" title="champlain_memphis_renderer_remove_rule ()">champlain_memphis_renderer_remove_rule</a>
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *id</code></em>);
-<a class="link" href="ChamplainBoundingBox.html" title="ChamplainBoundingBox"><span class="returnvalue">ChamplainBoundingBox</span></a> * <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-bounding-box" title="champlain_memphis_renderer_get_bounding_box ()">champlain_memphis_renderer_get_bounding_box</a>
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-tile-size" title="champlain_memphis_renderer_set_tile_size ()">champlain_memphis_renderer_set_tile_size</a>
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint</span> size</code></em>);
-<span class="returnvalue">guint</span>               <a class="link" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-tile-size" title="champlain_memphis_renderer_get_tile_size ()">champlain_memphis_renderer_get_tile_size</a>
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>);
-</pre>
-</div>
-<div class="refsect1">
-<a name="ChamplainMemphisRenderer.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="synopsis">
-  GObject
-   +----GInitiallyUnowned
-         +----<a class="link" href="ChamplainRenderer.html" title="ChamplainRenderer">ChamplainRenderer</a>
-               +----ChamplainMemphisRenderer
-</pre>
-</div>
-<div class="refsect1">
-<a name="ChamplainMemphisRenderer.properties"></a><h2>Properties</h2>
-<pre class="synopsis">
-  "<a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer--bounding-box" title='The "bounding-box" property'>bounding-box</a>"             <a class="link" href="ChamplainBoundingBox.html" title="ChamplainBoundingBox"><span class="type">ChamplainBoundingBox</span></a>*  : Read / Write
-  "<a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer--tile-size" title='The "tile-size" property'>tile-size</a>"                <span class="type">guint</span>                 : Read / Write
-</pre>
-</div>
-<div class="refsect1">
-<a name="ChamplainMemphisRenderer.description"></a><h2>Description</h2>
-<p>
-The <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> uses the rendering library
-<a class="ulink" href="https://trac.openstreetmap.ch/trac/memphis/" target="_top">
-LibMemphis</a> to render tiles based on <a class="ulink" href="http://www.openstreetmap.org/" target="_top">
-OpenStreetMap</a> data. Tiles are rendered in separate threads.
-It supports zoom levels 12 to 18.
-</p>
-<p>
-The output of the renderer can be configured with a Memphis rules XML file.
-(TODO: link to the specification) The default rules only show
-highways as thin black lines.
-Once loaded, rules can be queried and edited.
-</p>
-</div>
-<div class="refsect1">
-<a name="ChamplainMemphisRenderer.details"></a><h2>Details</h2>
-<div class="refsect2">
-<a name="ChamplainMemphisRenderer-struct"></a><h3>struct ChamplainMemphisRenderer</h3>
-<pre class="programlisting">struct ChamplainMemphisRenderer;</pre>
-<p>
-The <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> structure contains only private data
-and should be accessed using the provided API
-</p>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="ChamplainMemphisRule"></a><h3>struct ChamplainMemphisRule</h3>
-<pre class="programlisting">struct ChamplainMemphisRule {
-  gchar **keys;
-  gchar **values;
-  ChamplainMemphisRuleType type;
-  ChamplainMemphisRuleAttr *polygon;
-  ChamplainMemphisRuleAttr *line;
-  ChamplainMemphisRuleAttr *border;
-  ChamplainMemphisRuleAttr *text;
-};
-</pre>
-<p>
-A wrapper of the MemphisRule structure. For details see the libmemphis
-documentation.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><span class="type">gchar</span> **<em class="structfield"><code><a name="ChamplainMemphisRule.keys"></a>keys</code></em>;</span></p></td>
-<td>keys</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="type">gchar</span> **<em class="structfield"><code><a name="ChamplainMemphisRule.values"></a>values</code></em>;</span></p></td>
-<td>values</td>
-</tr>
-<tr>
-<td><p><span class="term"><a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleType" title="enum ChamplainMemphisRuleType"><span class="type">ChamplainMemphisRuleType</span></a> <em class="structfield"><code><a name="ChamplainMemphisRule.type"></a>type</code></em>;</span></p></td>
-<td>type</td>
-</tr>
-<tr>
-<td><p><span class="term"><a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleAttr" title="struct ChamplainMemphisRuleAttr"><span class="type">ChamplainMemphisRuleAttr</span></a> *<em class="structfield"><code><a name="ChamplainMemphisRule.polygon"></a>polygon</code></em>;</span></p></td>
-<td>polygon</td>
-</tr>
-<tr>
-<td><p><span class="term"><a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleAttr" title="struct ChamplainMemphisRuleAttr"><span class="type">ChamplainMemphisRuleAttr</span></a> *<em class="structfield"><code><a name="ChamplainMemphisRule.line"></a>line</code></em>;</span></p></td>
-<td>line</td>
-</tr>
-<tr>
-<td><p><span class="term"><a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleAttr" title="struct ChamplainMemphisRuleAttr"><span class="type">ChamplainMemphisRuleAttr</span></a> *<em class="structfield"><code><a name="ChamplainMemphisRule.border"></a>border</code></em>;</span></p></td>
-<td>border</td>
-</tr>
-<tr>
-<td><p><span class="term"><a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleAttr" title="struct ChamplainMemphisRuleAttr"><span class="type">ChamplainMemphisRuleAttr</span></a> *<em class="structfield"><code><a name="ChamplainMemphisRule.text"></a>text</code></em>;</span></p></td>
-<td>text</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="ChamplainMemphisRuleAttr"></a><h3>struct ChamplainMemphisRuleAttr</h3>
-<pre class="programlisting">struct ChamplainMemphisRuleAttr {
-  guint8 z_min;
-  guint8 z_max;
-  guint8 color_red;
-  guint8 color_green;
-  guint8 color_blue;
-  guint8 color_alpha;
-  gchar *style;
-  gdouble size;
-};
-</pre>
-<p>
-A wrapper of the MemphisRuleAttr structure. For details see the libmemphis
-documentation.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><span class="type">guint8</span> <em class="structfield"><code><a name="ChamplainMemphisRuleAttr.z-min"></a>z_min</code></em>;</span></p></td>
-<td>z_min</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="type">guint8</span> <em class="structfield"><code><a name="ChamplainMemphisRuleAttr.z-max"></a>z_max</code></em>;</span></p></td>
-<td>z_max</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="type">guint8</span> <em class="structfield"><code><a name="ChamplainMemphisRuleAttr.color-red"></a>color_red</code></em>;</span></p></td>
-<td>color_red</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="type">guint8</span> <em class="structfield"><code><a name="ChamplainMemphisRuleAttr.color-green"></a>color_green</code></em>;</span></p></td>
-<td>color_green</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="type">guint8</span> <em class="structfield"><code><a name="ChamplainMemphisRuleAttr.color-blue"></a>color_blue</code></em>;</span></p></td>
-<td>color_blue</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="type">guint8</span> <em class="structfield"><code><a name="ChamplainMemphisRuleAttr.color-alpha"></a>color_alpha</code></em>;</span></p></td>
-<td>color_alpha</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="type">gchar</span> *<em class="structfield"><code><a name="ChamplainMemphisRuleAttr.style"></a>style</code></em>;</span></p></td>
-<td>style</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="type">gdouble</span> <em class="structfield"><code><a name="ChamplainMemphisRuleAttr.size"></a>size</code></em>;</span></p></td>
-<td>size</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="ChamplainMemphisRuleType"></a><h3>enum ChamplainMemphisRuleType</h3>
-<pre class="programlisting">typedef enum {
-  CHAMPLAIN_MEMPHIS_RULE_TYPE_UNKNOWN,
-  CHAMPLAIN_MEMPHIS_RULE_TYPE_NODE,
-  CHAMPLAIN_MEMPHIS_RULE_TYPE_WAY,
-  CHAMPLAIN_MEMPHIS_RULE_TYPE_RELATION
-} ChamplainMemphisRuleType;
-</pre>
-<p>
-A wrapper of the MemphisRuleType union. For details see the libmemphis
-documentation.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><a name="CHAMPLAIN-MEMPHIS-RULE-TYPE-UNKNOWN:CAPS"></a><span class="term"><code class="literal">CHAMPLAIN_MEMPHIS_RULE_TYPE_UNKNOWN</code></span></p></td>
-<td>MEMPHIS_RULE_TYPE_UNKNOWN
-</td>
-</tr>
-<tr>
-<td><p><a name="CHAMPLAIN-MEMPHIS-RULE-TYPE-NODE:CAPS"></a><span class="term"><code class="literal">CHAMPLAIN_MEMPHIS_RULE_TYPE_NODE</code></span></p></td>
-<td>MEMPHIS_RULE_TYPE_NODE
-</td>
-</tr>
-<tr>
-<td><p><a name="CHAMPLAIN-MEMPHIS-RULE-TYPE-WAY:CAPS"></a><span class="term"><code class="literal">CHAMPLAIN_MEMPHIS_RULE_TYPE_WAY</code></span></p></td>
-<td>MEMPHIS_RULE_TYPE_WAY
-</td>
-</tr>
-<tr>
-<td><p><a name="CHAMPLAIN-MEMPHIS-RULE-TYPE-RELATION:CAPS"></a><span class="term"><code class="literal">CHAMPLAIN_MEMPHIS_RULE_TYPE_RELATION</code></span></p></td>
-<td>MEMPHIS_RULE_TYPE_RELATION
-</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-new-full"></a><h3>champlain_memphis_renderer_new_full ()</h3>
-<pre class="programlisting"><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="returnvalue">ChamplainMemphisRenderer</span></a> * champlain_memphis_renderer_new_full
-                                                        (<em class="parameter"><code><span class="type">guint</span> tile_size</code></em>);</pre>
-<p>
-Constructor of a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>tile_size</code></em> :</span></p></td>
-<td>the size of the rendered error tile</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a constructed <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> object</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-load-rules"></a><h3>champlain_memphis_renderer_load_rules ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                champlain_memphis_renderer_load_rules
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *rules_path</code></em>);</pre>
-<p>
-Loads a Memphis rules file.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>renderer</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>rules_path</code></em> :</span></p></td>
-<td>a path to a rules file</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-get-background-color"></a><h3>champlain_memphis_renderer_get_background_color ()</h3>
-<pre class="programlisting"><span class="returnvalue">ClutterColor</span> *      champlain_memphis_renderer_get_background_color
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>);</pre>
-<p>
-Gets the background color of the map.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>renderer</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the background color of the map as a newly-allocated
-<span class="type">ClutterColor</span>.</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-set-background-color"></a><h3>champlain_memphis_renderer_set_background_color ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                champlain_memphis_renderer_set_background_color
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">ClutterColor</span> *color</code></em>);</pre>
-<p>
-Sets the background color of the map from a <span class="type">ClutterColor</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>renderer</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>color</code></em> :</span></p></td>
-<td>a <span class="type">ClutterColor</span>
-</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-get-rule-ids"></a><h3>champlain_memphis_renderer_get_rule_ids ()</h3>
-<pre class="programlisting"><span class="returnvalue">GList</span> *             champlain_memphis_renderer_get_rule_ids
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>);</pre>
-<p>
-Get a list of rule id's.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>renderer</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a <span class="type">GList</span> of id strings of the form:
-key1|key2|...|keyN:value1|value2|...|valueM
-Example: "waterway:river|stream|canal". <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span>
-</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-set-rule"></a><h3>champlain_memphis_renderer_set_rule ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                champlain_memphis_renderer_set_rule (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule" title="struct ChamplainMemphisRule"><span class="type">ChamplainMemphisRule</span></a> *rule</code></em>);</pre>
-<p>
-Edits or adds a <a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule" title="struct ChamplainMemphisRule"><span class="type">ChamplainMemphisRule</span></a> to the rules-set. New rules are appended
-to the list.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>renderer</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>rule</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule" title="struct ChamplainMemphisRule"><span class="type">ChamplainMemphisRule</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-get-rule"></a><h3>champlain_memphis_renderer_get_rule ()</h3>
-<pre class="programlisting"><a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule" title="struct ChamplainMemphisRule"><span class="returnvalue">ChamplainMemphisRule</span></a> * champlain_memphis_renderer_get_rule
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *id</code></em>);</pre>
-<p>
-Gets the requested <a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule" title="struct ChamplainMemphisRule"><span class="type">ChamplainMemphisRule</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>renderer</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>an id string</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the requested <a class="link" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule" title="struct ChamplainMemphisRule"><span class="type">ChamplainMemphisRule</span></a> or NULL if none is found.</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-remove-rule"></a><h3>champlain_memphis_renderer_remove_rule ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                champlain_memphis_renderer_remove_rule
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">gchar</span> *id</code></em>);</pre>
-<p>
-Removes the rule with the given id.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>renderer</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>an id string</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-get-bounding-box"></a><h3>champlain_memphis_renderer_get_bounding_box ()</h3>
-<pre class="programlisting"><a class="link" href="ChamplainBoundingBox.html" title="ChamplainBoundingBox"><span class="returnvalue">ChamplainBoundingBox</span></a> * champlain_memphis_renderer_get_bounding_box
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>);</pre>
-<p>
-Gets the bounding box of the area for which map data is available.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>renderer</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the bounding box</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-set-tile-size"></a><h3>champlain_memphis_renderer_set_tile_size ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                champlain_memphis_renderer_set_tile_size
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint</span> size</code></em>);</pre>
-<p>
-Sets the size of the rendered tiles.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>renderer</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>size</code></em> :</span></p></td>
-<td>the size of the rendered tiles</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="champlain-memphis-renderer-get-tile-size"></a><h3>champlain_memphis_renderer_get_tile_size ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>               champlain_memphis_renderer_get_tile_size
-                                                        (<em class="parameter"><code><a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a> *renderer</code></em>);</pre>
-<p>
-Gets the size of the rendered tiles.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>renderer</code></em> :</span></p></td>
-<td>a <a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer"><span class="type">ChamplainMemphisRenderer</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the size of the rendered tiles</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.8</p>
-</div>
-</div>
-<div class="refsect1">
-<a name="ChamplainMemphisRenderer.property-details"></a><h2>Property Details</h2>
-<div class="refsect2">
-<a name="ChamplainMemphisRenderer--bounding-box"></a><h3>The <code class="literal">"bounding-box"</code> property</h3>
-<pre class="programlisting">  "bounding-box"             <a class="link" href="ChamplainBoundingBox.html" title="ChamplainBoundingBox"><span class="type">ChamplainBoundingBox</span></a>*  : Read / Write</pre>
-<p>
-The bounding box of the area that contains map data.
-</p>
-<p class="since">Since 0.8</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="ChamplainMemphisRenderer--tile-size"></a><h3>The <code class="literal">"tile-size"</code> property</h3>
-<pre class="programlisting">  "tile-size"                <span class="type">guint</span>                 : Read / Write</pre>
-<p>The size of the rendered tile.</p>
-<p>Allowed values: &lt;= G_MAXINT</p>
-<p>Default value: 256</p>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
-          Generated by GTK-Doc V1.18</div>
-</body>
-</html>
\ No newline at end of file

=== modified file 'docs/reference/html/ChamplainRenderer.html'
--- docs/reference/html/ChamplainRenderer.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ChamplainRenderer.html	2014-02-16 21:01:35 +0000
@@ -55,7 +55,6 @@
          +----ChamplainRenderer
                +----<a class="link" href="ChamplainErrorTileRenderer.html" title="ChamplainErrorTileRenderer">ChamplainErrorTileRenderer</a>
                +----<a class="link" href="ChamplainImageRenderer.html" title="ChamplainImageRenderer">ChamplainImageRenderer</a>
-               +----<a class="link" href="ChamplainMemphisRenderer.html" title="ChamplainMemphisRenderer">ChamplainMemphisRenderer</a>
 </pre>
 </div>
 <div class="refsect1">

=== modified file 'docs/reference/html/ChamplainView.html'
--- docs/reference/html/ChamplainView.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ChamplainView.html	2014-02-16 21:01:35 +0000
@@ -129,6 +129,9 @@
 <span class="returnvalue">gdouble</span>             <a class="link" href="ChamplainView.html#champlain-view-get-center-latitude" title="champlain_view_get_center_latitude ()">champlain_view_get_center_latitude</a>  (<em class="parameter"><code><a class="link" href="ChamplainView.html" title="ChamplainView"><span class="type">ChamplainView</span></a> *view</code></em>);
 <span class="returnvalue">gdouble</span>             <a class="link" href="ChamplainView.html#champlain-view-get-center-longitude" title="champlain_view_get_center_longitude ()">champlain_view_get_center_longitude</a> (<em class="parameter"><code><a class="link" href="ChamplainView.html" title="ChamplainView"><span class="type">ChamplainView</span></a> *view</code></em>);
 <a class="link" href="ChamplainBoundingBox.html" title="ChamplainBoundingBox"><span class="returnvalue">ChamplainBoundingBox</span></a> * <a class="link" href="ChamplainView.html#champlain-view-get-bounding-box" title="champlain_view_get_bounding_box ()">champlain_view_get_bounding_box</a>  (<em class="parameter"><code><a class="link" href="ChamplainView.html" title="ChamplainView"><span class="type">ChamplainView</span></a> *view</code></em>);
+<a class="link" href="ChamplainBoundingBox.html" title="ChamplainBoundingBox"><span class="returnvalue">ChamplainBoundingBox</span></a> * <a class="link" href="ChamplainView.html#champlain-view-get-bounding-box-for-zoom-level" title="champlain_view_get_bounding_box_for_zoom_level ()">champlain_view_get_bounding_box_for_zoom_level</a>
+                                                        (<em class="parameter"><code><a class="link" href="ChamplainView.html" title="ChamplainView"><span class="type">ChamplainView</span></a> *view</code></em>,
+                                                         <em class="parameter"><code><span class="type">guint</span> zoom_level</code></em>);
 <a class="link" href="ChamplainTile.html#ChamplainState" title="enum ChamplainState"><span class="returnvalue">ChamplainState</span></a>      <a class="link" href="ChamplainView.html#champlain-view-get-state" title="champlain_view_get_state ()">champlain_view_get_state</a>            (<em class="parameter"><code><a class="link" href="ChamplainView.html" title="ChamplainView"><span class="type">ChamplainView</span></a> *view</code></em>);
 </pre>
 </div>
@@ -520,6 +523,11 @@
 </td>
 </tr>
 <tr>
+<td><p><span class="term"><em class="parameter"><code>map_source</code></em> :</span></p></td>
+<td>a <a class="link" href="ChamplainMapSource.html" title="ChamplainMapSource"><span class="type">ChamplainMapSource</span></a>
+</td>
+</tr>
+<tr>
 <td><p><span class="term"><em class="parameter"><code>opacity</code></em> :</span></p></td>
 <td>opacity to use</td>
 </tr>
@@ -538,11 +546,18 @@
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<tbody><tr>
+<tbody>
+<tr>
 <td><p><span class="term"><em class="parameter"><code>view</code></em> :</span></p></td>
 <td>a <a class="link" href="ChamplainView.html" title="ChamplainView"><span class="type">ChamplainView</span></a>
 </td>
-</tr></tbody>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>map_source</code></em> :</span></p></td>
+<td>a <a class="link" href="ChamplainMapSource.html" title="ChamplainMapSource"><span class="type">ChamplainMapSource</span></a>
+</td>
+</tr>
+</tbody>
 </table></div>
 <p class="since">Since 0.12.5</p>
 </div>
@@ -1307,6 +1322,36 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="champlain-view-get-bounding-box-for-zoom-level"></a><h3>champlain_view_get_bounding_box_for_zoom_level ()</h3>
+<pre class="programlisting"><a class="link" href="ChamplainBoundingBox.html" title="ChamplainBoundingBox"><span class="returnvalue">ChamplainBoundingBox</span></a> * champlain_view_get_bounding_box_for_zoom_level
+                                                        (<em class="parameter"><code><a class="link" href="ChamplainView.html" title="ChamplainView"><span class="type">ChamplainView</span></a> *view</code></em>,
+                                                         <em class="parameter"><code><span class="type">guint</span> zoom_level</code></em>);</pre>
+<p>
+Gets the bounding box for view <em class="parameter"><code>view</code></em> at <em class="parameter"><code>zoom_level</code></em>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>view</code></em> :</span></p></td>
+<td>a <a class="link" href="ChamplainView.html" title="ChamplainView"><span class="type">ChamplainView</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>zoom_level</code></em> :</span></p></td>
+<td>the level of zoom, a guint between 1 and 20</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the bounding box for the view at <em class="parameter"><code>zoom_level</code></em>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.12.6</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="champlain-view-get-state"></a><h3>champlain_view_get_state ()</h3>
 <pre class="programlisting"><a class="link" href="ChamplainTile.html#ChamplainState" title="enum ChamplainState"><span class="returnvalue">ChamplainState</span></a>      champlain_view_get_state            (<em class="parameter"><code><a class="link" href="ChamplainView.html" title="ChamplainView"><span class="type">ChamplainView</span></a> *view</code></em>);</pre>
 <p>

=== modified file 'docs/reference/html/ch01.html'
--- docs/reference/html/ch01.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ch01.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp65376"></a>Layers</h2></div></div></div>
+<a name="idp4192192"></a>Layers</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="ChamplainLayer.html">ChamplainLayer</a></span><span class="refpurpose"> — Base class of libchamplain layers</span>

=== modified file 'docs/reference/html/ch02.html'
--- docs/reference/html/ch02.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ch02.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp67792"></a>Markers</h2></div></div></div>
+<a name="idp4194608"></a>Markers</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="ChamplainMarker.html">ChamplainMarker</a></span><span class="refpurpose"> — Base class of libchamplain markers</span>

=== modified file 'docs/reference/html/ch03.html'
--- docs/reference/html/ch03.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ch03.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp83056"></a>Locations</h2></div></div></div>
+<a name="idp4197552"></a>Locations</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="ChamplainLocation.html">ChamplainLocation</a></span><span class="refpurpose"> — An interface common to objects having latitude and longitude</span>

=== modified file 'docs/reference/html/ch04.html'
--- docs/reference/html/ch04.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ch04.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp88160"></a>Tile Sources</h2></div></div></div>
+<a name="idp4202656"></a>Tile Sources</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="ChamplainTileSource.html">ChamplainTileSource</a></span><span class="refpurpose"> — A base class of tile sources</span>

=== modified file 'docs/reference/html/ch05.html'
--- docs/reference/html/ch05.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ch05.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp173760"></a>Tile Caches</h2></div></div></div>
+<a name="idp40272"></a>Tile Caches</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="ChamplainTileCache.html">ChamplainTileCache</a></span><span class="refpurpose"> — A base class of tile caches</span>

=== modified file 'docs/reference/html/ch06.html'
--- docs/reference/html/ch06.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ch06.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp176192"></a>Map Source Utilities</h2></div></div></div>
+<a name="idp42704"></a>Map Source Utilities</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="ChamplainMapSourceChain.html">ChamplainMapSourceChain</a></span><span class="refpurpose"> — A map source simplifying creation of source chains</span>

=== modified file 'docs/reference/html/index.html'
--- docs/reference/html/index.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/index.html	2014-02-16 21:01:35 +0000
@@ -16,7 +16,7 @@
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libchamplain Reference Manual</p></th></tr></table></div>
 <div>
 <p class="releaseinfo">
-      for libchamplain 0.12.5
+      for libchamplain 0.12.7
 
       </p>
 <p>
@@ -28,7 +28,7 @@
 </div>
 <div><p class="copyright">Copyright © 2008-2013 libchamplain contributors</p></div>
 <div><div class="legalnotice">
-<a name="idp166400"></a><p>
+<a name="idp200144"></a><p>
         Permission is granted to copy, distribute and/or modify this
         document under the terms of the <em class="citetitle">GNU Free
         Documentation License</em>, Version 1.1 or any later
@@ -165,9 +165,6 @@
 <span class="refentrytitle"><a href="ChamplainImageRenderer.html">ChamplainImageRenderer</a></span><span class="refpurpose"> — A renderer that renders tiles from binary image data</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="ChamplainMemphisRenderer.html">ChamplainMemphisRenderer</a></span><span class="refpurpose"> — A renderer that renders tiles from OSM vector XML data</span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="ChamplainErrorTileRenderer.html">ChamplainErrorTileRenderer</a></span><span class="refpurpose"> — A renderer that renders error tiles independently of input data</span>
 </dt>
 </dl></dd>

=== modified file 'docs/reference/html/index.sgml'
--- docs/reference/html/index.sgml	2013-09-21 15:31:58 +0000
+++ docs/reference/html/index.sgml	2014-02-16 21:01:35 +0000
@@ -51,6 +51,7 @@
 <ANCHOR id="champlain-view-get-center-latitude" href="libchamplain/ChamplainView.html#champlain-view-get-center-latitude">
 <ANCHOR id="champlain-view-get-center-longitude" href="libchamplain/ChamplainView.html#champlain-view-get-center-longitude">
 <ANCHOR id="champlain-view-get-bounding-box" href="libchamplain/ChamplainView.html#champlain-view-get-bounding-box">
+<ANCHOR id="champlain-view-get-bounding-box-for-zoom-level" href="libchamplain/ChamplainView.html#champlain-view-get-bounding-box-for-zoom-level">
 <ANCHOR id="champlain-view-get-state" href="libchamplain/ChamplainView.html#champlain-view-get-state">
 <ANCHOR id="ChamplainView.property-details" href="libchamplain/ChamplainView.html#ChamplainView.property-details">
 <ANCHOR id="ChamplainView--animate-zoom" href="libchamplain/ChamplainView.html#ChamplainView--animate-zoom">
@@ -503,8 +504,6 @@
 <ANCHOR id="CHAMPLAIN-MAP-SOURCE-OWM-PRESSURE:CAPS" href="libchamplain/ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-OWM-PRESSURE:CAPS">
 <ANCHOR id="CHAMPLAIN-MAP-SOURCE-OWM-TEMPERATURE:CAPS" href="libchamplain/ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-OWM-TEMPERATURE:CAPS">
 <ANCHOR id="CHAMPLAIN-MAP-SOURCE-OWM-WIND:CAPS" href="libchamplain/ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-OWM-WIND:CAPS">
-<ANCHOR id="CHAMPLAIN-MAP-SOURCE-MEMPHIS-LOCAL:CAPS" href="libchamplain/ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-MEMPHIS-LOCAL:CAPS">
-<ANCHOR id="CHAMPLAIN-MAP-SOURCE-MEMPHIS-NETWORK:CAPS" href="libchamplain/ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-MEMPHIS-NETWORK:CAPS">
 <ANCHOR id="ChamplainMapSourceDesc" href="libchamplain/ChamplainMapSourceDesc.html">
 <ANCHOR id="ChamplainMapSourceDesc.synopsis" href="libchamplain/ChamplainMapSourceDesc.html#ChamplainMapSourceDesc.synopsis">
 <ANCHOR id="ChamplainMapSourceDesc.object-hierarchy" href="libchamplain/ChamplainMapSourceDesc.html#ChamplainMapSourceDesc.object-hierarchy">
@@ -553,34 +552,6 @@
 <ANCHOR id="ChamplainImageRenderer.details" href="libchamplain/ChamplainImageRenderer.html#ChamplainImageRenderer.details">
 <ANCHOR id="ChamplainImageRenderer-struct" href="libchamplain/ChamplainImageRenderer.html#ChamplainImageRenderer-struct">
 <ANCHOR id="champlain-image-renderer-new" href="libchamplain/ChamplainImageRenderer.html#champlain-image-renderer-new">
-<ANCHOR id="ChamplainMemphisRenderer" href="libchamplain/ChamplainMemphisRenderer.html">
-<ANCHOR id="ChamplainMemphisRenderer.synopsis" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRenderer.synopsis">
-<ANCHOR id="ChamplainMemphisRenderer.object-hierarchy" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRenderer.object-hierarchy">
-<ANCHOR id="ChamplainMemphisRenderer.properties" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRenderer.properties">
-<ANCHOR id="ChamplainMemphisRenderer.description" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRenderer.description">
-<ANCHOR id="ChamplainMemphisRenderer.details" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRenderer.details">
-<ANCHOR id="ChamplainMemphisRenderer-struct" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRenderer-struct">
-<ANCHOR id="ChamplainMemphisRule" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRule">
-<ANCHOR id="ChamplainMemphisRuleAttr" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRuleAttr">
-<ANCHOR id="ChamplainMemphisRuleType" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRuleType">
-<ANCHOR id="CHAMPLAIN-MEMPHIS-RULE-TYPE-UNKNOWN:CAPS" href="libchamplain/ChamplainMemphisRenderer.html#CHAMPLAIN-MEMPHIS-RULE-TYPE-UNKNOWN:CAPS">
-<ANCHOR id="CHAMPLAIN-MEMPHIS-RULE-TYPE-NODE:CAPS" href="libchamplain/ChamplainMemphisRenderer.html#CHAMPLAIN-MEMPHIS-RULE-TYPE-NODE:CAPS">
-<ANCHOR id="CHAMPLAIN-MEMPHIS-RULE-TYPE-WAY:CAPS" href="libchamplain/ChamplainMemphisRenderer.html#CHAMPLAIN-MEMPHIS-RULE-TYPE-WAY:CAPS">
-<ANCHOR id="CHAMPLAIN-MEMPHIS-RULE-TYPE-RELATION:CAPS" href="libchamplain/ChamplainMemphisRenderer.html#CHAMPLAIN-MEMPHIS-RULE-TYPE-RELATION:CAPS">
-<ANCHOR id="champlain-memphis-renderer-new-full" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-new-full">
-<ANCHOR id="champlain-memphis-renderer-load-rules" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-load-rules">
-<ANCHOR id="champlain-memphis-renderer-get-background-color" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-background-color">
-<ANCHOR id="champlain-memphis-renderer-set-background-color" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-background-color">
-<ANCHOR id="champlain-memphis-renderer-get-rule-ids" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-rule-ids">
-<ANCHOR id="champlain-memphis-renderer-set-rule" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-rule">
-<ANCHOR id="champlain-memphis-renderer-get-rule" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-rule">
-<ANCHOR id="champlain-memphis-renderer-remove-rule" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-remove-rule">
-<ANCHOR id="champlain-memphis-renderer-get-bounding-box" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-bounding-box">
-<ANCHOR id="champlain-memphis-renderer-set-tile-size" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-tile-size">
-<ANCHOR id="champlain-memphis-renderer-get-tile-size" href="libchamplain/ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-tile-size">
-<ANCHOR id="ChamplainMemphisRenderer.property-details" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRenderer.property-details">
-<ANCHOR id="ChamplainMemphisRenderer--bounding-box" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRenderer--bounding-box">
-<ANCHOR id="ChamplainMemphisRenderer--tile-size" href="libchamplain/ChamplainMemphisRenderer.html#ChamplainMemphisRenderer--tile-size">
 <ANCHOR id="ChamplainErrorTileRenderer" href="libchamplain/ChamplainErrorTileRenderer.html">
 <ANCHOR id="ChamplainErrorTileRenderer.synopsis" href="libchamplain/ChamplainErrorTileRenderer.html#ChamplainErrorTileRenderer.synopsis">
 <ANCHOR id="ChamplainErrorTileRenderer.object-hierarchy" href="libchamplain/ChamplainErrorTileRenderer.html#ChamplainErrorTileRenderer.object-hierarchy">

=== modified file 'docs/reference/html/ix01.html'
--- docs/reference/html/ix01.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ix01.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp96768"></a>Index</h2></div></div></div>
+<a name="idp51632"></a>Index</h2></div></div></div>
 <div class="index">
 <div class="indexdiv">
 <h3>B</h3>
@@ -374,10 +374,6 @@
 </dt>
 <dt>champlain_map_source_get_y, <a class="indexterm" href="ChamplainMapSource.html#champlain-map-source-get-y">champlain_map_source_get_y ()</a>
 </dt>
-<dt>CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL, <a class="indexterm" href="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-MEMPHIS-LOCAL:CAPS">CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL</a>
-</dt>
-<dt>CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK, <a class="indexterm" href="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-MEMPHIS-NETWORK:CAPS">CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK</a>
-</dt>
 <dt>CHAMPLAIN_MAP_SOURCE_MFF_RELIEF, <a class="indexterm" href="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-MFF-RELIEF:CAPS">CHAMPLAIN_MAP_SOURCE_MFF_RELIEF</a>
 </dt>
 <dt>CHAMPLAIN_MAP_SOURCE_OAM, <a class="indexterm" href="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-OAM:CAPS">CHAMPLAIN_MAP_SOURCE_OAM</a>
@@ -504,40 +500,6 @@
 </dt>
 <dt>champlain_memory_cache_set_size_limit, <a class="indexterm" href="ChamplainMemoryCache.html#champlain-memory-cache-set-size-limit">champlain_memory_cache_set_size_limit ()</a>
 </dt>
-<dt>ChamplainMemphisRenderer, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer-struct">struct ChamplainMemphisRenderer</a>
-</dt>
-<dt>ChamplainMemphisRenderer:bounding-box, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer--bounding-box">The "bounding-box" property</a>
-</dt>
-<dt>ChamplainMemphisRenderer:tile-size, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer--tile-size">The "tile-size" property</a>
-</dt>
-<dt>ChamplainMemphisRule, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule">struct ChamplainMemphisRule</a>
-</dt>
-<dt>ChamplainMemphisRuleAttr, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleAttr">struct ChamplainMemphisRuleAttr</a>
-</dt>
-<dt>ChamplainMemphisRuleType, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleType">enum ChamplainMemphisRuleType</a>
-</dt>
-<dt>champlain_memphis_renderer_get_background_color, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-background-color">champlain_memphis_renderer_get_background_color ()</a>
-</dt>
-<dt>champlain_memphis_renderer_get_bounding_box, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-bounding-box">champlain_memphis_renderer_get_bounding_box ()</a>
-</dt>
-<dt>champlain_memphis_renderer_get_rule, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-rule">champlain_memphis_renderer_get_rule ()</a>
-</dt>
-<dt>champlain_memphis_renderer_get_rule_ids, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-rule-ids">champlain_memphis_renderer_get_rule_ids ()</a>
-</dt>
-<dt>champlain_memphis_renderer_get_tile_size, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-tile-size">champlain_memphis_renderer_get_tile_size ()</a>
-</dt>
-<dt>champlain_memphis_renderer_load_rules, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-load-rules">champlain_memphis_renderer_load_rules ()</a>
-</dt>
-<dt>champlain_memphis_renderer_new_full, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-new-full">champlain_memphis_renderer_new_full ()</a>
-</dt>
-<dt>champlain_memphis_renderer_remove_rule, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-remove-rule">champlain_memphis_renderer_remove_rule ()</a>
-</dt>
-<dt>champlain_memphis_renderer_set_background_color, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-background-color">champlain_memphis_renderer_set_background_color ()</a>
-</dt>
-<dt>champlain_memphis_renderer_set_rule, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-rule">champlain_memphis_renderer_set_rule ()</a>
-</dt>
-<dt>champlain_memphis_renderer_set_tile_size, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-tile-size">champlain_memphis_renderer_set_tile_size ()</a>
-</dt>
 <dt>CHAMPLAIN_MICRO_VERSION, <a class="indexterm" href="libchamplain-ChamplainVersion.html#CHAMPLAIN-MICRO-VERSION:CAPS">CHAMPLAIN_MICRO_VERSION</a>
 </dt>
 <dt>CHAMPLAIN_MINOR_VERSION, <a class="indexterm" href="libchamplain-ChamplainVersion.html#CHAMPLAIN-MINOR-VERSION:CAPS">CHAMPLAIN_MINOR_VERSION</a>
@@ -897,6 +859,8 @@
 </dt>
 <dt>champlain_view_get_bounding_box, <a class="indexterm" href="ChamplainView.html#champlain-view-get-bounding-box">champlain_view_get_bounding_box ()</a>
 </dt>
+<dt>champlain_view_get_bounding_box_for_zoom_level, <a class="indexterm" href="ChamplainView.html#champlain-view-get-bounding-box-for-zoom-level">champlain_view_get_bounding_box_for_zoom_level ()</a>
+</dt>
 <dt>champlain_view_get_center_latitude, <a class="indexterm" href="ChamplainView.html#champlain-view-get-center-latitude">champlain_view_get_center_latitude ()</a>
 </dt>
 <dt>champlain_view_get_center_longitude, <a class="indexterm" href="ChamplainView.html#champlain-view-get-center-longitude">champlain_view_get_center_longitude ()</a>

=== modified file 'docs/reference/html/ix02.html'
--- docs/reference/html/ix02.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ix02.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp97568"></a>Index of deprecated symbols</h2></div></div></div>
+<a name="idp52432"></a>Index of deprecated symbols</h2></div></div></div>
 <div class="index">
 <div class="indexdiv">
 <h3>C</h3>

=== modified file 'docs/reference/html/ix03.html'
--- docs/reference/html/ix03.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ix03.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp98656"></a>Index of new symbols in 0.1</h2></div></div></div>
+<a name="idp53520"></a>Index of new symbols in 0.1</h2></div></div></div>
 <div class="index"><div class="indexdiv">
 <h3>V</h3>
 <dl>

=== modified file 'docs/reference/html/ix04.html'
--- docs/reference/html/ix04.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ix04.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp99712"></a>Index of new symbols in 0.2</h2></div></div></div>
+<a name="idp54624"></a>Index of new symbols in 0.2</h2></div></div></div>
 <div class="index"><div class="indexdiv">
 <h3>V</h3>
 <dl>

=== modified file 'docs/reference/html/ix05.html'
--- docs/reference/html/ix05.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ix05.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp100768"></a>Index of new symbols in 0.4</h2></div></div></div>
+<a name="idp61312"></a>Index of new symbols in 0.4</h2></div></div></div>
 <div class="index">
 <div class="indexdiv">
 <h3>F</h3>

=== modified file 'docs/reference/html/ix06.html'
--- docs/reference/html/ix06.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ix06.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp101824"></a>Index of new symbols in 0.6</h2></div></div></div>
+<a name="idp62416"></a>Index of new symbols in 0.6</h2></div></div></div>
 <div class="index">
 <div class="indexdiv">
 <h3>B</h3>

=== modified file 'docs/reference/html/ix07.html'
--- docs/reference/html/ix07.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ix07.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp102928"></a>Index of new symbols in 0.8</h2></div></div></div>
+<a name="idp63520"></a>Index of new symbols in 0.8</h2></div></div></div>
 <div class="index">
 <div class="indexdiv">
 <h3>E</h3>
@@ -83,38 +83,6 @@
 </dt>
 <dt>champlain_memory_cache_set_size_limit, <a class="indexterm" href="ChamplainMemoryCache.html#champlain-memory-cache-set-size-limit">champlain_memory_cache_set_size_limit ()</a>
 </dt>
-<dt>ChamplainMemphisRenderer, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer-struct">struct ChamplainMemphisRenderer</a>
-</dt>
-<dt>ChamplainMemphisRenderer:bounding-box, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer--bounding-box">The "bounding-box" property</a>
-</dt>
-<dt>ChamplainMemphisRule, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRule">struct ChamplainMemphisRule</a>
-</dt>
-<dt>ChamplainMemphisRuleAttr, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleAttr">struct ChamplainMemphisRuleAttr</a>
-</dt>
-<dt>ChamplainMemphisRuleType, <a class="indexterm" href="ChamplainMemphisRenderer.html#ChamplainMemphisRuleType">enum ChamplainMemphisRuleType</a>
-</dt>
-<dt>champlain_memphis_renderer_get_background_color, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-background-color">champlain_memphis_renderer_get_background_color ()</a>
-</dt>
-<dt>champlain_memphis_renderer_get_bounding_box, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-bounding-box">champlain_memphis_renderer_get_bounding_box ()</a>
-</dt>
-<dt>champlain_memphis_renderer_get_rule, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-rule">champlain_memphis_renderer_get_rule ()</a>
-</dt>
-<dt>champlain_memphis_renderer_get_rule_ids, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-rule-ids">champlain_memphis_renderer_get_rule_ids ()</a>
-</dt>
-<dt>champlain_memphis_renderer_get_tile_size, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-tile-size">champlain_memphis_renderer_get_tile_size ()</a>
-</dt>
-<dt>champlain_memphis_renderer_load_rules, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-load-rules">champlain_memphis_renderer_load_rules ()</a>
-</dt>
-<dt>champlain_memphis_renderer_new_full, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-new-full">champlain_memphis_renderer_new_full ()</a>
-</dt>
-<dt>champlain_memphis_renderer_remove_rule, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-remove-rule">champlain_memphis_renderer_remove_rule ()</a>
-</dt>
-<dt>champlain_memphis_renderer_set_background_color, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-background-color">champlain_memphis_renderer_set_background_color ()</a>
-</dt>
-<dt>champlain_memphis_renderer_set_rule, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-rule">champlain_memphis_renderer_set_rule ()</a>
-</dt>
-<dt>champlain_memphis_renderer_set_tile_size, <a class="indexterm" href="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-tile-size">champlain_memphis_renderer_set_tile_size ()</a>
-</dt>
 </dl>
 </div>
 <div class="indexdiv">

=== modified file 'docs/reference/html/ix08.html'
--- docs/reference/html/ix08.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ix08.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp103984"></a>Index of new symbols in 0.10</h2></div></div></div>
+<a name="idp64624"></a>Index of new symbols in 0.10</h2></div></div></div>
 <div class="index">
 <div class="indexdiv">
 <h3>B</h3>

=== modified file 'docs/reference/html/ix09.html'
--- docs/reference/html/ix09.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/ix09.html	2014-02-16 21:01:35 +0000
@@ -20,7 +20,7 @@
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp105072"></a>Index of new symbols in 0.12</h2></div></div></div>
+<a name="idp65712"></a>Index of new symbols in 0.12</h2></div></div></div>
 <div class="index"><div class="indexdiv">
 <h3>V</h3>
 <dl>

=== modified file 'docs/reference/html/libchamplain-ChamplainVersion.html'
--- docs/reference/html/libchamplain-ChamplainVersion.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/libchamplain-ChamplainVersion.html	2014-02-16 21:01:35 +0000
@@ -77,7 +77,7 @@
 <hr>
 <div class="refsect2">
 <a name="CHAMPLAIN-MICRO-VERSION:CAPS"></a><h3>CHAMPLAIN_MICRO_VERSION</h3>
-<pre class="programlisting">#define CHAMPLAIN_MICRO_VERSION   (5)
+<pre class="programlisting">#define CHAMPLAIN_MICRO_VERSION   (7)
 </pre>
 <p>
 The micro version of libchamplain (3, if <a class="link" href="libchamplain-ChamplainVersion.html#CHAMPLAIN-VERSION:CAPS" title="CHAMPLAIN_VERSION"><code class="literal">CHAMPLAIN_VERSION</code></a> is 1.2.3)
@@ -86,7 +86,7 @@
 <hr>
 <div class="refsect2">
 <a name="CHAMPLAIN-VERSION:CAPS"></a><h3>CHAMPLAIN_VERSION</h3>
-<pre class="programlisting">#define CHAMPLAIN_VERSION         0.12.5
+<pre class="programlisting">#define CHAMPLAIN_VERSION         0.12.7
 </pre>
 <p>
 The full version of libchamplain, like 1.2.3
@@ -95,7 +95,7 @@
 <hr>
 <div class="refsect2">
 <a name="CHAMPLAIN-VERSION-S:CAPS"></a><h3>CHAMPLAIN_VERSION_S</h3>
-<pre class="programlisting">#define CHAMPLAIN_VERSION_S       "0.12.5"
+<pre class="programlisting">#define CHAMPLAIN_VERSION_S       "0.12.7"
 </pre>
 <p>
 The full version of libchamplain, in string form (suited for

=== modified file 'docs/reference/html/libchamplain.devhelp2'
--- docs/reference/html/libchamplain.devhelp2	2013-09-21 15:31:58 +0000
+++ docs/reference/html/libchamplain.devhelp2	2014-02-16 21:01:35 +0000
@@ -49,7 +49,6 @@
     <sub name="Renderer API" link="pt05.html">
       <sub name="ChamplainRenderer" link="ChamplainRenderer.html"/>
       <sub name="ChamplainImageRenderer" link="ChamplainImageRenderer.html"/>
-      <sub name="ChamplainMemphisRenderer" link="ChamplainMemphisRenderer.html"/>
       <sub name="ChamplainErrorTileRenderer" link="ChamplainErrorTileRenderer.html"/>
     </sub>
     <sub name="Others" link="pt06.html">
@@ -116,6 +115,7 @@
     <keyword type="function" name="champlain_view_get_center_latitude ()" link="ChamplainView.html#champlain-view-get-center-latitude" since="0.10"/>
     <keyword type="function" name="champlain_view_get_center_longitude ()" link="ChamplainView.html#champlain-view-get-center-longitude" since="0.10"/>
     <keyword type="function" name="champlain_view_get_bounding_box ()" link="ChamplainView.html#champlain-view-get-bounding-box" since="0.12.4"/>
+    <keyword type="function" name="champlain_view_get_bounding_box_for_zoom_level ()" link="ChamplainView.html#champlain-view-get-bounding-box-for-zoom-level" since="0.12.6"/>
     <keyword type="function" name="champlain_view_get_state ()" link="ChamplainView.html#champlain-view-get-state" since="0.10"/>
     <keyword type="property" name="The &quot;animate-zoom&quot; property" link="ChamplainView.html#ChamplainView--animate-zoom"/>
     <keyword type="property" name="The &quot;background-pattern&quot; property" link="ChamplainView.html#ChamplainView--background-pattern"/>
@@ -408,8 +408,6 @@
     <keyword type="macro" name="CHAMPLAIN_MAP_SOURCE_OWM_PRESSURE" link="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-OWM-PRESSURE:CAPS"/>
     <keyword type="macro" name="CHAMPLAIN_MAP_SOURCE_OWM_TEMPERATURE" link="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-OWM-TEMPERATURE:CAPS"/>
     <keyword type="macro" name="CHAMPLAIN_MAP_SOURCE_OWM_WIND" link="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-OWM-WIND:CAPS"/>
-    <keyword type="macro" name="CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL" link="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-MEMPHIS-LOCAL:CAPS"/>
-    <keyword type="macro" name="CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK" link="ChamplainMapSourceFactory.html#CHAMPLAIN-MAP-SOURCE-MEMPHIS-NETWORK:CAPS"/>
     <keyword type="struct" name="struct ChamplainMapSourceDesc" link="ChamplainMapSourceDesc.html#ChamplainMapSourceDesc-struct"/>
     <keyword type="function" name="ChamplainMapSourceConstructor ()" link="ChamplainMapSourceDesc.html#ChamplainMapSourceConstructor" since="0.10"/>
     <keyword type="macro" name="CHAMPLAIN_MAP_SOURCE_CONSTRUCTOR" link="ChamplainMapSourceDesc.html#CHAMPLAIN-MAP-SOURCE-CONSTRUCTOR:CAPS" since="0.10"/>
@@ -441,23 +439,6 @@
     <keyword type="function" name="champlain_renderer_render ()" link="ChamplainRenderer.html#champlain-renderer-render" since="0.8"/>
     <keyword type="struct" name="struct ChamplainImageRenderer" link="ChamplainImageRenderer.html#ChamplainImageRenderer-struct"/>
     <keyword type="function" name="champlain_image_renderer_new ()" link="ChamplainImageRenderer.html#champlain-image-renderer-new" since="0.8"/>
-    <keyword type="struct" name="struct ChamplainMemphisRenderer" link="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer-struct"/>
-    <keyword type="struct" name="struct ChamplainMemphisRule" link="ChamplainMemphisRenderer.html#ChamplainMemphisRule" since="0.8"/>
-    <keyword type="struct" name="struct ChamplainMemphisRuleAttr" link="ChamplainMemphisRenderer.html#ChamplainMemphisRuleAttr" since="0.8"/>
-    <keyword type="enum" name="enum ChamplainMemphisRuleType" link="ChamplainMemphisRenderer.html#ChamplainMemphisRuleType" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_new_full ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-new-full" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_load_rules ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-load-rules" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_get_background_color ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-background-color" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_set_background_color ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-background-color" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_get_rule_ids ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-rule-ids" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_set_rule ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-rule" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_get_rule ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-rule" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_remove_rule ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-remove-rule" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_get_bounding_box ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-bounding-box" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_set_tile_size ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-set-tile-size" since="0.8"/>
-    <keyword type="function" name="champlain_memphis_renderer_get_tile_size ()" link="ChamplainMemphisRenderer.html#champlain-memphis-renderer-get-tile-size" since="0.8"/>
-    <keyword type="property" name="The &quot;bounding-box&quot; property" link="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer--bounding-box"/>
-    <keyword type="property" name="The &quot;tile-size&quot; property" link="ChamplainMemphisRenderer.html#ChamplainMemphisRenderer--tile-size"/>
     <keyword type="struct" name="struct ChamplainErrorTileRenderer" link="ChamplainErrorTileRenderer.html#ChamplainErrorTileRenderer-struct"/>
     <keyword type="function" name="champlain_error_tile_renderer_new ()" link="ChamplainErrorTileRenderer.html#champlain-error-tile-renderer-new" since="0.8"/>
     <keyword type="function" name="champlain_error_tile_renderer_set_tile_size ()" link="ChamplainErrorTileRenderer.html#champlain-error-tile-renderer-set-tile-size" since="0.8"/>
@@ -517,10 +498,6 @@
     <keyword type="constant" name="CHAMPLAIN_UNIT_KM" link="ChamplainScale.html#CHAMPLAIN-UNIT-KM:CAPS"/>
     <keyword type="constant" name="CHAMPLAIN_UNIT_MILES" link="ChamplainScale.html#CHAMPLAIN-UNIT-MILES:CAPS"/>
     <keyword type="constant" name="CHAMPLAIN_MAP_PROJECTION_MERCATOR" link="ChamplainMapSource.html#CHAMPLAIN-MAP-PROJECTION-MERCATOR:CAPS"/>
-    <keyword type="constant" name="CHAMPLAIN_MEMPHIS_RULE_TYPE_UNKNOWN" link="ChamplainMemphisRenderer.html#CHAMPLAIN-MEMPHIS-RULE-TYPE-UNKNOWN:CAPS"/>
-    <keyword type="constant" name="CHAMPLAIN_MEMPHIS_RULE_TYPE_NODE" link="ChamplainMemphisRenderer.html#CHAMPLAIN-MEMPHIS-RULE-TYPE-NODE:CAPS"/>
-    <keyword type="constant" name="CHAMPLAIN_MEMPHIS_RULE_TYPE_WAY" link="ChamplainMemphisRenderer.html#CHAMPLAIN-MEMPHIS-RULE-TYPE-WAY:CAPS"/>
-    <keyword type="constant" name="CHAMPLAIN_MEMPHIS_RULE_TYPE_RELATION" link="ChamplainMemphisRenderer.html#CHAMPLAIN-MEMPHIS-RULE-TYPE-RELATION:CAPS"/>
     <keyword type="constant" name="CHAMPLAIN_STATE_NONE" link="ChamplainTile.html#CHAMPLAIN-STATE-NONE:CAPS"/>
     <keyword type="constant" name="CHAMPLAIN_STATE_LOADING" link="ChamplainTile.html#CHAMPLAIN-STATE-LOADING:CAPS"/>
     <keyword type="constant" name="CHAMPLAIN_STATE_LOADED" link="ChamplainTile.html#CHAMPLAIN-STATE-LOADED:CAPS"/>

=== modified file 'docs/reference/html/pt01.html'
--- docs/reference/html/pt01.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/pt01.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="idp63312"></a>Part I. Basic API</h1></div></div></div>
+<a name="idp4190128"></a>Part I. Basic API</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl><dt>

=== modified file 'docs/reference/html/pt02.html'
--- docs/reference/html/pt02.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/pt02.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="idp64688"></a>Part II. Layers, Markers and Locations</h1></div></div></div>
+<a name="idp4191504"></a>Part II. Layers, Markers and Locations</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>

=== modified file 'docs/reference/html/pt03.html'
--- docs/reference/html/pt03.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/pt03.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="idp85072"></a>Part III. Widgets</h1></div></div></div>
+<a name="idp4199568"></a>Part III. Widgets</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>

=== modified file 'docs/reference/html/pt04.html'
--- docs/reference/html/pt04.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/pt04.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="idp86944"></a>Part IV. Map Source API</h1></div></div></div>
+<a name="idp4201440"></a>Part IV. Map Source API</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>

=== modified file 'docs/reference/html/pt05.html'
--- docs/reference/html/pt05.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/pt05.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="idp178752"></a>Part V. Renderer API</h1></div></div></div>
+<a name="idp45264"></a>Part V. Renderer API</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
@@ -32,9 +32,6 @@
 <span class="refentrytitle"><a href="ChamplainImageRenderer.html">ChamplainImageRenderer</a></span><span class="refpurpose"> — A renderer that renders tiles from binary image data</span>
 </dt>
 <dt>
-<span class="refentrytitle"><a href="ChamplainMemphisRenderer.html">ChamplainMemphisRenderer</a></span><span class="refpurpose"> — A renderer that renders tiles from OSM vector XML data</span>
-</dt>
-<dt>
 <span class="refentrytitle"><a href="ChamplainErrorTileRenderer.html">ChamplainErrorTileRenderer</a></span><span class="refpurpose"> — A renderer that renders error tiles independently of input data</span>
 </dt>
 </dl>

=== modified file 'docs/reference/html/pt06.html'
--- docs/reference/html/pt06.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/pt06.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="idp92832"></a>Part VI. Others</h1></div></div></div>
+<a name="idp47696"></a>Part VI. Others</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>

=== modified file 'docs/reference/html/pt07.html'
--- docs/reference/html/pt07.html	2013-09-21 15:31:58 +0000
+++ docs/reference/html/pt07.html	2014-02-16 21:01:35 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="part">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="idp95248"></a>Part VII. Annotation Glossary</h1></div></div></div>
+<a name="idp50112"></a>Part VII. Annotation Glossary</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl><dt><span class="glossary"><a href="annotation-glossary.html">Annotation Glossary</a></span></dt></dl>

=== modified file 'docs/reference/libchamplain-docs.sgml'
--- docs/reference/libchamplain-docs.sgml	2013-09-21 15:31:58 +0000
+++ docs/reference/libchamplain-docs.sgml	2014-02-16 21:01:35 +0000
@@ -98,7 +98,6 @@
     <title>Renderer API</title>
     <xi:include href="xml/champlain-renderer.xml"/>
     <xi:include href="xml/champlain-image-renderer.xml"/>
-    <xi:include href="xml/champlain-memphis-renderer.xml"/>
     <xi:include href="xml/champlain-error-tile-renderer.xml"/>
   </part>
   <part>

=== modified file 'docs/reference/libchamplain-sections.txt'
--- docs/reference/libchamplain-sections.txt	2013-09-21 15:31:58 +0000
+++ docs/reference/libchamplain-sections.txt	2014-02-16 21:01:35 +0000
@@ -164,6 +164,7 @@
 champlain_view_get_center_latitude
 champlain_view_get_center_longitude
 champlain_view_get_bounding_box
+champlain_view_get_bounding_box_for_zoom_level
 champlain_view_get_state
 <SUBSECTION Standard>
 CHAMPLAIN_VIEW
@@ -456,8 +457,6 @@
 CHAMPLAIN_MAP_SOURCE_OWM_PRESSURE
 CHAMPLAIN_MAP_SOURCE_OWM_TEMPERATURE
 CHAMPLAIN_MAP_SOURCE_OWM_WIND
-CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL
-CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK
 <SUBSECTION Standard>
 CHAMPLAIN_MAP_SOURCE_FACTORY
 CHAMPLAIN_IS_MAP_SOURCE_FACTORY
@@ -692,38 +691,6 @@
 </SECTION>
 
 <SECTION>
-<FILE>champlain-memphis-renderer</FILE>
-<TITLE>ChamplainMemphisRenderer</TITLE>
-ChamplainMemphisRenderer
-ChamplainMemphisRule
-ChamplainMemphisRuleAttr
-ChamplainMemphisRuleType
-champlain_memphis_renderer_new_full
-champlain_memphis_renderer_load_rules
-champlain_memphis_renderer_get_background_color
-champlain_memphis_renderer_set_background_color
-champlain_memphis_renderer_get_rule_ids
-champlain_memphis_renderer_set_rule
-champlain_memphis_renderer_get_rule
-champlain_memphis_renderer_remove_rule
-champlain_memphis_renderer_get_bounding_box
-champlain_memphis_renderer_set_tile_size
-champlain_memphis_renderer_get_tile_size
-<SUBSECTION Standard>
-CHAMPLAIN_MEMPHIS_RENDERER
-CHAMPLAIN_IS_MEMPHIS_RENDERER
-CHAMPLAIN_TYPE_MEMPHIS_RENDERER
-champlain_memphis_renderer_get_type
-CHAMPLAIN_MEMPHIS_RENDERER_CLASS
-CHAMPLAIN_IS_MEMPHIS_RENDERER_CLASS
-CHAMPLAIN_MEMPHIS_RENDERER_GET_CLASS
-<SUBSECTION Private>
-ChamplainMemphisRendererClass
-ChamplainMemphisRendererPrivate
-</SECTION>
-
-
-<SECTION>
 <FILE>champlain-custom-marker</FILE>
 <TITLE>ChamplainCustomMarker</TITLE>
 ChamplainCustomMarker

=== modified file 'docs/reference/libchamplain.types'
--- docs/reference/libchamplain.types	2011-09-20 20:48:16 +0000
+++ docs/reference/libchamplain.types	2014-02-16 21:01:35 +0000
@@ -16,7 +16,6 @@
 champlain_marker_get_type
 champlain_marker_layer_get_type
 champlain_memory_cache_get_type
-champlain_memphis_renderer_get_type
 champlain_network_bbox_tile_source_get_type
 champlain_network_tile_source_get_type
 champlain_null_tile_source_get_type

=== modified file 'docs/reference/tmpl/champlain-map-source-factory.sgml'
--- docs/reference/tmpl/champlain-map-source-factory.sgml	2013-09-21 15:31:58 +0000
+++ docs/reference/tmpl/champlain-map-source-factory.sgml	2014-02-16 21:01:35 +0000
@@ -185,17 +185,3 @@
 
 
 
-<!-- ##### MACRO CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK ##### -->
-<para>
-
-</para>
-
-
-

=== modified file 'docs/reference/tmpl/champlain-memphis-renderer.sgml'
--- docs/reference/tmpl/champlain-memphis-renderer.sgml	2011-09-20 20:48:16 +0000
+++ docs/reference/tmpl/champlain-memphis-renderer.sgml	2014-02-16 21:01:35 +0000
@@ -20,156 +20,3 @@
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT ChamplainMemphisRenderer ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG ChamplainMemphisRenderer:bounding-box ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG ChamplainMemphisRenderer:tile-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT ChamplainMemphisRule ##### -->
-<para>
-
-</para>
-
-@keys: 
-@values: 
-@type: 
-@polygon: 
-@line: 
-@border: 
-@text: 
-
-<!-- ##### STRUCT ChamplainMemphisRuleAttr ##### -->
-<para>
-
-</para>
-
-@z_min: 
-@z_max: 
-@color_red: 
-@color_green: 
-@color_blue: 
-@color_alpha: 
-@style: 
-@size: 
-
-<!-- ##### ENUM ChamplainMemphisRuleType ##### -->
-<para>
-
-</para>
-
-@CHAMPLAIN_MEMPHIS_RULE_TYPE_UNKNOWN: 
-@CHAMPLAIN_MEMPHIS_RULE_TYPE_NODE: 
-@CHAMPLAIN_MEMPHIS_RULE_TYPE_WAY: 
-@CHAMPLAIN_MEMPHIS_RULE_TYPE_RELATION: 
-
-<!-- ##### FUNCTION champlain_memphis_renderer_new_full ##### -->
-<para>
-
-</para>
-
-@tile_size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION champlain_memphis_renderer_load_rules ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@rules_path: 
-
-
-<!-- ##### FUNCTION champlain_memphis_renderer_get_background_color ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION champlain_memphis_renderer_set_background_color ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@color: 
-
-
-<!-- ##### FUNCTION champlain_memphis_renderer_get_rule_ids ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION champlain_memphis_renderer_set_rule ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@rule: 
-
-
-<!-- ##### FUNCTION champlain_memphis_renderer_get_rule ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION champlain_memphis_renderer_remove_rule ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@id: 
-
-
-<!-- ##### FUNCTION champlain_memphis_renderer_get_bounding_box ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION champlain_memphis_renderer_set_tile_size ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@size: 
-
-
-<!-- ##### FUNCTION champlain_memphis_renderer_get_tile_size ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@Returns: 
-
-

=== modified file 'docs/reference/tmpl/champlain-view.sgml'
--- docs/reference/tmpl/champlain-view.sgml	2013-09-21 15:31:58 +0000
+++ docs/reference/tmpl/champlain-view.sgml	2014-02-16 21:01:35 +0000
@@ -518,6 +518,16 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION champlain_view_get_bounding_box_for_zoom_level ##### -->
+<para>
+
+</para>
+
+@view: 
+@zoom_level: 
+@Returns: 
+
+
 <!-- ##### FUNCTION champlain_view_get_state ##### -->
 <para>
 

=== modified file 'docs/reference/tmpl/libchamplain-unused.sgml'
--- docs/reference/tmpl/libchamplain-unused.sgml	2013-09-21 15:31:58 +0000
+++ docs/reference/tmpl/libchamplain-unused.sgml	2014-02-16 21:01:35 +0000
@@ -0,0 +1,184 @@
+<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/champlain-memphis-renderer.sgml:Title ##### -->
+ChamplainMemphisRenderer
+
+
+<!-- ##### MACRO CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT ChamplainMemphisRenderer ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG ChamplainMemphisRenderer:bounding-box ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG ChamplainMemphisRenderer:tile-size ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT ChamplainMemphisRule ##### -->
+<para>
+
+</para>
+
+@keys: 
+@values: 
+@type: 
+@polygon: 
+@line: 
+@border: 
+@text: 
+
+<!-- ##### STRUCT ChamplainMemphisRuleAttr ##### -->
+<para>
+
+</para>
+
+@z_min: 
+@z_max: 
+@color_red: 
+@color_green: 
+@color_blue: 
+@color_alpha: 
+@style: 
+@size: 
+
+<!-- ##### ENUM ChamplainMemphisRuleType ##### -->
+<para>
+
+</para>
+
+@CHAMPLAIN_MEMPHIS_RULE_TYPE_UNKNOWN: 
+@CHAMPLAIN_MEMPHIS_RULE_TYPE_NODE: 
+@CHAMPLAIN_MEMPHIS_RULE_TYPE_WAY: 
+@CHAMPLAIN_MEMPHIS_RULE_TYPE_RELATION: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_get_background_color ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@Returns: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_get_bounding_box ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@Returns: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_get_rule ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@id: 
+@Returns: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_get_rule_ids ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@Returns: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_get_tile_size ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@Returns: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_load_rules ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@rules_path: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_new_full ##### -->
+<para>
+
+</para>
+
+@tile_size: 
+@Returns: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_remove_rule ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@id: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_set_background_color ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@color: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_set_rule ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@rule: 
+
+<!-- ##### FUNCTION champlain_memphis_renderer_set_tile_size ##### -->
+<para>
+
+</para>
+
+@renderer: 
+@size: 
+

=== modified file 'docs/reference/version.xml'
--- docs/reference/version.xml	2013-09-21 15:31:58 +0000
+++ docs/reference/version.xml	2014-02-16 21:01:35 +0000
@@ -1,1 +1,1 @@
-0.12.5
+0.12.7