From 3e8dd902111ff9a235c943b1480db5c346caabc8 Mon Sep 17 00:00:00 2001
From: luccioman <luccioman@users.noreply.github.com>
Date: Thu, 15 Feb 2018 19:14:07 +0100
Subject: [PATCH] Use https rather than http in links and queries to
 openstreetmap.org

---
 htroot/yacysearch.html                      | 6 +++---
 source/net/yacy/peers/graphics/OSMTile.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index 50ef06494..f4c7214b9 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -186,12 +186,12 @@ document.getElementById("Enter").innerHTML = "search again";
   <a href="osm.png?lon=#[lon]#&amp;lat=#[lat]#&amp;zoom=14" class="thumblink"  style="float:left;" onclick="return hs.expand(this)">
       <img src="osm.png?lon=#[lon]#&amp;lat=#[lat]#&amp;zoom=14" width="192" height="192" alt="map #[lon]#, #[lat]#" />
   </a>
-  <div class="TableCellDark"><a href="http://www.openstreetmap.org/?lat=#[lat]#&amp;lon=#[lon]#&amp;zoom=14">#[name]#</a><br /><a href="http://www.openstreetmap.org/?lat=#[lat]#&amp;lon=#[lon]#&amp;zoom=14">lat=#[lat]#, lon=#[lon]#</a></div> <!-- preview -->
-  <div class="highslide-caption"><a href="http://www.openstreetmap.org/?lat=#[lat]#&amp;lon=#[lon]#&amp;zoom=14">#[name]#</a><br /><a href="http://www.openstreetmap.org/?lat=#[lat]#&amp;lon=#[lon]#&amp;zoom=14">lat=#[lat]#, lon=#[lon]#</a></div> <!-- zoomed -->
+  <div class="TableCellDark"><a href="https://www.openstreetmap.org/?lat=#[lat]#&amp;lon=#[lon]#&amp;zoom=14">#[name]#</a><br /><a href="https://www.openstreetmap.org/?lat=#[lat]#&amp;lon=#[lon]#&amp;zoom=14">lat=#[lat]#, lon=#[lon]#</a></div> <!-- preview -->
+  <div class="highslide-caption"><a href="https://www.openstreetmap.org/?lat=#[lat]#&amp;lon=#[lon]#&amp;zoom=14">#[name]#</a><br /><a href="https://www.openstreetmap.org/?lat=#[lat]#&amp;lon=#[lon]#&amp;zoom=14">lat=#[lat]#, lon=#[lon]#</a></div> <!-- zoomed -->
   </div>
   #{/loc}#
   </p>
-  <p class="urlinfo" style="clear:left;">Map (c) by <a href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, CC-BY-SA</p>
+  <p class="urlinfo" style="clear:left;">Map (c) by <a href="https://www.openstreetmap.org">OpenStreetMap</a> and contributors, CC-BY-SA</p>
   </div>
 #(/geoinfo)#
 
diff --git a/source/net/yacy/peers/graphics/OSMTile.java b/source/net/yacy/peers/graphics/OSMTile.java
index ecb240e9c..019e9da0a 100644
--- a/source/net/yacy/peers/graphics/OSMTile.java
+++ b/source/net/yacy/peers/graphics/OSMTile.java
@@ -152,7 +152,7 @@ public class OSMTile {
             // see http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames
             final int hash = (this.xtile + 7 * this.ytile + 13 * this.zoom + retry) % 4;
             final String host = (hash == 3) ? "tile.openstreetmap.org" : ((char) ('a' + hash)) + ".tile.openstreetmap.org";
-            final String url = "http://" + host + "/" + this.zoom + "/" + this.xtile + "/" + this.ytile + ".png";
+            final String url = "https://" + host + "/" + this.zoom + "/" + this.xtile + "/" + this.ytile + ".png";
             //System.out.println("OSM URL = " + url);
             return url;
         }