[libchamplainmm] Regenerate libchamplain_methods.defs

[Juan R. Garcia Blanco <juanrgar src gnome org>]

commit ee3bb2a942ecc554d4154dcf31ac4bbeea765035
Author: Juan R. García Blanco <juanrgar gmail com>
Date:   Mon Feb 24 22:44:01 2014 +0100

    Regenerate libchamplain_methods.defs

 libchamplain/src/libchamplain_methods.defs | 2657 +++++++++++++++++++++-------
 1 files changed, 1977 insertions(+), 680 deletions(-)
---
diff --git a/libchamplain/src/libchamplain_methods.defs b/libchamplain/src/libchamplain_methods.defs
index 2c1fe8c..7ac6984 100644
--- a/libchamplain/src/libchamplain_methods.defs
+++ b/libchamplain/src/libchamplain_methods.defs
@@ -1,33 +1,67 @@
 ;; -*- scheme -*-
 ; object definitions ...
-(define-object BaseMarker
+(define-object Adjustment
   (in-module "Champlain")
-  (parent "ClutterGroup")
-  (c-name "ChamplainBaseMarker")
-  (gtype-id "CHAMPLAIN_TYPE_BASE_MARKER")
+  (parent "GObject")
+  (c-name "ChamplainAdjustment")
+  (gtype-id "CHAMPLAIN_TYPE_ADJUSTMENT")
 )
 
-(define-object Cache
+(define-object Coordinate
   (in-module "Champlain")
-  (parent "GObject")
-  (c-name "ChamplainCache")
-  (gtype-id "CHAMPLAIN_TYPE_CACHE")
+  (parent "GInitiallyUnowned")
+  (c-name "ChamplainCoordinate")
+  (gtype-id "CHAMPLAIN_TYPE_COORDINATE")
+)
+
+(define-object KineticScrollView
+  (in-module "Champlain")
+  (parent "ClutterActor")
+  (c-name "ChamplainKineticScrollView")
+  (gtype-id "CHAMPLAIN_TYPE_KINETIC_SCROLL_VIEW")
 )
 
 (define-object Layer
   (in-module "Champlain")
-  (parent "ClutterGroup")
+  (parent "ClutterActor")
   (c-name "ChamplainLayer")
   (gtype-id "CHAMPLAIN_TYPE_LAYER")
 )
 
+(define-object License
+  (in-module "Champlain")
+  (parent "ClutterActor")
+  (c-name "ChamplainLicense")
+  (gtype-id "CHAMPLAIN_TYPE_LICENSE")
+)
+
+(define-object Location
+  (in-module "Champlain")
+  (c-name "ChamplainLocation")
+  (gtype-id "CHAMPLAIN_TYPE_LOCATION")
+)
+
 (define-object MapSource
   (in-module "Champlain")
-  (parent "GObject")
+  (parent "GInitiallyUnowned")
   (c-name "ChamplainMapSource")
   (gtype-id "CHAMPLAIN_TYPE_MAP_SOURCE")
 )
 
+(define-object MapSourceChain
+  (in-module "Champlain")
+  (parent "ChamplainMapSource")
+  (c-name "ChamplainMapSourceChain")
+  (gtype-id "CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN")
+)
+
+(define-object MapSourceDesc
+  (in-module "Champlain")
+  (parent "GObject")
+  (c-name "ChamplainMapSourceDesc")
+  (gtype-id "CHAMPLAIN_TYPE_MAP_SOURCE_DESC")
+)
+
 (define-object MapSourceFactory
   (in-module "Champlain")
   (parent "GObject")
@@ -37,65 +71,173 @@
 
 (define-object Marker
   (in-module "Champlain")
-  (parent "ChamplainBaseMarker")
+  (parent "ClutterActor")
   (c-name "ChamplainMarker")
   (gtype-id "CHAMPLAIN_TYPE_MARKER")
 )
 
-(define-object NetworkMapSource
+(define-object Label
   (in-module "Champlain")
-  (parent "ChamplainMapSource")
-  (c-name "ChamplainNetworkMapSource")
-  (gtype-id "CHAMPLAIN_TYPE_NETWORK_MAP_SOURCE")
+  (parent "ChamplainMarker")
+  (c-name "ChamplainLabel")
+  (gtype-id "CHAMPLAIN_TYPE_LABEL")
 )
 
-(define-object Polygon
+(define-object CustomMarker
   (in-module "Champlain")
-  (parent "GObject")
-  (c-name "ChamplainPolygon")
-  (gtype-id "CHAMPLAIN_TYPE_POLYGON")
+  (parent "ChamplainMarker")
+  (c-name "ChamplainCustomMarker")
+  (gtype-id "CHAMPLAIN_TYPE_CUSTOM_MARKER")
 )
 
-(define-object SelectionLayer
+(define-object MarkerLayer
   (in-module "Champlain")
   (parent "ChamplainLayer")
-  (c-name "ChamplainSelectionLayer")
-  (gtype-id "CHAMPLAIN_TYPE_SELECTION_LAYER")
+  (c-name "ChamplainMarkerLayer")
+  (gtype-id "CHAMPLAIN_TYPE_MARKER_LAYER")
+)
+
+(define-object PathLayer
+  (in-module "Champlain")
+  (parent "ChamplainLayer")
+  (c-name "ChamplainPathLayer")
+  (gtype-id "CHAMPLAIN_TYPE_PATH_LAYER")
+)
+
+(define-object Point
+  (in-module "Champlain")
+  (parent "ChamplainMarker")
+  (c-name "ChamplainPoint")
+  (gtype-id "CHAMPLAIN_TYPE_POINT")
+)
+
+(define-object Renderer
+  (in-module "Champlain")
+  (parent "GInitiallyUnowned")
+  (c-name "ChamplainRenderer")
+  (gtype-id "CHAMPLAIN_TYPE_RENDERER")
+)
+
+(define-object MemphisRenderer
+  (in-module "Champlain")
+  (parent "ChamplainRenderer")
+  (c-name "ChamplainMemphisRenderer")
+  (gtype-id "CHAMPLAIN_TYPE_MEMPHIS_RENDERER")
+)
+
+(define-object ImageRenderer
+  (in-module "Champlain")
+  (parent "ChamplainRenderer")
+  (c-name "ChamplainImageRenderer")
+  (gtype-id "CHAMPLAIN_TYPE_IMAGE_RENDERER")
+)
+
+(define-object ErrorTileRenderer
+  (in-module "Champlain")
+  (parent "ChamplainRenderer")
+  (c-name "ChamplainErrorTileRenderer")
+  (gtype-id "CHAMPLAIN_TYPE_ERROR_TILE_RENDERER")
+)
+
+(define-object Scale
+  (in-module "Champlain")
+  (parent "ClutterActor")
+  (c-name "ChamplainScale")
+  (gtype-id "CHAMPLAIN_TYPE_SCALE")
 )
 
 (define-object Tile
   (in-module "Champlain")
-  (parent "GObject")
+  (parent "ClutterActor")
   (c-name "ChamplainTile")
   (gtype-id "CHAMPLAIN_TYPE_TILE")
 )
 
+(define-object TileCache
+  (in-module "Champlain")
+  (parent "ChamplainMapSource")
+  (c-name "ChamplainTileCache")
+  (gtype-id "CHAMPLAIN_TYPE_TILE_CACHE")
+)
+
+(define-object MemoryCache
+  (in-module "Champlain")
+  (parent "ChamplainTileCache")
+  (c-name "ChamplainMemoryCache")
+  (gtype-id "CHAMPLAIN_TYPE_MEMORY_CACHE")
+)
+
+(define-object FileCache
+  (in-module "Champlain")
+  (parent "ChamplainTileCache")
+  (c-name "ChamplainFileCache")
+  (gtype-id "CHAMPLAIN_TYPE_FILE_CACHE")
+)
+
+(define-object TileSource
+  (in-module "Champlain")
+  (parent "ChamplainMapSource")
+  (c-name "ChamplainTileSource")
+  (gtype-id "CHAMPLAIN_TYPE_TILE_SOURCE")
+)
+
+(define-object NullTileSource
+  (in-module "Champlain")
+  (parent "ChamplainTileSource")
+  (c-name "ChamplainNullTileSource")
+  (gtype-id "CHAMPLAIN_TYPE_NULL_TILE_SOURCE")
+)
+
+(define-object NetworkTileSource
+  (in-module "Champlain")
+  (parent "ChamplainTileSource")
+  (c-name "ChamplainNetworkTileSource")
+  (gtype-id "CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE")
+)
+
+(define-object NetworkBboxTileSource
+  (in-module "Champlain")
+  (parent "ChamplainTileSource")
+  (c-name "ChamplainNetworkBboxTileSource")
+  (gtype-id "CHAMPLAIN_TYPE_NETWORK_BBOX_TILE_SOURCE")
+)
+
+(define-object FileTileSource
+  (in-module "Champlain")
+  (parent "ChamplainTileSource")
+  (c-name "ChamplainFileTileSource")
+  (gtype-id "CHAMPLAIN_TYPE_FILE_TILE_SOURCE")
+)
+
 (define-object View
   (in-module "Champlain")
-  (parent "ClutterGroup")
+  (parent "ClutterActor")
   (c-name "ChamplainView")
   (gtype-id "CHAMPLAIN_TYPE_VIEW")
 )
 
-(define-object ZoomLevel
+(define-object Viewport
   (in-module "Champlain")
-  (parent "GObject")
-  (c-name "ChamplainZoomLevel")
-  (gtype-id "CHAMPLAIN_TYPE_ZOOM_LEVEL")
+  (parent "ClutterActor")
+  (c-name "ChamplainViewport")
+  (gtype-id "CHAMPLAIN_TYPE_VIEWPORT")
 )
 
 ;; Enumerations and flags ...
 
-(define-enum State
+(define-flags DebugFlags
   (in-module "Champlain")
-  (c-name "ChamplainState")
-  (gtype-id "CHAMPLAIN_TYPE_STATE")
+  (c-name "ChamplainDebugFlags")
+  (gtype-id "CHAMPLAIN_TYPE_DEBUG_FLAGS")
   (values
-    '("none" "CHAMPLAIN_STATE_NONE")
-    '("init" "CHAMPLAIN_STATE_INIT")
-    '("loading" "CHAMPLAIN_STATE_LOADING")
-    '("validating-cache" "CHAMPLAIN_STATE_VALIDATING_CACHE")
-    '("done" "CHAMPLAIN_STATE_DONE")
+    '("loading" "CHAMPLAIN_DEBUG_LOADING")
+    '("engine" "CHAMPLAIN_DEBUG_ENGINE")
+    '("view" "CHAMPLAIN_DEBUG_VIEW")
+    '("network" "CHAMPLAIN_DEBUG_NETWORK")
+    '("cache" "CHAMPLAIN_DEBUG_CACHE")
+    '("selection" "CHAMPLAIN_DEBUG_SELECTION")
+    '("memphis" "CHAMPLAIN_DEBUG_MEMPHIS")
+    '("other" "CHAMPLAIN_DEBUG_OTHER")
   )
 )
 
@@ -119,190 +261,709 @@
   )
 )
 
-(define-enum ScrollMode
+(define-enum MemphisRuleType
+  (in-module "Champlain")
+  (c-name "ChamplainMemphisRuleType")
+  (gtype-id "CHAMPLAIN_TYPE_MEMPHIS_RULE_TYPE")
+  (values
+    '("unknown" "CHAMPLAIN_MEMPHIS_RULE_TYPE_UNKNOWN")
+    '("node" "CHAMPLAIN_MEMPHIS_RULE_TYPE_NODE")
+    '("way" "CHAMPLAIN_MEMPHIS_RULE_TYPE_WAY")
+    '("relation" "CHAMPLAIN_MEMPHIS_RULE_TYPE_RELATION")
+  )
+)
+
+(define-enum Unit
+  (in-module "Champlain")
+  (c-name "ChamplainUnit")
+  (gtype-id "CHAMPLAIN_TYPE_UNIT")
+  (values
+    '("km" "CHAMPLAIN_UNIT_KM")
+    '("miles" "CHAMPLAIN_UNIT_MILES")
+  )
+)
+
+(define-enum State
   (in-module "Champlain")
-  (c-name "ChamplainScrollMode")
-  (gtype-id "CHAMPLAIN_TYPE_SCROLL_MODE")
+  (c-name "ChamplainState")
+  (gtype-id "CHAMPLAIN_TYPE_STATE")
   (values
-    '("push" "CHAMPLAIN_SCROLL_MODE_PUSH")
-    '("kinetic" "CHAMPLAIN_SCROLL_MODE_KINETIC")
+    '("none" "CHAMPLAIN_STATE_NONE")
+    '("loading" "CHAMPLAIN_STATE_LOADING")
+    '("loaded" "CHAMPLAIN_STATE_LOADED")
+    '("done" "CHAMPLAIN_STATE_DONE")
   )
 )
 
 
-;; From champlain-base-marker.h
+;; From champlain-adjustment.h
 
-(define-function champlain_base_marker_get_type
-  (c-name "champlain_base_marker_get_type")
+(define-function champlain_adjustment_get_type
+  (c-name "champlain_adjustment_get_type")
   (return-type "GType")
 )
 
-(define-function champlain_base_marker_new
-  (c-name "champlain_base_marker_new")
-  (is-constructor-of "ChamplainBaseMarker")
-  (return-type "ClutterActor*")
+(define-function champlain_adjustment_new
+  (c-name "champlain_adjustment_new")
+  (is-constructor-of "ChamplainAdjustment")
+  (return-type "ChamplainAdjustment*")
+  (parameters
+    '("gdouble" "value")
+    '("gdouble" "lower")
+    '("gdouble" "upper")
+    '("gdouble" "step_increment")
+  )
+)
+
+(define-method get_value
+  (of-object "ChamplainAdjustment")
+  (c-name "champlain_adjustment_get_value")
+  (return-type "gdouble")
 )
 
-(define-method set_position
-  (of-object "ChamplainBaseMarker")
-  (c-name "champlain_base_marker_set_position")
+(define-method set_value
+  (of-object "ChamplainAdjustment")
+  (c-name "champlain_adjustment_set_value")
   (return-type "none")
   (parameters
-    '("gdouble" "longitude")
-    '("gdouble" "latitude")
+    '("gdouble" "value")
   )
 )
 
-(define-method set_highlighted
-  (of-object "ChamplainBaseMarker")
-  (c-name "champlain_base_marker_set_highlighted")
+(define-method set_values
+  (of-object "ChamplainAdjustment")
+  (c-name "champlain_adjustment_set_values")
   (return-type "none")
   (parameters
-    '("gboolean" "value")
+    '("gdouble" "value")
+    '("gdouble" "lower")
+    '("gdouble" "upper")
+    '("gdouble" "step_increment")
   )
 )
 
-(define-method get_highlighted
-  (of-object "ChamplainBaseMarker")
-  (c-name "champlain_base_marker_get_highlighted")
+(define-method get_values
+  (of-object "ChamplainAdjustment")
+  (c-name "champlain_adjustment_get_values")
+  (return-type "none")
+  (parameters
+    '("gdouble*" "value")
+    '("gdouble*" "lower")
+    '("gdouble*" "upper")
+    '("gdouble*" "step_increment")
+  )
+)
+
+(define-method interpolate
+  (of-object "ChamplainAdjustment")
+  (c-name "champlain_adjustment_interpolate")
+  (return-type "none")
+  (parameters
+    '("gdouble" "value")
+    '("guint" "n_frames")
+    '("guint" "fps")
+  )
+)
+
+(define-method clamp
+  (of-object "ChamplainAdjustment")
+  (c-name "champlain_adjustment_clamp")
   (return-type "gboolean")
+  (parameters
+    '("gboolean" "interpolate")
+    '("guint" "n_frames")
+    '("guint" "fps")
+  )
 )
 
-(define-method animate_in
-  (of-object "ChamplainBaseMarker")
-  (c-name "champlain_base_marker_animate_in")
+(define-method interpolate_stop
+  (of-object "ChamplainAdjustment")
+  (c-name "champlain_adjustment_interpolate_stop")
   (return-type "none")
 )
 
-(define-method animate_in_with_delay
-  (of-object "ChamplainBaseMarker")
-  (c-name "champlain_base_marker_animate_in_with_delay")
+
+
+;; From champlain-bounding-box.h
+
+(define-function champlain_bounding_box_get_type
+  (c-name "champlain_bounding_box_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_bounding_box_new
+  (c-name "champlain_bounding_box_new")
+  (is-constructor-of "ChamplainBoundingBox")
+  (return-type "ChamplainBoundingBox*")
+)
+
+(define-method copy
+  (of-object "ChamplainBoundingBox")
+  (c-name "champlain_bounding_box_copy")
+  (return-type "ChamplainBoundingBox*")
+)
+
+(define-method free
+  (of-object "ChamplainBoundingBox")
+  (c-name "champlain_bounding_box_free")
+  (return-type "none")
+)
+
+(define-method get_center
+  (of-object "ChamplainBoundingBox")
+  (c-name "champlain_bounding_box_get_center")
   (return-type "none")
   (parameters
-    '("guint" "delay")
+    '("gdouble*" "latitude")
+    '("gdouble*" "longitude")
   )
 )
 
-(define-method animate_out
-  (of-object "ChamplainBaseMarker")
-  (c-name "champlain_base_marker_animate_out")
+(define-method compose
+  (of-object "ChamplainBoundingBox")
+  (c-name "champlain_bounding_box_compose")
   (return-type "none")
+  (parameters
+    '("ChamplainBoundingBox*" "other")
+  )
 )
 
-(define-method animate_out_with_delay
-  (of-object "ChamplainBaseMarker")
-  (c-name "champlain_base_marker_animate_out_with_delay")
+(define-method extend
+  (of-object "ChamplainBoundingBox")
+  (c-name "champlain_bounding_box_extend")
   (return-type "none")
   (parameters
-    '("guint" "delay")
+    '("gdouble" "latitude")
+    '("gdouble" "longitude")
+  )
+)
+
+(define-method is_valid
+  (of-object "ChamplainBoundingBox")
+  (c-name "champlain_bounding_box_is_valid")
+  (return-type "gboolean")
+)
+
+(define-method covers
+  (of-object "ChamplainBoundingBox")
+  (c-name "champlain_bounding_box_covers")
+  (return-type "gboolean")
+  (parameters
+    '("gdouble" "latitude")
+    '("gdouble" "longitude")
   )
 )
 
 
 
-;; From champlain-cache.h
+;; From champlain-coordinate.h
 
-(define-function champlain_cache_get_type
-  (c-name "champlain_cache_get_type")
+(define-function champlain_coordinate_get_type
+  (c-name "champlain_coordinate_get_type")
   (return-type "GType")
 )
 
-(define-function champlain_cache_dup_default
-  (c-name "champlain_cache_dup_default")
-  (return-type "ChamplainCache*")
+(define-function champlain_coordinate_new
+  (c-name "champlain_coordinate_new")
+  (is-constructor-of "ChamplainCoordinate")
+  (return-type "ChamplainCoordinate*")
 )
 
-(define-function champlain_cache_get_default
-  (c-name "champlain_cache_get_default")
-  (return-type "ChamplainCache*")
+(define-function champlain_coordinate_new_full
+  (c-name "champlain_coordinate_new_full")
+  (return-type "ChamplainCoordinate*")
+  (parameters
+    '("gdouble" "latitude")
+    '("gdouble" "longitude")
+  )
 )
 
-(define-method update_tile
-  (of-object "ChamplainCache")
-  (c-name "champlain_cache_update_tile")
+
+
+;; From champlain-custom-marker.h
+
+(define-function champlain_custom_marker_get_type
+  (c-name "champlain_custom_marker_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_custom_marker_new
+  (c-name "champlain_custom_marker_new")
+  (is-constructor-of "ChamplainCustomMarker")
+  (return-type "ClutterActor*")
+)
+
+
+
+;; From champlain-debug.h
+
+(define-function champlain_debug_flag_is_set
+  (c-name "champlain_debug_flag_is_set")
+  (return-type "gboolean")
+  (parameters
+    '("ChamplainDebugFlags" "flag")
+  )
+)
+
+(define-function champlain_debug
+  (c-name "champlain_debug")
   (return-type "none")
   (parameters
-    '("ChamplainTile*" "tile")
-    '("guint" "filesize")
+    '("ChamplainDebugFlags" "flag")
+    '("const-gchar*" "format")
   )
+  (varargs #t)
 )
 
-(define-method fill_tile
-  (of-object "ChamplainCache")
-  (c-name "champlain_cache_fill_tile")
-  (return-type "gboolean")
+(define-function champlain_debug_set_flags
+  (c-name "champlain_debug_set_flags")
+  (return-type "none")
   (parameters
-    '("ChamplainTile*" "tile")
+    '("const-gchar*" "flags_string")
   )
 )
 
-(define-method tile_is_expired
-  (of-object "ChamplainCache")
-  (c-name "champlain_cache_tile_is_expired")
-  (return-type "gboolean")
+
+
+;; From champlain-defines.h
+
+
+
+;; From champlain-enum-types.h
+
+(define-function champlain_selection_mode_get_type
+  (c-name "champlain_selection_mode_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_unit_get_type
+  (c-name "champlain_unit_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_state_get_type
+  (c-name "champlain_state_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_map_projection_get_type
+  (c-name "champlain_map_projection_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From champlain-error-tile-renderer.h
+
+(define-function champlain_error_tile_renderer_get_type
+  (c-name "champlain_error_tile_renderer_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_error_tile_renderer_new
+  (c-name "champlain_error_tile_renderer_new")
+  (is-constructor-of "ChamplainErrorTileRenderer")
+  (return-type "ChamplainErrorTileRenderer*")
   (parameters
-    '("ChamplainTile*" "tile")
+    '("guint" "tile_size")
   )
 )
 
-(define-method set_size_limit
-  (of-object "ChamplainCache")
-  (c-name "champlain_cache_set_size_limit")
+(define-method set_tile_size
+  (of-object "ChamplainErrorTileRenderer")
+  (c-name "champlain_error_tile_renderer_set_tile_size")
   (return-type "none")
   (parameters
+    '("guint" "size")
+  )
+)
+
+(define-method get_tile_size
+  (of-object "ChamplainErrorTileRenderer")
+  (c-name "champlain_error_tile_renderer_get_tile_size")
+  (return-type "guint")
+)
+
+
+
+;; From champlain-features.h
+
+
+
+;; From champlain-file-cache.h
+
+(define-function champlain_file_cache_get_type
+  (c-name "champlain_file_cache_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_file_cache_new_full
+  (c-name "champlain_file_cache_new_full")
+  (return-type "ChamplainFileCache*")
+  (parameters
     '("guint" "size_limit")
+    '("const-gchar*" "cache_dir")
+    '("ChamplainRenderer*" "renderer")
   )
 )
 
 (define-method get_size_limit
-  (of-object "ChamplainCache")
-  (c-name "champlain_cache_get_size_limit")
+  (of-object "ChamplainFileCache")
+  (c-name "champlain_file_cache_get_size_limit")
   (return-type "guint")
 )
 
+(define-method set_size_limit
+  (of-object "ChamplainFileCache")
+  (c-name "champlain_file_cache_set_size_limit")
+  (return-type "none")
+  (parameters
+    '("guint" "size_limit")
+  )
+)
+
+(define-method get_cache_dir
+  (of-object "ChamplainFileCache")
+  (c-name "champlain_file_cache_get_cache_dir")
+  (return-type "const-gchar*")
+)
+
 (define-method purge
-  (of-object "ChamplainCache")
-  (c-name "champlain_cache_purge")
+  (of-object "ChamplainFileCache")
+  (c-name "champlain_file_cache_purge")
   (return-type "none")
 )
 
 (define-method purge_on_idle
-  (of-object "ChamplainCache")
-  (c-name "champlain_cache_purge_on_idle")
+  (of-object "ChamplainFileCache")
+  (c-name "champlain_file_cache_purge_on_idle")
   (return-type "none")
 )
 
 
 
-;; From champlain-defines.h
+;; From champlain-file-tile-source.h
 
+(define-function champlain_file_tile_source_get_type
+  (c-name "champlain_file_tile_source_get_type")
+  (return-type "GType")
+)
 
+(define-function champlain_file_tile_source_new_full
+  (c-name "champlain_file_tile_source_new_full")
+  (return-type "ChamplainFileTileSource*")
+  (parameters
+    '("const-gchar*" "id")
+    '("const-gchar*" "name")
+    '("const-gchar*" "license")
+    '("const-gchar*" "license_uri")
+    '("guint" "min_zoom")
+    '("guint" "max_zoom")
+    '("guint" "tile_size")
+    '("ChamplainMapProjection" "projection")
+    '("ChamplainRenderer*" "renderer")
+  )
+)
 
-;; From champlain-enum-types.h
+(define-method load_map_data
+  (of-object "ChamplainFileTileSource")
+  (c-name "champlain_file_tile_source_load_map_data")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "map_path")
+  )
+)
 
-(define-function champlain_state_get_type
-  (c-name "champlain_state_get_type")
+
+
+;; From champlain.h
+
+
+
+;; From champlain-image-renderer.h
+
+(define-function champlain_image_renderer_get_type
+  (c-name "champlain_image_renderer_get_type")
   (return-type "GType")
 )
 
-(define-function champlain_scroll_mode_get_type
-  (c-name "champlain_scroll_mode_get_type")
-  (return-type "GType")
+(define-function champlain_image_renderer_new
+  (c-name "champlain_image_renderer_new")
+  (is-constructor-of "ChamplainImageRenderer")
+  (return-type "ChamplainImageRenderer*")
 )
 
-(define-function champlain_selection_mode_get_type
-  (c-name "champlain_selection_mode_get_type")
+
+
+;; From champlain-kinetic-scroll-view.h
+
+(define-function champlain_kinetic_scroll_view_get_type
+  (c-name "champlain_kinetic_scroll_view_get_type")
   (return-type "GType")
 )
 
-(define-function champlain_map_projection_get_type
-  (c-name "champlain_map_projection_get_type")
+(define-function champlain_kinetic_scroll_view_new
+  (c-name "champlain_kinetic_scroll_view_new")
+  (is-constructor-of "ChamplainKineticScrollView")
+  (return-type "ClutterActor*")
+  (parameters
+    '("gboolean" "kinetic")
+    '("ChamplainViewport*" "viewport")
+  )
+)
+
+(define-method stop
+  (of-object "ChamplainKineticScrollView")
+  (c-name "champlain_kinetic_scroll_view_stop")
+  (return-type "none")
+)
+
+
+
+;; From champlain-label.h
+
+(define-function champlain_label_get_type
+  (c-name "champlain_label_get_type")
   (return-type "GType")
 )
 
+(define-function champlain_label_new
+  (c-name "champlain_label_new")
+  (is-constructor-of "ChamplainLabel")
+  (return-type "ClutterActor*")
+)
+
+(define-function champlain_label_new_with_text
+  (c-name "champlain_label_new_with_text")
+  (return-type "ClutterActor*")
+  (parameters
+    '("const-gchar*" "text")
+    '("const-gchar*" "font")
+    '("ClutterColor*" "text_color")
+    '("ClutterColor*" "label_color")
+  )
+)
+
+(define-function champlain_label_new_with_image
+  (c-name "champlain_label_new_with_image")
+  (return-type "ClutterActor*")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
+)
 
+(define-function champlain_label_new_from_file
+  (c-name "champlain_label_new_from_file")
+  (return-type "ClutterActor*")
+  (parameters
+    '("const-gchar*" "filename")
+    '("GError**" "error")
+  )
+)
 
-;; From champlain.h
+(define-function champlain_label_new_full
+  (c-name "champlain_label_new_full")
+  (return-type "ClutterActor*")
+  (parameters
+    '("const-gchar*" "text")
+    '("ClutterActor*" "actor")
+  )
+)
+
+(define-method set_text
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_text")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "text")
+  )
+)
+
+(define-method set_image
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_image")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "image")
+  )
+)
+
+(define-method set_use_markup
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_use_markup")
+  (return-type "none")
+  (parameters
+    '("gboolean" "use_markup")
+  )
+)
+
+(define-method set_alignment
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_alignment")
+  (return-type "none")
+  (parameters
+    '("PangoAlignment" "alignment")
+  )
+)
+
+(define-method set_color
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_color")
+  (return-type "none")
+  (parameters
+    '("const-ClutterColor*" "color")
+  )
+)
+
+(define-method set_text_color
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_text_color")
+  (return-type "none")
+  (parameters
+    '("const-ClutterColor*" "color")
+  )
+)
+
+(define-method set_font_name
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_font_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "font_name")
+  )
+)
+
+(define-method set_wrap
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_wrap")
+  (return-type "none")
+  (parameters
+    '("gboolean" "wrap")
+  )
+)
+
+(define-method set_wrap_mode
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_wrap_mode")
+  (return-type "none")
+  (parameters
+    '("PangoWrapMode" "wrap_mode")
+  )
+)
+
+(define-method set_attributes
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_attributes")
+  (return-type "none")
+  (parameters
+    '("PangoAttrList*" "list")
+  )
+)
+
+(define-method set_single_line_mode
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_single_line_mode")
+  (return-type "none")
+  (parameters
+    '("gboolean" "mode")
+  )
+)
+
+(define-method set_ellipsize
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_ellipsize")
+  (return-type "none")
+  (parameters
+    '("PangoEllipsizeMode" "mode")
+  )
+)
+
+(define-method set_draw_background
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_set_draw_background")
+  (return-type "none")
+  (parameters
+    '("gboolean" "background")
+  )
+)
+
+(define-method get_use_markup
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_use_markup")
+  (return-type "gboolean")
+)
+
+(define-method get_text
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_text")
+  (return-type "const-gchar*")
+)
+
+(define-method get_image
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_image")
+  (return-type "ClutterActor*")
+)
+
+(define-method get_alignment
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_alignment")
+  (return-type "PangoAlignment")
+)
+
+(define-method get_color
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_color")
+  (return-type "ClutterColor*")
+)
+
+(define-method get_text_color
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_text_color")
+  (return-type "ClutterColor*")
+)
+
+(define-method get_font_name
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_font_name")
+  (return-type "const-gchar*")
+)
+
+(define-method get_wrap
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_wrap")
+  (return-type "gboolean")
+)
+
+(define-method get_wrap_mode
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_wrap_mode")
+  (return-type "PangoWrapMode")
+)
+
+(define-method get_ellipsize
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_ellipsize")
+  (return-type "PangoEllipsizeMode")
+)
+
+(define-method get_single_line_mode
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_single_line_mode")
+  (return-type "gboolean")
+)
+
+(define-method get_draw_background
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_draw_background")
+  (return-type "gboolean")
+)
+
+(define-method get_attributes
+  (of-object "ChamplainLabel")
+  (c-name "champlain_label_get_attributes")
+  (return-type "PangoAttrList*")
+)
 
 
 
@@ -313,42 +974,142 @@
   (return-type "GType")
 )
 
-(define-function champlain_layer_new
-  (c-name "champlain_layer_new")
-  (is-constructor-of "ChamplainLayer")
-  (return-type "ChamplainLayer*")
+(define-method set_view
+  (of-object "ChamplainLayer")
+  (c-name "champlain_layer_set_view")
+  (return-type "none")
+  (parameters
+    '("ChamplainView*" "view")
+  )
 )
 
-(define-method show
+(define-method get_bounding_box
   (of-object "ChamplainLayer")
-  (c-name "champlain_layer_show")
+  (c-name "champlain_layer_get_bounding_box")
+  (return-type "ChamplainBoundingBox*")
+)
+
+
+
+;; From champlain-license.h
+
+(define-function champlain_license_get_type
+  (c-name "champlain_license_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_license_new
+  (c-name "champlain_license_new")
+  (is-constructor-of "ChamplainLicense")
+  (return-type "ClutterActor*")
+)
+
+(define-method set_extra_text
+  (of-object "ChamplainLicense")
+  (c-name "champlain_license_set_extra_text")
   (return-type "none")
+  (parameters
+    '("const-gchar*" "text")
+  )
 )
 
-(define-method hide
-  (of-object "ChamplainLayer")
-  (c-name "champlain_layer_hide")
+(define-method get_extra_text
+  (of-object "ChamplainLicense")
+  (c-name "champlain_license_get_extra_text")
+  (return-type "const-gchar*")
+)
+
+(define-method set_alignment
+  (of-object "ChamplainLicense")
+  (c-name "champlain_license_set_alignment")
   (return-type "none")
+  (parameters
+    '("PangoAlignment" "alignment")
+  )
 )
 
-(define-method add_marker
-  (of-object "ChamplainLayer")
-  (c-name "champlain_layer_add_marker")
+(define-method get_alignment
+  (of-object "ChamplainLicense")
+  (c-name "champlain_license_get_alignment")
+  (return-type "PangoAlignment")
+)
+
+(define-method connect_view
+  (of-object "ChamplainLicense")
+  (c-name "champlain_license_connect_view")
   (return-type "none")
   (parameters
-    '("ChamplainBaseMarker*" "marker")
+    '("ChamplainView*" "view")
   )
 )
 
-(define-method remove_marker
-  (of-object "ChamplainLayer")
-  (c-name "champlain_layer_remove_marker")
+(define-method disconnect_view
+  (of-object "ChamplainLicense")
+  (c-name "champlain_license_disconnect_view")
+  (return-type "none")
+)
+
+
+
+;; From champlain-location.h
+
+(define-function champlain_location_get_type
+  (c-name "champlain_location_get_type")
+  (return-type "GType")
+)
+
+(define-method set_location
+  (of-object "ChamplainLocation")
+  (c-name "champlain_location_set_location")
+  (return-type "none")
+  (parameters
+    '("gdouble" "latitude")
+    '("gdouble" "longitude")
+  )
+)
+
+(define-method get_latitude
+  (of-object "ChamplainLocation")
+  (c-name "champlain_location_get_latitude")
+  (return-type "gdouble")
+)
+
+(define-method get_longitude
+  (of-object "ChamplainLocation")
+  (c-name "champlain_location_get_longitude")
+  (return-type "gdouble")
+)
+
+
+
+;; From champlain-map-source-chain.h
+
+(define-function champlain_map_source_chain_get_type
+  (c-name "champlain_map_source_chain_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_map_source_chain_new
+  (c-name "champlain_map_source_chain_new")
+  (is-constructor-of "ChamplainMapSourceChain")
+  (return-type "ChamplainMapSourceChain*")
+)
+
+(define-method push
+  (of-object "ChamplainMapSourceChain")
+  (c-name "champlain_map_source_chain_push")
   (return-type "none")
   (parameters
-    '("ChamplainBaseMarker*" "marker")
+    '("ChamplainMapSource*" "map_source")
   )
 )
 
+(define-method pop
+  (of-object "ChamplainMapSourceChain")
+  (c-name "champlain_map_source_chain_pop")
+  (return-type "none")
+)
+
 
 
 ;; From champlain-map-source-desc.h
@@ -358,22 +1119,88 @@
   (return-type "GType")
 )
 
-(define-method copy
-  (of-object "ChamplainMapSourceDesc")
-  (c-name "champlain_map_source_desc_copy")
+(define-function champlain_map_source_desc_new_full
+  (c-name "champlain_map_source_desc_new_full")
   (return-type "ChamplainMapSourceDesc*")
+  (parameters
+    '("gchar*" "id")
+    '("gchar*" "name")
+    '("gchar*" "license")
+    '("gchar*" "license_uri")
+    '("guint" "min_zoom")
+    '("guint" "max_zoom")
+    '("guint" "tile_size")
+    '("ChamplainMapProjection" "projection")
+    '("gchar*" "uri_format")
+    '("ChamplainMapSourceConstructor" "constructor")
+    '("gpointer" "data")
+  )
 )
 
-(define-method free
+(define-method get_id
   (of-object "ChamplainMapSourceDesc")
-  (c-name "champlain_map_source_desc_free")
-  (return-type "none")
+  (c-name "champlain_map_source_desc_get_id")
+  (return-type "const-gchar*")
 )
 
-(define-function champlain_map_source_desc_new
-  (c-name "champlain_map_source_desc_new")
-  (is-constructor-of "ChamplainMapSourceDesc")
-  (return-type "ChamplainMapSourceDesc*")
+(define-method get_name
+  (of-object "ChamplainMapSourceDesc")
+  (c-name "champlain_map_source_desc_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method get_license
+  (of-object "ChamplainMapSourceDesc")
+  (c-name "champlain_map_source_desc_get_license")
+  (return-type "const-gchar*")
+)
+
+(define-method get_license_uri
+  (of-object "ChamplainMapSourceDesc")
+  (c-name "champlain_map_source_desc_get_license_uri")
+  (return-type "const-gchar*")
+)
+
+(define-method get_uri_format
+  (of-object "ChamplainMapSourceDesc")
+  (c-name "champlain_map_source_desc_get_uri_format")
+  (return-type "const-gchar*")
+)
+
+(define-method get_min_zoom_level
+  (of-object "ChamplainMapSourceDesc")
+  (c-name "champlain_map_source_desc_get_min_zoom_level")
+  (return-type "guint")
+)
+
+(define-method get_max_zoom_level
+  (of-object "ChamplainMapSourceDesc")
+  (c-name "champlain_map_source_desc_get_max_zoom_level")
+  (return-type "guint")
+)
+
+(define-method get_tile_size
+  (of-object "ChamplainMapSourceDesc")
+  (c-name "champlain_map_source_desc_get_tile_size")
+  (return-type "guint")
+)
+
+(define-method get_projection
+  (of-object "ChamplainMapSourceDesc")
+  (c-name "champlain_map_source_desc_get_projection")
+  (return-type "ChamplainMapProjection")
+)
+
+(define-method get_data
+  (of-object "ChamplainMapSourceDesc")
+  (c-name "champlain_map_source_desc_get_data")
+  (return-type "gpointer")
+)
+
+(define-method get_constructor
+  (of-object "ChamplainMapSourceDesc")
+  (c-name "champlain_map_source_desc_get_constructor")
+  (return-type "ChamplainMapSourceConstructor")
 )
 
 
@@ -390,29 +1217,39 @@
   (return-type "ChamplainMapSourceFactory*")
 )
 
-(define-function champlain_map_source_factory_get_default
-  (c-name "champlain_map_source_factory_get_default")
-  (return-type "ChamplainMapSourceFactory*")
+(define-method create
+  (of-object "ChamplainMapSourceFactory")
+  (c-name "champlain_map_source_factory_create")
+  (return-type "ChamplainMapSource*")
+  (parameters
+    '("const-gchar*" "id")
+  )
 )
 
-(define-method dup_list
+(define-method create_cached_source
   (of-object "ChamplainMapSourceFactory")
-  (c-name "champlain_map_source_factory_dup_list")
-  (return-type "GSList*")
+  (c-name "champlain_map_source_factory_create_cached_source")
+  (return-type "ChamplainMapSource*")
+  (parameters
+    '("const-gchar*" "id")
+  )
 )
 
-(define-method get_list
+(define-method create_memcached_source
   (of-object "ChamplainMapSourceFactory")
-  (c-name "champlain_map_source_factory_get_list")
-  (return-type "GSList*")
+  (c-name "champlain_map_source_factory_create_memcached_source")
+  (return-type "ChamplainMapSource*")
+  (parameters
+    '("const-gchar*" "id")
+  )
 )
 
-(define-method create
+(define-method create_error_source
   (of-object "ChamplainMapSourceFactory")
-  (c-name "champlain_map_source_factory_create")
+  (c-name "champlain_map_source_factory_create_error_source")
   (return-type "ChamplainMapSource*")
   (parameters
-    '("const-gchar*" "id")
+    '("guint" "tile_size")
   )
 )
 
@@ -422,11 +1259,15 @@
   (return-type "gboolean")
   (parameters
     '("ChamplainMapSourceDesc*" "desc")
-    '("ChamplainMapSourceConstructor" "constructor")
-    '("gpointer" "user_data")
   )
 )
 
+(define-method get_registered
+  (of-object "ChamplainMapSourceFactory")
+  (c-name "champlain_map_source_factory_get_registered")
+  (return-type "GSList*")
+)
+
 
 
 ;; From champlain-map-source.h
@@ -436,16 +1277,70 @@
   (return-type "GType")
 )
 
+(define-method get_next_source
+  (of-object "ChamplainMapSource")
+  (c-name "champlain_map_source_get_next_source")
+  (return-type "ChamplainMapSource*")
+)
+
+(define-method set_next_source
+  (of-object "ChamplainMapSource")
+  (c-name "champlain_map_source_set_next_source")
+  (return-type "none")
+  (parameters
+    '("ChamplainMapSource*" "next_source")
+  )
+)
+
+(define-method get_renderer
+  (of-object "ChamplainMapSource")
+  (c-name "champlain_map_source_get_renderer")
+  (return-type "ChamplainRenderer*")
+)
+
+(define-method set_renderer
+  (of-object "ChamplainMapSource")
+  (c-name "champlain_map_source_set_renderer")
+  (return-type "none")
+  (parameters
+    '("ChamplainRenderer*" "renderer")
+  )
+)
+
+(define-method get_id
+  (of-object "ChamplainMapSource")
+  (c-name "champlain_map_source_get_id")
+  (return-type "const-gchar*")
+)
+
+(define-method get_name
+  (of-object "ChamplainMapSource")
+  (c-name "champlain_map_source_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method get_license
+  (of-object "ChamplainMapSource")
+  (c-name "champlain_map_source_get_license")
+  (return-type "const-gchar*")
+)
+
+(define-method get_license_uri
+  (of-object "ChamplainMapSource")
+  (c-name "champlain_map_source_get_license_uri")
+  (return-type "const-gchar*")
+)
+
 (define-method get_min_zoom_level
   (of-object "ChamplainMapSource")
   (c-name "champlain_map_source_get_min_zoom_level")
-  (return-type "gint")
+  (return-type "guint")
 )
 
 (define-method get_max_zoom_level
   (of-object "ChamplainMapSource")
   (c-name "champlain_map_source_get_max_zoom_level")
-  (return-type "gint")
+  (return-type "guint")
 )
 
 (define-method get_tile_size
@@ -454,12 +1349,18 @@
   (return-type "guint")
 )
 
+(define-method get_projection
+  (of-object "ChamplainMapSource")
+  (c-name "champlain_map_source_get_projection")
+  (return-type "ChamplainMapProjection")
+)
+
 (define-method get_x
   (of-object "ChamplainMapSource")
   (c-name "champlain_map_source_get_x")
-  (return-type "guint")
+  (return-type "gdouble")
   (parameters
-    '("gint" "zoom_level")
+    '("guint" "zoom_level")
     '("gdouble" "longitude")
   )
 )
@@ -467,9 +1368,9 @@
 (define-method get_y
   (of-object "ChamplainMapSource")
   (c-name "champlain_map_source_get_y")
-  (return-type "guint")
+  (return-type "gdouble")
   (parameters
-    '("gint" "zoom_level")
+    '("guint" "zoom_level")
     '("gdouble" "latitude")
   )
 )
@@ -479,8 +1380,8 @@
   (c-name "champlain_map_source_get_longitude")
   (return-type "gdouble")
   (parameters
-    '("gint" "zoom_level")
-    '("guint" "x")
+    '("guint" "zoom_level")
+    '("gdouble" "x")
   )
 )
 
@@ -489,8 +1390,8 @@
   (c-name "champlain_map_source_get_latitude")
   (return-type "gdouble")
   (parameters
-    '("gint" "zoom_level")
-    '("guint" "y")
+    '("guint" "zoom_level")
+    '("gdouble" "y")
   )
 )
 
@@ -499,7 +1400,7 @@
   (c-name "champlain_map_source_get_row_count")
   (return-type "guint")
   (parameters
-    '("gint" "zoom_level")
+    '("guint" "zoom_level")
   )
 )
 
@@ -508,7 +1409,18 @@
   (c-name "champlain_map_source_get_column_count")
   (return-type "guint")
   (parameters
-    '("gint" "zoom_level")
+    '("guint" "zoom_level")
+  )
+)
+
+(define-method get_meters_per_pixel
+  (of-object "ChamplainMapSource")
+  (c-name "champlain_map_source_get_meters_per_pixel")
+  (return-type "gdouble")
+  (parameters
+    '("guint" "zoom_level")
+    '("gdouble" "latitude")
+    '("gdouble" "longitude")
   )
 )
 
@@ -521,342 +1433,443 @@
   )
 )
 
-(define-method set_id
-  (of-object "ChamplainMapSource")
-  (c-name "champlain_map_source_set_id")
+
+
+;; From champlain-marker.h
+
+(define-function champlain_marker_get_type
+  (c-name "champlain_marker_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_marker_new
+  (c-name "champlain_marker_new")
+  (is-constructor-of "ChamplainMarker")
+  (return-type "ClutterActor*")
+)
+
+(define-method set_selectable
+  (of-object "ChamplainMarker")
+  (c-name "champlain_marker_set_selectable")
   (return-type "none")
   (parameters
-    '("const-gchar*" "id")
+    '("gboolean" "value")
   )
 )
 
-(define-method get_id
-  (of-object "ChamplainMapSource")
-  (c-name "champlain_map_source_get_id")
-  (return-type "const-gchar*")
+(define-method get_selectable
+  (of-object "ChamplainMarker")
+  (c-name "champlain_marker_get_selectable")
+  (return-type "gboolean")
 )
 
-(define-method set_name
-  (of-object "ChamplainMapSource")
-  (c-name "champlain_map_source_set_name")
+(define-method set_draggable
+  (of-object "ChamplainMarker")
+  (c-name "champlain_marker_set_draggable")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("gboolean" "value")
   )
 )
 
-(define-method get_name
-  (of-object "ChamplainMapSource")
-  (c-name "champlain_map_source_get_name")
-  (return-type "const-gchar*")
+(define-method get_draggable
+  (of-object "ChamplainMarker")
+  (c-name "champlain_marker_get_draggable")
+  (return-type "gboolean")
 )
 
-(define-method set_license
-  (of-object "ChamplainMapSource")
-  (c-name "champlain_map_source_set_license")
+(define-method set_selected
+  (of-object "ChamplainMarker")
+  (c-name "champlain_marker_set_selected")
   (return-type "none")
   (parameters
-    '("const-gchar*" "license")
+    '("gboolean" "value")
   )
 )
 
-(define-method get_license
-  (of-object "ChamplainMapSource")
-  (c-name "champlain_map_source_get_license")
-  (return-type "const-gchar*")
+(define-method get_selected
+  (of-object "ChamplainMarker")
+  (c-name "champlain_marker_get_selected")
+  (return-type "gboolean")
 )
 
-(define-method set_license_uri
-  (of-object "ChamplainMapSource")
-  (c-name "champlain_map_source_set_license_uri")
+(define-method animate_in
+  (of-object "ChamplainMarker")
+  (c-name "champlain_marker_animate_in")
+  (return-type "none")
+)
+
+(define-method animate_in_with_delay
+  (of-object "ChamplainMarker")
+  (c-name "champlain_marker_animate_in_with_delay")
   (return-type "none")
   (parameters
-    '("const-gchar*" "license_uri")
+    '("guint" "delay")
   )
 )
 
-(define-method get_license_uri
-  (of-object "ChamplainMapSource")
-  (c-name "champlain_map_source_get_license_uri")
-  (return-type "const-gchar*")
+(define-method animate_out
+  (of-object "ChamplainMarker")
+  (c-name "champlain_marker_animate_out")
+  (return-type "none")
 )
 
-(define-method set_projection
-  (of-object "ChamplainMapSource")
-  (c-name "champlain_map_source_set_projection")
+(define-method animate_out_with_delay
+  (of-object "ChamplainMarker")
+  (c-name "champlain_marker_animate_out_with_delay")
   (return-type "none")
   (parameters
-    '("ChamplainMapProjection" "projection")
+    '("guint" "delay")
   )
 )
 
-(define-method get_projection
-  (of-object "ChamplainMapSource")
-  (c-name "champlain_map_source_get_projection")
-  (return-type "ChamplainMapProjection")
+(define-function champlain_marker_set_selection_color
+  (c-name "champlain_marker_set_selection_color")
+  (return-type "none")
+  (parameters
+    '("ClutterColor*" "color")
+  )
+)
+
+(define-function champlain_marker_get_selection_color
+  (c-name "champlain_marker_get_selection_color")
+  (return-type "const-ClutterColor*")
 )
 
+(define-function champlain_marker_set_selection_text_color
+  (c-name "champlain_marker_set_selection_text_color")
+  (return-type "none")
+  (parameters
+    '("ClutterColor*" "color")
+  )
+)
 
+(define-function champlain_marker_get_selection_text_color
+  (c-name "champlain_marker_get_selection_text_color")
+  (return-type "const-ClutterColor*")
+)
 
-;; From champlain-marker.h
 
-(define-function champlain_marker_get_type
-  (c-name "champlain_marker_get_type")
+
+;; From champlain-marker-layer.h
+
+(define-function champlain_marker_layer_get_type
+  (c-name "champlain_marker_layer_get_type")
   (return-type "GType")
 )
 
-(define-function champlain_marker_new
-  (c-name "champlain_marker_new")
-  (is-constructor-of "ChamplainMarker")
-  (return-type "ClutterActor*")
+(define-function champlain_marker_layer_new
+  (c-name "champlain_marker_layer_new")
+  (is-constructor-of "ChamplainMarkerLayer")
+  (return-type "ChamplainMarkerLayer*")
 )
 
-(define-function champlain_marker_new_with_text
-  (c-name "champlain_marker_new_with_text")
-  (return-type "ClutterActor*")
+(define-function champlain_marker_layer_new_full
+  (c-name "champlain_marker_layer_new_full")
+  (return-type "ChamplainMarkerLayer*")
   (parameters
-    '("const-gchar*" "text")
-    '("const-gchar*" "font")
-    '("ClutterColor*" "text_color")
-    '("ClutterColor*" "marker_color")
+    '("ChamplainSelectionMode" "mode")
   )
 )
 
-(define-function champlain_marker_new_with_image
-  (c-name "champlain_marker_new_with_image")
-  (return-type "ClutterActor*")
+(define-method add_marker
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_add_marker")
+  (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
+    '("ChamplainMarker*" "marker")
   )
 )
 
-(define-function champlain_marker_new_from_file
-  (c-name "champlain_marker_new_from_file")
-  (return-type "ClutterActor*")
+(define-method remove_marker
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_remove_marker")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
-    '("GError**" "error")
+    '("ChamplainMarker*" "marker")
   )
 )
 
-(define-function champlain_marker_new_full
-  (c-name "champlain_marker_new_full")
-  (return-type "ClutterActor*")
-  (parameters
-    '("const-gchar*" "text")
-    '("ClutterActor*" "actor")
-  )
+(define-method remove_all
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_remove_all")
+  (return-type "none")
 )
 
-(define-method set_text
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_text")
+(define-method get_markers
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_get_markers")
+  (return-type "GList*")
+)
+
+(define-method get_selected
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_get_selected")
+  (return-type "GList*")
+)
+
+(define-method animate_in_all_markers
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_animate_in_all_markers")
   (return-type "none")
-  (parameters
-    '("const-gchar*" "text")
-  )
 )
 
-(define-method set_image
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_image")
+(define-method animate_out_all_markers
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_animate_out_all_markers")
   (return-type "none")
-  (parameters
-    '("ClutterActor*" "image")
-  )
 )
 
-(define-method set_use_markup
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_use_markup")
+(define-method show_all_markers
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_show_all_markers")
   (return-type "none")
-  (parameters
-    '("gboolean" "use_markup")
-  )
 )
 
-(define-method set_alignment
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_alignment")
+(define-method hide_all_markers
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_hide_all_markers")
   (return-type "none")
-  (parameters
-    '("PangoAlignment" "alignment")
-  )
 )
 
-(define-method set_color
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_color")
+(define-method set_all_markers_draggable
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_set_all_markers_draggable")
   (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "color")
-  )
 )
 
-(define-method set_text_color
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_text_color")
+(define-method set_all_markers_undraggable
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_set_all_markers_undraggable")
   (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "color")
-  )
 )
 
-(define-method set_font_name
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_font_name")
+(define-method select_all_markers
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_select_all_markers")
   (return-type "none")
-  (parameters
-    '("const-gchar*" "font_name")
-  )
 )
 
-(define-method set_wrap
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_wrap")
+(define-method unselect_all_markers
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_unselect_all_markers")
+  (return-type "none")
+)
+
+(define-method set_selection_mode
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_set_selection_mode")
   (return-type "none")
   (parameters
-    '("gboolean" "wrap")
+    '("ChamplainSelectionMode" "mode")
   )
 )
 
-(define-method set_wrap_mode
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_wrap_mode")
-  (return-type "none")
+(define-method get_selection_mode
+  (of-object "ChamplainMarkerLayer")
+  (c-name "champlain_marker_layer_get_selection_mode")
+  (return-type "ChamplainSelectionMode")
+)
+
+
+
+;; From champlain-marshal.h
+
+
+
+;; From champlain-memory-cache.h
+
+(define-function champlain_memory_cache_get_type
+  (c-name "champlain_memory_cache_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_memory_cache_new_full
+  (c-name "champlain_memory_cache_new_full")
+  (return-type "ChamplainMemoryCache*")
   (parameters
-    '("PangoWrapMode" "wrap_mode")
+    '("guint" "size_limit")
+    '("ChamplainRenderer*" "renderer")
   )
 )
 
-(define-method set_attributes
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_attributes")
+(define-method get_size_limit
+  (of-object "ChamplainMemoryCache")
+  (c-name "champlain_memory_cache_get_size_limit")
+  (return-type "guint")
+)
+
+(define-method set_size_limit
+  (of-object "ChamplainMemoryCache")
+  (c-name "champlain_memory_cache_set_size_limit")
   (return-type "none")
   (parameters
-    '("PangoAttrList*" "list")
+    '("guint" "size_limit")
   )
 )
 
-(define-method set_single_line_mode
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_single_line_mode")
+(define-method clean
+  (of-object "ChamplainMemoryCache")
+  (c-name "champlain_memory_cache_clean")
   (return-type "none")
+)
+
+
+
+;; From champlain-memphis-renderer.h
+
+(define-function champlain_memphis_renderer_get_type
+  (c-name "champlain_memphis_renderer_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_memphis_renderer_new_full
+  (c-name "champlain_memphis_renderer_new_full")
+  (return-type "ChamplainMemphisRenderer*")
   (parameters
-    '("gboolean" "mode")
+    '("guint" "tile_size")
   )
 )
 
-(define-method set_ellipsize
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_ellipsize")
+(define-method load_rules
+  (of-object "ChamplainMemphisRenderer")
+  (c-name "champlain_memphis_renderer_load_rules")
   (return-type "none")
   (parameters
-    '("PangoEllipsizeMode" "mode")
+    '("const-gchar*" "rules_path")
   )
 )
 
-(define-method set_draw_background
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_set_draw_background")
+(define-method get_background_color
+  (of-object "ChamplainMemphisRenderer")
+  (c-name "champlain_memphis_renderer_get_background_color")
+  (return-type "ClutterColor*")
+)
+
+(define-method set_background_color
+  (of-object "ChamplainMemphisRenderer")
+  (c-name "champlain_memphis_renderer_set_background_color")
   (return-type "none")
   (parameters
-    '("gboolean" "background")
+    '("const-ClutterColor*" "color")
   )
 )
 
-(define-method get_use_markup
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_use_markup")
-  (return-type "gboolean")
+(define-method get_rule_ids
+  (of-object "ChamplainMemphisRenderer")
+  (c-name "champlain_memphis_renderer_get_rule_ids")
+  (return-type "GList*")
 )
 
-(define-method get_text
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_text")
-  (return-type "const-gchar*")
+(define-method set_rule
+  (of-object "ChamplainMemphisRenderer")
+  (c-name "champlain_memphis_renderer_set_rule")
+  (return-type "none")
+  (parameters
+    '("ChamplainMemphisRule*" "rule")
+  )
 )
 
-(define-method get_image
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_image")
-  (return-type "ClutterActor*")
+(define-method get_rule
+  (of-object "ChamplainMemphisRenderer")
+  (c-name "champlain_memphis_renderer_get_rule")
+  (return-type "ChamplainMemphisRule*")
+  (parameters
+    '("const-gchar*" "id")
+  )
 )
 
-(define-method get_alignment
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_alignment")
-  (return-type "PangoAlignment")
+(define-method remove_rule
+  (of-object "ChamplainMemphisRenderer")
+  (c-name "champlain_memphis_renderer_remove_rule")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "id")
+  )
 )
 
-(define-method get_color
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_color")
-  (return-type "ClutterColor*")
+(define-method get_bounding_box
+  (of-object "ChamplainMemphisRenderer")
+  (c-name "champlain_memphis_renderer_get_bounding_box")
+  (return-type "ChamplainBoundingBox*")
 )
 
-(define-method get_text_color
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_text_color")
-  (return-type "ClutterColor*")
+(define-method set_tile_size
+  (of-object "ChamplainMemphisRenderer")
+  (c-name "champlain_memphis_renderer_set_tile_size")
+  (return-type "none")
+  (parameters
+    '("guint" "size")
+  )
 )
 
-(define-method get_font_name
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_font_name")
-  (return-type "const-gchar*")
+(define-method get_tile_size
+  (of-object "ChamplainMemphisRenderer")
+  (c-name "champlain_memphis_renderer_get_tile_size")
+  (return-type "guint")
 )
 
-(define-method get_wrap
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_wrap")
-  (return-type "gboolean")
-)
 
-(define-method get_wrap_mode
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_wrap_mode")
-  (return-type "PangoWrapMode")
+
+;; From champlain-network-bbox-tile-source.h
+
+(define-function champlain_network_bbox_tile_source_get_type
+  (c-name "champlain_network_bbox_tile_source_get_type")
+  (return-type "GType")
 )
 
-(define-method get_ellipsize
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_ellipsize")
-  (return-type "PangoEllipsizeMode")
+(define-function champlain_network_bbox_tile_source_new_full
+  (c-name "champlain_network_bbox_tile_source_new_full")
+  (return-type "ChamplainNetworkBboxTileSource*")
+  (parameters
+    '("const-gchar*" "id")
+    '("const-gchar*" "name")
+    '("const-gchar*" "license")
+    '("const-gchar*" "license_uri")
+    '("guint" "min_zoom")
+    '("guint" "max_zoom")
+    '("guint" "tile_size")
+    '("ChamplainMapProjection" "projection")
+    '("ChamplainRenderer*" "renderer")
+  )
 )
 
-(define-method get_single_line_mode
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_single_line_mode")
-  (return-type "gboolean")
+(define-method load_map_data
+  (of-object "ChamplainNetworkBboxTileSource")
+  (c-name "champlain_network_bbox_tile_source_load_map_data")
+  (return-type "none")
+  (parameters
+    '("ChamplainBoundingBox*" "bbox")
+  )
 )
 
-(define-method get_draw_background
-  (of-object "ChamplainMarker")
-  (c-name "champlain_marker_get_draw_background")
-  (return-type "gboolean")
+(define-method get_api_uri
+  (of-object "ChamplainNetworkBboxTileSource")
+  (c-name "champlain_network_bbox_tile_source_get_api_uri")
+  (return-type "const-gchar*")
 )
 
-(define-function champlain_marker_set_highlight_color
-  (c-name "champlain_marker_set_highlight_color")
+(define-method set_api_uri
+  (of-object "ChamplainNetworkBboxTileSource")
+  (c-name "champlain_network_bbox_tile_source_set_api_uri")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "color")
+    '("const-gchar*" "api_uri")
   )
 )
 
 
 
-;; From champlain-network-map-source.h
+;; From champlain-network-tile-source.h
 
-(define-function champlain_network_map_source_get_type
-  (c-name "champlain_network_map_source_get_type")
+(define-function champlain_network_tile_source_get_type
+  (c-name "champlain_network_tile_source_get_type")
   (return-type "GType")
 )
 
-(define-function champlain_network_map_source_new_full
-  (c-name "champlain_network_map_source_new_full")
-  (return-type "ChamplainNetworkMapSource*")
+(define-function champlain_network_tile_source_new_full
+  (c-name "champlain_network_tile_source_new_full")
+  (return-type "ChamplainNetworkTileSource*")
   (parameters
     '("const-gchar*" "id")
     '("const-gchar*" "name")
@@ -867,165 +1880,166 @@
     '("guint" "tile_size")
     '("ChamplainMapProjection" "projection")
     '("const-gchar*" "uri_format")
+    '("ChamplainRenderer*" "renderer")
   )
 )
 
-(define-method get_tile_uri
-  (of-object "ChamplainNetworkMapSource")
-  (c-name "champlain_network_map_source_get_tile_uri")
-  (return-type "gchar*")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "z")
-  )
+(define-method get_uri_format
+  (of-object "ChamplainNetworkTileSource")
+  (c-name "champlain_network_tile_source_get_uri_format")
+  (return-type "const-gchar*")
 )
 
 (define-method set_uri_format
-  (of-object "ChamplainNetworkMapSource")
-  (c-name "champlain_network_map_source_set_uri_format")
+  (of-object "ChamplainNetworkTileSource")
+  (c-name "champlain_network_tile_source_set_uri_format")
   (return-type "none")
   (parameters
     '("const-gchar*" "uri_format")
   )
 )
 
-(define-function champlain_network_map_source_fill_tile
-  (c-name "champlain_network_map_source_fill_tile")
+(define-method get_offline
+  (of-object "ChamplainNetworkTileSource")
+  (c-name "champlain_network_tile_source_get_offline")
+  (return-type "gboolean")
+)
+
+(define-method set_offline
+  (of-object "ChamplainNetworkTileSource")
+  (c-name "champlain_network_tile_source_set_offline")
   (return-type "none")
   (parameters
-    '("ChamplainMapSource*" "map_source")
-    '("ChamplainTile*" "tile")
+    '("gboolean" "offline")
   )
 )
 
+(define-method get_proxy_uri
+  (of-object "ChamplainNetworkTileSource")
+  (c-name "champlain_network_tile_source_get_proxy_uri")
+  (return-type "const-gchar*")
+)
 
+(define-method set_proxy_uri
+  (of-object "ChamplainNetworkTileSource")
+  (c-name "champlain_network_tile_source_set_proxy_uri")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "proxy_uri")
+  )
+)
 
-;; From champlain-point.h
 
-(define-function champlain_point_get_type
-  (c-name "champlain_point_get_type")
-  (return-type "GType")
-)
 
-(define-method copy
-  (of-object "ChamplainPoint")
-  (c-name "champlain_point_copy")
-  (return-type "ChamplainPoint*")
-)
+;; From champlain-null-tile-source.h
 
-(define-method free
-  (of-object "ChamplainPoint")
-  (c-name "champlain_point_free")
-  (return-type "none")
+(define-function champlain_null_tile_source_get_type
+  (c-name "champlain_null_tile_source_get_type")
+  (return-type "GType")
 )
 
-(define-function champlain_point_new
-  (c-name "champlain_point_new")
-  (is-constructor-of "ChamplainPoint")
-  (return-type "ChamplainPoint*")
+(define-function champlain_null_tile_source_new_full
+  (c-name "champlain_null_tile_source_new_full")
+  (return-type "ChamplainNullTileSource*")
   (parameters
-    '("gdouble" "lat")
-    '("gdouble" "lon")
+    '("ChamplainRenderer*" "renderer")
   )
 )
 
 
 
-;; From champlain-polygon.h
+;; From champlain-path-layer.h
 
-(define-function champlain_polygon_get_type
-  (c-name "champlain_polygon_get_type")
+(define-function champlain_path_layer_get_type
+  (c-name "champlain_path_layer_get_type")
   (return-type "GType")
 )
 
-(define-function champlain_polygon_new
-  (c-name "champlain_polygon_new")
-  (is-constructor-of "ChamplainPolygon")
-  (return-type "ChamplainPolygon*")
+(define-function champlain_path_layer_new
+  (c-name "champlain_path_layer_new")
+  (is-constructor-of "ChamplainPathLayer")
+  (return-type "ChamplainPathLayer*")
 )
 
-(define-method append_point
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_append_point")
-  (return-type "ChamplainPoint*")
+(define-method add_node
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_add_node")
+  (return-type "none")
   (parameters
-    '("gdouble" "lat")
-    '("gdouble" "lon")
+    '("ChamplainLocation*" "location")
   )
 )
 
-(define-method insert_point
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_insert_point")
-  (return-type "ChamplainPoint*")
+(define-method remove_node
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_remove_node")
+  (return-type "none")
   (parameters
-    '("gdouble" "lat")
-    '("gdouble" "lon")
-    '("gint" "pos")
+    '("ChamplainLocation*" "location")
   )
 )
 
-(define-method remove_point
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_remove_point")
+(define-method remove_all
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_remove_all")
   (return-type "none")
-  (parameters
-    '("ChamplainPoint*" "point")
-  )
 )
 
-(define-method clear_points
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_clear_points")
+(define-method insert_node
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_insert_node")
   (return-type "none")
+  (parameters
+    '("ChamplainLocation*" "location")
+    '("guint" "position")
+  )
 )
 
-(define-method get_points
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_get_points")
+(define-method get_nodes
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_get_nodes")
   (return-type "GList*")
 )
 
+(define-method get_fill_color
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_get_fill_color")
+  (return-type "ClutterColor*")
+)
+
 (define-method set_fill_color
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_set_fill_color")
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_set_fill_color")
   (return-type "none")
   (parameters
     '("const-ClutterColor*" "color")
   )
 )
 
+(define-method get_stroke_color
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_get_stroke_color")
+  (return-type "ClutterColor*")
+)
+
 (define-method set_stroke_color
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_set_stroke_color")
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_set_stroke_color")
   (return-type "none")
   (parameters
     '("const-ClutterColor*" "color")
   )
 )
 
-(define-method get_fill_color
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_get_fill_color")
-  (return-type "ClutterColor*")
-)
-
-(define-method get_stroke_color
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_get_stroke_color")
-  (return-type "ClutterColor*")
-)
-
 (define-method get_fill
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_get_fill")
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_get_fill")
   (return-type "gboolean")
 )
 
 (define-method set_fill
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_set_fill")
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_set_fill")
   (return-type "none")
   (parameters
     '("gboolean" "value")
@@ -1033,132 +2047,262 @@
 )
 
 (define-method get_stroke
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_get_stroke")
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_get_stroke")
   (return-type "gboolean")
 )
 
 (define-method set_stroke
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_set_stroke")
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_set_stroke")
   (return-type "none")
   (parameters
     '("gboolean" "value")
   )
 )
 
+(define-method get_stroke_width
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_get_stroke_width")
+  (return-type "gdouble")
+)
+
 (define-method set_stroke_width
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_set_stroke_width")
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_set_stroke_width")
   (return-type "none")
   (parameters
     '("gdouble" "value")
   )
 )
 
-(define-method get_stroke_width
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_get_stroke_width")
-  (return-type "gdouble")
+(define-method get_visible
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_get_visible")
+  (return-type "gboolean")
 )
 
-(define-method show
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_show")
+(define-method set_visible
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_set_visible")
   (return-type "none")
+  (parameters
+    '("gboolean" "value")
+  )
+)
+
+(define-method get_closed
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_get_closed")
+  (return-type "gboolean")
 )
 
-(define-method hide
-  (of-object "ChamplainPolygon")
-  (c-name "champlain_polygon_hide")
+(define-method set_closed
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_set_closed")
   (return-type "none")
+  (parameters
+    '("gboolean" "value")
+  )
 )
 
+(define-method get_dash
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_get_dash")
+  (return-type "GList*")
+)
+
+(define-method set_dash
+  (of-object "ChamplainPathLayer")
+  (c-name "champlain_path_layer_set_dash")
+  (return-type "none")
+  (parameters
+    '("GList*" "dash_pattern")
+  )
+)
 
 
-;; From champlain-selection-layer.h
 
-(define-function champlain_selection_layer_get_type
-  (c-name "champlain_selection_layer_get_type")
+;; From champlain-point.h
+
+(define-function champlain_point_get_type
+  (c-name "champlain_point_get_type")
   (return-type "GType")
 )
 
-(define-function champlain_selection_layer_new
-  (c-name "champlain_selection_layer_new")
-  (is-constructor-of "ChamplainSelectionLayer")
-  (return-type "ChamplainLayer*")
+(define-function champlain_point_new
+  (c-name "champlain_point_new")
+  (is-constructor-of "ChamplainPoint")
+  (return-type "ClutterActor*")
 )
 
-(define-method get_selected
-  (of-object "ChamplainSelectionLayer")
-  (c-name "champlain_selection_layer_get_selected")
-  (return-type "ChamplainBaseMarker*")
+(define-function champlain_point_new_full
+  (c-name "champlain_point_new_full")
+  (return-type "ClutterActor*")
+  (parameters
+    '("gdouble" "size")
+    '("const-ClutterColor*" "color")
+  )
 )
 
-(define-method get_selected_markers
-  (of-object "ChamplainSelectionLayer")
-  (c-name "champlain_selection_layer_get_selected_markers")
-  (return-type "const-GList*")
+(define-method set_color
+  (of-object "ChamplainPoint")
+  (c-name "champlain_point_set_color")
+  (return-type "none")
+  (parameters
+    '("const-ClutterColor*" "color")
+  )
 )
 
-(define-method count_selected_markers
-  (of-object "ChamplainSelectionLayer")
-  (c-name "champlain_selection_layer_count_selected_markers")
-  (return-type "guint")
+(define-method get_color
+  (of-object "ChamplainPoint")
+  (c-name "champlain_point_get_color")
+  (return-type "ClutterColor*")
 )
 
-(define-method select
-  (of-object "ChamplainSelectionLayer")
-  (c-name "champlain_selection_layer_select")
+(define-method set_size
+  (of-object "ChamplainPoint")
+  (c-name "champlain_point_set_size")
   (return-type "none")
   (parameters
-    '("ChamplainBaseMarker*" "marker")
+    '("gdouble" "size")
   )
 )
 
-(define-method unselect
-  (of-object "ChamplainSelectionLayer")
-  (c-name "champlain_selection_layer_unselect")
+(define-method get_size
+  (of-object "ChamplainPoint")
+  (c-name "champlain_point_get_size")
+  (return-type "gdouble")
+)
+
+
+
+;; From champlain-private.h
+
+
+
+;; From champlain-renderer.h
+
+(define-function champlain_renderer_get_type
+  (c-name "champlain_renderer_get_type")
+  (return-type "GType")
+)
+
+(define-method set_data
+  (of-object "ChamplainRenderer")
+  (c-name "champlain_renderer_set_data")
   (return-type "none")
   (parameters
-    '("ChamplainBaseMarker*" "marker")
+    '("const-gchar*" "data")
+    '("guint" "size")
   )
 )
 
-(define-method marker_is_selected
-  (of-object "ChamplainSelectionLayer")
-  (c-name "champlain_selection_layer_marker_is_selected")
-  (return-type "gboolean")
+(define-method render
+  (of-object "ChamplainRenderer")
+  (c-name "champlain_renderer_render")
+  (return-type "none")
   (parameters
-    '("ChamplainBaseMarker*" "marker")
+    '("ChamplainTile*" "tile")
   )
 )
 
-(define-method select_all
-  (of-object "ChamplainSelectionLayer")
-  (c-name "champlain_selection_layer_select_all")
+
+
+;; From champlain-scale.h
+
+(define-function champlain_scale_get_type
+  (c-name "champlain_scale_get_type")
+  (return-type "GType")
+)
+
+(define-function champlain_scale_new
+  (c-name "champlain_scale_new")
+  (is-constructor-of "ChamplainScale")
+  (return-type "ClutterActor*")
+)
+
+(define-method set_max_width
+  (of-object "ChamplainScale")
+  (c-name "champlain_scale_set_max_width")
   (return-type "none")
+  (parameters
+    '("guint" "value")
+  )
 )
 
-(define-method unselect_all
-  (of-object "ChamplainSelectionLayer")
-  (c-name "champlain_selection_layer_unselect_all")
+(define-method set_unit
+  (of-object "ChamplainScale")
+  (c-name "champlain_scale_set_unit")
   (return-type "none")
+  (parameters
+    '("ChamplainUnit" "unit")
+  )
 )
 
-(define-method set_selection_mode
-  (of-object "ChamplainSelectionLayer")
-  (c-name "champlain_selection_layer_set_selection_mode")
+(define-method get_max_width
+  (of-object "ChamplainScale")
+  (c-name "champlain_scale_get_max_width")
+  (return-type "guint")
+)
+
+(define-method get_unit
+  (of-object "ChamplainScale")
+  (c-name "champlain_scale_get_unit")
+  (return-type "ChamplainUnit")
+)
+
+(define-method connect_view
+  (of-object "ChamplainScale")
+  (c-name "champlain_scale_connect_view")
   (return-type "none")
   (parameters
-    '("ChamplainSelectionMode" "mode")
+    '("ChamplainView*" "view")
   )
 )
 
-(define-method get_selection_mode
-  (of-object "ChamplainSelectionLayer")
-  (c-name "champlain_selection_layer_get_selection_mode")
-  (return-type "ChamplainSelectionMode")
+(define-method disconnect_view
+  (of-object "ChamplainScale")
+  (c-name "champlain_scale_disconnect_view")
+  (return-type "none")
+)
+
+
+
+;; From champlain-tile-cache.h
+
+(define-function champlain_tile_cache_get_type
+  (c-name "champlain_tile_cache_get_type")
+  (return-type "GType")
+)
+
+(define-method store_tile
+  (of-object "ChamplainTileCache")
+  (c-name "champlain_tile_cache_store_tile")
+  (return-type "none")
+  (parameters
+    '("ChamplainTile*" "tile")
+    '("const-gchar*" "contents")
+    '("gsize" "size")
+  )
+)
+
+(define-method refresh_tile_time
+  (of-object "ChamplainTileCache")
+  (c-name "champlain_tile_cache_refresh_tile_time")
+  (return-type "none")
+  (parameters
+    '("ChamplainTile*" "tile")
+  )
+)
+
+(define-method on_tile_filled
+  (of-object "ChamplainTileCache")
+  (c-name "champlain_tile_cache_on_tile_filled")
+  (return-type "none")
+  (parameters
+    '("ChamplainTile*" "tile")
+  )
 )
 
 
@@ -1180,29 +2324,29 @@
   (c-name "champlain_tile_new_full")
   (return-type "ChamplainTile*")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("guint" "x")
+    '("guint" "y")
     '("guint" "size")
-    '("gint" "zoom_level")
+    '("guint" "zoom_level")
   )
 )
 
 (define-method get_x
   (of-object "ChamplainTile")
   (c-name "champlain_tile_get_x")
-  (return-type "gint")
+  (return-type "guint")
 )
 
 (define-method get_y
   (of-object "ChamplainTile")
   (c-name "champlain_tile_get_y")
-  (return-type "gint")
+  (return-type "guint")
 )
 
 (define-method get_zoom_level
   (of-object "ChamplainTile")
   (c-name "champlain_tile_get_zoom_level")
-  (return-type "gint")
+  (return-type "guint")
 )
 
 (define-method get_size
@@ -1217,24 +2361,6 @@
   (return-type "ChamplainState")
 )
 
-(define-method get_uri
-  (of-object "ChamplainTile")
-  (c-name "champlain_tile_get_uri")
-  (return-type "const-gchar*")
-)
-
-(define-method get_filename
-  (of-object "ChamplainTile")
-  (c-name "champlain_tile_get_filename")
-  (return-type "const-gchar*")
-)
-
-(define-method get_actor
-  (of-object "ChamplainTile")
-  (c-name "champlain_tile_get_actor")
-  (return-type "ClutterActor*")
-)
-
 (define-method get_content
   (of-object "ChamplainTile")
   (c-name "champlain_tile_get_content")
@@ -1247,24 +2373,24 @@
   (return-type "const-GTimeVal*")
 )
 
-(define-method get_modified_time_string
-  (of-object "ChamplainTile")
-  (c-name "champlain_tile_get_modified_time_string")
-  (return-type "gchar*")
-)
-
 (define-method get_etag
   (of-object "ChamplainTile")
   (c-name "champlain_tile_get_etag")
   (return-type "const-gchar*")
 )
 
+(define-method get_fade_in
+  (of-object "ChamplainTile")
+  (c-name "champlain_tile_get_fade_in")
+  (return-type "gboolean")
+)
+
 (define-method set_x
   (of-object "ChamplainTile")
   (c-name "champlain_tile_set_x")
   (return-type "none")
   (parameters
-    '("gint" "x")
+    '("guint" "x")
   )
 )
 
@@ -1273,7 +2399,7 @@
   (c-name "champlain_tile_set_y")
   (return-type "none")
   (parameters
-    '("gint" "y")
+    '("guint" "y")
   )
 )
 
@@ -1282,7 +2408,7 @@
   (c-name "champlain_tile_set_zoom_level")
   (return-type "none")
   (parameters
-    '("gint" "zoom_level")
+    '("guint" "zoom_level")
   )
 )
 
@@ -1304,49 +2430,141 @@
   )
 )
 
-(define-method set_uri
+(define-method set_content
   (of-object "ChamplainTile")
-  (c-name "champlain_tile_set_uri")
+  (c-name "champlain_tile_set_content")
   (return-type "none")
   (parameters
-    '("const-gchar*" "uri")
+    '("ClutterActor*" "actor")
   )
 )
 
-(define-method set_filename
+(define-method set_etag
   (of-object "ChamplainTile")
-  (c-name "champlain_tile_set_filename")
+  (c-name "champlain_tile_set_etag")
   (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
+    '("const-gchar*" "etag")
   )
 )
 
-(define-method set_content
+(define-method set_modified_time
   (of-object "ChamplainTile")
-  (c-name "champlain_tile_set_content")
+  (c-name "champlain_tile_set_modified_time")
   (return-type "none")
   (parameters
-    '("ClutterActor*" "actor")
-    '("gboolean" "fade_in")
+    '("const-GTimeVal*" "time")
   )
 )
 
-(define-method set_etag
+(define-method set_fade_in
   (of-object "ChamplainTile")
-  (c-name "champlain_tile_set_etag")
+  (c-name "champlain_tile_set_fade_in")
   (return-type "none")
   (parameters
-    '("const-gchar*" "etag")
+    '("gboolean" "fade_in")
   )
 )
 
-(define-method set_modified_time
+(define-method display_content
   (of-object "ChamplainTile")
-  (c-name "champlain_tile_set_modified_time")
+  (c-name "champlain_tile_display_content")
+  (return-type "none")
+)
+
+
+
+;; From champlain-tile-source.h
+
+(define-function champlain_tile_source_get_type
+  (c-name "champlain_tile_source_get_type")
+  (return-type "GType")
+)
+
+(define-method get_cache
+  (of-object "ChamplainTileSource")
+  (c-name "champlain_tile_source_get_cache")
+  (return-type "ChamplainTileCache*")
+)
+
+(define-method set_cache
+  (of-object "ChamplainTileSource")
+  (c-name "champlain_tile_source_set_cache")
   (return-type "none")
   (parameters
-    '("const-GTimeVal*" "time")
+    '("ChamplainTileCache*" "cache")
+  )
+)
+
+(define-method set_id
+  (of-object "ChamplainTileSource")
+  (c-name "champlain_tile_source_set_id")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "id")
+  )
+)
+
+(define-method set_name
+  (of-object "ChamplainTileSource")
+  (c-name "champlain_tile_source_set_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method set_license
+  (of-object "ChamplainTileSource")
+  (c-name "champlain_tile_source_set_license")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "license")
+  )
+)
+
+(define-method set_license_uri
+  (of-object "ChamplainTileSource")
+  (c-name "champlain_tile_source_set_license_uri")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "license_uri")
+  )
+)
+
+(define-method set_min_zoom_level
+  (of-object "ChamplainTileSource")
+  (c-name "champlain_tile_source_set_min_zoom_level")
+  (return-type "none")
+  (parameters
+    '("guint" "zoom_level")
+  )
+)
+
+(define-method set_max_zoom_level
+  (of-object "ChamplainTileSource")
+  (c-name "champlain_tile_source_set_max_zoom_level")
+  (return-type "none")
+  (parameters
+    '("guint" "zoom_level")
+  )
+)
+
+(define-method set_tile_size
+  (of-object "ChamplainTileSource")
+  (c-name "champlain_tile_source_set_tile_size")
+  (return-type "none")
+  (parameters
+    '("guint" "tile_size")
+  )
+)
+
+(define-method set_projection
+  (of-object "ChamplainTileSource")
+  (c-name "champlain_tile_source_set_projection")
+  (return-type "none")
+  (parameters
+    '("ChamplainMapProjection" "projection")
   )
 )
 
@@ -1395,6 +2613,18 @@
   (return-type "none")
 )
 
+(define-method get_center_latitude
+  (of-object "ChamplainView")
+  (c-name "champlain_view_get_center_latitude")
+  (return-type "gdouble")
+)
+
+(define-method get_center_longitude
+  (of-object "ChamplainView")
+  (c-name "champlain_view_get_center_longitude")
+  (return-type "gdouble")
+)
+
 (define-method zoom_in
   (of-object "ChamplainView")
   (c-name "champlain_view_zoom_in")
@@ -1412,7 +2642,7 @@
   (c-name "champlain_view_set_zoom_level")
   (return-type "none")
   (parameters
-    '("gint" "zoom_level")
+    '("guint" "zoom_level")
   )
 )
 
@@ -1421,7 +2651,7 @@
   (c-name "champlain_view_set_min_zoom_level")
   (return-type "none")
   (parameters
-    '("gint" "zoom_level")
+    '("guint" "zoom_level")
   )
 )
 
@@ -1430,7 +2660,7 @@
   (c-name "champlain_view_set_max_zoom_level")
   (return-type "none")
   (parameters
-    '("gint" "zoom_level")
+    '("guint" "zoom_level")
   )
 )
 
@@ -1439,20 +2669,16 @@
   (c-name "champlain_view_ensure_visible")
   (return-type "none")
   (parameters
-    '("gdouble" "lat1")
-    '("gdouble" "lon1")
-    '("gdouble" "lat2")
-    '("gdouble" "lon2")
+    '("ChamplainBoundingBox*" "bbox")
     '("gboolean" "animate")
   )
 )
 
-(define-method ensure_markers_visible
+(define-method ensure_layers_visible
   (of-object "ChamplainView")
-  (c-name "champlain_view_ensure_markers_visible")
+  (c-name "champlain_view_ensure_layers_visible")
   (return-type "none")
   (parameters
-    '("ChamplainBaseMarker*[]" "markers")
     '("gboolean" "animate")
   )
 )
@@ -1466,46 +2692,52 @@
   )
 )
 
-(define-method set_size
+(define-method add_overlay_source
   (of-object "ChamplainView")
-  (c-name "champlain_view_set_size")
+  (c-name "champlain_view_add_overlay_source")
   (return-type "none")
   (parameters
-    '("guint" "width")
-    '("guint" "height")
+    '("ChamplainMapSource*" "map_source")
+    '("guint8" "opacity")
   )
 )
 
-(define-method set_decel_rate
+(define-method remove_overlay_source
   (of-object "ChamplainView")
-  (c-name "champlain_view_set_decel_rate")
+  (c-name "champlain_view_remove_overlay_source")
   (return-type "none")
   (parameters
-    '("gdouble" "rate")
+    '("ChamplainMapSource*" "map_source")
   )
 )
 
-(define-method set_scroll_mode
+(define-method get_overlay_sources
+  (of-object "ChamplainView")
+  (c-name "champlain_view_get_overlay_sources")
+  (return-type "GList*")
+)
+
+(define-method set_deceleration
   (of-object "ChamplainView")
-  (c-name "champlain_view_set_scroll_mode")
+  (c-name "champlain_view_set_deceleration")
   (return-type "none")
   (parameters
-    '("ChamplainScrollMode" "mode")
+    '("gdouble" "rate")
   )
 )
 
-(define-method set_keep_center_on_resize
+(define-method set_kinetic_mode
   (of-object "ChamplainView")
-  (c-name "champlain_view_set_keep_center_on_resize")
+  (c-name "champlain_view_set_kinetic_mode")
   (return-type "none")
   (parameters
-    '("gboolean" "value")
+    '("gboolean" "kinetic")
   )
 )
 
-(define-method set_show_license
+(define-method set_keep_center_on_resize
   (of-object "ChamplainView")
-  (c-name "champlain_view_set_show_license")
+  (c-name "champlain_view_set_keep_center_on_resize")
   (return-type "none")
   (parameters
     '("gboolean" "value")
@@ -1521,63 +2753,58 @@
   )
 )
 
-(define-method add_layer
+(define-method set_animate_zoom
   (of-object "ChamplainView")
-  (c-name "champlain_view_add_layer")
+  (c-name "champlain_view_set_animate_zoom")
   (return-type "none")
   (parameters
-    '("ChamplainLayer*" "layer")
+    '("gboolean" "value")
   )
 )
 
-(define-method remove_layer
+(define-method set_background_pattern
   (of-object "ChamplainView")
-  (c-name "champlain_view_remove_layer")
+  (c-name "champlain_view_set_background_pattern")
   (return-type "none")
   (parameters
-    '("ChamplainLayer*" "layer")
+    '("ClutterContent*" "background")
   )
 )
 
-(define-method get_coords_from_event
+(define-method add_layer
   (of-object "ChamplainView")
-  (c-name "champlain_view_get_coords_from_event")
-  (return-type "gboolean")
+  (c-name "champlain_view_add_layer")
+  (return-type "none")
   (parameters
-    '("ClutterEvent*" "event")
-    '("gdouble*" "lat")
-    '("gdouble*" "lon")
+    '("ChamplainLayer*" "layer")
   )
 )
 
-(define-method get_coords_at
+(define-method remove_layer
   (of-object "ChamplainView")
-  (c-name "champlain_view_get_coords_at")
-  (return-type "gboolean")
+  (c-name "champlain_view_remove_layer")
+  (return-type "none")
   (parameters
-    '("guint" "x")
-    '("guint" "y")
-    '("gdouble*" "lat")
-    '("gdouble*" "lon")
+    '("ChamplainLayer*" "layer")
   )
 )
 
 (define-method get_zoom_level
   (of-object "ChamplainView")
   (c-name "champlain_view_get_zoom_level")
-  (return-type "gint")
+  (return-type "guint")
 )
 
 (define-method get_min_zoom_level
   (of-object "ChamplainView")
   (c-name "champlain_view_get_min_zoom_level")
-  (return-type "gint")
+  (return-type "guint")
 )
 
 (define-method get_max_zoom_level
   (of-object "ChamplainView")
   (c-name "champlain_view_get_max_zoom_level")
-  (return-type "gint")
+  (return-type "guint")
 )
 
 (define-method get_map_source
@@ -1586,16 +2813,16 @@
   (return-type "ChamplainMapSource*")
 )
 
-(define-method get_decel_rate
+(define-method get_deceleration
   (of-object "ChamplainView")
-  (c-name "champlain_view_get_decel_rate")
+  (c-name "champlain_view_get_deceleration")
   (return-type "gdouble")
 )
 
-(define-method get_scroll_mode
+(define-method get_kinetic_mode
   (of-object "ChamplainView")
-  (c-name "champlain_view_get_scroll_mode")
-  (return-type "ChamplainScrollMode")
+  (c-name "champlain_view_get_kinetic_mode")
+  (return-type "gboolean")
 )
 
 (define-method get_keep_center_on_resize
@@ -1604,132 +2831,202 @@
   (return-type "gboolean")
 )
 
-(define-method get_show_license
+(define-method get_zoom_on_double_click
   (of-object "ChamplainView")
-  (c-name "champlain_view_get_show_license")
+  (c-name "champlain_view_get_zoom_on_double_click")
   (return-type "gboolean")
 )
 
-(define-method get_zoom_on_double_click
+(define-method get_animate_zoom
   (of-object "ChamplainView")
-  (c-name "champlain_view_get_zoom_on_double_click")
+  (c-name "champlain_view_get_animate_zoom")
   (return-type "gboolean")
 )
 
-(define-method add_polygon
+(define-method get_state
   (of-object "ChamplainView")
-  (c-name "champlain_view_add_polygon")
+  (c-name "champlain_view_get_state")
+  (return-type "ChamplainState")
+)
+
+(define-method get_background_pattern
+  (of-object "ChamplainView")
+  (c-name "champlain_view_get_background_pattern")
+  (return-type "ClutterContent*")
+)
+
+(define-method reload_tiles
+  (of-object "ChamplainView")
+  (c-name "champlain_view_reload_tiles")
   (return-type "none")
+)
+
+(define-method x_to_longitude
+  (of-object "ChamplainView")
+  (c-name "champlain_view_x_to_longitude")
+  (return-type "gdouble")
   (parameters
-    '("ChamplainPolygon*" "polygon")
+    '("gdouble" "x")
   )
 )
 
-(define-method remove_polygon
+(define-method y_to_latitude
   (of-object "ChamplainView")
-  (c-name "champlain_view_remove_polygon")
-  (return-type "none")
+  (c-name "champlain_view_y_to_latitude")
+  (return-type "gdouble")
   (parameters
-    '("ChamplainPolygon*" "polygon")
+    '("gdouble" "y")
   )
 )
 
+(define-method longitude_to_x
+  (of-object "ChamplainView")
+  (c-name "champlain_view_longitude_to_x")
+  (return-type "gdouble")
+  (parameters
+    '("gdouble" "longitude")
+  )
+)
 
+(define-method latitude_to_y
+  (of-object "ChamplainView")
+  (c-name "champlain_view_latitude_to_y")
+  (return-type "gdouble")
+  (parameters
+    '("gdouble" "latitude")
+  )
+)
 
-;; From champlain-zoom-level.h
+(define-method get_viewport_origin
+  (of-object "ChamplainView")
+  (c-name "champlain_view_get_viewport_origin")
+  (return-type "none")
+  (parameters
+    '("gint*" "x")
+    '("gint*" "y")
+  )
+)
 
-(define-function champlain_zoom_level_get_type
-  (c-name "champlain_zoom_level_get_type")
-  (return-type "GType")
+(define-method bin_layout_add
+  (of-object "ChamplainView")
+  (c-name "champlain_view_bin_layout_add")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "child")
+    '("ClutterBinAlignment" "x_align")
+    '("ClutterBinAlignment" "y_align")
+  )
 )
 
-(define-function champlain_zoom_level_new
-  (c-name "champlain_zoom_level_new")
-  (is-constructor-of "ChamplainZoomLevel")
-  (return-type "ChamplainZoomLevel*")
+(define-method get_license_actor
+  (of-object "ChamplainView")
+  (c-name "champlain_view_get_license_actor")
+  (return-type "ChamplainLicense*")
 )
 
-(define-method get_width
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_get_width")
-  (return-type "guint")
+(define-method get_bounding_box
+  (of-object "ChamplainView")
+  (c-name "champlain_view_get_bounding_box")
+  (return-type "ChamplainBoundingBox*")
 )
 
-(define-method get_height
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_get_height")
-  (return-type "guint")
+(define-method get_bounding_box_for_zoom_level
+  (of-object "ChamplainView")
+  (c-name "champlain_view_get_bounding_box_for_zoom_level")
+  (return-type "ChamplainBoundingBox*")
+  (parameters
+    '("guint" "zoom_level")
+  )
 )
 
-(define-method get_zoom_level
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_get_zoom_level")
-  (return-type "gint")
+
+
+;; From champlain-viewport.h
+
+(define-function champlain_viewport_get_type
+  (c-name "champlain_viewport_get_type")
+  (return-type "GType")
 )
 
-(define-method get_actor
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_get_actor")
+(define-function champlain_viewport_new
+  (c-name "champlain_viewport_new")
+  (is-constructor-of "ChamplainViewport")
   (return-type "ClutterActor*")
 )
 
-(define-method set_width
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_set_width")
+(define-method set_origin
+  (of-object "ChamplainViewport")
+  (c-name "champlain_viewport_set_origin")
   (return-type "none")
   (parameters
-    '("guint" "width")
+    '("gdouble" "x")
+    '("gdouble" "y")
   )
 )
 
-(define-method set_height
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_set_height")
+(define-method get_origin
+  (of-object "ChamplainViewport")
+  (c-name "champlain_viewport_get_origin")
   (return-type "none")
   (parameters
-    '("guint" "height")
+    '("gdouble*" "x")
+    '("gdouble*" "y")
   )
 )
 
-(define-method set_zoom_level
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_set_zoom_level")
+(define-method stop
+  (of-object "ChamplainViewport")
+  (c-name "champlain_viewport_stop")
+  (return-type "none")
+)
+
+(define-method get_adjustments
+  (of-object "ChamplainViewport")
+  (c-name "champlain_viewport_get_adjustments")
   (return-type "none")
   (parameters
-    '("gint" "zoom_level")
+    '("ChamplainAdjustment**" "hadjustment")
+    '("ChamplainAdjustment**" "vadjustment")
   )
 )
 
-(define-method add_tile
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_add_tile")
+(define-method set_adjustments
+  (of-object "ChamplainViewport")
+  (c-name "champlain_viewport_set_adjustments")
   (return-type "none")
   (parameters
-    '("ChamplainTile*" "tile")
+    '("ChamplainAdjustment*" "hadjustment")
+    '("ChamplainAdjustment*" "vadjustment")
   )
 )
 
-(define-method remove_tile
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_remove_tile")
+(define-method set_child
+  (of-object "ChamplainViewport")
+  (c-name "champlain_viewport_set_child")
   (return-type "none")
   (parameters
-    '("ChamplainTile*" "tile")
+    '("ClutterActor*" "child")
   )
 )
 
-(define-method tile_count
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_tile_count")
-  (return-type "guint")
+(define-method get_anchor
+  (of-object "ChamplainViewport")
+  (c-name "champlain_viewport_get_anchor")
+  (return-type "none")
+  (parameters
+    '("gint*" "x")
+    '("gint*" "y")
+  )
 )
 
-(define-method get_nth_tile
-  (of-object "ChamplainZoomLevel")
-  (c-name "champlain_zoom_level_get_nth_tile")
-  (return-type "ChamplainTile*")
+(define-method set_actor_position
+  (of-object "ChamplainViewport")
+  (c-name "champlain_viewport_set_actor_position")
+  (return-type "none")
   (parameters
-    '("guint" "index")
+    '("ClutterActor*" "actor")
+    '("gdouble" "x")
+    '("gdouble" "y")
   )
 )