zoom-level property

diff --git a/champlain/champlainview.c b/champlain/champlainview.c
index d8a48d5e3223aa078c1df594ae116fc5047a437c..91c6da23837204c00fffc5da1faf645e8f6d60e9 100644 (file)
--- a/champlain/champlainview.c
+++ b/champlain/champlainview.c
@@ -68,6 +68,8 @@ struct _ChamplainViewPrivate
   GtkWidget *clutterEmbed;
   
   ChamplainMapSource mapSource;
+  gint zoomLevel; // only used when the zoom-level property is set before map is created
+  
   ClutterActor *viewport;
   ClutterActor *fingerScroll;
   GdkRectangle viewportSize;
@@ -89,6 +91,42 @@ viewport_get_current_latitude(ChamplainViewPrivate *priv)
   return priv->map->y_to_latitude(priv->map, priv->viewportSize.y + priv->viewportSize.height/2.0, priv->map->current_level->level);
 }
 
+static void
+resize_viewport(ChamplainView *champlainView)
+{
+  gdouble lower, upper;
+  TidyAdjustment *hadjust, *vadjust;
+  
+  ChamplainViewPrivate *priv = CHAMPLAIN_VIEW_GET_PRIVATE (champlainView);
+  
+  if(priv->map == NULL)
+    {
+      priv->map = map_new(priv->mapSource);
+      map_load_level(priv->map, priv->zoomLevel);
+      clutter_container_add_actor (CLUTTER_CONTAINER (priv->viewport), priv->map->current_level->group);
+    }
+  
+  clutter_actor_set_size (priv->fingerScroll, priv->viewportSize.width, priv->viewportSize.height);
+  
+  g_object_set (G_OBJECT (priv->viewport), "sync-adjustments", FALSE, NULL);
+  
+  tidy_scrollable_get_adjustments (TIDY_SCROLLABLE (priv->viewport), &hadjust, &vadjust);
+  
+  tidy_adjustment_get_values (hadjust, NULL, &lower, &upper, NULL, NULL, NULL);
+  lower = 0;
+  upper = zoom_level_get_width(priv->map->current_level) - priv->viewportSize.width; 
+  g_object_set (hadjust, "lower", lower, "upper", upper,
+                "step-increment", 1.0, "elastic", TRUE, NULL);
+                
+  tidy_adjustment_get_values (vadjust, NULL, &lower, &upper, NULL, NULL, NULL);
+  lower = 0;
+  upper = zoom_level_get_height(priv->map->current_level) - priv->viewportSize.height;
+  g_object_set (vadjust, "lower", lower, "upper", upper,
+                "step-increment", 1.0, "elastic", TRUE, NULL);
+  
+  //g_print("%d, %d, %d\n", zoom_level_get_width(priv->map->current_level), zoom_level_get_height(priv->map->current_level), sizeof(guint));
+}
+
 static void 
 champlain_view_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
 {
@@ -104,8 +142,17 @@ champlain_view_get_property(GObject* object, guint prop_id, GValue* value, GPara
           g_value_set_double(value, viewport_get_current_latitude(priv));
           break;
         case PROP_ZOOM_LEVEL:
-          //g_value_set_int(value, priv->map->current_level->level);
-          break;
+          {
+            if (priv->map) 
+              {
+                g_value_set_int(value, priv->map->current_level->level);
+              }
+            else
+              {
+                g_value_set_int(value, 0);
+              }
+            break;
+          }
         case PROP_MAP_SOURCE:
           g_value_set_int(value, priv->mapSource);
           break;
@@ -138,7 +185,32 @@ champlain_view_set_property(GObject* object, guint prop_id, const GValue* value,
         }
       case PROP_ZOOM_LEVEL:
         {
-          //FIXME
+          gint level = g_value_get_int(value);
+          if (priv->map) 
+            {
+              if (level != priv->map->current_level->level) 
+                {
+                  ClutterActor * group = priv->map->current_level->group;
+                  gdouble lon = viewport_get_current_longitude(priv);
+                  gdouble lat = viewport_get_current_latitude(priv);
+                  if (map_zoom_to(priv->map, level)) 
+                    {
+                      gint old_level = priv->map->current_level->level;
+                      gdouble x = priv->map->longitude_to_x(priv->map, lon, level);
+                      gdouble y = priv->map->latitude_to_y(priv->map, lat, level);
+
+                      resize_viewport(view);
+                      clutter_container_remove_actor (CLUTTER_CONTAINER (priv->viewport), group);
+                      clutter_container_add_actor (CLUTTER_CONTAINER (priv->viewport), priv->map->current_level->group);
+
+                      tidy_viewport_set_origin(TIDY_VIEWPORT(priv->viewport), x - priv->viewportSize.width/2.0, y - priv->viewportSize.height/2.0, 0);
+                    }
+                }
+            }
+          else 
+            {
+              priv->zoomLevel = level;
+            }
           break;
         }
       case PROP_MAP_SOURCE:
@@ -155,7 +227,6 @@ champlain_view_set_property(GObject* object, guint prop_id, const GValue* value,
                 map_load_visible_tiles (priv->map, priv->viewportSize);
                 clutter_container_add_actor (CLUTTER_CONTAINER (priv->viewport), priv->map->current_level->group);
               }
-              g_print("mapsource: %d", source);
             }
           break;
         }
