[libchamplain] Use_memphis_renderer_tile_has_data() as it works in libmemphis 0.2.1

[Jiří Techet <jiritechet src gnome org>]

commit 23c614fb68c8c7635d870f0503424cc142211ef1
Author: JiÅ?í Techet <techet gmail com>
Date:   Tue Aug 17 01:59:08 2010 +0200

    Use_memphis_renderer_tile_has_data() as it works in libmemphis 0.2.1
    
    In addition, add a cool thing into the local rendering demo - tiles
    rendered by memphis and downloaded get combined in a single map.
    Commented out for now.
    
    Signed-off-by: JiÅ?í Techet <techet gmail com>

 champlain/champlain-memphis-renderer.c |    7 +++----
 configure.ac                           |    2 +-
 demos/local-rendering.c                |   10 ++++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/champlain/champlain-memphis-renderer.c b/champlain/champlain-memphis-renderer.c
index 6859027..9416436 100644
--- a/champlain/champlain-memphis-renderer.c
+++ b/champlain/champlain-memphis-renderer.c
@@ -374,10 +374,9 @@ memphis_worker_thread (gpointer worker_data,
 
   data->cst = NULL;
 
-/* uncomment when libmemphis works correctly */
-/*  g_static_rw_lock_reader_lock (&MemphisLock);
- *  has_data = memphis_renderer_tile_has_data (renderer->priv->renderer, data->x, data->y, data->z);
- *  g_static_rw_lock_reader_unlock (&MemphisLock); */
+  g_static_rw_lock_reader_lock (&MemphisLock);
+  has_data = memphis_renderer_tile_has_data (renderer->priv->renderer, data->x, data->y, data->z);
+  g_static_rw_lock_reader_unlock (&MemphisLock);
 
   if (has_data)
     {
diff --git a/configure.ac b/configure.ac
index b7c1745..cc4a1a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,7 +173,7 @@ if test x$enable_python = xyes; then
   )
 
   if test "x$enable_memphis" = "xyes"; then
-    PKG_CHECK_MODULES(PYTHON_BINDING_MEMPHIS, [pymemphis-0.2 >= 0.2])
+    PKG_CHECK_MODULES(PYTHON_BINDING_MEMPHIS, [pymemphis-0.2 >= 0.2.1])
   fi
 
   if test "x$enable_gtk" = "xyes"; then
diff --git a/demos/local-rendering.c b/demos/local-rendering.c
index 2602496..43ad2ad 100644
--- a/demos/local-rendering.c
+++ b/demos/local-rendering.c
@@ -481,6 +481,16 @@ map_source_changed (GtkWidget *widget, ChamplainView *view)
       src = champlain_map_source_factory_create_error_source (factory, tile_size);
 
       champlain_map_source_chain_push (source_chain, src);
+
+// uncomment to see the rendered map combined with normal map
+/*      
+      if (g_strcmp0 (id, "memphis-local") == 0 || g_strcmp0 (id, "memphis-network") == 0)
+        {
+          src = champlain_map_source_factory_create (factory, CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK);
+          champlain_map_source_chain_push (source_chain, src);
+        }
+*/
+
       champlain_map_source_chain_push (source_chain, tile_source);
 
       image_renderer = CHAMPLAIN_RENDERER (champlain_image_renderer_new ());