GNOME.org
 

[libchamplain] Update URLs

commit 46bb6cde6942f4201eb708d2c82726847edcd11d
Author: Jiří Techet <techet gmail com>
Date:   Wed Feb 6 22:28:00 2019 +0100

    Update URLs

 README                                         | 10 +++---
 champlain/champlain-file-tile-source.c         |  2 +-
 champlain/champlain-map-source-factory.c       | 42 +++++++++++++-------------
 champlain/champlain-memphis-renderer.c         |  2 +-
 champlain/champlain-network-bbox-tile-source.c | 14 ++++-----
 champlain/champlain-network-tile-source.c      |  2 +-
 champlain/champlain-view.c                     |  2 +-
 configure.ac                                   |  2 +-
 demos/url-marker.c                             |  6 ++--
 9 files changed, 42 insertions(+), 40 deletions(-)
---
diff --git a/README b/README
index 4b1666c..8158bdf 100644
--- a/README
+++ b/README
@@ -28,16 +28,18 @@ The usual rules for building apply -
 configure; make; sudo make install; sudo ldconfig
 
 should do the right thing. For more details consult the INSTALL file in this 
-directory.
+directory. Alternatively, using the meson build system, run
+
+meson _builddir; cd _builddir; ninja; sudo ninja install
 
 The official website is:
    https://wiki.gnome.org/Projects/libchamplain
 
 The official mailing list archive is:
-   http://mail.gnome.org/mailman/listinfo/libchamplain-list
+   https://mail.gnome.org/mailman/listinfo/libchamplain-list
 
-New bug page on Bugzilla:
-   http://bugzilla.gnome.org/simple-bug-guide.cgi?product=libchamplain
+New bug page on GitLab:
+   https://gitlab.gnome.org/GNOME/libchamplain/issues
 
 libchamplain is licensed under the terms of the GNU Lesser General Public
 License, version 2.1 or (at your option) later.
diff --git a/champlain/champlain-file-tile-source.c b/champlain/champlain-file-tile-source.c
index 18e36ad..5b9a8e0 100644
--- a/champlain/champlain-file-tile-source.c
+++ b/champlain/champlain-file-tile-source.c
@@ -22,7 +22,7 @@
  * @short_description: A map source that loads tile data from a file
  *
  * This tile source loads local <ulink role="online-location"
- * url="http://wiki.openstreetmap.org/wiki/.osm";>
+ * url="https://wiki.openstreetmap.org/wiki/OSM_XML";>
  * OpenStreetMap XML data files</ulink> (*.osm).
  */
 
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 2580c2c..74b7b0d 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -147,7 +147,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK,
         "OpenStreetMap Mapnik",
         "Map Data ODBL OpenStreetMap Contributors, Map Imagery CC-BY-SA 2.0 OpenStreetMap",
-        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         18,
         256,
@@ -161,7 +161,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP,
         "OpenStreetMap Cycle Map",
         "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
-        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         18,
         256,
@@ -175,7 +175,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_OSM_TRANSPORT_MAP,
         "OpenStreetMap Transport Map",
         "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
-        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         18,
         256,
@@ -189,12 +189,12 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_MFF_RELIEF,
         "Maps for Free Relief",
         "Map data available under GNU Free Documentation license, Version 1.2 or later",
-        "http://www.gnu.org/copyleft/fdl.html";,
+        "https://www.gnu.org/copyleft/fdl.html";,
         0,
         11,
         256,
         CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://maps-for-free.com/layer/relief/z#Z#/row#Y#/#Z#_#X#-#Y#.jpg";,
+        "https://maps-for-free.com/layer/relief/z#Z#/row#Y#/#Z#_#X#-#Y#.jpg";,
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
@@ -203,12 +203,12 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_OWM_CLOUDS,
         "OpenWeatherMap cloud layer",
         "Map data is CC-BY-SA 2.0 OpenWeatherMap contributors",
-        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         18,
         256,
         CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://tile.openweathermap.org/map/clouds/#Z#/#X#/#Y#.png";,
+        "https://tile.openweathermap.org/map/clouds/#Z#/#X#/#Y#.png";,
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
@@ -217,12 +217,12 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_OWM_WIND,
         "OpenWeatherMap wind layer",
         "Map data is CC-BY-SA 2.0 OpenWeatherMap contributors",
-        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         18,
         256,
         CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://tile.openweathermap.org/map/wind/#Z#/#X#/#Y#.png";,
+        "https://tile.openweathermap.org/map/wind/#Z#/#X#/#Y#.png";,
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
@@ -231,12 +231,12 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_OWM_TEMPERATURE,
         "OpenWeatherMap temperature layer",
         "Map data is CC-BY-SA 2.0 OpenWeatherMap contributors",