@@ -230,7 +301,7 @@ champlain_view_class_init (ChamplainViewClass *champlainViewClass)
                                                      0,
                                                      20,
                                                      1.0f,
-                                                     CHAMPLAIN_PARAM_READABLE)); //FIXME change when can be written
+                                                     CHAMPLAIN_PARAM_READWRITE));
 
 
   /**
@@ -255,6 +326,7 @@ champlain_view_init (ChamplainView *champlainView)
 {
   ChamplainViewPrivate *priv = CHAMPLAIN_VIEW_GET_PRIVATE (champlainView);
   priv->mapSource = CHAMPLAIN_MAP_SOURCE_OPENSTREETMAP;
+  priv->zoomLevel = 0;
 }
 
 static void 
@@ -282,42 +354,6 @@ viewport_x_changed_cb(GObject    *gobject,
   g_object_notify(G_OBJECT(champlainView), "latitude");
 }
 
-static void
-resize_viewport(ChamplainView *champlainView)
-{
-  gdouble lower, upper;
-  TidyAdjustment *hadjust, *vadjust;
-  
-  ChamplainViewPrivate *priv = CHAMPLAIN_VIEW_GET_PRIVATE (champlainView);
-  
-  if(priv->map == NULL)
-    {
-      priv->map = map_new(priv->mapSource);
-      map_load_level(priv->map, 0);
-      clutter_container_add_actor (CLUTTER_CONTAINER (priv->viewport), priv->map->current_level->group);
-    }
-  
-  clutter_actor_set_size (priv->fingerScroll, priv->viewportSize.width, priv->viewportSize.height);
-  
-  g_object_set (G_OBJECT (priv->viewport), "sync-adjustments", FALSE, NULL);
-  
-  tidy_scrollable_get_adjustments (TIDY_SCROLLABLE (priv->viewport), &hadjust, &vadjust);
-  
-  tidy_adjustment_get_values (hadjust, NULL, &lower, &upper, NULL, NULL, NULL);
-  lower = 0;
-  upper = zoom_level_get_width(priv->map->current_level) - priv->viewportSize.width; 
-  g_object_set (hadjust, "lower", lower, "upper", upper,
-                "step-increment", 1.0, "elastic", TRUE, NULL);
-                
-  tidy_adjustment_get_values (vadjust, NULL, &lower, &upper, NULL, NULL, NULL);
-  lower = 0;
-  upper = zoom_level_get_height(priv->map->current_level) - priv->viewportSize.height;
-  g_object_set (vadjust, "lower", lower, "upper", upper,
-                "step-increment", 1.0, "elastic", TRUE, NULL);
-  
-  //g_print("%d, %d, %d\n", zoom_level_get_width(priv->map->current_level), zoom_level_get_height(priv->map->current_level), sizeof(guint));
-}
-
 static void
 view_size_allocated_cb (GtkWidget *view, GtkAllocation *allocation, ChamplainView *champlainView) 
 {
@@ -401,6 +437,8 @@ champlain_view_center_on (ChamplainView *champlainView, gdouble longitude, gdoub
   
   g_object_notify(G_OBJECT(champlainView), "longitude");
   g_object_notify(G_OBJECT(champlainView), "latitude");
+  
+  map_load_visible_tiles (priv->map, priv->viewportSize);
 }
 
 /**
@@ -416,13 +454,11 @@ champlain_view_zoom_in (ChamplainView *champlainView)
 {
   ChamplainViewPrivate *priv = CHAMPLAIN_VIEW_GET_PRIVATE (champlainView);
   ClutterActor * group = priv->map->current_level->group;
+  gdouble lon = viewport_get_current_longitude(priv);
+  gdouble lat = viewport_get_current_latitude(priv);
   if(map_zoom_in(priv->map)) 
     {
       gint level = priv->map->current_level->level;
-      g_print("Zoom: %d\n", level);
-      gdouble lon = viewport_get_current_longitude(priv);
-      gdouble lat = viewport_get_current_latitude(priv);
-      level++;
       gdouble x = priv->map->longitude_to_x(priv->map, lon, level);
       gdouble y = priv->map->latitude_to_y(priv->map, lat, level);
       
@@ -449,13 +485,11 @@ champlain_view_zoom_out (ChamplainView *champlainView)
 {
   ChamplainViewPrivate *priv = CHAMPLAIN_VIEW_GET_PRIVATE (champlainView);
   ClutterActor * group = priv->map->current_level->group;
+  gdouble lon = viewport_get_current_longitude(priv);
+  gdouble lat = viewport_get_current_latitude(priv);
   if(map_zoom_out(priv->map))
     {
       gint level = priv->map->current_level->level;
-      g_print("Zoom: %d\n", level);
-      gdouble lon = viewport_get_current_longitude(priv);
-      gdouble lat = viewport_get_current_latitude(priv);
-      level--;
       gdouble x = priv->map->longitude_to_x(priv->map, lon, level);
       gdouble y = priv->map->latitude_to_y(priv->map, lat, level);
       

diff --git a/champlain/launcher.c b/champlain/launcher.c
index d85c5d0adf62c4f6908254e6372104d9e3b7de71..a27bf858e6a572ada03ab50c7e47fb143df76a75 100644 (file)
--- a/champlain/launcher.c
+++ b/champlain/launcher.c
@@ -41,7 +41,7 @@ go_to_montreal (GtkWidget * widget, ChamplainView* view)
 static void
 switch_to_openstreetmap (GtkWidget * widget, ChamplainView* view)
 {
-  g_object_set(G_OBJECT(view), "map-source", CHAMPLAIN_MAP_SOURCE_OPENSTREETMAP, NULL);
+  g_object_set(G_OBJECT(view), "zoom-level", 5, NULL);
 }
 
 static void
@@ -88,6 +88,7 @@ main (int argc, char *argv[])
   
   widget = champlain_view_new ();
   g_object_set(G_OBJECT(widget), "map-source", CHAMPLAIN_MAP_SOURCE_OPENARIALMAP, NULL);
+  g_object_set(G_OBJECT(widget), "zoom-level", 5, NULL);
   
   gtk_widget_set_size_request(widget, 640, 480);
   
@@ -131,7 +132,7 @@ main (int argc, char *argv[])
 
   /* make sure that everything, window and label, are visible */
   gtk_widget_show_all (window);
