[libchamplain] Revert "factory: remove Mapquest map source"

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

commit aeb75e444553a545543bf94d70f5c3ac3e9b3e4e
Author: Jiří Techet <techet gmail com>
Date:   Wed Jul 13 19:32:59 2016 +0200

    Revert "factory: remove Mapquest map source"
    
    This reverts commit 4ef6b1804a3e68fe993a16ef027eb40c097fefb6.
    
    We have to do this in a backwards-compatible way

 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 7042439..f8ca290 100644
--- a/champlain/champlain-0.12.vapi
+++ b/champlain/champlain-0.12.vapi
@@ -640,6 +640,8 @@ namespace Champlain {
        public const string MAP_SOURCE_OSM_CYCLE_MAP;
        [CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK")]
        public const string MAP_SOURCE_OSM_MAPNIK;
+       [CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST")]
+       public const string MAP_SOURCE_OSM_MAPQUEST;
        [CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER")]
        [Deprecated]
        public const string MAP_SOURCE_OSM_OSMARENDER;
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 176f8ae..c86aa11 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -162,6 +162,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_MAPQUEST,
+        "MapQuest OSM",
+        "Data, imagery and map information provided by MapQuest, Open Street Map and contributors",
+        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        0,
+        17,
+        256,
+        CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+        "https://otile1.mqcdn.com/tiles/1.0.0/osm/#Z#/#X#/#Y#.png";,
+        champlain_map_source_new_generic,
+        NULL);
+  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",
diff --git a/champlain/champlain-map-source-factory.h b/champlain/champlain-map-source-factory.h
index 367796f..ff4f9fc 100644
--- a/champlain/champlain-map-source-factory.h
+++ b/champlain/champlain-map-source-factory.h
@@ -121,6 +121,12 @@ GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *
 #define CHAMPLAIN_MAP_SOURCE_OAM "OpenAerialMap"
 #endif
 /**
+ * CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST:
+ *
+ * Mapquest OpenStreetMap
+ */
+#define CHAMPLAIN_MAP_SOURCE_OSM_MAPQUEST "osm-mapquest"
+/**
  * CHAMPLAIN_MAP_SOURCE_OSM_AERIAL_MAP:
  *
  * Mapquest Open Aerial
@@ -178,6 +184,7 @@ GSList *champlain_map_source_factory_get_registered (ChamplainMapSourceFactory *
 #else
 #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"
diff --git a/docs/reference/libchamplain-sections.txt b/docs/reference/libchamplain-sections.txt
index d85c2da..970d819 100644
--- a/docs/reference/libchamplain-sections.txt
+++ b/docs/reference/libchamplain-sections.txt
@@ -453,6 +453,7 @@ CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK
 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_MFF_RELIEF
 CHAMPLAIN_MAP_SOURCE_OAM
 CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER