From 34835b77e23271c4674dba6f10e5a4334fd045a3 Mon Sep 17 00:00:00 2001
From: Alexandre Flament <alex@al-f.net>
Date: Mon, 25 Jul 2016 15:28:25 +0200
Subject: [PATCH] [fix] Close #640 : remove MapQuest maps. Add in comment
 maps.wikimedia.org maps, see https://www.mediawiki.org/wiki/Maps

---
 searx/static/themes/oscar/js/searx.min.js     | Bin 5193 -> 4585 bytes
 .../themes/oscar/js/searx_src/leaflet_map.js  |  25 +++++++-----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js
index 8a1055da35f92db88fcf8bd7a67d67d91e10ec73..9bc4aae87a6a5575fee225fd59f95f7cbb83f165 100644
GIT binary patch
delta 522
zcmZ8e-D=w~6eeqS(XKQB7fM$sjx!Po962fU2fJd7-E9tmtuV%Di()&rYFSDn(Z9sK
z*$b5E1$Muy(d#|HV7Ki%>=|}5d!t)7gw7G?`@VC|hrWXE&8yXgjm=JXyR*^lZGCRe
z&$XWbl~4&$LgaHsqy$zV7$ajDg%*6uqtnAgWejUEx3Wa+A$0GTZgjtD&fl-BE(ZTn
zR`kc}m*o>dL$lk!IB2zkA~kxm*|mK5ty-su@-R9Zj6eu6?)0t)3m+<vhe(lFz6<yN
zpq6XFMv4D;^!`DG=*y)~^%F8N6YQgmjKL7vRJ*mU%8@><y)sf<Y-RdrkFv-o=g|aE
zeOqh3J<6fYu$3q^magLzN{LQsO0y`W1c^!P2$^*#SIn7S<j(Z0xaT<<^VqU8+<tRM
zHA|&Aj1)0vX1{prXZ4px+xveiE2mbo9C~`!XjBq?VDyT3Wvu^-Yib8VJ3%B2e{Y#W
zuXM%n)Ed0*mz_CHEjP_Q9|eM|iC~D8ek9<ql<f(SKs#==d=y9Gg%ljbe}Tg7-3N=&
K2oRVT$NLG+WU5gB

delta 1042
zcmcgr-A)rh6b@2N03#41iP4Z@A!R3-&UW!9*s>%9;{_>#7O$J>?sRwP?#wbXZK<Up
zh6m8Nmp+15h8OVG#7lh!<E3xlEC$37!krg$COPNin{&SJo1gPv?00v^%TG#Wx3pAt
zAAOo18y(}c*NAiydl?#?y}w}Vh$)Ekj194*X-s@-6V!y2Y=89ox%SNhxU9X2eAE7+
z@NLHK3KoE}=Xw6Yfp4xk7Z!`hN7ug=rb@2oG0b>C_qSSh0FN8v??(zHch1XxP0Som
z+&sFLy}k8ude9{j5U++4lG;s(qHJUG@d(S_OuoFm>zVmM4ezj+)<~a9JIX#!&9Ac|
zL~YNCv`#CIBeW?G)DS0oe!#IW5+~0n$Hiq_b_}jFcs+Cm`{wkAcsC6#6dU~QLvR3c
zXa&|qM{272K(xRL0g<GwGx%Pwm(RA>p-P{CTR;;TQterdW=we7THPe+i@dzzkX5k4
zk`O5Ap8*84OJk8z`7eww5Z9DzN2tU}_8PGW1x|TrtuCVE!s2bS_#J;4sZKKx31M7S
zEO+U_LkkhDC2Mvx6TA`|V))s^R}iC!zDSJtU&JV*+-1xhic6R=f^7?#uX;|i=WF#f
zXJfloS|_olegp^)z$;wG;3-Xs)HqjlEtJgf#JVFX0?&v{K%L4i^Qoy&?)Mj~=d5<)
z#A`gKe8IhfaxsL%?8nsH2+78#T@$O*vnTQ1;WC7XU=jp>yqmyk?)B6gSX=c?U`)eV
z+p6rMQ~OksVYOx~#<dhNj`Jauox&VpN7w|Suvo0&kctf@xE=m27}Za|wrI6Xr<n;>
Fe*?<{Ur_)6

diff --git a/searx/static/themes/oscar/js/searx_src/leaflet_map.js b/searx/static/themes/oscar/js/searx_src/leaflet_map.js
index cbcbe157..4be46acb 100644
--- a/searx/static/themes/oscar/js/searx_src/leaflet_map.js
+++ b/searx/static/themes/oscar/js/searx_src/leaflet_map.js
@@ -122,17 +122,13 @@ $(document).ready(function(){
             var map = L.map(leaflet_target);
 
             // create the tile layer with correct attribution
-	        var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
-	        var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
-	        var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib});
-	        
-	        var osmMapquestUrl='http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg';
-	        var osmMapquestAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">';
-	        var osmMapquest = new L.TileLayer(osmMapquestUrl, {minZoom: 1, maxZoom: 18, subdomains: '1234', attribution: osmMapquestAttrib});
-	        
-	        var osmMapquestOpenAerialUrl='http://otile{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg';
-	        var osmMapquestOpenAerialAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors | Tiles Courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="https://developer.mapquest.com/content/osm/mq_logo.png"> | Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency';
-	        var osmMapquestOpenAerial = new L.TileLayer(osmMapquestOpenAerialUrl, {minZoom: 1, maxZoom: 11, subdomains: '1234', attribution: osmMapquestOpenAerialAttrib});
+	    var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+	    var osmMapnikAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+	    var osmMapnik = new L.TileLayer(osmMapnikUrl, {minZoom: 1, maxZoom: 19, attribution: osmMapnikAttrib});
+
+	    var osmWikimediaUrl='https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png';
+	    var osmWikimediaAttrib = 'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+	    var osmWikimedia = new L.TileLayer(osmWikimediaUrl, {minZoom: 1, maxZoom: 19, attribution: osmWikimediaAttrib});
 
             // init map view
             if(map_bounds) {
@@ -149,12 +145,11 @@ $(document).ready(function(){
                     map.setView(new L.LatLng(map_lat, map_lon),8);
             }
 
-	        map.addLayer(osmMapquest);
+	        map.addLayer(osmMapnik);
 	        
 	        var baseLayers = {
-             "OSM Mapnik": osmMapnik,
-             "MapQuest": osmMapquest/*,
-             "MapQuest Open Aerial": osmMapquestOpenAerial*/
+             "OSM Mapnik": osmMapnik/*,
+             "OSM Wikimedia": osmWikimedia*/
             };
 
             L.control.layers(baseLayers).addTo(map);