-  champlain_view_center_on(widget, 0.00, 0.0);
+  champlain_view_center_on(widget, -73.75, 45.466);
   /* start the main loop */
   gtk_main ();
 

diff --git a/champlain/map.c b/champlain/map.c
index 371fd69d3c5145836285948a3bff83acda1add90..dd74f5f774eaee0b2179e067b93e90e1b6ce3fba 100644 (file)
--- a/champlain/map.c
+++ b/champlain/map.c
@@ -154,7 +154,8 @@ map_zoom_out (Map* map)
   return FALSE;
 }
 
-void map_free (Map* map)
+void 
+map_free (Map* map)
 {
   int i;
   for (i = 0; i < map->levels->len; i++)
@@ -163,3 +164,31 @@ void map_free (Map* map)
       zoom_level_free(level);
     }
 }
+
+gboolean 
+map_zoom_to (Map* map, guint zoomLevel)
+{
+  if(zoomLevel >= 0 && 
+     zoomLevel<= map->zoom_levels &&
+     zoomLevel <= 8) //FIXME Due to a ClutterUnit limitation (the x, y will have to be rethinked)
+    {
+      gboolean exist = FALSE;
+      int i;
+      for (i = 0; i < map->levels->len && !exist; i++)
+        {
+          ZoomLevel* level = g_ptr_array_index(map->levels, i);
+          if (level && level->level == zoomLevel)
+            {
+              exist = TRUE;
+              map->current_level = level;
+            }
+        }
+
+      if(!exist)
+        {
+          map_load_level(map, zoomLevel);
+        }
+      return TRUE;
+    }
+  return FALSE;
+}

diff --git a/champlain/map.h b/champlain/map.h
index b017ee76bd8b1036b40d57811b70f2543dc1bb21..8de4e8657b9223a1e1c3175a601774ab59edcc62 100644 (file)
--- a/champlain/map.h
+++ b/champlain/map.h
@@ -58,4 +58,6 @@ void map_load_visible_tiles (Map* map, GdkRectangle viewport);
 
 void map_free (Map* map);
 
+gboolean map_zoom_to (Map* map, guint zoomLevel);
+
 #endif