-        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         18,
         256,
         CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://tile.openweathermap.org/map/temp/#Z#/#X#/#Y#.png";,
+        "https://tile.openweathermap.org/map/temp/#Z#/#X#/#Y#.png";,
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
@@ -245,12 +245,12 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_OWM_PRECIPITATION,
         "OpenWeatherMap precipitation layer",
         "Map data is CC-BY-SA 2.0 OpenWeatherMap contributors",
-        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         18,
         256,
         CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://tile.openweathermap.org/map/precipitation/#Z#/#X#/#Y#.png";,
+        "https://tile.openweathermap.org/map/precipitation/#Z#/#X#/#Y#.png";,
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
@@ -259,12 +259,12 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_OWM_PRESSURE,
         "OpenWeatherMap sea level pressure layer",
         "Map data is CC-BY-SA 2.0 OpenWeatherMap contributors",
-        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         18,
         256,
         CHAMPLAIN_MAP_PROJECTION_MERCATOR,
-        "http://tile.openweathermap.org/map/pressure/#Z#/#X#/#Y#.png";,
+        "https://tile.openweathermap.org/map/pressure/#Z#/#X#/#Y#.png";,
         champlain_map_source_new_generic,
         NULL);
   champlain_map_source_factory_register (factory, desc);
@@ -274,7 +274,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL,
         "OpenStreetMap Memphis Local Map",
         "(CC) BY 2.0 OpenStreetMap contributors",
-        "http://creativecommons.org/licenses/by/2.0/";,
+        "https://creativecommons.org/licenses/by/2.0/";,
         12,
         18,
         256,
@@ -288,7 +288,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK,
         "OpenStreetMap Memphis Network Map",
         "(CC) BY 2.0 OpenStreetMap contributors",
-        "http://creativecommons.org/licenses/by/2.0/";,
+        "https://creativecommons.org/licenses/by/2.0/";,
         12,
         18,
         256,
@@ -305,7 +305,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         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/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         18,
         256,
@@ -319,7 +319,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         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/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         17,
         256,
@@ -333,7 +333,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_OAM,
         "OpenAerialMap",
         "(CC) BY 3.0 OpenAerialMap contributors",
-        "http://creativecommons.org/licenses/by/3.0/";,
+        "https://creativecommons.org/licenses/by/3.0/";,
         0,
         17,
         256,
@@ -347,7 +347,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
         CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER,
         "OpenStreetMap Osmarender",
         "Map data is CC-BY-SA 2.0 OpenStreetMap contributors",
-        "http://creativecommons.org/licenses/by-sa/2.0/";,
+        "https://creativecommons.org/licenses/by-sa/2.0/";,
         0,
         17,
         256,
diff --git a/champlain/champlain-memphis-renderer.c b/champlain/champlain-memphis-renderer.c
index e012e70..e62d82d 100644
--- a/champlain/champlain-memphis-renderer.c
+++ b/champlain/champlain-memphis-renderer.c
@@ -23,7 +23,7 @@
  *
  * The #ChamplainMemphisRenderer uses the rendering library
  * <ulink role="online-location" url="https://trac.openstreetmap.ch/trac/memphis/";>
- * LibMemphis</ulink> to render tiles based on <ulink role="online-location" 
url="http://www.openstreetmap.org/";>
+ * LibMemphis</ulink> to render tiles based on <ulink role="online-location" 
url="https://www.openstreetmap.org/";>
  * OpenStreetMap</ulink> data. Tiles are rendered in separate threads.
  * It supports zoom levels 12 to 18.
  *
diff --git a/champlain/champlain-network-bbox-tile-source.c b/champlain/champlain-network-bbox-tile-source.c
index c2670f0..f6f10ba 100644
--- a/champlain/champlain-network-bbox-tile-source.c
+++ b/champlain/champlain-network-bbox-tile-source.c
@@ -25,8 +25,8 @@
  * This map source source downloads the map data from an OpenStreetMap API
  * server. It supports protocol version 0.5 and 0.6.
  *
- * <ulink role="online-location" url="http://wiki.openstreetmap.org/wiki/API";>
- * http://wiki.openstreetmap.org/wiki/API</ulink>
+ * <ulink role="online-location" url="https://wiki.openstreetmap.org/wiki/API";>
+ * https://wiki.openstreetmap.org/wiki/API</ulink>
  */
 
 #include "champlain-network-bbox-tile-source.h"
