diff options
Diffstat (limited to 'searx/static/themes/oscar')
| -rw-r--r-- | searx/static/themes/oscar/js/searx.js | 94 | ||||
| -rw-r--r-- | searx/static/themes/oscar/js/searx.min.js | 2 | ||||
| -rw-r--r-- | searx/static/themes/oscar/js/searx.min.js.map | 2 | ||||
| -rw-r--r-- | searx/static/themes/oscar/js/searx_src/00_requirejs_config.js | 23 | ||||
| -rw-r--r-- | searx/static/themes/oscar/js/searx_src/leaflet_map.js | 71 |
5 files changed, 68 insertions, 124 deletions
diff --git a/searx/static/themes/oscar/js/searx.js b/searx/static/themes/oscar/js/searx.js index 8208ce461..53b1c1696 100644 --- a/searx/static/themes/oscar/js/searx.js +++ b/searx/static/themes/oscar/js/searx.js @@ -12,29 +12,6 @@ * You should have received a copy of the GNU Affero General Public License * along with searx. If not, see < http://www.gnu.org/licenses/ >. * - * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at> - */ - -requirejs.config({ - baseUrl: './static/themes/oscar/js', - paths: { - app: '../app' - } -}); -;/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * * (C) 2019 by Alexandre Flament */ window.searx = (function(d) { @@ -331,59 +308,54 @@ $(document).ready(function(){ var map_boundingbox = $(this).data('map-boundingbox'); var map_geojson = $(this).data('map-geojson'); - require(['leaflet-0.7.3.min'], function(leaflet) { - if(map_boundingbox) { - southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]); - northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]); - map_bounds = L.latLngBounds(southWest, northEast); - } + if(map_boundingbox) { + southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]); + northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]); + map_bounds = L.latLngBounds(southWest, northEast); + } - // TODO hack - // change default imagePath - L.Icon.Default.imagePath = "./static/themes/oscar/img/map"; + // change default imagePath + L.Icon.Default.imagePath = "./static/themes/oscar/img/map"; - // init map - var map = L.map(leaflet_target); + // init map + 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}); + // 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 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}); + 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 + // init map view + setTimeout(function() { if(map_bounds) { - // TODO hack: https://github.com/Leaflet/Leaflet/issues/2021 - setTimeout(function () { - map.fitBounds(map_bounds, { - maxZoom:17 - }); - }, 0); + map.fitBounds(map_bounds, { + maxZoom:17 + }); } else if (map_lon && map_lat) { if(map_zoom) map.setView(new L.LatLng(map_lat, map_lon),map_zoom); else map.setView(new L.LatLng(map_lat, map_lon),8); - } - - map.addLayer(osmMapnik); + } + }, 0); - var baseLayers = { - "OSM Mapnik": osmMapnik/*, - "OSM Wikimedia": osmWikimedia*/ - }; + map.addLayer(osmMapnik); - L.control.layers(baseLayers).addTo(map); + var baseLayers = { + "OSM Mapnik": osmMapnik/*, + "OSM Wikimedia": osmWikimedia*/ + }; + L.control.layers(baseLayers).addTo(map); - if(map_geojson) - L.geoJson(map_geojson).addTo(map); - /*else if(map_bounds) - L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/ - }); + if(map_geojson) + L.geoJson(map_geojson).addTo(map); + /*else if(map_bounds) + L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/ // this event occour only once per element $( this ).off( event ); diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js index ad96c5c12..e3716b6d7 100644 --- a/searx/static/themes/oscar/js/searx.min.js +++ b/searx/static/themes/oscar/js/searx.min.js @@ -1,4 +1,4 @@ /*! oscar/searx.min.js | 10-03-2021 | */ -requirejs.config({baseUrl:"./static/themes/oscar/js",paths:{app:"../app"}}),window.searx=function(t){"use strict";var e,e=t.currentScript||(e=t.getElementsByTagName("script"))[e.length-1];return{autocompleter:"true"===e.getAttribute("data-autocompleter"),method:e.getAttribute("data-method")}}(document),searx.autocompleter&&(searx.searchResults=new Bloodhound({datumTokenizer:Bloodhound.tokenizers.obj.whitespace("value"),queryTokenizer:Bloodhound.tokenizers.whitespace,remote:"./autocompleter?q=%QUERY"}),searx.searchResults.initialize()),$(document).ready(function(){var a="";searx.autocompleter&&($("#q").on("keydown",function(t){13==t.which&&(a=$("#q").val())}),$("#q").typeahead(null,{name:"search-results",displayKey:function(t){return t},source:searx.searchResults.ttAdapter()}),$("#q").bind("typeahead:selected",function(t,e){a&&$("#q").val(a),$("#search_form").submit()}))}),$(document).ready(function(){$("#q.autofocus").focus(),$("#clear_search").click(function(){document.getElementById("q").value=""}),$(".select-all-on-click").click(function(){$(this).select()}),$(".btn-collapse").click(function(){var t=$(this).data("btn-text-collapsed"),e=$(this).data("btn-text-not-collapsed");""!==t&&""!==e&&(new_html=$(this).hasClass("collapsed")?$(this).html().replace(t,e):$(this).html().replace(e,t),$(this).html(new_html))}),$(".btn-toggle .btn").click(function(){var t="btn-"+$(this).data("btn-class"),e=$(this).data("btn-label-default"),a=$(this).data("btn-label-toggled");""!==a&&(new_html=$(this).hasClass("btn-default")?$(this).html().replace(e,a):$(this).html().replace(a,e),$(this).html(new_html)),$(this).toggleClass(t),$(this).toggleClass("btn-default")}),$(".media-loader").click(function(){var t=$(this).data("target"),e=$(t+" > iframe"),t=e.attr("src");void 0!==t&&!1!==t||e.attr("src",e.data("src"))}),$(".btn-sm").dblclick(function(){var t="btn-"+$(this).data("btn-class");$(this).hasClass("btn-default")?($(".btn-sm > input").attr("checked","checked"),$(".btn-sm > input").prop("checked",!0),$(".btn-sm").addClass(t),$(".btn-sm").addClass("active"),$(".btn-sm").removeClass("btn-default")):($(".btn-sm > input").attr("checked",""),$(".btn-sm > input").removeAttr("checked"),$(".btn-sm > input").checked=!1,$(".btn-sm").removeClass(t),$(".btn-sm").removeClass("active"),$(".btn-sm").addClass("btn-default"))}),$(".nav-tabs").click(function(t){$(t.target).parents("ul").children().attr("aria-selected","false"),$(t.target).parent().attr("aria-selected","true")})}),window.addEventListener("load",function(){$(".infobox").each(function(){var t=$(this).find(".infobox_body");t.prop("scrollHeight")+t.find("img.infobox_part").height()<=t.css("max-height").replace("px","")&&$(this).find(".infobox_toggle").hide()})}),$(document).ready(function(){$(".searx_overpass_request").on("click",function(t){var e="https://overpass-api.de/api/interpreter?data=[out:json][timeout:25];(",a=");out meta;",s=$(this).data("osm-id"),n=$(this).data("osm-type"),i=$(this).data("result-table"),o="#"+$(this).data("result-table-loadicon"),r=["addr:city","addr:country","addr:housenumber","addr:postcode","addr:street"];if(s&&n&&i){var i="#"+i,c=null;switch(n){case"node":c=e+"node("+s+");"+a;break;case"way":c=e+"way("+s+");"+a;break;case"relation":c=e+"relation("+s+");"+a}c&&$.ajax(c).done(function(t){if(t&&t.elements&&t.elements[0]){var e,a=t.elements[0],s=$(i).html();for(e in a.tags)if(null===a.tags.name||-1==r.indexOf(e)){switch(s+="<tr><td>"+e+"</td><td>",e){case"phone":case"fax":s+='<a href="tel:'+a.tags[e].replace(/ /g,"")+'">'+a.tags[e]+"</a>";break;case"email":s+='<a href="mailto:'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"website":case"url":s+='<a href="'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"wikidata":s+='<a href="https://www.wikidata.org/wiki/'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"wikipedia":if(-1!=a.tags[e].indexOf(":")){s+='<a href="https://'+a.tags[e].substring(0,a.tags[e].indexOf(":"))+".wikipedia.org/wiki/"+a.tags[e].substring(a.tags[e].indexOf(":")+1)+'">'+a.tags[e]+"</a>";break}default:s+=a.tags[e]}s+="</td></tr>"}$(i).html(s),$(i).removeClass("hidden"),$(o).addClass("hidden")}}).fail(function(){$(o).html($(o).html()+'<p class="text-muted">'+could_not_load+"</p>")})}$(this).off(t)}),$(".searx_init_map").on("click",function(t){var s=$(this).data("leaflet-target"),n=$(this).data("map-lon"),i=$(this).data("map-lat"),o=$(this).data("map-zoom"),r=$(this).data("map-boundingbox"),c=$(this).data("map-geojson");require(["leaflet-0.7.3.min"],function(t){r&&(southWest=L.latLng(r[0],r[2]),northEast=L.latLng(r[1],r[3]),map_bounds=L.latLngBounds(southWest,northEast)),L.Icon.Default.imagePath="./static/themes/oscar/img/map";var e=L.map(s),a=new L.TileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",{minZoom:1,maxZoom:19,attribution:'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});new L.TileLayer("https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png",{minZoom:1,maxZoom:19,attribution:'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});map_bounds?setTimeout(function(){e.fitBounds(map_bounds,{maxZoom:17})},0):n&&i&&(o?e.setView(new L.LatLng(i,n),o):e.setView(new L.LatLng(i,n),8)),e.addLayer(a);a={"OSM Mapnik":a};L.control.layers(a).addTo(e),c&&L.geoJson(c).addTo(e)}),$(this).off(t)})}),$(document).ready(function(){$("#allow-all-engines").click(function(){$(".onoffswitch-checkbox").each(function(){this.checked=!1})}),$("#disable-all-engines").click(function(){$(".onoffswitch-checkbox").each(function(){this.checked=!0})})}); +window.searx=function(t){"use strict";var e,e=t.currentScript||(e=t.getElementsByTagName("script"))[e.length-1];return{autocompleter:"true"===e.getAttribute("data-autocompleter"),method:e.getAttribute("data-method")}}(document),searx.autocompleter&&(searx.searchResults=new Bloodhound({datumTokenizer:Bloodhound.tokenizers.obj.whitespace("value"),queryTokenizer:Bloodhound.tokenizers.whitespace,remote:"./autocompleter?q=%QUERY"}),searx.searchResults.initialize()),$(document).ready(function(){var a="";searx.autocompleter&&($("#q").on("keydown",function(t){13==t.which&&(a=$("#q").val())}),$("#q").typeahead(null,{name:"search-results",displayKey:function(t){return t},source:searx.searchResults.ttAdapter()}),$("#q").bind("typeahead:selected",function(t,e){a&&$("#q").val(a),$("#search_form").submit()}))}),$(document).ready(function(){$("#q.autofocus").focus(),$("#clear_search").click(function(){document.getElementById("q").value=""}),$(".select-all-on-click").click(function(){$(this).select()}),$(".btn-collapse").click(function(){var t=$(this).data("btn-text-collapsed"),e=$(this).data("btn-text-not-collapsed");""!==t&&""!==e&&(new_html=$(this).hasClass("collapsed")?$(this).html().replace(t,e):$(this).html().replace(e,t),$(this).html(new_html))}),$(".btn-toggle .btn").click(function(){var t="btn-"+$(this).data("btn-class"),e=$(this).data("btn-label-default"),a=$(this).data("btn-label-toggled");""!==a&&(new_html=$(this).hasClass("btn-default")?$(this).html().replace(e,a):$(this).html().replace(a,e),$(this).html(new_html)),$(this).toggleClass(t),$(this).toggleClass("btn-default")}),$(".media-loader").click(function(){var t=$(this).data("target"),e=$(t+" > iframe"),t=e.attr("src");void 0!==t&&!1!==t||e.attr("src",e.data("src"))}),$(".btn-sm").dblclick(function(){var t="btn-"+$(this).data("btn-class");$(this).hasClass("btn-default")?($(".btn-sm > input").attr("checked","checked"),$(".btn-sm > input").prop("checked",!0),$(".btn-sm").addClass(t),$(".btn-sm").addClass("active"),$(".btn-sm").removeClass("btn-default")):($(".btn-sm > input").attr("checked",""),$(".btn-sm > input").removeAttr("checked"),$(".btn-sm > input").checked=!1,$(".btn-sm").removeClass(t),$(".btn-sm").removeClass("active"),$(".btn-sm").addClass("btn-default"))}),$(".nav-tabs").click(function(t){$(t.target).parents("ul").children().attr("aria-selected","false"),$(t.target).parent().attr("aria-selected","true")})}),window.addEventListener("load",function(){$(".infobox").each(function(){var t=$(this).find(".infobox_body");t.prop("scrollHeight")+t.find("img.infobox_part").height()<=t.css("max-height").replace("px","")&&$(this).find(".infobox_toggle").hide()})}),$(document).ready(function(){$(".searx_overpass_request").on("click",function(t){var e="https://overpass-api.de/api/interpreter?data=[out:json][timeout:25];(",a=");out meta;",s=$(this).data("osm-id"),n=$(this).data("osm-type"),i=$(this).data("result-table"),o="#"+$(this).data("result-table-loadicon"),r=["addr:city","addr:country","addr:housenumber","addr:postcode","addr:street"];if(s&&n&&i){var i="#"+i,l=null;switch(n){case"node":l=e+"node("+s+");"+a;break;case"way":l=e+"way("+s+");"+a;break;case"relation":l=e+"relation("+s+");"+a}l&&$.ajax(l).done(function(t){if(t&&t.elements&&t.elements[0]){var e,a=t.elements[0],s=$(i).html();for(e in a.tags)if(null===a.tags.name||-1==r.indexOf(e)){switch(s+="<tr><td>"+e+"</td><td>",e){case"phone":case"fax":s+='<a href="tel:'+a.tags[e].replace(/ /g,"")+'">'+a.tags[e]+"</a>";break;case"email":s+='<a href="mailto:'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"website":case"url":s+='<a href="'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"wikidata":s+='<a href="https://www.wikidata.org/wiki/'+a.tags[e]+'">'+a.tags[e]+"</a>";break;case"wikipedia":if(-1!=a.tags[e].indexOf(":")){s+='<a href="https://'+a.tags[e].substring(0,a.tags[e].indexOf(":"))+".wikipedia.org/wiki/"+a.tags[e].substring(a.tags[e].indexOf(":")+1)+'">'+a.tags[e]+"</a>";break}default:s+=a.tags[e]}s+="</td></tr>"}$(i).html(s),$(i).removeClass("hidden"),$(o).addClass("hidden")}}).fail(function(){$(o).html($(o).html()+'<p class="text-muted">'+could_not_load+"</p>")})}$(this).off(t)}),$(".searx_init_map").on("click",function(t){var e=$(this).data("leaflet-target"),a=$(this).data("map-lon"),s=$(this).data("map-lat"),n=$(this).data("map-zoom"),i=$(this).data("map-boundingbox"),o=$(this).data("map-geojson");i&&(southWest=L.latLng(i[0],i[2]),northEast=L.latLng(i[1],i[3]),map_bounds=L.latLngBounds(southWest,northEast)),L.Icon.Default.imagePath="./static/themes/oscar/img/map";var r=L.map(e),e=new L.TileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",{minZoom:1,maxZoom:19,attribution:'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});new L.TileLayer("https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png",{minZoom:1,maxZoom:19,attribution:'Wikimedia maps beta | Maps data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});setTimeout(function(){map_bounds?r.fitBounds(map_bounds,{maxZoom:17}):a&&s&&(n?r.setView(new L.LatLng(s,a),n):r.setView(new L.LatLng(s,a),8))},0),r.addLayer(e);e={"OSM Mapnik":e};L.control.layers(e).addTo(r),o&&L.geoJson(o).addTo(r),$(this).off(t)})}),$(document).ready(function(){$("#allow-all-engines").click(function(){$(".onoffswitch-checkbox").each(function(){this.checked=!1})}),$("#disable-all-engines").click(function(){$(".onoffswitch-checkbox").each(function(){this.checked=!0})})}); //# sourceMappingURL=searx.min.js.map
\ No newline at end of file diff --git a/searx/static/themes/oscar/js/searx.min.js.map b/searx/static/themes/oscar/js/searx.min.js.map index 90bd35e3f..8def39456 100644 --- a/searx/static/themes/oscar/js/searx.min.js.map +++ b/searx/static/themes/oscar/js/searx.min.js.map @@ -1 +1 @@ -{"version":3,"file":"searx.min.js","sources":["searx.js"],"names":["requirejs","config","baseUrl","paths","app","window","searx","d","scripts","script","currentScript","getElementsByTagName","length","autocompleter","getAttribute","method","document","searchResults","Bloodhound","datumTokenizer","tokenizers","obj","whitespace","queryTokenizer","remote","initialize","$","ready","original_search_value","on","e","which","val","typeahead","name","displayKey","result","source","ttAdapter","bind","ev","suggestion","submit","focus","click","getElementById","value","this","select","btnTextCollapsed","data","btnTextNotCollapsed","new_html","hasClass","html","replace","btnClass","btnLabelDefault","btnLabelToggled","toggleClass","target","iframe_load","srctest","attr","undefined","dblclick","prop","addClass","removeClass","removeAttr","checked","a","parents","children","parent","addEventListener","each","infobox_body","find","height","css","hide","event","query_start","overpass_url","query_end","osm_id","osm_type","result_table","result_table_loadicon","osm_ignore_tags","query","ajax","done","elements","row","element","newHtml","tags","indexOf","substring","fail","could_not_load","off","leaflet_target","map_lon","map_lat","map_zoom","map_boundingbox","map_geojson","require","leaflet","southWest","L","latLng","northEast","map_bounds","latLngBounds","Icon","Default","imagePath","map","osmMapnik","TileLayer","minZoom","maxZoom","attribution","setTimeout","fitBounds","setView","LatLng","addLayer","baseLayers","OSM Mapnik","control","layers","addTo","geoJson"],"mappings":"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"}
\ No newline at end of file +{"version":3,"file":"searx.min.js","sources":["searx.js"],"names":["window","searx","d","scripts","script","currentScript","getElementsByTagName","length","autocompleter","getAttribute","method","document","searchResults","Bloodhound","datumTokenizer","tokenizers","obj","whitespace","queryTokenizer","remote","initialize","$","ready","original_search_value","on","e","which","val","typeahead","name","displayKey","result","source","ttAdapter","bind","ev","suggestion","submit","focus","click","getElementById","value","this","select","btnTextCollapsed","data","btnTextNotCollapsed","new_html","hasClass","html","replace","btnClass","btnLabelDefault","btnLabelToggled","toggleClass","target","iframe_load","srctest","attr","undefined","dblclick","prop","addClass","removeClass","removeAttr","checked","a","parents","children","parent","addEventListener","each","infobox_body","find","height","css","hide","event","query_start","overpass_url","query_end","osm_id","osm_type","result_table","result_table_loadicon","osm_ignore_tags","query","ajax","done","elements","row","element","newHtml","tags","indexOf","substring","fail","could_not_load","off","leaflet_target","map_lon","map_lat","map_zoom","map_boundingbox","map_geojson","southWest","L","latLng","northEast","map_bounds","latLngBounds","Icon","Default","imagePath","map","osmMapnik","TileLayer","minZoom","maxZoom","attribution","setTimeout","fitBounds","setView","LatLng","addLayer","baseLayers","OSM Mapnik","control","layers","addTo","geoJson"],"mappings":"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"}
\ No newline at end of file diff --git a/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js b/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js deleted file mode 100644 index e7c2abdac..000000000 --- a/searx/static/themes/oscar/js/searx_src/00_requirejs_config.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * searx is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * searx is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with searx. If not, see < http://www.gnu.org/licenses/ >. - * - * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at> - */ - -requirejs.config({ - baseUrl: './static/themes/oscar/js', - paths: { - app: '../app' - } -}); 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 06931b474..60bf836ce 100644 --- a/searx/static/themes/oscar/js/searx_src/leaflet_map.js +++ b/searx/static/themes/oscar/js/searx_src/leaflet_map.js @@ -107,59 +107,54 @@ $(document).ready(function(){ var map_boundingbox = $(this).data('map-boundingbox'); var map_geojson = $(this).data('map-geojson'); - require(['leaflet-0.7.3.min'], function(leaflet) { - if(map_boundingbox) { - southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]); - northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]); - map_bounds = L.latLngBounds(southWest, northEast); - } + if(map_boundingbox) { + southWest = L.latLng(map_boundingbox[0], map_boundingbox[2]); + northEast = L.latLng(map_boundingbox[1], map_boundingbox[3]); + map_bounds = L.latLngBounds(southWest, northEast); + } - // TODO hack - // change default imagePath - L.Icon.Default.imagePath = "./static/themes/oscar/img/map"; + // change default imagePath + L.Icon.Default.imagePath = "./static/themes/oscar/img/map"; - // init map - var map = L.map(leaflet_target); + // init map + 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}); + // 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 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}); + 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 + // init map view + setTimeout(function() { if(map_bounds) { - // TODO hack: https://github.com/Leaflet/Leaflet/issues/2021 - setTimeout(function () { - map.fitBounds(map_bounds, { - maxZoom:17 - }); - }, 0); + map.fitBounds(map_bounds, { + maxZoom:17 + }); } else if (map_lon && map_lat) { if(map_zoom) map.setView(new L.LatLng(map_lat, map_lon),map_zoom); else map.setView(new L.LatLng(map_lat, map_lon),8); - } - - map.addLayer(osmMapnik); + } + }, 0); - var baseLayers = { - "OSM Mapnik": osmMapnik/*, - "OSM Wikimedia": osmWikimedia*/ - }; + map.addLayer(osmMapnik); - L.control.layers(baseLayers).addTo(map); + var baseLayers = { + "OSM Mapnik": osmMapnik/*, + "OSM Wikimedia": osmWikimedia*/ + }; + L.control.layers(baseLayers).addTo(map); - if(map_geojson) - L.geoJson(map_geojson).addTo(map); - /*else if(map_bounds) - L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/ - }); + if(map_geojson) + L.geoJson(map_geojson).addTo(map); + /*else if(map_bounds) + L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).addTo(map);*/ // this event occour only once per element $( this ).off( event ); |