[libchamplain/libchamplain-0-12: 129/134] factory: Revert "Drop OAM map source completely"

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

commit 50e2dcf0b0abd226b6fda901c3c4c93974283a9f
Author: Jiří Techet <techet gmail com>
Date:   Thu May 16 17:50:17 2013 +0200

    factory: Revert "Drop OAM map source completely"
    
    This reverts commit 5fbcda5c709d34efb87d6d60af1cf7f286e94fe1. After a second
    thought it's not a good idea to change the API by removing the define.
    Let's remove the define next time we make an API bump.
    
    Conflicts:
        champlain/champlain-0.12.vapi

 champlain/champlain-0.12.vapi            |    6 +++---
 champlain/champlain-map-source-factory.c |   17 +++++++++++++++++
 champlain/champlain-map-source-factory.h |    7 +++++++
 3 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/champlain/champlain-0.12.vapi b/champlain/champlain-0.12.vapi
index 03d4f5e..dbc0e9b 100644
--- a/champlain/champlain-0.12.vapi
+++ b/champlain/champlain-0.12.vapi
@@ -7,15 +7,12 @@ namespace Champlain {
                [CCode (has_construct_function = false)]
                public Adjustment (double value, double lower, double upper, double step_increment);
                public bool clamp (bool interpolate, uint n_frames, uint fps);
-               public bool get_elastic ();
                public double get_value ();
                public void get_values (double value, double lower, double upper, double step_increment);
                public void interpolate (double value, uint n_frames, uint fps);
                public void interpolate_stop ();
-               public void set_elastic (bool elastic);
                public void set_value (double value);
                public void set_values (double value, double lower, double upper, double step_increment);
-               public bool elastic { get; set; }
                [NoAccessorMethod]
                public double lower { get; set; }
                [NoAccessorMethod]
@@ -567,6 +564,7 @@ namespace Champlain {
                public void get_adjustments (Champlain.Adjustment hadjustment, Champlain.Adjustment 
vadjustment);
                public void get_anchor (int x, int y);
                public void get_origin (double x, double y);
+               public void set_actor_position (Clutter.Actor actor, double x, double y);
                public void set_adjustments (Champlain.Adjustment hadjustment, Champlain.Adjustment 
vadjustment);
                public void set_child (Clutter.Actor child);
                public void set_origin (double x, double y);
@@ -650,6 +648,8 @@ namespace Champlain {
        public const string MAP_SOURCE_MEMPHIS_NETWORK;
        [CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_MFF_RELIEF")]
        public const string MAP_SOURCE_MFF_RELIEF;
+       [CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OAM")]
+       public const string MAP_SOURCE_OAM;
        [CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_AERIAL_MAP")]
        public const string MAP_SOURCE_OSM_AERIAL_MAP;
        [CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP")]
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index f288d2f..80280c0 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -234,6 +234,23 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         NULL);
   champlain_map_source_factory_register (factory, desc);
 
+#if 0
+/* Disabling until OpenArealMap works again */
+  desc = champlain_map_source_desc_new_full (
+        CHAMPLAIN_MAP_SOURCE_OAM,
+        "OpenAerialMap",
+        "(CC) BY 3.0 OpenAerialMap contributors",
+        "http://creativecommons.org/licenses/by/3.0/";,
+        0,
+        17,
+        256,
+        CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+        "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z#/#X#/#Y#.jpg";,
+        champlain_map_source_new_generic,
+        NULL);
+  champlain_map_source_factory_register (factory, desc);
+#endif
+
   desc = champlain_map_source_desc_new_full (
         CHAMPLAIN_MAP_SOURCE_MFF_RELIEF,
         "Maps for Free Relief",
diff --git a/champlain/champlain-map-source-factory.h b/champlain/champlain-map-source-factory.h
index 95e6766..fad2bcc 100644
--- a/champlain/champlain-map-source-factory.h
+++ b/champlain/champlain-map-source-factory.h
@@ -131,6 +131,12 @@ GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *
  */
 #define CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP "osm-transportmap"
 /**
+ * CHAMPLAIN_MAP_SOURCE_OAM:
+ *
+ * OpenAerialMap
+ */
+#define CHAMPLAIN_MAP_SOURCE_OAM "OpenAerialMap"
+/**
  * CHAMPLAIN_MAP_SOURCE_MFF_RELIEF:
  *
  * Maps for Free Relief
@@ -143,6 +149,7 @@ GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *
 #define CHAMPLAIN_MAP_SOURCE_OSM_AERIAL_MAP "Open Aerial Map"
 #define CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP "OpenCycleMap"
 #define CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP "Public Transport"
+#define CHAMPLAIN_MAP_SOURCE_OAM "OpenAerialMap"
 #define CHAMPLAIN_MAP_SOURCE_MFF_RELIEF "MapsForFree Relief"
 #endif