@@ -192,7 +192,7 @@ champlain_network_bbox_tile_source_class_init (ChamplainNetworkBboxTileSourceCla
       g_param_spec_string ("api-uri",
           "API URI",
           "The API URI of an OpenStreetMap server",
-          "http://www.informationfreeway.org/api/0.6";,
+          "https://www.informationfreeway.org/api/0.6";,
           G_PARAM_READWRITE));
 
   /**
@@ -251,7 +251,7 @@ champlain_network_bbox_tile_source_init (ChamplainNetworkBboxTileSource *self)
 
   self->priv = priv;
 
-  priv->api_uri = g_strdup ("http://www.informationfreeway.org/api/0.6";);
+  priv->api_uri = g_strdup ("https://www.informationfreeway.org/api/0.6";);
   /* informationfreeway.org is a load-balancer for different api servers */
   priv->proxy_uri = g_strdup ("");
   priv->soup_session = soup_session_new_with_options (
@@ -348,8 +348,8 @@ load_map_data_cb (G_GNUC_UNUSED SoupSession *session, SoupMessage *msg,
  * limitations on the maximum number of nodes that can be requested.
  *
  * For details, see: <ulink role="online-location"
- * url="http://api.openstreetmap.org/api/capabilities";>
- * http://api.openstreetmap.org/api/capabilities</ulink>
+ * url="https://api.openstreetmap.org/api/capabilities";>
+ * https://api.openstreetmap.org/api/capabilities</ulink>
  *
  * Since: 0.10
  */
@@ -368,7 +368,7 @@ champlain_network_bbox_tile_source_load_map_data (
   gchar *url;
 
   url = g_strdup_printf (
-        "http://api.openstreetmap.org/api/0.6/map?bbox=%f,%f,%f,%f";,
+        "https://api.openstreetmap.org/api/0.6/map?bbox=%f,%f,%f,%f";,
         bbox->left, bbox->bottom, bbox->right, bbox->top);
   msg = soup_message_new ("GET", url);
 
diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c
index acb4794..fa1ce81 100644
--- a/champlain/champlain-network-tile-source.c
+++ b/champlain/champlain-network-tile-source.c
@@ -422,7 +422,7 @@ champlain_network_tile_source_get_uri_format (ChamplainNetworkTileSource *tile_s
  * Y in TMS coordinates.
  *
  * For example, this is the OpenStreetMap URI format:
- * "http://tile.openstreetmap.org/\#Z\#/\#X\#/\#Y\#.png";
+ * "https://tile.openstreetmap.org/\#Z\#/\#X\#/\#Y\#.png";
  *
  * Since: 0.4
  */
diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index d903556..42ac2c9 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -37,7 +37,7 @@
  *
  * The maps are downloaded from Internet from open maps sources (like
  * <ulink role="online-location"
- * url="http://www.openstreetmap.org";>OpenStreetMap</ulink>).  Maps are divided
+ * url="https://www.openstreetmap.org";>OpenStreetMap</ulink>).  Maps are divided
  * in tiles for each zoom level.  When a tile is requested, #ChamplainView will
  * first check if it is in cache (in the user's cache dir under champlain). If
  * an error occurs during download, an error tile will be displayed.
diff --git a/configure.ac b/configure.ac
index 90824ad..a89ecb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ m4_define([champlain_api_version],
 AC_PREREQ([2.64])
 AC_INIT([libchamplain],
         [champlain_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain],
+        [https://gitlab.gnome.org/GNOME/libchamplain/issues],
         [libchamplain],
         [https://wiki.gnome.org/Projects/libchamplain])
 AC_CONFIG_SRCDIR([champlain/champlain.h])
diff --git a/demos/url-marker.c b/demos/url-marker.c
index d79ab06..8134d66 100644
--- a/demos/url-marker.c
+++ b/demos/url-marker.c
@@ -241,11 +241,11 @@ main (int argc, char *argv[])
   champlain_view_add_layer (CHAMPLAIN_VIEW (view), CHAMPLAIN_LAYER (layer));
   session = soup_session_new ();
   create_marker_from_url (layer, session, 48.218611, 17.146397,
-      "http://hexten.net/cpan-faces/potyl.jpg";);
+      "https://gitlab.gnome.org/GNOME/libchamplain/raw/master/demos/icons/emblem-favorite.png";);
   create_marker_from_url (layer, session, 48.21066, 16.31476,
-      "http://hexten.net/cpan-faces/jkutej.jpg";);
+      "https://gitlab.gnome.org/GNOME/libchamplain/raw/master/demos/icons/emblem-generic.png";);
   create_marker_from_url (layer, session, 48.14838, 17.10791,
-      "http://bratislava.pm.org/images/whoiswho/jnthn.jpg";);
+      "https://gitlab.gnome.org/GNOME/libchamplain/raw/master/demos/icons/emblem-important.png";);
 
   /* Finish initialising the map view */
   g_object_set (G_OBJECT (view), "zoom-level", 10,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]