[libchamplain] Drop OAM map source completely

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

commit 5fbcda5c709d34efb87d6d60af1cf7f286e94fe1
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri Apr 5 16:30:55 2013 +0300

    Drop OAM map source completely
    
    OAM has been offline for quite a while now and the code to register this
    source was already disabled in commit c89725924 a while back. Any
    application that tries to use it ends-up crashing. Better remove all
    support for it already. Since the using apps are crashing anyways, there
    is no real API/ABI break involved here.
    
    I already added an alternative aerial source in the previous commit so
    application can use that instead.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=697304

 champlain/champlain-0.12.vapi            |    2 --
 champlain/champlain-map-source-factory.c |   17 -----------------
 champlain/champlain-map-source-factory.h |    7 -------
 3 files changed, 0 insertions(+), 26 deletions(-)
---
diff --git a/champlain/champlain-0.12.vapi b/champlain/champlain-0.12.vapi
index 16f81d7..7d9bcdf 100644
--- a/champlain/champlain-0.12.vapi
+++ b/champlain/champlain-0.12.vapi
@@ -646,8 +646,6 @@ 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_CYCLE_MAP")]
        public const string MAP_SOURCE_OSM_CYCLE_MAP;
        [CCode (cheader_filename = "champlain/champlain.h", cname = "CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK")]
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 281c866..5157d76 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -231,23 +231,6 @@ 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 68895aa..1a90037 100644
--- a/champlain/champlain-map-source-factory.h
+++ b/champlain/champlain-map-source-factory.h
@@ -127,12 +127,6 @@ 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
@@ -145,7 +139,6 @@ 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