Respect OSM tile usage policy

We'll have to use 7 days expiration until we can add the
http Expires data to tiles (after API freeze)

http://wiki.openstreetmap.org/wiki/Tile_usage_policy

diff --git a/champlain/champlain-cache.c b/champlain/champlain-cache.c
index 53791525cf3dfc2bb87883f82ecd75e2f6e90849..505440ec19b16f534f7714cb9be23d972a8abe1f 100644 (file)
--- a/champlain/champlain-cache.c
+++ b/champlain/champlain-cache.c
@@ -462,7 +462,7 @@ champlain_cache_tile_is_expired (ChamplainCache *self,
   gboolean validate_cache = FALSE;
 
   g_get_current_time (&now);
-  g_time_val_add (&now, (-24ul * 60ul * 60ul * 1000ul * 1000ul)); // Cache expires 1 day
+  g_time_val_add (&now, (-24ul * 60ul * 60ul * 1000ul * 1000ul * 7ul)); // Cache expires 7 days
   validate_cache = modified_time->tv_sec < now.tv_sec;
 
   return validate_cache;

diff --git a/champlain/champlain-network-map-source.c b/champlain/champlain-network-map-source.c
index 596fcbfcf82b0b708d9cd1092c6f65563d4cbd68..1460982efe06b33bf16c49cf4d46daaf043748d5 100644 (file)
--- a/champlain/champlain-network-map-source.c
+++ b/champlain/champlain-network-map-source.c
@@ -625,7 +625,7 @@ fill_tile (ChamplainMapSource *map_source,
               NULL);
           g_object_set (G_OBJECT (soup_session),
               "user-agent", "libchamplain/" CHAMPLAIN_VERSION_S,
-              "max-conns-per-host", 8, NULL); // This is the same has Firefox
+              "max-conns-per-host", 2, NULL); // This is as required by OSM
           g_object_add_weak_pointer (G_OBJECT (soup_session),
               (gpointer *) &soup_session);
         }