[libchamplain] factory: remove Mapquest map source



commit 4ef6b1804a3e68fe993a16ef027eb40c097fefb6
Author: Nayan Deshmukh <nayan26deshmukh gmail com>
Date:   Mon Jul 4 22:40:45 2016 +0530

    factory: remove Mapquest map source
    
    Due to change in their ToS, we can no longer access their
    tile servers directly.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=768392

 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, 0 insertions(+), 24 deletions(-)
---
diff --git a/champlain/champlain-0.12.vapi b/champlain/champlain-0.12.vapi
index f8ca290..7042439 100644
--- a/champlain/champlain-0.12.vapi
+++ b/champlain/champlain-0.12.vapi
@@ -640,8 +640,6 @@ 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 c86aa11..176f8ae 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -162,20 +162,6 @@ 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 ff4f9fc..367796f 100644
--- a/champlain/champlain-map-source-factory.h
+++ b/champlain/champlain-map-source-factory.h
@@ -121,12 +121,6 @@ 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
@@ -184,7 +178,6 @@ 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 970d819..d85c2da 100644
--- a/docs/reference/libchamplain-sections.txt
+++ b/docs/reference/libchamplain-sections.txt
@@ -453,7 +453,6 @@ 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]