[libchamplain] Add Mapquest Open Aerial map source

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

commit 19ac9ed8da57e024907f3cc9f4a6c74fd3e7c274
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri Apr 5 16:28:46 2013 +0300

    Add Mapquest Open Aerial map source
    
    Seems after the demise of OAM, this is the only usable and open service
    of aerial tiles.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=697304

 champlain/champlain-0.12.vapi            |    2 ++
 champlain/champlain-map-source-factory.c |   14 ++++++++++++++
 champlain/champlain-map-source-factory.h |    7 +++++++
 docs/reference/libchamplain-sections.txt |    1 +
 4 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/champlain/champlain-0.12.vapi b/champlain/champlain-0.12.vapi
index 12f88f8..16f81d7 100644
--- a/champlain/champlain-0.12.vapi
+++ b/champlain/champlain-0.12.vapi
@@ -658,6 +658,8 @@ namespace Champlain {
        public const string MAP_SOURCE_OSM_OSMARENDER;
        [CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP")]
        public const string MAP_SOURCE_OSM_TRANSPORT_MAP;
+       [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_MAX_LATITUDE")]
        public const double MAX_LATITUDE;
        [CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAX_LONGITUDE")]
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index b3aeb8f..281c866 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -190,6 +190,20 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
   champlain_map_source_factory_register (factory, desc);
 
   desc = champlain_map_source_desc_new_full (
+        CHAMPLAIN_MAP_SOURCE_OSM_AERIAL_MAP,
+        "MapQuest Open Aerial",
+        "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
+        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        0,
+        18,
+        256,
+        CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+        "http://otile1.mqcdn.com/tiles/1.0.0/sat/#Z#/#X#/#Y#.jpg";,
+        champlain_map_source_new_generic,
+        NULL);
+  champlain_map_source_factory_register (factory, desc);
+
+  desc = champlain_map_source_desc_new_full (
         CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP,
         "OpenStreetMap Cycle Map",
         "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
diff --git a/champlain/champlain-map-source-factory.h b/champlain/champlain-map-source-factory.h
index 2a1e291..68895aa 100644
--- a/champlain/champlain-map-source-factory.h
+++ b/champlain/champlain-map-source-factory.h
@@ -109,6 +109,12 @@ GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *
  */
 #define CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST "osm-mapquest"
 /**
+ * CHAMPLAIN_MAP_SOURCE_OSM_AERIAL_MAP:
+ *
+ * Mapquest Open Aerial
+ */
+#define CHAMPLAIN_MAP_SOURCE_OSM_AERIAL_MAP "osm-aerialmap"
+/**
  * CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP:
  *
  * OpenStreetMap Cycle Map
@@ -136,6 +142,7 @@ GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *
 #define CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK "OpenStreetMap I"
 #define CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER "OpenStreetMap II"
 #define CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST "Mapquest OSM"
+#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"
diff --git a/docs/reference/libchamplain-sections.txt b/docs/reference/libchamplain-sections.txt
index 3ee5959..2d73892 100644
--- a/docs/reference/libchamplain-sections.txt
+++ b/docs/reference/libchamplain-sections.txt
@@ -439,6 +439,7 @@ CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK
 CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER
 CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP
 CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP
+CHAMPLAIN_MAP_SOURCE_OSM_AERIAL_MAP
 CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST
 CHAMPLAIN_MAP_SOURCE_OAM
 CHAMPLAIN_MAP_SOURCE_MFF_RELIEF