remove-mapquest.patch 2.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. diff -Naur viking-1.6.2.orig/src/map_ids.h viking-1.6.2/src/map_ids.h
  2. --- viking-1.6.2.orig/src/map_ids.h 2015-11-10 22:01:35.000000000 +0100
  3. +++ viking-1.6.2/src/map_ids.h 2017-07-01 11:25:32.496994499 +0200
  4. @@ -35,7 +35,6 @@
  5. #define MAP_ID_OSM_MAPNIK 13
  6. #define MAP_ID_BLUE_MARBLE 15
  7. #define MAP_ID_OSM_CYCLE 17
  8. -#define MAP_ID_MAPQUEST_OSM 19
  9. #define MAP_ID_OSM_TRANSPORT 20
  10. #define MAP_ID_OSM_ON_DISK 21
  11. #define MAP_ID_OSM_HUMANITARIAN 22
  12. diff -Naur viking-1.6.2.orig/src/osm.c viking-1.6.2/src/osm.c
  13. --- viking-1.6.2.orig/src/osm.c 2015-11-10 22:01:35.000000000 +0100
  14. +++ viking-1.6.2/src/osm.c 2017-07-01 11:26:25.051880940 +0200
  15. @@ -89,21 +89,6 @@
  16. "license", "CC-BY-SA",
  17. "license-url", "http://www.openstreetmap.org/copyright",
  18. NULL));
  19. - VikMapSource *mapquest_type =
  20. - VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
  21. - "id", MAP_ID_MAPQUEST_OSM,
  22. - "name", "OSM-MapQuest",
  23. - "label", "OpenStreetMap (MapQuest)",
  24. - "hostname", "otile1.mqcdn.com",
  25. - "url", "/tiles/1.0.0/osm/%d/%d/%d.png",
  26. - "check-file-server-time", TRUE,
  27. - "use-etag", FALSE,
  28. - "zoom-min", 0,
  29. - "zoom-max", 19,
  30. - "copyright", "Tiles Courtesy of MapQuest © OpenStreetMap contributors",
  31. - "license", "MapQuest Specific",
  32. - "license-url", "http://developer.mapquest.com/web/info/terms-of-use",
  33. - NULL));
  34. VikMapSource *hot_type =
  35. VIK_MAP_SOURCE(g_object_new(VIK_TYPE_SLIPPY_MAP_SOURCE,
  36. "id", MAP_ID_OSM_HUMANITARIAN,
  37. @@ -152,7 +137,6 @@
  38. "is-osm-meta-tiles", TRUE,
  39. NULL));
  40. - maps_layer_register_map_source (mapquest_type);
  41. maps_layer_register_map_source (mapnik_type);
  42. maps_layer_register_map_source (cycle_type);
  43. maps_layer_register_map_source (transport_type);
  44. diff -Naur viking-1.6.2.orig/src/vikmapslayer.c viking-1.6.2/src/vikmapslayer.c
  45. --- viking-1.6.2.orig/src/vikmapslayer.c 2015-12-21 12:44:57.000000000 +0100
  46. +++ viking-1.6.2/src/vikmapslayer.c 2017-07-01 11:25:52.947597509 +0200
  47. @@ -127,7 +127,7 @@
  48. { 0, 255, 3, 0 }, /* alpha */
  49. };
  50. -static VikLayerParamData id_default ( void ) { return VIK_LPD_UINT ( MAP_ID_MAPQUEST_OSM ); }
  51. +static VikLayerParamData id_default ( void ) { return VIK_LPD_UINT ( MAP_ID_OSM_MAPNIK ); }
  52. static VikLayerParamData directory_default ( void )
  53. {
  54. VikLayerParamData data;