From 740594a4b73952ad3f5fa52dd1bb939c73dcc7c2 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Sun, 2 Nov 2014 13:00:28 +0100 Subject: [PATCH 01/11] [enh] oscar_template: initial osm-map support for map results * TODO: remove leaflet.min.css if not required --- searx/engines/openstreetmap.py | 18 +++- searx/static/oscar/css/leaflet.min.css | 93 ++++++++++++++++++ searx/static/oscar/img/map/layers-2x.png | Bin 0 -> 2898 bytes searx/static/oscar/img/map/layers.png | Bin 0 -> 1502 bytes searx/static/oscar/img/map/marker-icon-2x.png | Bin 0 -> 4033 bytes searx/static/oscar/img/map/marker-icon.png | Bin 0 -> 1747 bytes searx/static/oscar/img/map/marker-shadow.png | Bin 0 -> 797 bytes searx/static/oscar/js/leaflet-0.7.3.min.js | 9 ++ searx/static/oscar/js/require-2.1.15.min.js | 36 +++++++ searx/static/oscar/js/scripts.js | 59 +++++++++++ .../courgette/result_templates/map.html | 13 +++ .../default/result_templates/map.html | 13 +++ searx/templates/oscar/base.html | 6 +- .../oscar/result_templates/default.html | 2 + .../oscar/result_templates/images.html | 1 + .../templates/oscar/result_templates/map.html | 18 ++++ .../oscar/result_templates/torrent.html | 2 + .../oscar/result_templates/videos.html | 2 + 18 files changed, 268 insertions(+), 4 deletions(-) create mode 100644 searx/static/oscar/css/leaflet.min.css create mode 100644 searx/static/oscar/img/map/layers-2x.png create mode 100644 searx/static/oscar/img/map/layers.png create mode 100644 searx/static/oscar/img/map/marker-icon-2x.png create mode 100644 searx/static/oscar/img/map/marker-icon.png create mode 100644 searx/static/oscar/img/map/marker-shadow.png create mode 100644 searx/static/oscar/js/leaflet-0.7.3.min.js create mode 100644 searx/static/oscar/js/require-2.1.15.min.js create mode 100644 searx/templates/courgette/result_templates/map.html create mode 100644 searx/templates/default/result_templates/map.html create mode 100644 searx/templates/oscar/result_templates/map.html diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py index ea7251486..d73a116ba 100644 --- a/searx/engines/openstreetmap.py +++ b/searx/engines/openstreetmap.py @@ -15,7 +15,7 @@ categories = ['map'] paging = False # search-url -url = 'https://nominatim.openstreetmap.org/search/{query}?format=json' +url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1' result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}' @@ -38,9 +38,23 @@ def response(resp): osm_type = r.get('osm_type', r.get('type')) url = result_base_url.format(osm_type=osm_type, osm_id=r['osm_id']) + + geojson = r.get('geojson') + + # if no geojson is found and osm_type is a node, add geojson Point + if not geojson and\ + osm_type == 'node': + geojson = {u'type':u'Point', + u'coordinates':[r['lon'],r['lat']]} + # append result - results.append({'title': title, + results.append({'template': 'map.html', + 'title': title, 'content': '', + 'longitude': r['lon'], + 'latitude': r['lat'], + 'boundingbox': r['boundingbox'], + 'geojson': geojson, 'url': url}) # return results diff --git a/searx/static/oscar/css/leaflet.min.css b/searx/static/oscar/css/leaflet.min.css new file mode 100644 index 000000000..417e0e8e7 --- /dev/null +++ b/searx/static/oscar/css/leaflet.min.css @@ -0,0 +1,93 @@ +.leaflet-map-pane,.leaflet-tile,.leaflet-marker-icon,.leaflet-marker-shadow,.leaflet-tile-pane,.leaflet-tile-container,.leaflet-overlay-pane,.leaflet-shadow-pane,.leaflet-marker-pane,.leaflet-popup-pane,.leaflet-overlay-pane svg,.leaflet-zoom-box,.leaflet-image-layer,.leaflet-layer{position:absolute;left:0;top:0} +.leaflet-container{overflow:hidden;-ms-touch-action:none} +.leaflet-tile,.leaflet-marker-icon,.leaflet-marker-shadow{-webkit-user-select:none;-moz-user-select:none;user-select:none;-webkit-user-drag:none} +.leaflet-marker-icon,.leaflet-marker-shadow{display:block} +.leaflet-container img{max-width:none !important} +.leaflet-container img.leaflet-image-layer{max-width:15000px !important} +.leaflet-tile{filter:inherit;visibility:hidden} +.leaflet-tile-loaded{visibility:inherit} +.leaflet-zoom-box{width:0;height:0} +.leaflet-overlay-pane svg{-moz-user-select:none} +.leaflet-tile-pane{z-index:2} +.leaflet-objects-pane{z-index:3} +.leaflet-overlay-pane{z-index:4} +.leaflet-shadow-pane{z-index:5} +.leaflet-marker-pane{z-index:6} +.leaflet-popup-pane{z-index:7} +.leaflet-vml-shape{width:1px;height:1px} +.lvml{behavior:url(#default#VML);display:inline-block;position:absolute} +.leaflet-control{position:relative;z-index:7;pointer-events:auto} +.leaflet-top,.leaflet-bottom{position:absolute;z-index:1000;pointer-events:none} +.leaflet-top{top:0} +.leaflet-right{right:0} +.leaflet-bottom{bottom:0} +.leaflet-left{left:0} +.leaflet-control{float:left;clear:both} +.leaflet-right .leaflet-control{float:right} +.leaflet-top .leaflet-control{margin-top:10px} +.leaflet-bottom .leaflet-control{margin-bottom:10px} +.leaflet-left .leaflet-control{margin-left:10px} +.leaflet-right .leaflet-control{margin-right:10px} +.leaflet-fade-anim .leaflet-tile,.leaflet-fade-anim .leaflet-popup{opacity:0;-webkit-transition:opacity .2s linear;-moz-transition:opacity .2s linear;-o-transition:opacity .2s linear;transition:opacity .2s linear} +.leaflet-fade-anim .leaflet-tile-loaded,.leaflet-fade-anim .leaflet-map-pane .leaflet-popup{opacity:1} +.leaflet-zoom-anim .leaflet-zoom-animated{-webkit-transition:-webkit-transform .25s cubic-bezier(0, 0, .25, 1);-moz-transition:-moz-transform .25s cubic-bezier(0, 0, .25, 1);-o-transition:-o-transform .25s cubic-bezier(0, 0, .25, 1);transition:transform .25s cubic-bezier(0, 0, .25, 1)} +.leaflet-zoom-anim .leaflet-tile,.leaflet-pan-anim .leaflet-tile,.leaflet-touching .leaflet-zoom-animated{-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none} +.leaflet-zoom-anim .leaflet-zoom-hide{visibility:hidden} +.leaflet-clickable{cursor:pointer} +.leaflet-container{cursor:-webkit-grab;cursor:-moz-grab} +.leaflet-popup-pane,.leaflet-control{cursor:auto} +.leaflet-dragging .leaflet-container,.leaflet-dragging .leaflet-clickable{cursor:move;cursor:-webkit-grabbing;cursor:-moz-grabbing} +.leaflet-container{background:#ddd;outline:0} +.leaflet-container a{color:#0078a8} +.leaflet-container a.leaflet-active{outline:2px solid #ffa500} +.leaflet-zoom-box{border:2px dotted #38f;background:rgba(255,255,255,0.5)} +.leaflet-container{font:12px/1.5 "Helvetica Neue",Arial,Helvetica,sans-serif} +.leaflet-bar{box-shadow:0 1px 5px rgba(0,0,0,0.65);border-radius:4px} +.leaflet-bar a,.leaflet-bar a:hover{background-color:#fff;border-bottom:1px solid #ccc;width:26px;height:26px;line-height:26px;display:block;text-align:center;text-decoration:none;color:#000} +.leaflet-bar a,.leaflet-control-layers-toggle{background-position:50% 50%;background-repeat:no-repeat;display:block} +.leaflet-bar a:hover{background-color:#f4f4f4} +.leaflet-bar a:first-child{border-top-left-radius:4px;border-top-right-radius:4px} +.leaflet-bar a:last-child{border-bottom-left-radius:4px;border-bottom-right-radius:4px;border-bottom:none} +.leaflet-bar a.leaflet-disabled{cursor:default;background-color:#f4f4f4;color:#bbb} +.leaflet-touch .leaflet-bar a{width:30px;height:30px;line-height:30px} +.leaflet-control-zoom-in,.leaflet-control-zoom-out{font:bold 18px 'Lucida Console',Monaco,monospace;text-indent:1px} +.leaflet-control-zoom-out{font-size:20px} +.leaflet-touch .leaflet-control-zoom-in{font-size:22px} +.leaflet-touch .leaflet-control-zoom-out{font-size:24px} +.leaflet-control-layers{box-shadow:0 1px 5px rgba(0,0,0,0.4);background:#fff;border-radius:5px} +.leaflet-control-layers-toggle{background-image:url(images/layers.png);width:36px;height:36px} +.leaflet-retina .leaflet-control-layers-toggle{background-image:url(images/layers-2x.png);background-size:26px 26px} +.leaflet-touch .leaflet-control-layers-toggle{width:44px;height:44px} +.leaflet-control-layers .leaflet-control-layers-list,.leaflet-control-layers-expanded .leaflet-control-layers-toggle{display:none} +.leaflet-control-layers-expanded .leaflet-control-layers-list{display:block;position:relative} +.leaflet-control-layers-expanded{padding:6px 10px 6px 6px;color:#333;background:#fff} +.leaflet-control-layers-selector{margin-top:2px;position:relative;top:1px} +.leaflet-control-layers label{display:block} +.leaflet-control-layers-separator{height:0;border-top:1px solid #ddd;margin:5px -10px 5px -6px} +.leaflet-container .leaflet-control-attribution{background:#fff;background:rgba(255,255,255,0.7);margin:0} +.leaflet-control-attribution,.leaflet-control-scale-line{padding:0 5px;color:#333} +.leaflet-control-attribution a{text-decoration:none} +.leaflet-control-attribution a:hover{text-decoration:underline} +.leaflet-container .leaflet-control-attribution,.leaflet-container .leaflet-control-scale{font-size:11px} +.leaflet-left .leaflet-control-scale{margin-left:5px} +.leaflet-bottom .leaflet-control-scale{margin-bottom:5px} +.leaflet-control-scale-line{border:2px solid #777;border-top:none;line-height:1.1;padding:2px 5px 1px;font-size:11px;white-space:nowrap;overflow:hidden;-moz-box-sizing:content-box;box-sizing:content-box;background:#fff;background:rgba(255,255,255,0.5)} +.leaflet-control-scale-line:not(:first-child){border-top:2px solid #777;border-bottom:none;margin-top:-2px} +.leaflet-control-scale-line:not(:first-child):not(:last-child){border-bottom:2px solid #777} +.leaflet-touch .leaflet-control-attribution,.leaflet-touch .leaflet-control-layers,.leaflet-touch .leaflet-bar{box-shadow:none} +.leaflet-touch .leaflet-control-layers,.leaflet-touch .leaflet-bar{border:2px solid rgba(0,0,0,0.2);background-clip:padding-box} +.leaflet-popup{position:absolute;text-align:center} +.leaflet-popup-content-wrapper{padding:1px;text-align:left;border-radius:12px} +.leaflet-popup-content{margin:13px 19px;line-height:1.4} +.leaflet-popup-content p{margin:18px 0} +.leaflet-popup-tip-container{margin:0 auto;width:40px;height:20px;position:relative;overflow:hidden} +.leaflet-popup-tip{width:17px;height:17px;padding:1px;margin:-10px auto 0;-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)} +.leaflet-popup-content-wrapper,.leaflet-popup-tip{background:#fff;box-shadow:0 3px 14px rgba(0,0,0,0.4)} +.leaflet-container a.leaflet-popup-close-button{position:absolute;top:0;right:0;padding:4px 4px 0 0;text-align:center;width:18px;height:14px;font:16px/14px Tahoma,Verdana,sans-serif;color:#c3c3c3;text-decoration:none;font-weight:bold;background:transparent} +.leaflet-container a.leaflet-popup-close-button:hover{color:#999} +.leaflet-popup-scrolled{overflow:auto;border-bottom:1px solid #ddd;border-top:1px solid #ddd} +.leaflet-oldie .leaflet-popup-content-wrapper{zoom:1} +.leaflet-oldie .leaflet-popup-tip{width:24px;margin:0 auto;-ms-filter:"progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";filter:progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)} +.leaflet-oldie .leaflet-popup-tip-container{margin-top:-1px} +.leaflet-oldie .leaflet-control-zoom,.leaflet-oldie .leaflet-control-layers,.leaflet-oldie .leaflet-popup-content-wrapper,.leaflet-oldie .leaflet-popup-tip{border:1px solid #999} +.leaflet-div-icon{background:#fff;border:1px solid #666} diff --git a/searx/static/oscar/img/map/layers-2x.png b/searx/static/oscar/img/map/layers-2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a2cf7f9efef65d2e021f382f47ef50d51d51a0df GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/searx/static/oscar/img/map/marker-shadow.png b/searx/static/oscar/img/map/marker-shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..d1e773c715a9b508ebea055c4bb4b0a2ad7f6e52 GIT binary patch literal 797 zcmV+&1LFLNP)oNwbRQ6Eq$4M3RDU@$ z<4cV9zWLV=bA&uX9wCpA{{f^4$D#k>GcX53-UQqf>_LzMU@frMz|MwbfQGbY0?ccG zBj_wh0?6Tv;HWR0`x;m^Bm<;sCm_85SGspFBn6|A!tDh$nR`wGorGkyL7j?F3#OJq zIswLIz;iF7f|LMnF(pXPAY*GYpsw%&e_WjlnV`C$6@#Q7GZu1$Q8>&p8=(iJj8o|T~0u%hM*Yg_d(Av{WS$h&pM%nlEAonVL0;DkN|xc zn)9F+aMDk#VtAMb0c=kIb1pU-$e4$3pwo&qVh(Umlw3_IU_dFcFe(In6*x}D4LHLhFZ4N=V2ZR+>XHU5D&uY$npJ7Eu?{iAK>UxC?4uyg4+iD z!nst**H%2zhOBxc7C7Tv{f^`%hqT1KpU@Vf6+C2|bGaR(1~TU5D-1;&HXT~PMc2Lu z{Q%^i6vvox&EMFT7I_)R$xq1779I8kE@?|D*cLWnP0a@a)xJA`o*^$^V(yN)b`kV7 z=o@jbFF4j{KeuQhi;i++){o=s[i]||{};for(e in o)o.hasOwnProperty(e)&&(t[e]=o[e])}return t},bind:function(t,e){var i=arguments.length>2?Array.prototype.slice.call(arguments,2):null;return function(){return t.apply(e,i||arguments)}},stamp:function(){var t=0,e="_leaflet_id";return function(i){return i[e]=i[e]||++t,i[e]}}(),invokeEach:function(t,e,i){var n,o;if("object"==typeof t){o=Array.prototype.slice.call(arguments,3);for(n in t)e.apply(i,[n,t[n]].concat(o));return!0}return!1},limitExecByInterval:function(t,e,i){var n,o;return function s(){var a=arguments;return n?void(o=!0):(n=!0,setTimeout(function(){n=!1,o&&(s.apply(i,a),o=!1)},e),void t.apply(i,a))}},falseFn:function(){return!1},formatNum:function(t,e){var i=Math.pow(10,e||5);return Math.round(t*i)/i},trim:function(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")},splitWords:function(t){return o.Util.trim(t).split(/\s+/)},setOptions:function(t,e){return t.options=o.extend({},t.options,e),t.options},getParamString:function(t,e,i){var n=[];for(var o in t)n.push(encodeURIComponent(i?o.toUpperCase():o)+"="+encodeURIComponent(t[o]));return(e&&-1!==e.indexOf("?")?"&":"?")+n.join("&")},template:function(t,e){return t.replace(/\{ *([\w_]+) *\}/g,function(t,n){var o=e[n];if(o===i)throw new Error("No value provided for variable "+t);return"function"==typeof o&&(o=o(e)),o})},isArray:Array.isArray||function(t){return"[object Array]"===Object.prototype.toString.call(t)},emptyImageUrl:"data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="},function(){function e(e){var i,n,o=["webkit","moz","o","ms"];for(i=0;it;t++)n._initHooks[t].call(this)}},e},o.Class.include=function(t){o.extend(this.prototype,t)},o.Class.mergeOptions=function(t){o.extend(this.prototype.options,t)},o.Class.addInitHook=function(t){var e=Array.prototype.slice.call(arguments,1),i="function"==typeof t?t:function(){this[t].apply(this,e)};this.prototype._initHooks=this.prototype._initHooks||[],this.prototype._initHooks.push(i)};var s="_leaflet_events";o.Mixin={},o.Mixin.Events={addEventListener:function(t,e,i){if(o.Util.invokeEach(t,this.addEventListener,this,e,i))return this;var n,a,r,h,l,u,c,d=this[s]=this[s]||{},p=i&&i!==this&&o.stamp(i);for(t=o.Util.splitWords(t),n=0,a=t.length;a>n;n++)r={action:e,context:i||this},h=t[n],p?(l=h+"_idx",u=l+"_len",c=d[l]=d[l]||{},c[p]||(c[p]=[],d[u]=(d[u]||0)+1),c[p].push(r)):(d[h]=d[h]||[],d[h].push(r));return this},hasEventListeners:function(t){var e=this[s];return!!e&&(t in e&&e[t].length>0||t+"_idx"in e&&e[t+"_idx_len"]>0)},removeEventListener:function(t,e,i){if(!this[s])return this;if(!t)return this.clearAllEventListeners();if(o.Util.invokeEach(t,this.removeEventListener,this,e,i))return this;var n,a,r,h,l,u,c,d,p,_=this[s],m=i&&i!==this&&o.stamp(i);for(t=o.Util.splitWords(t),n=0,a=t.length;a>n;n++)if(r=t[n],u=r+"_idx",c=u+"_len",d=_[u],e){if(h=m&&d?d[m]:_[r]){for(l=h.length-1;l>=0;l--)h[l].action!==e||i&&h[l].context!==i||(p=h.splice(l,1),p[0].action=o.Util.falseFn);i&&d&&0===h.length&&(delete d[m],_[c]--)}}else delete _[r],delete _[u],delete _[c];return this},clearAllEventListeners:function(){return delete this[s],this},fireEvent:function(t,e){if(!this.hasEventListeners(t))return this;var i,n,a,r,h,l=o.Util.extend({},e,{type:t,target:this}),u=this[s];if(u[t])for(i=u[t].slice(),n=0,a=i.length;a>n;n++)i[n].action.call(i[n].context,l);r=u[t+"_idx"];for(h in r)if(i=r[h].slice())for(n=0,a=i.length;a>n;n++)i[n].action.call(i[n].context,l);return this},addOneTimeEventListener:function(t,e,i){if(o.Util.invokeEach(t,this.addOneTimeEventListener,this,e,i))return this;var n=o.bind(function(){this.removeEventListener(t,e,i).removeEventListener(t,n,i)},this);return this.addEventListener(t,e,i).addEventListener(t,n,i)}},o.Mixin.Events.on=o.Mixin.Events.addEventListener,o.Mixin.Events.off=o.Mixin.Events.removeEventListener,o.Mixin.Events.once=o.Mixin.Events.addOneTimeEventListener,o.Mixin.Events.fire=o.Mixin.Events.fireEvent,function(){var n="ActiveXObject"in t,s=n&&!e.addEventListener,a=navigator.userAgent.toLowerCase(),r=-1!==a.indexOf("webkit"),h=-1!==a.indexOf("chrome"),l=-1!==a.indexOf("phantom"),u=-1!==a.indexOf("android"),c=-1!==a.search("android [23]"),d=-1!==a.indexOf("gecko"),p=typeof orientation!=i+"",_=t.navigator&&t.navigator.msPointerEnabled&&t.navigator.msMaxTouchPoints&&!t.PointerEvent,m=t.PointerEvent&&t.navigator.pointerEnabled&&t.navigator.maxTouchPoints||_,f="devicePixelRatio"in t&&t.devicePixelRatio>1||"matchMedia"in t&&t.matchMedia("(min-resolution:144dpi)")&&t.matchMedia("(min-resolution:144dpi)").matches,g=e.documentElement,v=n&&"transition"in g.style,y="WebKitCSSMatrix"in t&&"m11"in new t.WebKitCSSMatrix&&!c,P="MozPerspective"in g.style,L="OTransition"in g.style,x=!t.L_DISABLE_3D&&(v||y||P||L)&&!l,w=!t.L_NO_TOUCH&&!l&&function(){var t="ontouchstart";if(m||t in g)return!0;var i=e.createElement("div"),n=!1;return i.setAttribute?(i.setAttribute(t,"return;"),"function"==typeof i[t]&&(n=!0),i.removeAttribute(t),i=null,n):!1}();o.Browser={ie:n,ielt9:s,webkit:r,gecko:d&&!r&&!t.opera&&!n,android:u,android23:c,chrome:h,ie3d:v,webkit3d:y,gecko3d:P,opera3d:L,any3d:x,mobile:p,mobileWebkit:p&&r,mobileWebkit3d:p&&y,mobileOpera:p&&t.opera,touch:w,msPointer:_,pointer:m,retina:f}}(),o.Point=function(t,e,i){this.x=i?Math.round(t):t,this.y=i?Math.round(e):e},o.Point.prototype={clone:function(){return new o.Point(this.x,this.y)},add:function(t){return this.clone()._add(o.point(t))},_add:function(t){return this.x+=t.x,this.y+=t.y,this},subtract:function(t){return this.clone()._subtract(o.point(t))},_subtract:function(t){return this.x-=t.x,this.y-=t.y,this},divideBy:function(t){return this.clone()._divideBy(t)},_divideBy:function(t){return this.x/=t,this.y/=t,this},multiplyBy:function(t){return this.clone()._multiplyBy(t)},_multiplyBy:function(t){return this.x*=t,this.y*=t,this},round:function(){return this.clone()._round()},_round:function(){return this.x=Math.round(this.x),this.y=Math.round(this.y),this},floor:function(){return this.clone()._floor()},_floor:function(){return this.x=Math.floor(this.x),this.y=Math.floor(this.y),this},distanceTo:function(t){t=o.point(t);var e=t.x-this.x,i=t.y-this.y;return Math.sqrt(e*e+i*i)},equals:function(t){return t=o.point(t),t.x===this.x&&t.y===this.y},contains:function(t){return t=o.point(t),Math.abs(t.x)<=Math.abs(this.x)&&Math.abs(t.y)<=Math.abs(this.y)},toString:function(){return"Point("+o.Util.formatNum(this.x)+", "+o.Util.formatNum(this.y)+")"}},o.point=function(t,e,n){return t instanceof o.Point?t:o.Util.isArray(t)?new o.Point(t[0],t[1]):t===i||null===t?t:new o.Point(t,e,n)},o.Bounds=function(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;o>n;n++)this.extend(i[n])},o.Bounds.prototype={extend:function(t){return t=o.point(t),this.min||this.max?(this.min.x=Math.min(t.x,this.min.x),this.max.x=Math.max(t.x,this.max.x),this.min.y=Math.min(t.y,this.min.y),this.max.y=Math.max(t.y,this.max.y)):(this.min=t.clone(),this.max=t.clone()),this},getCenter:function(t){return new o.Point((this.min.x+this.max.x)/2,(this.min.y+this.max.y)/2,t)},getBottomLeft:function(){return new o.Point(this.min.x,this.max.y)},getTopRight:function(){return new o.Point(this.max.x,this.min.y)},getSize:function(){return this.max.subtract(this.min)},contains:function(t){var e,i;return t="number"==typeof t[0]||t instanceof o.Point?o.point(t):o.bounds(t),t instanceof o.Bounds?(e=t.min,i=t.max):e=i=t,e.x>=this.min.x&&i.x<=this.max.x&&e.y>=this.min.y&&i.y<=this.max.y},intersects:function(t){t=o.bounds(t);var e=this.min,i=this.max,n=t.min,s=t.max,a=s.x>=e.x&&n.x<=i.x,r=s.y>=e.y&&n.y<=i.y;return a&&r},isValid:function(){return!(!this.min||!this.max)}},o.bounds=function(t,e){return!t||t instanceof o.Bounds?t:new o.Bounds(t,e)},o.Transformation=function(t,e,i,n){this._a=t,this._b=e,this._c=i,this._d=n},o.Transformation.prototype={transform:function(t,e){return this._transform(t.clone(),e)},_transform:function(t,e){return e=e||1,t.x=e*(this._a*t.x+this._b),t.y=e*(this._c*t.y+this._d),t},untransform:function(t,e){return e=e||1,new o.Point((t.x/e-this._b)/this._a,(t.y/e-this._d)/this._c)}},o.DomUtil={get:function(t){return"string"==typeof t?e.getElementById(t):t},getStyle:function(t,i){var n=t.style[i];if(!n&&t.currentStyle&&(n=t.currentStyle[i]),(!n||"auto"===n)&&e.defaultView){var o=e.defaultView.getComputedStyle(t,null);n=o?o[i]:null}return"auto"===n?null:n},getViewportOffset:function(t){var i,n=0,s=0,a=t,r=e.body,h=e.documentElement;do{if(n+=a.offsetTop||0,s+=a.offsetLeft||0,n+=parseInt(o.DomUtil.getStyle(a,"borderTopWidth"),10)||0,s+=parseInt(o.DomUtil.getStyle(a,"borderLeftWidth"),10)||0,i=o.DomUtil.getStyle(a,"position"),a.offsetParent===r&&"absolute"===i)break;if("fixed"===i){n+=r.scrollTop||h.scrollTop||0,s+=r.scrollLeft||h.scrollLeft||0;break}if("relative"===i&&!a.offsetLeft){var l=o.DomUtil.getStyle(a,"width"),u=o.DomUtil.getStyle(a,"max-width"),c=a.getBoundingClientRect();("none"!==l||"none"!==u)&&(s+=c.left+a.clientLeft),n+=c.top+(r.scrollTop||h.scrollTop||0);break}a=a.offsetParent}while(a);a=t;do{if(a===r)break;n-=a.scrollTop||0,s-=a.scrollLeft||0,a=a.parentNode}while(a);return new o.Point(s,n)},documentIsLtr:function(){return o.DomUtil._docIsLtrCached||(o.DomUtil._docIsLtrCached=!0,o.DomUtil._docIsLtr="ltr"===o.DomUtil.getStyle(e.body,"direction")),o.DomUtil._docIsLtr},create:function(t,i,n){var o=e.createElement(t);return o.className=i,n&&n.appendChild(o),o},hasClass:function(t,e){if(t.classList!==i)return t.classList.contains(e);var n=o.DomUtil._getClass(t);return n.length>0&&new RegExp("(^|\\s)"+e+"(\\s|$)").test(n)},addClass:function(t,e){if(t.classList!==i)for(var n=o.Util.splitWords(e),s=0,a=n.length;a>s;s++)t.classList.add(n[s]);else if(!o.DomUtil.hasClass(t,e)){var r=o.DomUtil._getClass(t);o.DomUtil._setClass(t,(r?r+" ":"")+e)}},removeClass:function(t,e){t.classList!==i?t.classList.remove(e):o.DomUtil._setClass(t,o.Util.trim((" "+o.DomUtil._getClass(t)+" ").replace(" "+e+" "," ")))},_setClass:function(t,e){t.className.baseVal===i?t.className=e:t.className.baseVal=e},_getClass:function(t){return t.className.baseVal===i?t.className:t.className.baseVal},setOpacity:function(t,e){if("opacity"in t.style)t.style.opacity=e;else if("filter"in t.style){var i=!1,n="DXImageTransform.Microsoft.Alpha";try{i=t.filters.item(n)}catch(o){if(1===e)return}e=Math.round(100*e),i?(i.Enabled=100!==e,i.Opacity=e):t.style.filter+=" progid:"+n+"(opacity="+e+")"}},testProp:function(t){for(var i=e.documentElement.style,n=0;ni||i===e?e:t),new o.LatLng(this.lat,i)}},o.latLng=function(t,e){return t instanceof o.LatLng?t:o.Util.isArray(t)?"number"==typeof t[0]||"string"==typeof t[0]?new o.LatLng(t[0],t[1],t[2]):null:t===i||null===t?t:"object"==typeof t&&"lat"in t?new o.LatLng(t.lat,"lng"in t?t.lng:t.lon):e===i?null:new o.LatLng(t,e)},o.LatLngBounds=function(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;o>n;n++)this.extend(i[n])},o.LatLngBounds.prototype={extend:function(t){if(!t)return this;var e=o.latLng(t);return t=null!==e?e:o.latLngBounds(t),t instanceof o.LatLng?this._southWest||this._northEast?(this._southWest.lat=Math.min(t.lat,this._southWest.lat),this._southWest.lng=Math.min(t.lng,this._southWest.lng),this._northEast.lat=Math.max(t.lat,this._northEast.lat),this._northEast.lng=Math.max(t.lng,this._northEast.lng)):(this._southWest=new o.LatLng(t.lat,t.lng),this._northEast=new o.LatLng(t.lat,t.lng)):t instanceof o.LatLngBounds&&(this.extend(t._southWest),this.extend(t._northEast)),this},pad:function(t){var e=this._southWest,i=this._northEast,n=Math.abs(e.lat-i.lat)*t,s=Math.abs(e.lng-i.lng)*t;return new o.LatLngBounds(new o.LatLng(e.lat-n,e.lng-s),new o.LatLng(i.lat+n,i.lng+s))},getCenter:function(){return new o.LatLng((this._southWest.lat+this._northEast.lat)/2,(this._southWest.lng+this._northEast.lng)/2)},getSouthWest:function(){return this._southWest},getNorthEast:function(){return this._northEast},getNorthWest:function(){return new o.LatLng(this.getNorth(),this.getWest())},getSouthEast:function(){return new o.LatLng(this.getSouth(),this.getEast())},getWest:function(){return this._southWest.lng},getSouth:function(){return this._southWest.lat},getEast:function(){return this._northEast.lng},getNorth:function(){return this._northEast.lat},contains:function(t){t="number"==typeof t[0]||t instanceof o.LatLng?o.latLng(t):o.latLngBounds(t);var e,i,n=this._southWest,s=this._northEast;return t instanceof o.LatLngBounds?(e=t.getSouthWest(),i=t.getNorthEast()):e=i=t,e.lat>=n.lat&&i.lat<=s.lat&&e.lng>=n.lng&&i.lng<=s.lng},intersects:function(t){t=o.latLngBounds(t);var e=this._southWest,i=this._northEast,n=t.getSouthWest(),s=t.getNorthEast(),a=s.lat>=e.lat&&n.lat<=i.lat,r=s.lng>=e.lng&&n.lng<=i.lng;return a&&r},toBBoxString:function(){return[this.getWest(),this.getSouth(),this.getEast(),this.getNorth()].join(",")},equals:function(t){return t?(t=o.latLngBounds(t),this._southWest.equals(t.getSouthWest())&&this._northEast.equals(t.getNorthEast())):!1},isValid:function(){return!(!this._southWest||!this._northEast)}},o.latLngBounds=function(t,e){return!t||t instanceof o.LatLngBounds?t:new o.LatLngBounds(t,e)},o.Projection={},o.Projection.SphericalMercator={MAX_LATITUDE:85.0511287798,project:function(t){var e=o.LatLng.DEG_TO_RAD,i=this.MAX_LATITUDE,n=Math.max(Math.min(i,t.lat),-i),s=t.lng*e,a=n*e;return a=Math.log(Math.tan(Math.PI/4+a/2)),new o.Point(s,a)},unproject:function(t){var e=o.LatLng.RAD_TO_DEG,i=t.x*e,n=(2*Math.atan(Math.exp(t.y))-Math.PI/2)*e;return new o.LatLng(n,i)}},o.Projection.LonLat={project:function(t){return new o.Point(t.lng,t.lat)},unproject:function(t){return new o.LatLng(t.y,t.x)}},o.CRS={latLngToPoint:function(t,e){var i=this.projection.project(t),n=this.scale(e);return this.transformation._transform(i,n)},pointToLatLng:function(t,e){var i=this.scale(e),n=this.transformation.untransform(t,i);return this.projection.unproject(n)},project:function(t){return this.projection.project(t)},scale:function(t){return 256*Math.pow(2,t)},getSize:function(t){var e=this.scale(t);return o.point(e,e)}},o.CRS.Simple=o.extend({},o.CRS,{projection:o.Projection.LonLat,transformation:new o.Transformation(1,0,-1,0),scale:function(t){return Math.pow(2,t)}}),o.CRS.EPSG3857=o.extend({},o.CRS,{code:"EPSG:3857",projection:o.Projection.SphericalMercator,transformation:new o.Transformation(.5/Math.PI,.5,-.5/Math.PI,.5),project:function(t){var e=this.projection.project(t),i=6378137;return e.multiplyBy(i)}}),o.CRS.EPSG900913=o.extend({},o.CRS.EPSG3857,{code:"EPSG:900913"}),o.CRS.EPSG4326=o.extend({},o.CRS,{code:"EPSG:4326",projection:o.Projection.LonLat,transformation:new o.Transformation(1/360,.5,-1/360,.5)}),o.Map=o.Class.extend({includes:o.Mixin.Events,options:{crs:o.CRS.EPSG3857,fadeAnimation:o.DomUtil.TRANSITION&&!o.Browser.android23,trackResize:!0,markerZoomAnimation:o.DomUtil.TRANSITION&&o.Browser.any3d},initialize:function(t,e){e=o.setOptions(this,e),this._initContainer(t),this._initLayout(),this._onResize=o.bind(this._onResize,this),this._initEvents(),e.maxBounds&&this.setMaxBounds(e.maxBounds),e.center&&e.zoom!==i&&this.setView(o.latLng(e.center),e.zoom,{reset:!0}),this._handlers=[],this._layers={},this._zoomBoundLayers={},this._tileLayersNum=0,this.callInitHooks(),this._addLayers(e.layers)},setView:function(t,e){return e=e===i?this.getZoom():e,this._resetView(o.latLng(t),this._limitZoom(e)),this},setZoom:function(t,e){return this._loaded?this.setView(this.getCenter(),t,{zoom:e}):(this._zoom=this._limitZoom(t),this)},zoomIn:function(t,e){return this.setZoom(this._zoom+(t||1),e)},zoomOut:function(t,e){return this.setZoom(this._zoom-(t||1),e)},setZoomAround:function(t,e,i){var n=this.getZoomScale(e),s=this.getSize().divideBy(2),a=t instanceof o.Point?t:this.latLngToContainerPoint(t),r=a.subtract(s).multiplyBy(1-1/n),h=this.containerPointToLatLng(s.add(r));return this.setView(h,e,{zoom:i})},fitBounds:function(t,e){e=e||{},t=t.getBounds?t.getBounds():o.latLngBounds(t);var i=o.point(e.paddingTopLeft||e.padding||[0,0]),n=o.point(e.paddingBottomRight||e.padding||[0,0]),s=this.getBoundsZoom(t,!1,i.add(n)),a=n.subtract(i).divideBy(2),r=this.project(t.getSouthWest(),s),h=this.project(t.getNorthEast(),s),l=this.unproject(r.add(h).divideBy(2).add(a),s);return s=e&&e.maxZoom?Math.min(e.maxZoom,s):s,this.setView(l,s,e)},fitWorld:function(t){return this.fitBounds([[-90,-180],[90,180]],t)},panTo:function(t,e){return this.setView(t,this._zoom,{pan:e})},panBy:function(t){return this.fire("movestart"),this._rawPanBy(o.point(t)),this.fire("move"),this.fire("moveend")},setMaxBounds:function(t){return t=o.latLngBounds(t),this.options.maxBounds=t,t?(this._loaded&&this._panInsideMaxBounds(),this.on("moveend",this._panInsideMaxBounds,this)):this.off("moveend",this._panInsideMaxBounds,this)},panInsideBounds:function(t,e){var i=this.getCenter(),n=this._limitCenter(i,this._zoom,t);return i.equals(n)?this:this.panTo(n,e)},addLayer:function(t){var e=o.stamp(t);return this._layers[e]?this:(this._layers[e]=t,!t.options||isNaN(t.options.maxZoom)&&isNaN(t.options.minZoom)||(this._zoomBoundLayers[e]=t,this._updateZoomLevels()),this.options.zoomAnimation&&o.TileLayer&&t instanceof o.TileLayer&&(this._tileLayersNum++,this._tileLayersToLoad++,t.on("load",this._onTileLayerLoad,this)),this._loaded&&this._layerAdd(t),this)},removeLayer:function(t){var e=o.stamp(t);return this._layers[e]?(this._loaded&&t.onRemove(this),delete this._layers[e],this._loaded&&this.fire("layerremove",{layer:t}),this._zoomBoundLayers[e]&&(delete this._zoomBoundLayers[e],this._updateZoomLevels()),this.options.zoomAnimation&&o.TileLayer&&t instanceof o.TileLayer&&(this._tileLayersNum--,this._tileLayersToLoad--,t.off("load",this._onTileLayerLoad,this)),this):this},hasLayer:function(t){return t?o.stamp(t)in this._layers:!1},eachLayer:function(t,e){for(var i in this._layers)t.call(e,this._layers[i]);return this},invalidateSize:function(t){if(!this._loaded)return this;t=o.extend({animate:!1,pan:!0},t===!0?{animate:!0}:t);var e=this.getSize();this._sizeChanged=!0,this._initialCenter=null;var i=this.getSize(),n=e.divideBy(2).round(),s=i.divideBy(2).round(),a=n.subtract(s);return a.x||a.y?(t.animate&&t.pan?this.panBy(a):(t.pan&&this._rawPanBy(a),this.fire("move"),t.debounceMoveend?(clearTimeout(this._sizeTimer),this._sizeTimer=setTimeout(o.bind(this.fire,this,"moveend"),200)):this.fire("moveend")),this.fire("resize",{oldSize:e,newSize:i})):this},addHandler:function(t,e){if(!e)return this;var i=this[t]=new e(this);return this._handlers.push(i),this.options[t]&&i.enable(),this},remove:function(){this._loaded&&this.fire("unload"),this._initEvents("off");try{delete this._container._leaflet}catch(t){this._container._leaflet=i}return this._clearPanes(),this._clearControlPos&&this._clearControlPos(),this._clearHandlers(),this},getCenter:function(){return this._checkIfLoaded(),this._initialCenter&&!this._moved()?this._initialCenter:this.layerPointToLatLng(this._getCenterLayerPoint())},getZoom:function(){return this._zoom},getBounds:function(){var t=this.getPixelBounds(),e=this.unproject(t.getBottomLeft()),i=this.unproject(t.getTopRight());return new o.LatLngBounds(e,i)},getMinZoom:function(){return this.options.minZoom===i?this._layersMinZoom===i?0:this._layersMinZoom:this.options.minZoom},getMaxZoom:function(){return this.options.maxZoom===i?this._layersMaxZoom===i?1/0:this._layersMaxZoom:this.options.maxZoom},getBoundsZoom:function(t,e,i){t=o.latLngBounds(t);var n,s=this.getMinZoom()-(e?1:0),a=this.getMaxZoom(),r=this.getSize(),h=t.getNorthWest(),l=t.getSouthEast(),u=!0;i=o.point(i||[0,0]);do s++,n=this.project(l,s).subtract(this.project(h,s)).add(i),u=e?n.x=s);return u&&e?null:e?s:s-1},getSize:function(){return(!this._size||this._sizeChanged)&&(this._size=new o.Point(this._container.clientWidth,this._container.clientHeight),this._sizeChanged=!1),this._size.clone()},getPixelBounds:function(){var t=this._getTopLeftPoint();return new o.Bounds(t,t.add(this.getSize()))},getPixelOrigin:function(){return this._checkIfLoaded(),this._initialTopLeftPoint},getPanes:function(){return this._panes},getContainer:function(){return this._container},getZoomScale:function(t){var e=this.options.crs;return e.scale(t)/e.scale(this._zoom)},getScaleZoom:function(t){return this._zoom+Math.log(t)/Math.LN2},project:function(t,e){return e=e===i?this._zoom:e,this.options.crs.latLngToPoint(o.latLng(t),e)},unproject:function(t,e){return e=e===i?this._zoom:e,this.options.crs.pointToLatLng(o.point(t),e)},layerPointToLatLng:function(t){var e=o.point(t).add(this.getPixelOrigin());return this.unproject(e)},latLngToLayerPoint:function(t){var e=this.project(o.latLng(t))._round();return e._subtract(this.getPixelOrigin())},containerPointToLayerPoint:function(t){return o.point(t).subtract(this._getMapPanePos())},layerPointToContainerPoint:function(t){return o.point(t).add(this._getMapPanePos())},containerPointToLatLng:function(t){var e=this.containerPointToLayerPoint(o.point(t));return this.layerPointToLatLng(e)},latLngToContainerPoint:function(t){return this.layerPointToContainerPoint(this.latLngToLayerPoint(o.latLng(t)))},mouseEventToContainerPoint:function(t){return o.DomEvent.getMousePosition(t,this._container)},mouseEventToLayerPoint:function(t){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t))},mouseEventToLatLng:function(t){return this.layerPointToLatLng(this.mouseEventToLayerPoint(t))},_initContainer:function(t){var e=this._container=o.DomUtil.get(t);if(!e)throw new Error("Map container not found.");if(e._leaflet)throw new Error("Map container is already initialized.");e._leaflet=!0},_initLayout:function(){var t=this._container;o.DomUtil.addClass(t,"leaflet-container"+(o.Browser.touch?" leaflet-touch":"")+(o.Browser.retina?" leaflet-retina":"")+(o.Browser.ielt9?" leaflet-oldie":"")+(this.options.fadeAnimation?" leaflet-fade-anim":""));var e=o.DomUtil.getStyle(t,"position");"absolute"!==e&&"relative"!==e&&"fixed"!==e&&(t.style.position="relative"),this._initPanes(),this._initControlPos&&this._initControlPos()},_initPanes:function(){var t=this._panes={};this._mapPane=t.mapPane=this._createPane("leaflet-map-pane",this._container),this._tilePane=t.tilePane=this._createPane("leaflet-tile-pane",this._mapPane),t.objectsPane=this._createPane("leaflet-objects-pane",this._mapPane),t.shadowPane=this._createPane("leaflet-shadow-pane"),t.overlayPane=this._createPane("leaflet-overlay-pane"),t.markerPane=this._createPane("leaflet-marker-pane"),t.popupPane=this._createPane("leaflet-popup-pane");var e=" leaflet-zoom-hide";this.options.markerZoomAnimation||(o.DomUtil.addClass(t.markerPane,e),o.DomUtil.addClass(t.shadowPane,e),o.DomUtil.addClass(t.popupPane,e))},_createPane:function(t,e){return o.DomUtil.create("div",t,e||this._panes.objectsPane)},_clearPanes:function(){this._container.removeChild(this._mapPane)},_addLayers:function(t){t=t?o.Util.isArray(t)?t:[t]:[];for(var e=0,i=t.length;i>e;e++)this.addLayer(t[e])},_resetView:function(t,e,i,n){var s=this._zoom!==e;n||(this.fire("movestart"),s&&this.fire("zoomstart")),this._zoom=e,this._initialCenter=t,this._initialTopLeftPoint=this._getNewTopLeftPoint(t),i?this._initialTopLeftPoint._add(this._getMapPanePos()):o.DomUtil.setPosition(this._mapPane,new o.Point(0,0)),this._tileLayersToLoad=this._tileLayersNum;var a=!this._loaded;this._loaded=!0,this.fire("viewreset",{hard:!i}),a&&(this.fire("load"),this.eachLayer(this._layerAdd,this)),this.fire("move"),(s||n)&&this.fire("zoomend"),this.fire("moveend",{hard:!i})},_rawPanBy:function(t){o.DomUtil.setPosition(this._mapPane,this._getMapPanePos().subtract(t))},_getZoomSpan:function(){return this.getMaxZoom()-this.getMinZoom()},_updateZoomLevels:function(){var t,e=1/0,n=-1/0,o=this._getZoomSpan();for(t in this._zoomBoundLayers){var s=this._zoomBoundLayers[t];isNaN(s.options.minZoom)||(e=Math.min(e,s.options.minZoom)),isNaN(s.options.maxZoom)||(n=Math.max(n,s.options.maxZoom))}t===i?this._layersMaxZoom=this._layersMinZoom=i:(this._layersMaxZoom=n,this._layersMinZoom=e),o!==this._getZoomSpan()&&this.fire("zoomlevelschange")},_panInsideMaxBounds:function(){this.panInsideBounds(this.options.maxBounds)},_checkIfLoaded:function(){if(!this._loaded)throw new Error("Set map center and zoom first.")},_initEvents:function(e){if(o.DomEvent){e=e||"on",o.DomEvent[e](this._container,"click",this._onMouseClick,this);var i,n,s=["dblclick","mousedown","mouseup","mouseenter","mouseleave","mousemove","contextmenu"];for(i=0,n=s.length;n>i;i++)o.DomEvent[e](this._container,s[i],this._fireMouseEvent,this);this.options.trackResize&&o.DomEvent[e](t,"resize",this._onResize,this)}},_onResize:function(){o.Util.cancelAnimFrame(this._resizeRequest),this._resizeRequest=o.Util.requestAnimFrame(function(){this.invalidateSize({debounceMoveend:!0})},this,!1,this._container)},_onMouseClick:function(t){!this._loaded||!t._simulated&&(this.dragging&&this.dragging.moved()||this.boxZoom&&this.boxZoom.moved())||o.DomEvent._skipped(t)||(this.fire("preclick"),this._fireMouseEvent(t))},_fireMouseEvent:function(t){if(this._loaded&&!o.DomEvent._skipped(t)){var e=t.type;if(e="mouseenter"===e?"mouseover":"mouseleave"===e?"mouseout":e,this.hasEventListeners(e)){"contextmenu"===e&&o.DomEvent.preventDefault(t);var i=this.mouseEventToContainerPoint(t),n=this.containerPointToLayerPoint(i),s=this.layerPointToLatLng(n);this.fire(e,{latlng:s,layerPoint:n,containerPoint:i,originalEvent:t})}}},_onTileLayerLoad:function(){this._tileLayersToLoad--,this._tileLayersNum&&!this._tileLayersToLoad&&this.fire("tilelayersload")},_clearHandlers:function(){for(var t=0,e=this._handlers.length;e>t;t++)this._handlers[t].disable()},whenReady:function(t,e){return this._loaded?t.call(e||this,this):this.on("load",t,e),this},_layerAdd:function(t){t.onAdd(this),this.fire("layeradd",{layer:t})},_getMapPanePos:function(){return o.DomUtil.getPosition(this._mapPane)},_moved:function(){var t=this._getMapPanePos();return t&&!t.equals([0,0])},_getTopLeftPoint:function(){return this.getPixelOrigin().subtract(this._getMapPanePos())},_getNewTopLeftPoint:function(t,e){var i=this.getSize()._divideBy(2);return this.project(t,e)._subtract(i)._round()},_latLngToNewLayerPoint:function(t,e,i){var n=this._getNewTopLeftPoint(i,e).add(this._getMapPanePos());return this.project(t,e)._subtract(n)},_getCenterLayerPoint:function(){return this.containerPointToLayerPoint(this.getSize()._divideBy(2))},_getCenterOffset:function(t){return this.latLngToLayerPoint(t).subtract(this._getCenterLayerPoint())},_limitCenter:function(t,e,i){if(!i)return t;var n=this.project(t,e),s=this.getSize().divideBy(2),a=new o.Bounds(n.subtract(s),n.add(s)),r=this._getBoundsOffset(a,i,e);return this.unproject(n.add(r),e)},_limitOffset:function(t,e){if(!e)return t;var i=this.getPixelBounds(),n=new o.Bounds(i.min.add(t),i.max.add(t));return t.add(this._getBoundsOffset(n,e))},_getBoundsOffset:function(t,e,i){var n=this.project(e.getNorthWest(),i).subtract(t.min),s=this.project(e.getSouthEast(),i).subtract(t.max),a=this._rebound(n.x,-s.x),r=this._rebound(n.y,-s.y);return new o.Point(a,r)},_rebound:function(t,e){return t+e>0?Math.round(t-e)/2:Math.max(0,Math.ceil(t))-Math.max(0,Math.floor(e))},_limitZoom:function(t){var e=this.getMinZoom(),i=this.getMaxZoom();return Math.max(e,Math.min(i,t))}}),o.map=function(t,e){return new o.Map(t,e)},o.Projection.Mercator={MAX_LATITUDE:85.0840591556,R_MINOR:6356752.314245179,R_MAJOR:6378137,project:function(t){var e=o.LatLng.DEG_TO_RAD,i=this.MAX_LATITUDE,n=Math.max(Math.min(i,t.lat),-i),s=this.R_MAJOR,a=this.R_MINOR,r=t.lng*e*s,h=n*e,l=a/s,u=Math.sqrt(1-l*l),c=u*Math.sin(h);c=Math.pow((1-c)/(1+c),.5*u);var d=Math.tan(.5*(.5*Math.PI-h))/c;return h=-s*Math.log(d),new o.Point(r,h)},unproject:function(t){for(var e,i=o.LatLng.RAD_TO_DEG,n=this.R_MAJOR,s=this.R_MINOR,a=t.x*i/n,r=s/n,h=Math.sqrt(1-r*r),l=Math.exp(-t.y/n),u=Math.PI/2-2*Math.atan(l),c=15,d=1e-7,p=c,_=.1;Math.abs(_)>d&&--p>0;)e=h*Math.sin(u),_=Math.PI/2-2*Math.atan(l*Math.pow((1-e)/(1+e),.5*h))-u,u+=_; +return new o.LatLng(u*i,a)}},o.CRS.EPSG3395=o.extend({},o.CRS,{code:"EPSG:3395",projection:o.Projection.Mercator,transformation:function(){var t=o.Projection.Mercator,e=t.R_MAJOR,i=.5/(Math.PI*e);return new o.Transformation(i,.5,-i,.5)}()}),o.TileLayer=o.Class.extend({includes:o.Mixin.Events,options:{minZoom:0,maxZoom:18,tileSize:256,subdomains:"abc",errorTileUrl:"",attribution:"",zoomOffset:0,opacity:1,unloadInvisibleTiles:o.Browser.mobile,updateWhenIdle:o.Browser.mobile},initialize:function(t,e){e=o.setOptions(this,e),e.detectRetina&&o.Browser.retina&&e.maxZoom>0&&(e.tileSize=Math.floor(e.tileSize/2),e.zoomOffset++,e.minZoom>0&&e.minZoom--,this.options.maxZoom--),e.bounds&&(e.bounds=o.latLngBounds(e.bounds)),this._url=t;var i=this.options.subdomains;"string"==typeof i&&(this.options.subdomains=i.split(""))},onAdd:function(t){this._map=t,this._animated=t._zoomAnimated,this._initContainer(),t.on({viewreset:this._reset,moveend:this._update},this),this._animated&&t.on({zoomanim:this._animateZoom,zoomend:this._endZoomAnim},this),this.options.updateWhenIdle||(this._limitedUpdate=o.Util.limitExecByInterval(this._update,150,this),t.on("move",this._limitedUpdate,this)),this._reset(),this._update()},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){this._container.parentNode.removeChild(this._container),t.off({viewreset:this._reset,moveend:this._update},this),this._animated&&t.off({zoomanim:this._animateZoom,zoomend:this._endZoomAnim},this),this.options.updateWhenIdle||t.off("move",this._limitedUpdate,this),this._container=null,this._map=null},bringToFront:function(){var t=this._map._panes.tilePane;return this._container&&(t.appendChild(this._container),this._setAutoZIndex(t,Math.max)),this},bringToBack:function(){var t=this._map._panes.tilePane;return this._container&&(t.insertBefore(this._container,t.firstChild),this._setAutoZIndex(t,Math.min)),this},getAttribution:function(){return this.options.attribution},getContainer:function(){return this._container},setOpacity:function(t){return this.options.opacity=t,this._map&&this._updateOpacity(),this},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},setUrl:function(t,e){return this._url=t,e||this.redraw(),this},redraw:function(){return this._map&&(this._reset({hard:!0}),this._update()),this},_updateZIndex:function(){this._container&&this.options.zIndex!==i&&(this._container.style.zIndex=this.options.zIndex)},_setAutoZIndex:function(t,e){var i,n,o,s=t.children,a=-e(1/0,-1/0);for(n=0,o=s.length;o>n;n++)s[n]!==this._container&&(i=parseInt(s[n].style.zIndex,10),isNaN(i)||(a=e(a,i)));this.options.zIndex=this._container.style.zIndex=(isFinite(a)?a:0)+e(1,-1)},_updateOpacity:function(){var t,e=this._tiles;if(o.Browser.ielt9)for(t in e)o.DomUtil.setOpacity(e[t],this.options.opacity);else o.DomUtil.setOpacity(this._container,this.options.opacity)},_initContainer:function(){var t=this._map._panes.tilePane;if(!this._container){if(this._container=o.DomUtil.create("div","leaflet-layer"),this._updateZIndex(),this._animated){var e="leaflet-tile-container";this._bgBuffer=o.DomUtil.create("div",e,this._container),this._tileContainer=o.DomUtil.create("div",e,this._container)}else this._tileContainer=this._container;t.appendChild(this._container),this.options.opacity<1&&this._updateOpacity()}},_reset:function(t){for(var e in this._tiles)this.fire("tileunload",{tile:this._tiles[e]});this._tiles={},this._tilesToLoad=0,this.options.reuseTiles&&(this._unusedTiles=[]),this._tileContainer.innerHTML="",this._animated&&t&&t.hard&&this._clearBgBuffer(),this._initContainer()},_getTileSize:function(){var t=this._map,e=t.getZoom()+this.options.zoomOffset,i=this.options.maxNativeZoom,n=this.options.tileSize;return i&&e>i&&(n=Math.round(t.getZoomScale(e)/t.getZoomScale(i)*n)),n},_update:function(){if(this._map){var t=this._map,e=t.getPixelBounds(),i=t.getZoom(),n=this._getTileSize();if(!(i>this.options.maxZoom||in;n++)this._addTile(a[n],l);this._tileContainer.appendChild(l)}},_tileShouldBeLoaded:function(t){if(t.x+":"+t.y in this._tiles)return!1;var e=this.options;if(!e.continuousWorld){var i=this._getWrapTileNum();if(e.noWrap&&(t.x<0||t.x>=i.x)||t.y<0||t.y>=i.y)return!1}if(e.bounds){var n=e.tileSize,o=t.multiplyBy(n),s=o.add([n,n]),a=this._map.unproject(o),r=this._map.unproject(s);if(e.continuousWorld||e.noWrap||(a=a.wrap(),r=r.wrap()),!e.bounds.intersects([a,r]))return!1}return!0},_removeOtherTiles:function(t){var e,i,n,o;for(o in this._tiles)e=o.split(":"),i=parseInt(e[0],10),n=parseInt(e[1],10),(it.max.x||nt.max.y)&&this._removeTile(o)},_removeTile:function(t){var e=this._tiles[t];this.fire("tileunload",{tile:e,url:e.src}),this.options.reuseTiles?(o.DomUtil.removeClass(e,"leaflet-tile-loaded"),this._unusedTiles.push(e)):e.parentNode===this._tileContainer&&this._tileContainer.removeChild(e),o.Browser.android||(e.onload=null,e.src=o.Util.emptyImageUrl),delete this._tiles[t]},_addTile:function(t,e){var i=this._getTilePos(t),n=this._getTile();o.DomUtil.setPosition(n,i,o.Browser.chrome),this._tiles[t.x+":"+t.y]=n,this._loadTile(n,t),n.parentNode!==this._tileContainer&&e.appendChild(n)},_getZoomForUrl:function(){var t=this.options,e=this._map.getZoom();return t.zoomReverse&&(e=t.maxZoom-e),e+=t.zoomOffset,t.maxNativeZoom?Math.min(e,t.maxNativeZoom):e},_getTilePos:function(t){var e=this._map.getPixelOrigin(),i=this._getTileSize();return t.multiplyBy(i).subtract(e)},getTileUrl:function(t){return o.Util.template(this._url,o.extend({s:this._getSubdomain(t),z:t.z,x:t.x,y:t.y},this.options))},_getWrapTileNum:function(){var t=this._map.options.crs,e=t.getSize(this._map.getZoom());return e.divideBy(this._getTileSize())._floor()},_adjustTilePoint:function(t){var e=this._getWrapTileNum();this.options.continuousWorld||this.options.noWrap||(t.x=(t.x%e.x+e.x)%e.x),this.options.tms&&(t.y=e.y-t.y-1),t.z=this._getZoomForUrl()},_getSubdomain:function(t){var e=Math.abs(t.x+t.y)%this.options.subdomains.length;return this.options.subdomains[e]},_getTile:function(){if(this.options.reuseTiles&&this._unusedTiles.length>0){var t=this._unusedTiles.pop();return this._resetTile(t),t}return this._createTile()},_resetTile:function(){},_createTile:function(){var t=o.DomUtil.create("img","leaflet-tile");return t.style.width=t.style.height=this._getTileSize()+"px",t.galleryimg="no",t.onselectstart=t.onmousemove=o.Util.falseFn,o.Browser.ielt9&&this.options.opacity!==i&&o.DomUtil.setOpacity(t,this.options.opacity),o.Browser.mobileWebkit3d&&(t.style.WebkitBackfaceVisibility="hidden"),t},_loadTile:function(t,e){t._layer=this,t.onload=this._tileOnLoad,t.onerror=this._tileOnError,this._adjustTilePoint(e),t.src=this.getTileUrl(e),this.fire("tileloadstart",{tile:t,url:t.src})},_tileLoaded:function(){this._tilesToLoad--,this._animated&&o.DomUtil.addClass(this._tileContainer,"leaflet-zoom-animated"),this._tilesToLoad||(this.fire("load"),this._animated&&(clearTimeout(this._clearBgBufferTimer),this._clearBgBufferTimer=setTimeout(o.bind(this._clearBgBuffer,this),500)))},_tileOnLoad:function(){var t=this._layer;this.src!==o.Util.emptyImageUrl&&(o.DomUtil.addClass(this,"leaflet-tile-loaded"),t.fire("tileload",{tile:this,url:this.src})),t._tileLoaded()},_tileOnError:function(){var t=this._layer;t.fire("tileerror",{tile:this,url:this.src});var e=t.options.errorTileUrl;e&&(this.src=e),t._tileLoaded()}}),o.tileLayer=function(t,e){return new o.TileLayer(t,e)},o.TileLayer.WMS=o.TileLayer.extend({defaultWmsParams:{service:"WMS",request:"GetMap",version:"1.1.1",layers:"",styles:"",format:"image/jpeg",transparent:!1},initialize:function(t,e){this._url=t;var i=o.extend({},this.defaultWmsParams),n=e.tileSize||this.options.tileSize;i.width=i.height=e.detectRetina&&o.Browser.retina?2*n:n;for(var s in e)this.options.hasOwnProperty(s)||"crs"===s||(i[s]=e[s]);this.wmsParams=i,o.setOptions(this,e)},onAdd:function(t){this._crs=this.options.crs||t.options.crs,this._wmsVersion=parseFloat(this.wmsParams.version);var e=this._wmsVersion>=1.3?"crs":"srs";this.wmsParams[e]=this._crs.code,o.TileLayer.prototype.onAdd.call(this,t)},getTileUrl:function(t){var e=this._map,i=this.options.tileSize,n=t.multiplyBy(i),s=n.add([i,i]),a=this._crs.project(e.unproject(n,t.z)),r=this._crs.project(e.unproject(s,t.z)),h=this._wmsVersion>=1.3&&this._crs===o.CRS.EPSG4326?[r.y,a.x,a.y,r.x].join(","):[a.x,r.y,r.x,a.y].join(","),l=o.Util.template(this._url,{s:this._getSubdomain(t)});return l+o.Util.getParamString(this.wmsParams,l,!0)+"&BBOX="+h},setParams:function(t,e){return o.extend(this.wmsParams,t),e||this.redraw(),this}}),o.tileLayer.wms=function(t,e){return new o.TileLayer.WMS(t,e)},o.TileLayer.Canvas=o.TileLayer.extend({options:{async:!1},initialize:function(t){o.setOptions(this,t)},redraw:function(){this._map&&(this._reset({hard:!0}),this._update());for(var t in this._tiles)this._redrawTile(this._tiles[t]);return this},_redrawTile:function(t){this.drawTile(t,t._tilePoint,this._map._zoom)},_createTile:function(){var t=o.DomUtil.create("canvas","leaflet-tile");return t.width=t.height=this.options.tileSize,t.onselectstart=t.onmousemove=o.Util.falseFn,t},_loadTile:function(t,e){t._layer=this,t._tilePoint=e,this._redrawTile(t),this.options.async||this.tileDrawn(t)},drawTile:function(){},tileDrawn:function(t){this._tileOnLoad.call(t)}}),o.tileLayer.canvas=function(t){return new o.TileLayer.Canvas(t)},o.ImageOverlay=o.Class.extend({includes:o.Mixin.Events,options:{opacity:1},initialize:function(t,e,i){this._url=t,this._bounds=o.latLngBounds(e),o.setOptions(this,i)},onAdd:function(t){this._map=t,this._image||this._initImage(),t._panes.overlayPane.appendChild(this._image),t.on("viewreset",this._reset,this),t.options.zoomAnimation&&o.Browser.any3d&&t.on("zoomanim",this._animateZoom,this),this._reset()},onRemove:function(t){t.getPanes().overlayPane.removeChild(this._image),t.off("viewreset",this._reset,this),t.options.zoomAnimation&&t.off("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},setOpacity:function(t){return this.options.opacity=t,this._updateOpacity(),this},bringToFront:function(){return this._image&&this._map._panes.overlayPane.appendChild(this._image),this},bringToBack:function(){var t=this._map._panes.overlayPane;return this._image&&t.insertBefore(this._image,t.firstChild),this},setUrl:function(t){this._url=t,this._image.src=this._url},getAttribution:function(){return this.options.attribution},_initImage:function(){this._image=o.DomUtil.create("img","leaflet-image-layer"),this._map.options.zoomAnimation&&o.Browser.any3d?o.DomUtil.addClass(this._image,"leaflet-zoom-animated"):o.DomUtil.addClass(this._image,"leaflet-zoom-hide"),this._updateOpacity(),o.extend(this._image,{galleryimg:"no",onselectstart:o.Util.falseFn,onmousemove:o.Util.falseFn,onload:o.bind(this._onImageLoad,this),src:this._url})},_animateZoom:function(t){var e=this._map,i=this._image,n=e.getZoomScale(t.zoom),s=this._bounds.getNorthWest(),a=this._bounds.getSouthEast(),r=e._latLngToNewLayerPoint(s,t.zoom,t.center),h=e._latLngToNewLayerPoint(a,t.zoom,t.center)._subtract(r),l=r._add(h._multiplyBy(.5*(1-1/n)));i.style[o.DomUtil.TRANSFORM]=o.DomUtil.getTranslateString(l)+" scale("+n+") "},_reset:function(){var t=this._image,e=this._map.latLngToLayerPoint(this._bounds.getNorthWest()),i=this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(e);o.DomUtil.setPosition(t,e),t.style.width=i.x+"px",t.style.height=i.y+"px"},_onImageLoad:function(){this.fire("load")},_updateOpacity:function(){o.DomUtil.setOpacity(this._image,this.options.opacity)}}),o.imageOverlay=function(t,e,i){return new o.ImageOverlay(t,e,i)},o.Icon=o.Class.extend({options:{className:""},initialize:function(t){o.setOptions(this,t)},createIcon:function(t){return this._createIcon("icon",t)},createShadow:function(t){return this._createIcon("shadow",t)},_createIcon:function(t,e){var i=this._getIconUrl(t);if(!i){if("icon"===t)throw new Error("iconUrl not set in Icon options (see the docs).");return null}var n;return n=e&&"IMG"===e.tagName?this._createImg(i,e):this._createImg(i),this._setIconStyles(n,t),n},_setIconStyles:function(t,e){var i,n=this.options,s=o.point(n[e+"Size"]);i=o.point("shadow"===e?n.shadowAnchor||n.iconAnchor:n.iconAnchor),!i&&s&&(i=s.divideBy(2,!0)),t.className="leaflet-marker-"+e+" "+n.className,i&&(t.style.marginLeft=-i.x+"px",t.style.marginTop=-i.y+"px"),s&&(t.style.width=s.x+"px",t.style.height=s.y+"px")},_createImg:function(t,i){return i=i||e.createElement("img"),i.src=t,i},_getIconUrl:function(t){return o.Browser.retina&&this.options[t+"RetinaUrl"]?this.options[t+"RetinaUrl"]:this.options[t+"Url"]}}),o.icon=function(t){return new o.Icon(t)},o.Icon.Default=o.Icon.extend({options:{iconSize:[25,41],iconAnchor:[12,41],popupAnchor:[1,-34],shadowSize:[41,41]},_getIconUrl:function(t){var e=t+"Url";if(this.options[e])return this.options[e];o.Browser.retina&&"icon"===t&&(t+="-2x");var i=o.Icon.Default.imagePath;if(!i)throw new Error("Couldn't autodetect L.Icon.Default.imagePath, set it manually.");return i+"/marker-"+t+".png"}}),o.Icon.Default.imagePath=function(){var t,i,n,o,s,a=e.getElementsByTagName("script"),r=/[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/;for(t=0,i=a.length;i>t;t++)if(n=a[t].src,o=n.match(r))return s=n.split(r)[0],(s?s+"/":"")+"images"}(),o.Marker=o.Class.extend({includes:o.Mixin.Events,options:{icon:new o.Icon.Default,title:"",alt:"",clickable:!0,draggable:!1,keyboard:!0,zIndexOffset:0,opacity:1,riseOnHover:!1,riseOffset:250},initialize:function(t,e){o.setOptions(this,e),this._latlng=o.latLng(t)},onAdd:function(t){this._map=t,t.on("viewreset",this.update,this),this._initIcon(),this.update(),this.fire("add"),t.options.zoomAnimation&&t.options.markerZoomAnimation&&t.on("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){this.dragging&&this.dragging.disable(),this._removeIcon(),this._removeShadow(),this.fire("remove"),t.off({viewreset:this.update,zoomanim:this._animateZoom},this),this._map=null},getLatLng:function(){return this._latlng},setLatLng:function(t){return this._latlng=o.latLng(t),this.update(),this.fire("move",{latlng:this._latlng})},setZIndexOffset:function(t){return this.options.zIndexOffset=t,this.update(),this},setIcon:function(t){return this.options.icon=t,this._map&&(this._initIcon(),this.update()),this._popup&&this.bindPopup(this._popup),this},update:function(){if(this._icon){var t=this._map.latLngToLayerPoint(this._latlng).round();this._setPos(t)}return this},_initIcon:function(){var t=this.options,e=this._map,i=e.options.zoomAnimation&&e.options.markerZoomAnimation,n=i?"leaflet-zoom-animated":"leaflet-zoom-hide",s=t.icon.createIcon(this._icon),a=!1;s!==this._icon&&(this._icon&&this._removeIcon(),a=!0,t.title&&(s.title=t.title),t.alt&&(s.alt=t.alt)),o.DomUtil.addClass(s,n),t.keyboard&&(s.tabIndex="0"),this._icon=s,this._initInteraction(),t.riseOnHover&&o.DomEvent.on(s,"mouseover",this._bringToFront,this).on(s,"mouseout",this._resetZIndex,this);var r=t.icon.createShadow(this._shadow),h=!1;r!==this._shadow&&(this._removeShadow(),h=!0),r&&o.DomUtil.addClass(r,n),this._shadow=r,t.opacity<1&&this._updateOpacity();var l=this._map._panes;a&&l.markerPane.appendChild(this._icon),r&&h&&l.shadowPane.appendChild(this._shadow)},_removeIcon:function(){this.options.riseOnHover&&o.DomEvent.off(this._icon,"mouseover",this._bringToFront).off(this._icon,"mouseout",this._resetZIndex),this._map._panes.markerPane.removeChild(this._icon),this._icon=null},_removeShadow:function(){this._shadow&&this._map._panes.shadowPane.removeChild(this._shadow),this._shadow=null},_setPos:function(t){o.DomUtil.setPosition(this._icon,t),this._shadow&&o.DomUtil.setPosition(this._shadow,t),this._zIndex=t.y+this.options.zIndexOffset,this._resetZIndex()},_updateZIndex:function(t){this._icon.style.zIndex=this._zIndex+t},_animateZoom:function(t){var e=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center).round();this._setPos(e)},_initInteraction:function(){if(this.options.clickable){var t=this._icon,e=["dblclick","mousedown","mouseover","mouseout","contextmenu"];o.DomUtil.addClass(t,"leaflet-clickable"),o.DomEvent.on(t,"click",this._onMouseClick,this),o.DomEvent.on(t,"keypress",this._onKeyPress,this);for(var i=0;is?(e.height=s+"px",o.DomUtil.addClass(t,a)):o.DomUtil.removeClass(t,a),this._containerWidth=this._container.offsetWidth},_updatePosition:function(){if(this._map){var t=this._map.latLngToLayerPoint(this._latlng),e=this._animated,i=o.point(this.options.offset);e&&o.DomUtil.setPosition(this._container,t),this._containerBottom=-i.y-(e?0:t.y),this._containerLeft=-Math.round(this._containerWidth/2)+i.x+(e?0:t.x),this._container.style.bottom=this._containerBottom+"px",this._container.style.left=this._containerLeft+"px"}},_zoomAnimation:function(t){var e=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center);o.DomUtil.setPosition(this._container,e)},_adjustPan:function(){if(this.options.autoPan){var t=this._map,e=this._container.offsetHeight,i=this._containerWidth,n=new o.Point(this._containerLeft,-e-this._containerBottom);this._animated&&n._add(o.DomUtil.getPosition(this._container));var s=t.layerPointToContainerPoint(n),a=o.point(this.options.autoPanPadding),r=o.point(this.options.autoPanPaddingTopLeft||a),h=o.point(this.options.autoPanPaddingBottomRight||a),l=t.getSize(),u=0,c=0;s.x+i+h.x>l.x&&(u=s.x+i-l.x+h.x),s.x-u-r.x<0&&(u=s.x-r.x),s.y+e+h.y>l.y&&(c=s.y+e-l.y+h.y),s.y-c-r.y<0&&(c=s.y-r.y),(u||c)&&t.fire("autopanstart").panBy([u,c])}},_onCloseButtonClick:function(t){this._close(),o.DomEvent.stop(t)}}),o.popup=function(t,e){return new o.Popup(t,e)},o.Map.include({openPopup:function(t,e,i){if(this.closePopup(),!(t instanceof o.Popup)){var n=t;t=new o.Popup(i).setLatLng(e).setContent(n)}return t._isOpen=!0,this._popup=t,this.addLayer(t)},closePopup:function(t){return t&&t!==this._popup||(t=this._popup,this._popup=null),t&&(this.removeLayer(t),t._isOpen=!1),this}}),o.Marker.include({openPopup:function(){return this._popup&&this._map&&!this._map.hasLayer(this._popup)&&(this._popup.setLatLng(this._latlng),this._map.openPopup(this._popup)),this},closePopup:function(){return this._popup&&this._popup._close(),this},togglePopup:function(){return this._popup&&(this._popup._isOpen?this.closePopup():this.openPopup()),this},bindPopup:function(t,e){var i=o.point(this.options.icon.options.popupAnchor||[0,0]);return i=i.add(o.Popup.prototype.options.offset),e&&e.offset&&(i=i.add(e.offset)),e=o.extend({offset:i},e),this._popupHandlersAdded||(this.on("click",this.togglePopup,this).on("remove",this.closePopup,this).on("move",this._movePopup,this),this._popupHandlersAdded=!0),t instanceof o.Popup?(o.setOptions(t,e),this._popup=t):this._popup=new o.Popup(e,this).setContent(t),this},setPopupContent:function(t){return this._popup&&this._popup.setContent(t),this},unbindPopup:function(){return this._popup&&(this._popup=null,this.off("click",this.togglePopup,this).off("remove",this.closePopup,this).off("move",this._movePopup,this),this._popupHandlersAdded=!1),this},getPopup:function(){return this._popup},_movePopup:function(t){this._popup.setLatLng(t.latlng)}}),o.LayerGroup=o.Class.extend({initialize:function(t){this._layers={};var e,i;if(t)for(e=0,i=t.length;i>e;e++)this.addLayer(t[e])},addLayer:function(t){var e=this.getLayerId(t);return this._layers[e]=t,this._map&&this._map.addLayer(t),this},removeLayer:function(t){var e=t in this._layers?t:this.getLayerId(t);return this._map&&this._layers[e]&&this._map.removeLayer(this._layers[e]),delete this._layers[e],this},hasLayer:function(t){return t?t in this._layers||this.getLayerId(t)in this._layers:!1},clearLayers:function(){return this.eachLayer(this.removeLayer,this),this},invoke:function(t){var e,i,n=Array.prototype.slice.call(arguments,1);for(e in this._layers)i=this._layers[e],i[t]&&i[t].apply(i,n);return this},onAdd:function(t){this._map=t,this.eachLayer(t.addLayer,t)},onRemove:function(t){this.eachLayer(t.removeLayer,t),this._map=null},addTo:function(t){return t.addLayer(this),this},eachLayer:function(t,e){for(var i in this._layers)t.call(e,this._layers[i]);return this},getLayer:function(t){return this._layers[t]},getLayers:function(){var t=[];for(var e in this._layers)t.push(this._layers[e]);return t},setZIndex:function(t){return this.invoke("setZIndex",t)},getLayerId:function(t){return o.stamp(t)}}),o.layerGroup=function(t){return new o.LayerGroup(t)},o.FeatureGroup=o.LayerGroup.extend({includes:o.Mixin.Events,statics:{EVENTS:"click dblclick mouseover mouseout mousemove contextmenu popupopen popupclose"},addLayer:function(t){return this.hasLayer(t)?this:("on"in t&&t.on(o.FeatureGroup.EVENTS,this._propagateEvent,this),o.LayerGroup.prototype.addLayer.call(this,t),this._popupContent&&t.bindPopup&&t.bindPopup(this._popupContent,this._popupOptions),this.fire("layeradd",{layer:t}))},removeLayer:function(t){return this.hasLayer(t)?(t in this._layers&&(t=this._layers[t]),t.off(o.FeatureGroup.EVENTS,this._propagateEvent,this),o.LayerGroup.prototype.removeLayer.call(this,t),this._popupContent&&this.invoke("unbindPopup"),this.fire("layerremove",{layer:t})):this},bindPopup:function(t,e){return this._popupContent=t,this._popupOptions=e,this.invoke("bindPopup",t,e)},openPopup:function(t){for(var e in this._layers){this._layers[e].openPopup(t);break}return this},setStyle:function(t){return this.invoke("setStyle",t)},bringToFront:function(){return this.invoke("bringToFront")},bringToBack:function(){return this.invoke("bringToBack")},getBounds:function(){var t=new o.LatLngBounds;return this.eachLayer(function(e){t.extend(e instanceof o.Marker?e.getLatLng():e.getBounds())}),t},_propagateEvent:function(t){t=o.extend({layer:t.target,target:this},t),this.fire(t.type,t)}}),o.featureGroup=function(t){return new o.FeatureGroup(t)},o.Path=o.Class.extend({includes:[o.Mixin.Events],statics:{CLIP_PADDING:function(){var e=o.Browser.mobile?1280:2e3,i=(e/Math.max(t.outerWidth,t.outerHeight)-1)/2;return Math.max(0,Math.min(.5,i))}()},options:{stroke:!0,color:"#0033ff",dashArray:null,lineCap:null,lineJoin:null,weight:5,opacity:.5,fill:!1,fillColor:null,fillOpacity:.2,clickable:!0},initialize:function(t){o.setOptions(this,t)},onAdd:function(t){this._map=t,this._container||(this._initElements(),this._initEvents()),this.projectLatlngs(),this._updatePath(),this._container&&this._map._pathRoot.appendChild(this._container),this.fire("add"),t.on({viewreset:this.projectLatlngs,moveend:this._updatePath},this)},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){t._pathRoot.removeChild(this._container),this.fire("remove"),this._map=null,o.Browser.vml&&(this._container=null,this._stroke=null,this._fill=null),t.off({viewreset:this.projectLatlngs,moveend:this._updatePath},this)},projectLatlngs:function(){},setStyle:function(t){return o.setOptions(this,t),this._container&&this._updateStyle(),this},redraw:function(){return this._map&&(this.projectLatlngs(),this._updatePath()),this}}),o.Map.include({_updatePathViewport:function(){var t=o.Path.CLIP_PADDING,e=this.getSize(),i=o.DomUtil.getPosition(this._mapPane),n=i.multiplyBy(-1)._subtract(e.multiplyBy(t)._round()),s=n.add(e.multiplyBy(1+2*t)._round());this._pathViewport=new o.Bounds(n,s)}}),o.Path.SVG_NS="http://www.w3.org/2000/svg",o.Browser.svg=!(!e.createElementNS||!e.createElementNS(o.Path.SVG_NS,"svg").createSVGRect),o.Path=o.Path.extend({statics:{SVG:o.Browser.svg},bringToFront:function(){var t=this._map._pathRoot,e=this._container;return e&&t.lastChild!==e&&t.appendChild(e),this},bringToBack:function(){var t=this._map._pathRoot,e=this._container,i=t.firstChild;return e&&i!==e&&t.insertBefore(e,i),this},getPathString:function(){},_createElement:function(t){return e.createElementNS(o.Path.SVG_NS,t)},_initElements:function(){this._map._initPathRoot(),this._initPath(),this._initStyle()},_initPath:function(){this._container=this._createElement("g"),this._path=this._createElement("path"),this.options.className&&o.DomUtil.addClass(this._path,this.options.className),this._container.appendChild(this._path)},_initStyle:function(){this.options.stroke&&(this._path.setAttribute("stroke-linejoin","round"),this._path.setAttribute("stroke-linecap","round")),this.options.fill&&this._path.setAttribute("fill-rule","evenodd"),this.options.pointerEvents&&this._path.setAttribute("pointer-events",this.options.pointerEvents),this.options.clickable||this.options.pointerEvents||this._path.setAttribute("pointer-events","none"),this._updateStyle()},_updateStyle:function(){this.options.stroke?(this._path.setAttribute("stroke",this.options.color),this._path.setAttribute("stroke-opacity",this.options.opacity),this._path.setAttribute("stroke-width",this.options.weight),this.options.dashArray?this._path.setAttribute("stroke-dasharray",this.options.dashArray):this._path.removeAttribute("stroke-dasharray"),this.options.lineCap&&this._path.setAttribute("stroke-linecap",this.options.lineCap),this.options.lineJoin&&this._path.setAttribute("stroke-linejoin",this.options.lineJoin)):this._path.setAttribute("stroke","none"),this.options.fill?(this._path.setAttribute("fill",this.options.fillColor||this.options.color),this._path.setAttribute("fill-opacity",this.options.fillOpacity)):this._path.setAttribute("fill","none")},_updatePath:function(){var t=this.getPathString();t||(t="M0 0"),this._path.setAttribute("d",t)},_initEvents:function(){if(this.options.clickable){(o.Browser.svg||!o.Browser.vml)&&o.DomUtil.addClass(this._path,"leaflet-clickable"),o.DomEvent.on(this._container,"click",this._onMouseClick,this);for(var t=["dblclick","mousedown","mouseover","mouseout","mousemove","contextmenu"],e=0;e';var i=t.firstChild;return i.style.behavior="url(#default#VML)",i&&"object"==typeof i.adj}catch(n){return!1}}(),o.Path=o.Browser.svg||!o.Browser.vml?o.Path:o.Path.extend({statics:{VML:!0,CLIP_PADDING:.02},_createElement:function(){try{return e.namespaces.add("lvml","urn:schemas-microsoft-com:vml"),function(t){return e.createElement("')}}catch(t){return function(t){return e.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}}(),_initPath:function(){var t=this._container=this._createElement("shape");o.DomUtil.addClass(t,"leaflet-vml-shape"+(this.options.className?" "+this.options.className:"")),this.options.clickable&&o.DomUtil.addClass(t,"leaflet-clickable"),t.coordsize="1 1",this._path=this._createElement("path"),t.appendChild(this._path),this._map._pathRoot.appendChild(t)},_initStyle:function(){this._updateStyle()},_updateStyle:function(){var t=this._stroke,e=this._fill,i=this.options,n=this._container;n.stroked=i.stroke,n.filled=i.fill,i.stroke?(t||(t=this._stroke=this._createElement("stroke"),t.endcap="round",n.appendChild(t)),t.weight=i.weight+"px",t.color=i.color,t.opacity=i.opacity,t.dashStyle=i.dashArray?o.Util.isArray(i.dashArray)?i.dashArray.join(" "):i.dashArray.replace(/( *, *)/g," "):"",i.lineCap&&(t.endcap=i.lineCap.replace("butt","flat")),i.lineJoin&&(t.joinstyle=i.lineJoin)):t&&(n.removeChild(t),this._stroke=null),i.fill?(e||(e=this._fill=this._createElement("fill"),n.appendChild(e)),e.color=i.fillColor||i.color,e.opacity=i.fillOpacity):e&&(n.removeChild(e),this._fill=null)},_updatePath:function(){var t=this._container.style;t.display="none",this._path.v=this.getPathString()+" ",t.display=""}}),o.Map.include(o.Browser.svg||!o.Browser.vml?{}:{_initPathRoot:function(){if(!this._pathRoot){var t=this._pathRoot=e.createElement("div");t.className="leaflet-vml-container",this._panes.overlayPane.appendChild(t),this.on("moveend",this._updatePathViewport),this._updatePathViewport()}}}),o.Browser.canvas=function(){return!!e.createElement("canvas").getContext}(),o.Path=o.Path.SVG&&!t.L_PREFER_CANVAS||!o.Browser.canvas?o.Path:o.Path.extend({statics:{CANVAS:!0,SVG:!1},redraw:function(){return this._map&&(this.projectLatlngs(),this._requestUpdate()),this},setStyle:function(t){return o.setOptions(this,t),this._map&&(this._updateStyle(),this._requestUpdate()),this},onRemove:function(t){t.off("viewreset",this.projectLatlngs,this).off("moveend",this._updatePath,this),this.options.clickable&&(this._map.off("click",this._onClick,this),this._map.off("mousemove",this._onMouseMove,this)),this._requestUpdate(),this.fire("remove"),this._map=null},_requestUpdate:function(){this._map&&!o.Path._updateRequest&&(o.Path._updateRequest=o.Util.requestAnimFrame(this._fireMapMoveEnd,this._map))},_fireMapMoveEnd:function(){o.Path._updateRequest=null,this.fire("moveend")},_initElements:function(){this._map._initPathRoot(),this._ctx=this._map._canvasCtx},_updateStyle:function(){var t=this.options;t.stroke&&(this._ctx.lineWidth=t.weight,this._ctx.strokeStyle=t.color),t.fill&&(this._ctx.fillStyle=t.fillColor||t.color)},_drawPath:function(){var t,e,i,n,s,a;for(this._ctx.beginPath(),t=0,i=this._parts.length;i>t;t++){for(e=0,n=this._parts[t].length;n>e;e++)s=this._parts[t][e],a=(0===e?"move":"line")+"To",this._ctx[a](s.x,s.y);this instanceof o.Polygon&&this._ctx.closePath()}},_checkIfEmpty:function(){return!this._parts.length},_updatePath:function(){if(!this._checkIfEmpty()){var t=this._ctx,e=this.options;this._drawPath(),t.save(),this._updateStyle(),e.fill&&(t.globalAlpha=e.fillOpacity,t.fill()),e.stroke&&(t.globalAlpha=e.opacity,t.stroke()),t.restore()}},_initEvents:function(){this.options.clickable&&(this._map.on("mousemove",this._onMouseMove,this),this._map.on("click",this._onClick,this))},_onClick:function(t){this._containsPoint(t.layerPoint)&&this.fire("click",t)},_onMouseMove:function(t){this._map&&!this._map._animatingZoom&&(this._containsPoint(t.layerPoint)?(this._ctx.canvas.style.cursor="pointer",this._mouseInside=!0,this.fire("mouseover",t)):this._mouseInside&&(this._ctx.canvas.style.cursor="",this._mouseInside=!1,this.fire("mouseout",t)))}}),o.Map.include(o.Path.SVG&&!t.L_PREFER_CANVAS||!o.Browser.canvas?{}:{_initPathRoot:function(){var t,i=this._pathRoot;i||(i=this._pathRoot=e.createElement("canvas"),i.style.position="absolute",t=this._canvasCtx=i.getContext("2d"),t.lineCap="round",t.lineJoin="round",this._panes.overlayPane.appendChild(i),this.options.zoomAnimation&&(this._pathRoot.className="leaflet-zoom-animated",this.on("zoomanim",this._animatePathZoom),this.on("zoomend",this._endPathZoom)),this.on("moveend",this._updateCanvasViewport),this._updateCanvasViewport())},_updateCanvasViewport:function(){if(!this._pathZooming){this._updatePathViewport();var t=this._pathViewport,e=t.min,i=t.max.subtract(e),n=this._pathRoot;o.DomUtil.setPosition(n,e),n.width=i.x,n.height=i.y,n.getContext("2d").translate(-e.x,-e.y)}}}),o.LineUtil={simplify:function(t,e){if(!e||!t.length)return t.slice();var i=e*e;return t=this._reducePoints(t,i),t=this._simplifyDP(t,i)},pointToSegmentDistance:function(t,e,i){return Math.sqrt(this._sqClosestPointOnSegment(t,e,i,!0))},closestPointOnSegment:function(t,e,i){return this._sqClosestPointOnSegment(t,e,i)},_simplifyDP:function(t,e){var n=t.length,o=typeof Uint8Array!=i+""?Uint8Array:Array,s=new o(n);s[0]=s[n-1]=1,this._simplifyDPStep(t,s,e,0,n-1);var a,r=[];for(a=0;n>a;a++)s[a]&&r.push(t[a]);return r},_simplifyDPStep:function(t,e,i,n,o){var s,a,r,h=0;for(a=n+1;o-1>=a;a++)r=this._sqClosestPointOnSegment(t[a],t[n],t[o],!0),r>h&&(s=a,h=r);h>i&&(e[s]=1,this._simplifyDPStep(t,e,i,n,s),this._simplifyDPStep(t,e,i,s,o))},_reducePoints:function(t,e){for(var i=[t[0]],n=1,o=0,s=t.length;s>n;n++)this._sqDist(t[n],t[o])>e&&(i.push(t[n]),o=n);return s-1>o&&i.push(t[s-1]),i},clipSegment:function(t,e,i,n){var o,s,a,r=n?this._lastCode:this._getBitCode(t,i),h=this._getBitCode(e,i);for(this._lastCode=h;;){if(!(r|h))return[t,e];if(r&h)return!1;o=r||h,s=this._getEdgeIntersection(t,e,o,i),a=this._getBitCode(s,i),o===r?(t=s,r=a):(e=s,h=a)}},_getEdgeIntersection:function(t,e,i,n){var s=e.x-t.x,a=e.y-t.y,r=n.min,h=n.max;return 8&i?new o.Point(t.x+s*(h.y-t.y)/a,h.y):4&i?new o.Point(t.x+s*(r.y-t.y)/a,r.y):2&i?new o.Point(h.x,t.y+a*(h.x-t.x)/s):1&i?new o.Point(r.x,t.y+a*(r.x-t.x)/s):void 0},_getBitCode:function(t,e){var i=0;return t.xe.max.x&&(i|=2),t.ye.max.y&&(i|=8),i},_sqDist:function(t,e){var i=e.x-t.x,n=e.y-t.y;return i*i+n*n},_sqClosestPointOnSegment:function(t,e,i,n){var s,a=e.x,r=e.y,h=i.x-a,l=i.y-r,u=h*h+l*l;return u>0&&(s=((t.x-a)*h+(t.y-r)*l)/u,s>1?(a=i.x,r=i.y):s>0&&(a+=h*s,r+=l*s)),h=t.x-a,l=t.y-r,n?h*h+l*l:new o.Point(a,r)}},o.Polyline=o.Path.extend({initialize:function(t,e){o.Path.prototype.initialize.call(this,e),this._latlngs=this._convertLatLngs(t)},options:{smoothFactor:1,noClip:!1},projectLatlngs:function(){this._originalPoints=[];for(var t=0,e=this._latlngs.length;e>t;t++)this._originalPoints[t]=this._map.latLngToLayerPoint(this._latlngs[t])},getPathString:function(){for(var t=0,e=this._parts.length,i="";e>t;t++)i+=this._getPathPartStr(this._parts[t]);return i},getLatLngs:function(){return this._latlngs},setLatLngs:function(t){return this._latlngs=this._convertLatLngs(t),this.redraw()},addLatLng:function(t){return this._latlngs.push(o.latLng(t)),this.redraw()},spliceLatLngs:function(){var t=[].splice.apply(this._latlngs,arguments);return this._convertLatLngs(this._latlngs,!0),this.redraw(),t},closestLayerPoint:function(t){for(var e,i,n=1/0,s=this._parts,a=null,r=0,h=s.length;h>r;r++)for(var l=s[r],u=1,c=l.length;c>u;u++){e=l[u-1],i=l[u];var d=o.LineUtil._sqClosestPointOnSegment(t,e,i,!0);n>d&&(n=d,a=o.LineUtil._sqClosestPointOnSegment(t,e,i))}return a&&(a.distance=Math.sqrt(n)),a},getBounds:function(){return new o.LatLngBounds(this.getLatLngs())},_convertLatLngs:function(t,e){var i,n,s=e?t:[];for(i=0,n=t.length;n>i;i++){if(o.Util.isArray(t[i])&&"number"!=typeof t[i][0])return;s[i]=o.latLng(t[i])}return s},_initEvents:function(){o.Path.prototype._initEvents.call(this)},_getPathPartStr:function(t){for(var e,i=o.Path.VML,n=0,s=t.length,a="";s>n;n++)e=t[n],i&&e._round(),a+=(n?"L":"M")+e.x+" "+e.y;return a},_clipPoints:function(){var t,e,i,n=this._originalPoints,s=n.length;if(this.options.noClip)return void(this._parts=[n]);this._parts=[];var a=this._parts,r=this._map._pathViewport,h=o.LineUtil;for(t=0,e=0;s-1>t;t++)i=h.clipSegment(n[t],n[t+1],r,t),i&&(a[e]=a[e]||[],a[e].push(i[0]),(i[1]!==n[t+1]||t===s-2)&&(a[e].push(i[1]),e++))},_simplifyPoints:function(){for(var t=this._parts,e=o.LineUtil,i=0,n=t.length;n>i;i++)t[i]=e.simplify(t[i],this.options.smoothFactor)},_updatePath:function(){this._map&&(this._clipPoints(),this._simplifyPoints(),o.Path.prototype._updatePath.call(this))}}),o.polyline=function(t,e){return new o.Polyline(t,e)},o.PolyUtil={},o.PolyUtil.clipPolygon=function(t,e){var i,n,s,a,r,h,l,u,c,d=[1,4,2,8],p=o.LineUtil;for(n=0,l=t.length;l>n;n++)t[n]._code=p._getBitCode(t[n],e);for(a=0;4>a;a++){for(u=d[a],i=[],n=0,l=t.length,s=l-1;l>n;s=n++)r=t[n],h=t[s],r._code&u?h._code&u||(c=p._getEdgeIntersection(h,r,u,e),c._code=p._getBitCode(c,e),i.push(c)):(h._code&u&&(c=p._getEdgeIntersection(h,r,u,e),c._code=p._getBitCode(c,e),i.push(c)),i.push(r));t=i}return t},o.Polygon=o.Polyline.extend({options:{fill:!0},initialize:function(t,e){o.Polyline.prototype.initialize.call(this,t,e),this._initWithHoles(t)},_initWithHoles:function(t){var e,i,n;if(t&&o.Util.isArray(t[0])&&"number"!=typeof t[0][0])for(this._latlngs=this._convertLatLngs(t[0]),this._holes=t.slice(1),e=0,i=this._holes.length;i>e;e++)n=this._holes[e]=this._convertLatLngs(this._holes[e]),n[0].equals(n[n.length-1])&&n.pop();t=this._latlngs,t.length>=2&&t[0].equals(t[t.length-1])&&t.pop()},projectLatlngs:function(){if(o.Polyline.prototype.projectLatlngs.call(this),this._holePoints=[],this._holes){var t,e,i,n;for(t=0,i=this._holes.length;i>t;t++)for(this._holePoints[t]=[],e=0,n=this._holes[t].length;n>e;e++)this._holePoints[t][e]=this._map.latLngToLayerPoint(this._holes[t][e])}},setLatLngs:function(t){return t&&o.Util.isArray(t[0])&&"number"!=typeof t[0][0]?(this._initWithHoles(t),this.redraw()):o.Polyline.prototype.setLatLngs.call(this,t)},_clipPoints:function(){var t=this._originalPoints,e=[];if(this._parts=[t].concat(this._holePoints),!this.options.noClip){for(var i=0,n=this._parts.length;n>i;i++){var s=o.PolyUtil.clipPolygon(this._parts[i],this._map._pathViewport);s.length&&e.push(s)}this._parts=e}},_getPathPartStr:function(t){var e=o.Polyline.prototype._getPathPartStr.call(this,t);return e+(o.Browser.svg?"z":"x")}}),o.polygon=function(t,e){return new o.Polygon(t,e)},function(){function t(t){return o.FeatureGroup.extend({initialize:function(t,e){this._layers={},this._options=e,this.setLatLngs(t)},setLatLngs:function(e){var i=0,n=e.length;for(this.eachLayer(function(t){n>i?t.setLatLngs(e[i++]):this.removeLayer(t)},this);n>i;)this.addLayer(new t(e[i++],this._options));return this},getLatLngs:function(){var t=[];return this.eachLayer(function(e){t.push(e.getLatLngs())}),t}})}o.MultiPolyline=t(o.Polyline),o.MultiPolygon=t(o.Polygon),o.multiPolyline=function(t,e){return new o.MultiPolyline(t,e)},o.multiPolygon=function(t,e){return new o.MultiPolygon(t,e)}}(),o.Rectangle=o.Polygon.extend({initialize:function(t,e){o.Polygon.prototype.initialize.call(this,this._boundsToLatLngs(t),e)},setBounds:function(t){this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return t=o.latLngBounds(t),[t.getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}}),o.rectangle=function(t,e){return new o.Rectangle(t,e)},o.Circle=o.Path.extend({initialize:function(t,e,i){o.Path.prototype.initialize.call(this,i),this._latlng=o.latLng(t),this._mRadius=e},options:{fill:!0},setLatLng:function(t){return this._latlng=o.latLng(t),this.redraw()},setRadius:function(t){return this._mRadius=t,this.redraw()},projectLatlngs:function(){var t=this._getLngRadius(),e=this._latlng,i=this._map.latLngToLayerPoint([e.lat,e.lng-t]);this._point=this._map.latLngToLayerPoint(e),this._radius=Math.max(this._point.x-i.x,1)},getBounds:function(){var t=this._getLngRadius(),e=this._mRadius/40075017*360,i=this._latlng;return new o.LatLngBounds([i.lat-e,i.lng-t],[i.lat+e,i.lng+t])},getLatLng:function(){return this._latlng},getPathString:function(){var t=this._point,e=this._radius;return this._checkIfEmpty()?"":o.Browser.svg?"M"+t.x+","+(t.y-e)+"A"+e+","+e+",0,1,1,"+(t.x-.1)+","+(t.y-e)+" z":(t._round(),e=Math.round(e),"AL "+t.x+","+t.y+" "+e+","+e+" 0,23592600")},getRadius:function(){return this._mRadius},_getLatRadius:function(){return this._mRadius/40075017*360},_getLngRadius:function(){return this._getLatRadius()/Math.cos(o.LatLng.DEG_TO_RAD*this._latlng.lat)},_checkIfEmpty:function(){if(!this._map)return!1;var t=this._map._pathViewport,e=this._radius,i=this._point;return i.x-e>t.max.x||i.y-e>t.max.y||i.x+ei;i++)for(l=this._parts[i],n=0,r=l.length,s=r-1;r>n;s=n++)if((e||0!==n)&&(h=o.LineUtil.pointToSegmentDistance(t,l[s],l[n]),u>=h))return!0;return!1}}:{}),o.Polygon.include(o.Path.CANVAS?{_containsPoint:function(t){var e,i,n,s,a,r,h,l,u=!1;if(o.Polyline.prototype._containsPoint.call(this,t,!0))return!0;for(s=0,h=this._parts.length;h>s;s++)for(e=this._parts[s],a=0,l=e.length,r=l-1;l>a;r=a++)i=e[a],n=e[r],i.y>t.y!=n.y>t.y&&t.x<(n.x-i.x)*(t.y-i.y)/(n.y-i.y)+i.x&&(u=!u);return u}}:{}),o.Circle.include(o.Path.CANVAS?{_drawPath:function(){var t=this._point;this._ctx.beginPath(),this._ctx.arc(t.x,t.y,this._radius,0,2*Math.PI,!1)},_containsPoint:function(t){var e=this._point,i=this.options.stroke?this.options.weight/2:0;return t.distanceTo(e)<=this._radius+i}}:{}),o.CircleMarker.include(o.Path.CANVAS?{_updateStyle:function(){o.Path.prototype._updateStyle.call(this)}}:{}),o.GeoJSON=o.FeatureGroup.extend({initialize:function(t,e){o.setOptions(this,e),this._layers={},t&&this.addData(t)},addData:function(t){var e,i,n,s=o.Util.isArray(t)?t:t.features;if(s){for(e=0,i=s.length;i>e;e++)n=s[e],(n.geometries||n.geometry||n.features||n.coordinates)&&this.addData(s[e]);return this}var a=this.options;if(!a.filter||a.filter(t)){var r=o.GeoJSON.geometryToLayer(t,a.pointToLayer,a.coordsToLatLng,a);return r.feature=o.GeoJSON.asFeature(t),r.defaultOptions=r.options,this.resetStyle(r),a.onEachFeature&&a.onEachFeature(t,r),this.addLayer(r)}},resetStyle:function(t){var e=this.options.style;e&&(o.Util.extend(t.options,t.defaultOptions),this._setLayerStyle(t,e))},setStyle:function(t){this.eachLayer(function(e){this._setLayerStyle(e,t)},this)},_setLayerStyle:function(t,e){"function"==typeof e&&(e=e(t.feature)),t.setStyle&&t.setStyle(e)}}),o.extend(o.GeoJSON,{geometryToLayer:function(t,e,i,n){var s,a,r,h,l="Feature"===t.type?t.geometry:t,u=l.coordinates,c=[];switch(i=i||this.coordsToLatLng,l.type){case"Point":return s=i(u),e?e(t,s):new o.Marker(s);case"MultiPoint":for(r=0,h=u.length;h>r;r++)s=i(u[r]),c.push(e?e(t,s):new o.Marker(s));return new o.FeatureGroup(c);case"LineString":return a=this.coordsToLatLngs(u,0,i),new o.Polyline(a,n);case"Polygon":if(2===u.length&&!u[1].length)throw new Error("Invalid GeoJSON object.");return a=this.coordsToLatLngs(u,1,i),new o.Polygon(a,n);case"MultiLineString":return a=this.coordsToLatLngs(u,1,i),new o.MultiPolyline(a,n);case"MultiPolygon":return a=this.coordsToLatLngs(u,2,i),new o.MultiPolygon(a,n);case"GeometryCollection":for(r=0,h=l.geometries.length;h>r;r++)c.push(this.geometryToLayer({geometry:l.geometries[r],type:"Feature",properties:t.properties},e,i,n));return new o.FeatureGroup(c);default:throw new Error("Invalid GeoJSON object.")}},coordsToLatLng:function(t){return new o.LatLng(t[1],t[0],t[2])},coordsToLatLngs:function(t,e,i){var n,o,s,a=[];for(o=0,s=t.length;s>o;o++)n=e?this.coordsToLatLngs(t[o],e-1,i):(i||this.coordsToLatLng)(t[o]),a.push(n);return a},latLngToCoords:function(t){var e=[t.lng,t.lat];return t.alt!==i&&e.push(t.alt),e},latLngsToCoords:function(t){for(var e=[],i=0,n=t.length;n>i;i++)e.push(o.GeoJSON.latLngToCoords(t[i]));return e},getFeature:function(t,e){return t.feature?o.extend({},t.feature,{geometry:e}):o.GeoJSON.asFeature(e)},asFeature:function(t){return"Feature"===t.type?t:{type:"Feature",properties:{},geometry:t}}});var a={toGeoJSON:function(){return o.GeoJSON.getFeature(this,{type:"Point",coordinates:o.GeoJSON.latLngToCoords(this.getLatLng())})}};o.Marker.include(a),o.Circle.include(a),o.CircleMarker.include(a),o.Polyline.include({toGeoJSON:function(){return o.GeoJSON.getFeature(this,{type:"LineString",coordinates:o.GeoJSON.latLngsToCoords(this.getLatLngs())})}}),o.Polygon.include({toGeoJSON:function(){var t,e,i,n=[o.GeoJSON.latLngsToCoords(this.getLatLngs())];if(n[0].push(n[0][0]),this._holes)for(t=0,e=this._holes.length;e>t;t++)i=o.GeoJSON.latLngsToCoords(this._holes[t]),i.push(i[0]),n.push(i);return o.GeoJSON.getFeature(this,{type:"Polygon",coordinates:n})}}),function(){function t(t){return function(){var e=[];return this.eachLayer(function(t){e.push(t.toGeoJSON().geometry.coordinates)}),o.GeoJSON.getFeature(this,{type:t,coordinates:e})}}o.MultiPolyline.include({toGeoJSON:t("MultiLineString")}),o.MultiPolygon.include({toGeoJSON:t("MultiPolygon")}),o.LayerGroup.include({toGeoJSON:function(){var e,i=this.feature&&this.feature.geometry,n=[];if(i&&"MultiPoint"===i.type)return t("MultiPoint").call(this);var s=i&&"GeometryCollection"===i.type;return this.eachLayer(function(t){t.toGeoJSON&&(e=t.toGeoJSON(),n.push(s?e.geometry:o.GeoJSON.asFeature(e)))}),s?o.GeoJSON.getFeature(this,{geometries:n,type:"GeometryCollection"}):{type:"FeatureCollection",features:n}}})}(),o.geoJson=function(t,e){return new o.GeoJSON(t,e)},o.DomEvent={addListener:function(t,e,i,n){var s,a,r,h=o.stamp(i),l="_leaflet_"+e+h;return t[l]?this:(s=function(e){return i.call(n||t,e||o.DomEvent._getEvent())},o.Browser.pointer&&0===e.indexOf("touch")?this.addPointerListener(t,e,s,h):(o.Browser.touch&&"dblclick"===e&&this.addDoubleTapListener&&this.addDoubleTapListener(t,s,h),"addEventListener"in t?"mousewheel"===e?(t.addEventListener("DOMMouseScroll",s,!1),t.addEventListener(e,s,!1)):"mouseenter"===e||"mouseleave"===e?(a=s,r="mouseenter"===e?"mouseover":"mouseout",s=function(e){return o.DomEvent._checkMouse(t,e)?a(e):void 0},t.addEventListener(r,s,!1)):"click"===e&&o.Browser.android?(a=s,s=function(t){return o.DomEvent._filterClick(t,a)},t.addEventListener(e,s,!1)):t.addEventListener(e,s,!1):"attachEvent"in t&&t.attachEvent("on"+e,s),t[l]=s,this))},removeListener:function(t,e,i){var n=o.stamp(i),s="_leaflet_"+e+n,a=t[s];return a?(o.Browser.pointer&&0===e.indexOf("touch")?this.removePointerListener(t,e,n):o.Browser.touch&&"dblclick"===e&&this.removeDoubleTapListener?this.removeDoubleTapListener(t,n):"removeEventListener"in t?"mousewheel"===e?(t.removeEventListener("DOMMouseScroll",a,!1),t.removeEventListener(e,a,!1)):"mouseenter"===e||"mouseleave"===e?t.removeEventListener("mouseenter"===e?"mouseover":"mouseout",a,!1):t.removeEventListener(e,a,!1):"detachEvent"in t&&t.detachEvent("on"+e,a),t[s]=null,this):this},stopPropagation:function(t){return t.stopPropagation?t.stopPropagation():t.cancelBubble=!0,o.DomEvent._skipped(t),this},disableScrollPropagation:function(t){var e=o.DomEvent.stopPropagation;return o.DomEvent.on(t,"mousewheel",e).on(t,"MozMousePixelScroll",e)},disableClickPropagation:function(t){for(var e=o.DomEvent.stopPropagation,i=o.Draggable.START.length-1;i>=0;i--)o.DomEvent.on(t,o.Draggable.START[i],e);return o.DomEvent.on(t,"click",o.DomEvent._fakeStop).on(t,"dblclick",e)},preventDefault:function(t){return t.preventDefault?t.preventDefault():t.returnValue=!1,this},stop:function(t){return o.DomEvent.preventDefault(t).stopPropagation(t)},getMousePosition:function(t,e){if(!e)return new o.Point(t.clientX,t.clientY);var i=e.getBoundingClientRect();return new o.Point(t.clientX-i.left-e.clientLeft,t.clientY-i.top-e.clientTop)},getWheelDelta:function(t){var e=0;return t.wheelDelta&&(e=t.wheelDelta/120),t.detail&&(e=-t.detail/3),e},_skipEvents:{},_fakeStop:function(t){o.DomEvent._skipEvents[t.type]=!0},_skipped:function(t){var e=this._skipEvents[t.type];return this._skipEvents[t.type]=!1,e},_checkMouse:function(t,e){var i=e.relatedTarget;if(!i)return!0;try{for(;i&&i!==t;)i=i.parentNode}catch(n){return!1}return i!==t},_getEvent:function(){var e=t.event;if(!e)for(var i=arguments.callee.caller;i&&(e=i.arguments[0],!e||t.Event!==e.constructor);)i=i.caller;return e},_filterClick:function(t,e){var i=t.timeStamp||t.originalEvent.timeStamp,n=o.DomEvent._lastClick&&i-o.DomEvent._lastClick;return n&&n>100&&500>n||t.target._simulatedClick&&!t._simulated?void o.DomEvent.stop(t):(o.DomEvent._lastClick=i,e(t))}},o.DomEvent.on=o.DomEvent.addListener,o.DomEvent.off=o.DomEvent.removeListener,o.Draggable=o.Class.extend({includes:o.Mixin.Events,statics:{START:o.Browser.touch?["touchstart","mousedown"]:["mousedown"],END:{mousedown:"mouseup",touchstart:"touchend",pointerdown:"touchend",MSPointerDown:"touchend"},MOVE:{mousedown:"mousemove",touchstart:"touchmove",pointerdown:"touchmove",MSPointerDown:"touchmove"}},initialize:function(t,e){this._element=t,this._dragStartTarget=e||t},enable:function(){if(!this._enabled){for(var t=o.Draggable.START.length-1;t>=0;t--)o.DomEvent.on(this._dragStartTarget,o.Draggable.START[t],this._onDown,this);this._enabled=!0}},disable:function(){if(this._enabled){for(var t=o.Draggable.START.length-1;t>=0;t--)o.DomEvent.off(this._dragStartTarget,o.Draggable.START[t],this._onDown,this);this._enabled=!1,this._moved=!1}},_onDown:function(t){if(this._moved=!1,!(t.shiftKey||1!==t.which&&1!==t.button&&!t.touches||(o.DomEvent.stopPropagation(t),o.Draggable._disabled||(o.DomUtil.disableImageDrag(),o.DomUtil.disableTextSelection(),this._moving)))){var i=t.touches?t.touches[0]:t;this._startPoint=new o.Point(i.clientX,i.clientY),this._startPos=this._newPos=o.DomUtil.getPosition(this._element),o.DomEvent.on(e,o.Draggable.MOVE[t.type],this._onMove,this).on(e,o.Draggable.END[t.type],this._onUp,this)}},_onMove:function(t){if(t.touches&&t.touches.length>1)return void(this._moved=!0);var i=t.touches&&1===t.touches.length?t.touches[0]:t,n=new o.Point(i.clientX,i.clientY),s=n.subtract(this._startPoint);(s.x||s.y)&&(o.Browser.touch&&Math.abs(s.x)+Math.abs(s.y)<3||(o.DomEvent.preventDefault(t),this._moved||(this.fire("dragstart"),this._moved=!0,this._startPos=o.DomUtil.getPosition(this._element).subtract(s),o.DomUtil.addClass(e.body,"leaflet-dragging"),this._lastTarget=t.target||t.srcElement,o.DomUtil.addClass(this._lastTarget,"leaflet-drag-target")),this._newPos=this._startPos.add(s),this._moving=!0,o.Util.cancelAnimFrame(this._animRequest),this._animRequest=o.Util.requestAnimFrame(this._updatePosition,this,!0,this._dragStartTarget)))},_updatePosition:function(){this.fire("predrag"),o.DomUtil.setPosition(this._element,this._newPos),this.fire("drag")},_onUp:function(){o.DomUtil.removeClass(e.body,"leaflet-dragging"),this._lastTarget&&(o.DomUtil.removeClass(this._lastTarget,"leaflet-drag-target"),this._lastTarget=null);for(var t in o.Draggable.MOVE)o.DomEvent.off(e,o.Draggable.MOVE[t],this._onMove).off(e,o.Draggable.END[t],this._onUp);o.DomUtil.enableImageDrag(),o.DomUtil.enableTextSelection(),this._moved&&this._moving&&(o.Util.cancelAnimFrame(this._animRequest),this.fire("dragend",{distance:this._newPos.distanceTo(this._startPos)})),this._moving=!1}}),o.Handler=o.Class.extend({initialize:function(t){this._map=t},enable:function(){this._enabled||(this._enabled=!0,this.addHooks())},disable:function(){this._enabled&&(this._enabled=!1,this.removeHooks())},enabled:function(){return!!this._enabled}}),o.Map.mergeOptions({dragging:!0,inertia:!o.Browser.android23,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,inertiaThreshold:o.Browser.touch?32:18,easeLinearity:.25,worldCopyJump:!1}),o.Map.Drag=o.Handler.extend({addHooks:function(){if(!this._draggable){var t=this._map;this._draggable=new o.Draggable(t._mapPane,t._container),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDrag,this),t.on("viewreset",this._onViewReset,this),t.whenReady(this._onViewReset,this))}this._draggable.enable()},removeHooks:function(){this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},_onDragStart:function(){var t=this._map;t._panAnim&&t._panAnim.stop(),t.fire("movestart").fire("dragstart"),t.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(){if(this._map.options.inertia){var t=this._lastTime=+new Date,e=this._lastPos=this._draggable._newPos;this._positions.push(e),this._times.push(t),t-this._times[0]>200&&(this._positions.shift(),this._times.shift())}this._map.fire("move").fire("drag")},_onViewReset:function(){var t=this._map.getSize()._divideBy(2),e=this._map.latLngToLayerPoint([0,0]);this._initialWorldOffset=e.subtract(t).x,this._worldWidth=this._map.project([0,180]).x},_onPreDrag:function(){var t=this._worldWidth,e=Math.round(t/2),i=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-e+i)%t+e-i,s=(n+e+i)%t-e-i,a=Math.abs(o+i)i.inertiaThreshold||!this._positions[0];if(e.fire("dragend",t),s)e.fire("moveend");else{var a=this._lastPos.subtract(this._positions[0]),r=(this._lastTime+n-this._times[0])/1e3,h=i.easeLinearity,l=a.multiplyBy(h/r),u=l.distanceTo([0,0]),c=Math.min(i.inertiaMaxSpeed,u),d=l.multiplyBy(c/u),p=c/(i.inertiaDeceleration*h),_=d.multiplyBy(-p/2).round();_.x&&_.y?(_=e._limitOffset(_,e.options.maxBounds),o.Util.requestAnimFrame(function(){e.panBy(_,{duration:p,easeLinearity:h,noMoveStart:!0})})):e.fire("moveend")}}}),o.Map.addInitHook("addHandler","dragging",o.Map.Drag),o.Map.mergeOptions({doubleClickZoom:!0}),o.Map.DoubleClickZoom=o.Handler.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick,this)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick,this)},_onDoubleClick:function(t){var e=this._map,i=e.getZoom()+(t.originalEvent.shiftKey?-1:1);"center"===e.options.doubleClickZoom?e.setZoom(i):e.setZoomAround(t.containerPoint,i)}}),o.Map.addInitHook("addHandler","doubleClickZoom",o.Map.DoubleClickZoom),o.Map.mergeOptions({scrollWheelZoom:!0}),o.Map.ScrollWheelZoom=o.Handler.extend({addHooks:function(){o.DomEvent.on(this._map._container,"mousewheel",this._onWheelScroll,this),o.DomEvent.on(this._map._container,"MozMousePixelScroll",o.DomEvent.preventDefault),this._delta=0},removeHooks:function(){o.DomEvent.off(this._map._container,"mousewheel",this._onWheelScroll),o.DomEvent.off(this._map._container,"MozMousePixelScroll",o.DomEvent.preventDefault)},_onWheelScroll:function(t){var e=o.DomEvent.getWheelDelta(t);this._delta+=e,this._lastMousePos=this._map.mouseEventToContainerPoint(t),this._startTime||(this._startTime=+new Date);var i=Math.max(40-(+new Date-this._startTime),0);clearTimeout(this._timer),this._timer=setTimeout(o.bind(this._performZoom,this),i),o.DomEvent.preventDefault(t),o.DomEvent.stopPropagation(t)},_performZoom:function(){var t=this._map,e=this._delta,i=t.getZoom();e=e>0?Math.ceil(e):Math.floor(e),e=Math.max(Math.min(e,4),-4),e=t._limitZoom(i+e)-i,this._delta=0,this._startTime=null,e&&("center"===t.options.scrollWheelZoom?t.setZoom(i+e):t.setZoomAround(this._lastMousePos,i+e))}}),o.Map.addInitHook("addHandler","scrollWheelZoom",o.Map.ScrollWheelZoom),o.extend(o.DomEvent,{_touchstart:o.Browser.msPointer?"MSPointerDown":o.Browser.pointer?"pointerdown":"touchstart",_touchend:o.Browser.msPointer?"MSPointerUp":o.Browser.pointer?"pointerup":"touchend",addDoubleTapListener:function(t,i,n){function s(t){var e;if(o.Browser.pointer?(_.push(t.pointerId),e=_.length):e=t.touches.length,!(e>1)){var i=Date.now(),n=i-(r||i);h=t.touches?t.touches[0]:t,l=n>0&&u>=n,r=i}}function a(t){if(o.Browser.pointer){var e=_.indexOf(t.pointerId);if(-1===e)return;_.splice(e,1)}if(l){if(o.Browser.pointer){var n,s={};for(var a in h)n=h[a],s[a]="function"==typeof n?n.bind(h):n;h=s}h.type="dblclick",i(h),r=null}}var r,h,l=!1,u=250,c="_leaflet_",d=this._touchstart,p=this._touchend,_=[];t[c+d+n]=s,t[c+p+n]=a;var m=o.Browser.pointer?e.documentElement:t;return t.addEventListener(d,s,!1),m.addEventListener(p,a,!1),o.Browser.pointer&&m.addEventListener(o.DomEvent.POINTER_CANCEL,a,!1),this},removeDoubleTapListener:function(t,i){var n="_leaflet_";return t.removeEventListener(this._touchstart,t[n+this._touchstart+i],!1),(o.Browser.pointer?e.documentElement:t).removeEventListener(this._touchend,t[n+this._touchend+i],!1),o.Browser.pointer&&e.documentElement.removeEventListener(o.DomEvent.POINTER_CANCEL,t[n+this._touchend+i],!1),this}}),o.extend(o.DomEvent,{POINTER_DOWN:o.Browser.msPointer?"MSPointerDown":"pointerdown",POINTER_MOVE:o.Browser.msPointer?"MSPointerMove":"pointermove",POINTER_UP:o.Browser.msPointer?"MSPointerUp":"pointerup",POINTER_CANCEL:o.Browser.msPointer?"MSPointerCancel":"pointercancel",_pointers:[],_pointerDocumentListener:!1,addPointerListener:function(t,e,i,n){switch(e){case"touchstart":return this.addPointerListenerStart(t,e,i,n);case"touchend":return this.addPointerListenerEnd(t,e,i,n);case"touchmove":return this.addPointerListenerMove(t,e,i,n);default:throw"Unknown touch event type"}},addPointerListenerStart:function(t,i,n,s){var a="_leaflet_",r=this._pointers,h=function(t){o.DomEvent.preventDefault(t);for(var e=!1,i=0;i1))&&(this._moved||(o.DomUtil.addClass(e._mapPane,"leaflet-touching"),e.fire("movestart").fire("zoomstart"),this._moved=!0),o.Util.cancelAnimFrame(this._animRequest),this._animRequest=o.Util.requestAnimFrame(this._updateOnMove,this,!0,this._map._container),o.DomEvent.preventDefault(t))}},_updateOnMove:function(){var t=this._map,e=this._getScaleOrigin(),i=t.layerPointToLatLng(e),n=t.getScaleZoom(this._scale);t._animateZoom(i,n,this._startCenter,this._scale,this._delta,!1,!0)},_onTouchEnd:function(){if(!this._moved||!this._zooming)return void(this._zooming=!1);var t=this._map;this._zooming=!1,o.DomUtil.removeClass(t._mapPane,"leaflet-touching"),o.Util.cancelAnimFrame(this._animRequest),o.DomEvent.off(e,"touchmove",this._onTouchMove).off(e,"touchend",this._onTouchEnd);var i=this._getScaleOrigin(),n=t.layerPointToLatLng(i),s=t.getZoom(),a=t.getScaleZoom(this._scale)-s,r=a>0?Math.ceil(a):Math.floor(a),h=t._limitZoom(s+r),l=t.getZoomScale(h)/this._scale;t._animateZoom(n,h,i,l)},_getScaleOrigin:function(){var t=this._centerOffset.subtract(this._delta).divideBy(this._scale);return this._startCenter.add(t)}}),o.Map.addInitHook("addHandler","touchZoom",o.Map.TouchZoom),o.Map.mergeOptions({tap:!0,tapTolerance:15}),o.Map.Tap=o.Handler.extend({addHooks:function(){o.DomEvent.on(this._map._container,"touchstart",this._onDown,this)},removeHooks:function(){o.DomEvent.off(this._map._container,"touchstart",this._onDown,this)},_onDown:function(t){if(t.touches){if(o.DomEvent.preventDefault(t),this._fireClick=!0,t.touches.length>1)return this._fireClick=!1,void clearTimeout(this._holdTimeout);var i=t.touches[0],n=i.target;this._startPos=this._newPos=new o.Point(i.clientX,i.clientY),n.tagName&&"a"===n.tagName.toLowerCase()&&o.DomUtil.addClass(n,"leaflet-active"),this._holdTimeout=setTimeout(o.bind(function(){this._isTapValid()&&(this._fireClick=!1,this._onUp(),this._simulateEvent("contextmenu",i))},this),1e3),o.DomEvent.on(e,"touchmove",this._onMove,this).on(e,"touchend",this._onUp,this)}},_onUp:function(t){if(clearTimeout(this._holdTimeout),o.DomEvent.off(e,"touchmove",this._onMove,this).off(e,"touchend",this._onUp,this),this._fireClick&&t&&t.changedTouches){var i=t.changedTouches[0],n=i.target;n&&n.tagName&&"a"===n.tagName.toLowerCase()&&o.DomUtil.removeClass(n,"leaflet-active"),this._isTapValid()&&this._simulateEvent("click",i)}},_isTapValid:function(){return this._newPos.distanceTo(this._startPos)<=this._map.options.tapTolerance},_onMove:function(t){var e=t.touches[0];this._newPos=new o.Point(e.clientX,e.clientY)},_simulateEvent:function(i,n){var o=e.createEvent("MouseEvents");o._simulated=!0,n.target._simulatedClick=!0,o.initMouseEvent(i,!0,!0,t,1,n.screenX,n.screenY,n.clientX,n.clientY,!1,!1,!1,!1,0,null),n.target.dispatchEvent(o)}}),o.Browser.touch&&!o.Browser.pointer&&o.Map.addInitHook("addHandler","tap",o.Map.Tap),o.Map.mergeOptions({boxZoom:!0}),o.Map.BoxZoom=o.Handler.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane,this._moved=!1},addHooks:function(){o.DomEvent.on(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){o.DomEvent.off(this._container,"mousedown",this._onMouseDown),this._moved=!1},moved:function(){return this._moved},_onMouseDown:function(t){return this._moved=!1,!t.shiftKey||1!==t.which&&1!==t.button?!1:(o.DomUtil.disableTextSelection(),o.DomUtil.disableImageDrag(),this._startLayerPoint=this._map.mouseEventToLayerPoint(t),void o.DomEvent.on(e,"mousemove",this._onMouseMove,this).on(e,"mouseup",this._onMouseUp,this).on(e,"keydown",this._onKeyDown,this))},_onMouseMove:function(t){this._moved||(this._box=o.DomUtil.create("div","leaflet-zoom-box",this._pane),o.DomUtil.setPosition(this._box,this._startLayerPoint),this._container.style.cursor="crosshair",this._map.fire("boxzoomstart"));var e=this._startLayerPoint,i=this._box,n=this._map.mouseEventToLayerPoint(t),s=n.subtract(e),a=new o.Point(Math.min(n.x,e.x),Math.min(n.y,e.y));o.DomUtil.setPosition(i,a),this._moved=!0,i.style.width=Math.max(0,Math.abs(s.x)-4)+"px",i.style.height=Math.max(0,Math.abs(s.y)-4)+"px"},_finish:function(){this._moved&&(this._pane.removeChild(this._box),this._container.style.cursor=""),o.DomUtil.enableTextSelection(),o.DomUtil.enableImageDrag(),o.DomEvent.off(e,"mousemove",this._onMouseMove).off(e,"mouseup",this._onMouseUp).off(e,"keydown",this._onKeyDown)},_onMouseUp:function(t){this._finish();var e=this._map,i=e.mouseEventToLayerPoint(t);if(!this._startLayerPoint.equals(i)){var n=new o.LatLngBounds(e.layerPointToLatLng(this._startLayerPoint),e.layerPointToLatLng(i));e.fitBounds(n),e.fire("boxzoomend",{boxZoomBounds:n})}},_onKeyDown:function(t){27===t.keyCode&&this._finish()}}),o.Map.addInitHook("addHandler","boxZoom",o.Map.BoxZoom),o.Map.mergeOptions({keyboard:!0,keyboardPanOffset:80,keyboardZoomOffset:1}),o.Map.Keyboard=o.Handler.extend({keyCodes:{left:[37],right:[39],down:[40],up:[38],zoomIn:[187,107,61,171],zoomOut:[189,109,173]},initialize:function(t){this._map=t,this._setPanOffset(t.options.keyboardPanOffset),this._setZoomOffset(t.options.keyboardZoomOffset)},addHooks:function(){var t=this._map._container;-1===t.tabIndex&&(t.tabIndex="0"),o.DomEvent.on(t,"focus",this._onFocus,this).on(t,"blur",this._onBlur,this).on(t,"mousedown",this._onMouseDown,this),this._map.on("focus",this._addHooks,this).on("blur",this._removeHooks,this)},removeHooks:function(){this._removeHooks();var t=this._map._container;o.DomEvent.off(t,"focus",this._onFocus,this).off(t,"blur",this._onBlur,this).off(t,"mousedown",this._onMouseDown,this),this._map.off("focus",this._addHooks,this).off("blur",this._removeHooks,this)},_onMouseDown:function(){if(!this._focused){var i=e.body,n=e.documentElement,o=i.scrollTop||n.scrollTop,s=i.scrollLeft||n.scrollLeft;this._map._container.focus(),t.scrollTo(s,o)}},_onFocus:function(){this._focused=!0,this._map.fire("focus")},_onBlur:function(){this._focused=!1,this._map.fire("blur")},_setPanOffset:function(t){var e,i,n=this._panKeys={},o=this.keyCodes;for(e=0,i=o.left.length;i>e;e++)n[o.left[e]]=[-1*t,0];for(e=0,i=o.right.length;i>e;e++)n[o.right[e]]=[t,0];for(e=0,i=o.down.length;i>e;e++)n[o.down[e]]=[0,t];for(e=0,i=o.up.length;i>e;e++)n[o.up[e]]=[0,-1*t]},_setZoomOffset:function(t){var e,i,n=this._zoomKeys={},o=this.keyCodes;for(e=0,i=o.zoomIn.length;i>e;e++)n[o.zoomIn[e]]=t;for(e=0,i=o.zoomOut.length;i>e;e++)n[o.zoomOut[e]]=-t},_addHooks:function(){o.DomEvent.on(e,"keydown",this._onKeyDown,this)},_removeHooks:function(){o.DomEvent.off(e,"keydown",this._onKeyDown,this)},_onKeyDown:function(t){var e=t.keyCode,i=this._map;if(e in this._panKeys){if(i._panAnim&&i._panAnim._inProgress)return;i.panBy(this._panKeys[e]),i.options.maxBounds&&i.panInsideBounds(i.options.maxBounds)}else{if(!(e in this._zoomKeys))return;i.setZoom(i.getZoom()+this._zoomKeys[e])}o.DomEvent.stop(t)}}),o.Map.addInitHook("addHandler","keyboard",o.Map.Keyboard),o.Handler.MarkerDrag=o.Handler.extend({initialize:function(t){this._marker=t},addHooks:function(){var t=this._marker._icon;this._draggable||(this._draggable=new o.Draggable(t,t)),this._draggable.on("dragstart",this._onDragStart,this).on("drag",this._onDrag,this).on("dragend",this._onDragEnd,this),this._draggable.enable(),o.DomUtil.addClass(this._marker._icon,"leaflet-marker-draggable")},removeHooks:function(){this._draggable.off("dragstart",this._onDragStart,this).off("drag",this._onDrag,this).off("dragend",this._onDragEnd,this),this._draggable.disable(),o.DomUtil.removeClass(this._marker._icon,"leaflet-marker-draggable")},moved:function(){return this._draggable&&this._draggable._moved},_onDragStart:function(){this._marker.closePopup().fire("movestart").fire("dragstart")},_onDrag:function(){var t=this._marker,e=t._shadow,i=o.DomUtil.getPosition(t._icon),n=t._map.layerPointToLatLng(i);e&&o.DomUtil.setPosition(e,i),t._latlng=n,t.fire("move",{latlng:n}).fire("drag")},_onDragEnd:function(t){this._marker.fire("moveend").fire("dragend",t)}}),o.Control=o.Class.extend({options:{position:"topright"},initialize:function(t){o.setOptions(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var e=this._map;return e&&e.removeControl(this),this.options.position=t,e&&e.addControl(this),this},getContainer:function(){return this._container},addTo:function(t){this._map=t;var e=this._container=this.onAdd(t),i=this.getPosition(),n=t._controlCorners[i];return o.DomUtil.addClass(e,"leaflet-control"),-1!==i.indexOf("bottom")?n.insertBefore(e,n.firstChild):n.appendChild(e),this},removeFrom:function(t){var e=this.getPosition(),i=t._controlCorners[e];return i.removeChild(this._container),this._map=null,this.onRemove&&this.onRemove(t),this},_refocusOnMap:function(){this._map&&this._map.getContainer().focus()}}),o.control=function(t){return new o.Control(t)},o.Map.include({addControl:function(t){return t.addTo(this),this},removeControl:function(t){return t.removeFrom(this),this},_initControlPos:function(){function t(t,s){var a=i+t+" "+i+s;e[t+s]=o.DomUtil.create("div",a,n)}var e=this._controlCorners={},i="leaflet-",n=this._controlContainer=o.DomUtil.create("div",i+"control-container",this._container);t("top","left"),t("top","right"),t("bottom","left"),t("bottom","right")},_clearControlPos:function(){this._container.removeChild(this._controlContainer)}}),o.Control.Zoom=o.Control.extend({options:{position:"topleft",zoomInText:"+",zoomInTitle:"Zoom in",zoomOutText:"-",zoomOutTitle:"Zoom out"},onAdd:function(t){var e="leaflet-control-zoom",i=o.DomUtil.create("div",e+" leaflet-bar");return this._map=t,this._zoomInButton=this._createButton(this.options.zoomInText,this.options.zoomInTitle,e+"-in",i,this._zoomIn,this),this._zoomOutButton=this._createButton(this.options.zoomOutText,this.options.zoomOutTitle,e+"-out",i,this._zoomOut,this),this._updateDisabled(),t.on("zoomend zoomlevelschange",this._updateDisabled,this),i},onRemove:function(t){t.off("zoomend zoomlevelschange",this._updateDisabled,this)},_zoomIn:function(t){this._map.zoomIn(t.shiftKey?3:1)},_zoomOut:function(t){this._map.zoomOut(t.shiftKey?3:1)},_createButton:function(t,e,i,n,s,a){var r=o.DomUtil.create("a",i,n);r.innerHTML=t,r.href="#",r.title=e;var h=o.DomEvent.stopPropagation;return o.DomEvent.on(r,"click",h).on(r,"mousedown",h).on(r,"dblclick",h).on(r,"click",o.DomEvent.preventDefault).on(r,"click",s,a).on(r,"click",this._refocusOnMap,a),r},_updateDisabled:function(){var t=this._map,e="leaflet-disabled";o.DomUtil.removeClass(this._zoomInButton,e),o.DomUtil.removeClass(this._zoomOutButton,e),t._zoom===t.getMinZoom()&&o.DomUtil.addClass(this._zoomOutButton,e),t._zoom===t.getMaxZoom()&&o.DomUtil.addClass(this._zoomInButton,e)}}),o.Map.mergeOptions({zoomControl:!0}),o.Map.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new o.Control.Zoom,this.addControl(this.zoomControl))}),o.control.zoom=function(t){return new o.Control.Zoom(t)},o.Control.Attribution=o.Control.extend({options:{position:"bottomright",prefix:'Leaflet'},initialize:function(t){o.setOptions(this,t),this._attributions={}},onAdd:function(t){this._container=o.DomUtil.create("div","leaflet-control-attribution"),o.DomEvent.disableClickPropagation(this._container);for(var e in t._layers)t._layers[e].getAttribution&&this.addAttribution(t._layers[e].getAttribution());return t.on("layeradd",this._onLayerAdd,this).on("layerremove",this._onLayerRemove,this),this._update(),this._container},onRemove:function(t){t.off("layeradd",this._onLayerAdd).off("layerremove",this._onLayerRemove)},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t?(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update(),this):void 0},removeAttribution:function(t){return t?(this._attributions[t]&&(this._attributions[t]--,this._update()),this):void 0},_update:function(){if(this._map){var t=[];for(var e in this._attributions)this._attributions[e]&&t.push(e);var i=[];this.options.prefix&&i.push(this.options.prefix),t.length&&i.push(t.join(", ")),this._container.innerHTML=i.join(" | ")}},_onLayerAdd:function(t){t.layer.getAttribution&&this.addAttribution(t.layer.getAttribution())},_onLayerRemove:function(t){t.layer.getAttribution&&this.removeAttribution(t.layer.getAttribution())}}),o.Map.mergeOptions({attributionControl:!0}),o.Map.addInitHook(function(){this.options.attributionControl&&(this.attributionControl=(new o.Control.Attribution).addTo(this))}),o.control.attribution=function(t){return new o.Control.Attribution(t)},o.Control.Scale=o.Control.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0,updateWhenIdle:!1},onAdd:function(t){this._map=t;var e="leaflet-control-scale",i=o.DomUtil.create("div",e),n=this.options;return this._addScales(n,e,i),t.on(n.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),i},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,e,i){t.metric&&(this._mScale=o.DomUtil.create("div",e+"-line",i)),t.imperial&&(this._iScale=o.DomUtil.create("div",e+"-line",i))},_update:function(){var t=this._map.getBounds(),e=t.getCenter().lat,i=6378137*Math.PI*Math.cos(e*Math.PI/180),n=i*(t.getNorthEast().lng-t.getSouthWest().lng)/180,o=this._map.getSize(),s=this.options,a=0;o.x>0&&(a=n*(s.maxWidth/o.x)),this._updateScales(s,a)},_updateScales:function(t,e){t.metric&&e&&this._updateMetric(e),t.imperial&&e&&this._updateImperial(e)},_updateMetric:function(t){var e=this._getRoundNum(t);this._mScale.style.width=this._getScaleWidth(e/t)+"px",this._mScale.innerHTML=1e3>e?e+" m":e/1e3+" km"},_updateImperial:function(t){var e,i,n,o=3.2808399*t,s=this._iScale;o>5280?(e=o/5280,i=this._getRoundNum(e),s.style.width=this._getScaleWidth(i/e)+"px",s.innerHTML=i+" mi"):(n=this._getRoundNum(o),s.style.width=this._getScaleWidth(n/o)+"px",s.innerHTML=n+" ft")},_getScaleWidth:function(t){return Math.round(this.options.maxWidth*t)-10},_getRoundNum:function(t){var e=Math.pow(10,(Math.floor(t)+"").length-1),i=t/e;return i=i>=10?10:i>=5?5:i>=3?3:i>=2?2:1,e*i}}),o.control.scale=function(t){return new o.Control.Scale(t)},o.Control.Layers=o.Control.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0},initialize:function(t,e,i){o.setOptions(this,i),this._layers={},this._lastZIndex=0,this._handlingClick=!1;for(var n in t)this._addLayer(t[n],n);for(n in e)this._addLayer(e[n],n,!0)},onAdd:function(t){return this._initLayout(),this._update(),t.on("layeradd",this._onLayerChange,this).on("layerremove",this._onLayerChange,this),this._container},onRemove:function(t){t.off("layeradd",this._onLayerChange,this).off("layerremove",this._onLayerChange,this)},addBaseLayer:function(t,e){return this._addLayer(t,e),this._update(),this},addOverlay:function(t,e){return this._addLayer(t,e,!0),this._update(),this},removeLayer:function(t){var e=o.stamp(t);return delete this._layers[e],this._update(),this},_initLayout:function(){var t="leaflet-control-layers",e=this._container=o.DomUtil.create("div",t);e.setAttribute("aria-haspopup",!0),o.Browser.touch?o.DomEvent.on(e,"click",o.DomEvent.stopPropagation):o.DomEvent.disableClickPropagation(e).disableScrollPropagation(e);var i=this._form=o.DomUtil.create("form",t+"-list");if(this.options.collapsed){o.Browser.android||o.DomEvent.on(e,"mouseover",this._expand,this).on(e,"mouseout",this._collapse,this);var n=this._layersLink=o.DomUtil.create("a",t+"-toggle",e);n.href="#",n.title="Layers",o.Browser.touch?o.DomEvent.on(n,"click",o.DomEvent.stop).on(n,"click",this._expand,this):o.DomEvent.on(n,"focus",this._expand,this),o.DomEvent.on(i,"click",function(){setTimeout(o.bind(this._onInputClick,this),0)},this),this._map.on("click",this._collapse,this)}else this._expand();this._baseLayersList=o.DomUtil.create("div",t+"-base",i),this._separator=o.DomUtil.create("div",t+"-separator",i),this._overlaysList=o.DomUtil.create("div",t+"-overlays",i),e.appendChild(i)},_addLayer:function(t,e,i){var n=o.stamp(t);this._layers[n]={layer:t,name:e,overlay:i},this.options.autoZIndex&&t.setZIndex&&(this._lastZIndex++,t.setZIndex(this._lastZIndex))},_update:function(){if(this._container){this._baseLayersList.innerHTML="",this._overlaysList.innerHTML="";var t,e,i=!1,n=!1;for(t in this._layers)e=this._layers[t],this._addItem(e),n=n||e.overlay,i=i||!e.overlay;this._separator.style.display=n&&i?"":"none"}},_onLayerChange:function(t){var e=this._layers[o.stamp(t.layer)];if(e){this._handlingClick||this._update();var i=e.overlay?"layeradd"===t.type?"overlayadd":"overlayremove":"layeradd"===t.type?"baselayerchange":null;i&&this._map.fire(i,e)}},_createRadioElement:function(t,i){var n='t;t++)e=n[t],i=this._layers[e.layerId],e.checked&&!this._map.hasLayer(i.layer)?this._map.addLayer(i.layer):!e.checked&&this._map.hasLayer(i.layer)&&this._map.removeLayer(i.layer);this._handlingClick=!1,this._refocusOnMap()},_expand:function(){o.DomUtil.addClass(this._container,"leaflet-control-layers-expanded")},_collapse:function(){this._container.className=this._container.className.replace(" leaflet-control-layers-expanded","")}}),o.control.layers=function(t,e,i){return new o.Control.Layers(t,e,i)},o.PosAnimation=o.Class.extend({includes:o.Mixin.Events,run:function(t,e,i,n){this.stop(),this._el=t,this._inProgress=!0,this._newPos=e,this.fire("start"),t.style[o.DomUtil.TRANSITION]="all "+(i||.25)+"s cubic-bezier(0,0,"+(n||.5)+",1)",o.DomEvent.on(t,o.DomUtil.TRANSITION_END,this._onTransitionEnd,this),o.DomUtil.setPosition(t,e),o.Util.falseFn(t.offsetWidth),this._stepTimer=setInterval(o.bind(this._onStep,this),50)},stop:function(){this._inProgress&&(o.DomUtil.setPosition(this._el,this._getPos()),this._onTransitionEnd(),o.Util.falseFn(this._el.offsetWidth))},_onStep:function(){var t=this._getPos();return t?(this._el._leaflet_pos=t,void this.fire("step")):void this._onTransitionEnd()},_transformRe:/([-+]?(?:\d*\.)?\d+)\D*, ([-+]?(?:\d*\.)?\d+)\D*\)/,_getPos:function(){var e,i,n,s=this._el,a=t.getComputedStyle(s);if(o.Browser.any3d){if(n=a[o.DomUtil.TRANSFORM].match(this._transformRe),!n)return;e=parseFloat(n[1]),i=parseFloat(n[2])}else e=parseFloat(a.left),i=parseFloat(a.top);return new o.Point(e,i,!0)},_onTransitionEnd:function(){o.DomEvent.off(this._el,o.DomUtil.TRANSITION_END,this._onTransitionEnd,this),this._inProgress&&(this._inProgress=!1,this._el.style[o.DomUtil.TRANSITION]="",this._el._leaflet_pos=this._newPos,clearInterval(this._stepTimer),this.fire("step").fire("end"))}}),o.Map.include({setView:function(t,e,n){if(e=e===i?this._zoom:this._limitZoom(e),t=this._limitCenter(o.latLng(t),e,this.options.maxBounds),n=n||{},this._panAnim&&this._panAnim.stop(),this._loaded&&!n.reset&&n!==!0){n.animate!==i&&(n.zoom=o.extend({animate:n.animate},n.zoom),n.pan=o.extend({animate:n.animate},n.pan));var s=this._zoom!==e?this._tryAnimatedZoom&&this._tryAnimatedZoom(t,e,n.zoom):this._tryAnimatedPan(t,n.pan);if(s)return clearTimeout(this._sizeTimer),this}return this._resetView(t,e),this},panBy:function(t,e){if(t=o.point(t).round(),e=e||{},!t.x&&!t.y)return this;if(this._panAnim||(this._panAnim=new o.PosAnimation,this._panAnim.on({step:this._onPanTransitionStep,end:this._onPanTransitionEnd},this)),e.noMoveStart||this.fire("movestart"),e.animate!==!1){o.DomUtil.addClass(this._mapPane,"leaflet-pan-anim");var i=this._getMapPanePos().subtract(t);this._panAnim.run(this._mapPane,i,e.duration||.25,e.easeLinearity)}else this._rawPanBy(t),this.fire("move").fire("moveend");return this},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){o.DomUtil.removeClass(this._mapPane,"leaflet-pan-anim"),this.fire("moveend")},_tryAnimatedPan:function(t,e){var i=this._getCenterOffset(t)._floor();return(e&&e.animate)===!0||this.getSize().contains(i)?(this.panBy(i,e),!0):!1}}),o.PosAnimation=o.DomUtil.TRANSITION?o.PosAnimation:o.PosAnimation.extend({run:function(t,e,i,n){this.stop(),this._el=t,this._inProgress=!0,this._duration=i||.25,this._easeOutPower=1/Math.max(n||.5,.2),this._startPos=o.DomUtil.getPosition(t),this._offset=e.subtract(this._startPos),this._startTime=+new Date,this.fire("start"),this._animate()},stop:function(){this._inProgress&&(this._step(),this._complete())},_animate:function(){this._animId=o.Util.requestAnimFrame(this._animate,this),this._step()},_step:function(){var t=+new Date-this._startTime,e=1e3*this._duration;e>t?this._runFrame(this._easeOut(t/e)):(this._runFrame(1),this._complete())},_runFrame:function(t){var e=this._startPos.add(this._offset.multiplyBy(t));o.DomUtil.setPosition(this._el,e),this.fire("step")},_complete:function(){o.Util.cancelAnimFrame(this._animId),this._inProgress=!1,this.fire("end")},_easeOut:function(t){return 1-Math.pow(1-t,this._easeOutPower)}}),o.Map.mergeOptions({zoomAnimation:!0,zoomAnimationThreshold:4}),o.DomUtil.TRANSITION&&o.Map.addInitHook(function(){this._zoomAnimated=this.options.zoomAnimation&&o.DomUtil.TRANSITION&&o.Browser.any3d&&!o.Browser.android23&&!o.Browser.mobileOpera,this._zoomAnimated&&o.DomEvent.on(this._mapPane,o.DomUtil.TRANSITION_END,this._catchTransitionEnd,this)}),o.Map.include(o.DomUtil.TRANSITION?{_catchTransitionEnd:function(t){this._animatingZoom&&t.propertyName.indexOf("transform")>=0&&this._onZoomTransitionEnd()},_nothingToAnimate:function(){return!this._container.getElementsByClassName("leaflet-zoom-animated").length},_tryAnimatedZoom:function(t,e,i){if(this._animatingZoom)return!0;if(i=i||{},!this._zoomAnimated||i.animate===!1||this._nothingToAnimate()||Math.abs(e-this._zoom)>this.options.zoomAnimationThreshold)return!1;var n=this.getZoomScale(e),o=this._getCenterOffset(t)._divideBy(1-1/n),s=this._getCenterLayerPoint()._add(o);return i.animate===!0||this.getSize().contains(o)?(this.fire("movestart").fire("zoomstart"),this._animateZoom(t,e,s,n,null,!0),!0):!1},_animateZoom:function(t,e,i,n,s,a,r){r||(this._animatingZoom=!0),o.DomUtil.addClass(this._mapPane,"leaflet-zoom-anim"),this._animateToCenter=t,this._animateToZoom=e,o.Draggable&&(o.Draggable._disabled=!0),o.Util.requestAnimFrame(function(){this.fire("zoomanim",{center:t,zoom:e,origin:i,scale:n,delta:s,backwards:a})},this)},_onZoomTransitionEnd:function(){this._animatingZoom=!1,o.DomUtil.removeClass(this._mapPane,"leaflet-zoom-anim"),this._resetView(this._animateToCenter,this._animateToZoom,!0,!0),o.Draggable&&(o.Draggable._disabled=!1)}}:{}),o.TileLayer.include({_animateZoom:function(t){this._animating||(this._animating=!0,this._prepareBgBuffer());var e=this._bgBuffer,i=o.DomUtil.TRANSFORM,n=t.delta?o.DomUtil.getTranslateString(t.delta):e.style[i],s=o.DomUtil.getScaleString(t.scale,t.origin);e.style[i]=t.backwards?s+" "+n:n+" "+s},_endZoomAnim:function(){var t=this._tileContainer,e=this._bgBuffer;t.style.visibility="",t.parentNode.appendChild(t),o.Util.falseFn(e.offsetWidth),this._animating=!1},_clearBgBuffer:function(){var t=this._map;!t||t._animatingZoom||t.touchZoom._zooming||(this._bgBuffer.innerHTML="",this._bgBuffer.style[o.DomUtil.TRANSFORM]="")},_prepareBgBuffer:function(){var t=this._tileContainer,e=this._bgBuffer,i=this._getLoadedTilesPercentage(e),n=this._getLoadedTilesPercentage(t);return e&&i>.5&&.5>n?(t.style.visibility="hidden",void this._stopLoadingImages(t)):(e.style.visibility="hidden",e.style[o.DomUtil.TRANSFORM]="",this._tileContainer=e,e=this._bgBuffer=t,this._stopLoadingImages(e),void clearTimeout(this._clearBgBufferTimer))},_getLoadedTilesPercentage:function(t){var e,i,n=t.getElementsByTagName("img"),o=0;for(e=0,i=n.length;i>e;e++)n[e].complete&&o++;return o/i},_stopLoadingImages:function(t){var e,i,n,s=Array.prototype.slice.call(t.getElementsByTagName("img"));for(e=0,i=s.length;i>e;e++)n=s[e],n.complete||(n.onload=o.Util.falseFn,n.onerror=o.Util.falseFn,n.src=o.Util.emptyImageUrl,n.parentNode.removeChild(n))}}),o.Map.include({_defaultLocateOptions:{watch:!1,setView:!1,maxZoom:1/0,timeout:1e4,maximumAge:0,enableHighAccuracy:!1},locate:function(t){if(t=this._locateOptions=o.extend(this._defaultLocateOptions,t),!navigator.geolocation)return this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this;var e=o.bind(this._handleGeolocationResponse,this),i=o.bind(this._handleGeolocationError,this);return t.watch?this._locationWatchId=navigator.geolocation.watchPosition(e,i,t):navigator.geolocation.getCurrentPosition(e,i,t),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch(this._locationWatchId),this._locateOptions&&(this._locateOptions.setView=!1),this},_handleGeolocationError:function(t){var e=t.code,i=t.message||(1===e?"permission denied":2===e?"position unavailable":"timeout");this._locateOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:e,message:"Geolocation error: "+i+"."})},_handleGeolocationResponse:function(t){var e=t.coords.latitude,i=t.coords.longitude,n=new o.LatLng(e,i),s=180*t.coords.accuracy/40075017,a=s/Math.cos(o.LatLng.DEG_TO_RAD*e),r=o.latLngBounds([e-s,i-a],[e+s,i+a]),h=this._locateOptions;if(h.setView){var l=Math.min(this.getBoundsZoom(r),h.maxZoom);this.setView(n,l)}var u={latlng:n,bounds:r,timestamp:t.timestamp};for(var c in t.coords)"number"==typeof t.coords[c]&&(u[c]=t.coords[c]);this.fire("locationfound",u)}})}(window,document); \ No newline at end of file diff --git a/searx/static/oscar/js/require-2.1.15.min.js b/searx/static/oscar/js/require-2.1.15.min.js new file mode 100644 index 000000000..be103a74e --- /dev/null +++ b/searx/static/oscar/js/require-2.1.15.min.js @@ -0,0 +1,36 @@ +/* + RequireJS 2.1.15 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved. + Available via the MIT or new BSD license. + see: http://github.com/jrburke/requirejs for details +*/ +var requirejs,require,define; +(function(ba){function G(b){return"[object Function]"===K.call(b)}function H(b){return"[object Array]"===K.call(b)}function v(b,c){if(b){var d;for(d=0;dthis.depCount&&!this.defined){if(G(l)){if(this.events.error&&this.map.isDefine||g.onError!==ca)try{f=i.execCb(c,l,b,f)}catch(d){a=d}else f=i.execCb(c,l,b,f);this.map.isDefine&&void 0===f&&((b=this.module)?f=b.exports:this.usingExports&& +(f=this.exports));if(a)return a.requireMap=this.map,a.requireModules=this.map.isDefine?[this.map.id]:null,a.requireType=this.map.isDefine?"define":"require",w(this.error=a)}else f=l;this.exports=f;if(this.map.isDefine&&!this.ignore&&(r[c]=f,g.onResourceLoad))g.onResourceLoad(i,this.map,this.depMaps);y(c);this.defined=!0}this.defining=!1;this.defined&&!this.defineEmitted&&(this.defineEmitted=!0,this.emit("defined",this.exports),this.defineEmitComplete=!0)}}else this.fetch()}},callPlugin:function(){var a= +this.map,b=a.id,d=p(a.prefix);this.depMaps.push(d);q(d,"defined",u(this,function(f){var l,d;d=m(aa,this.map.id);var e=this.map.name,P=this.map.parentMap?this.map.parentMap.name:null,n=i.makeRequire(a.parentMap,{enableBuildCallback:!0});if(this.map.unnormalized){if(f.normalize&&(e=f.normalize(e,function(a){return c(a,P,!0)})||""),f=p(a.prefix+"!"+e,this.map.parentMap),q(f,"defined",u(this,function(a){this.init([],function(){return a},null,{enabled:!0,ignore:!0})})),d=m(h,f.id)){this.depMaps.push(f); +if(this.events.error)d.on("error",u(this,function(a){this.emit("error",a)}));d.enable()}}else d?(this.map.url=i.nameToUrl(d),this.load()):(l=u(this,function(a){this.init([],function(){return a},null,{enabled:!0})}),l.error=u(this,function(a){this.inited=!0;this.error=a;a.requireModules=[b];B(h,function(a){0===a.map.id.indexOf(b+"_unnormalized")&&y(a.map.id)});w(a)}),l.fromText=u(this,function(f,c){var d=a.name,e=p(d),P=M;c&&(f=c);P&&(M=!1);s(e);t(j.config,b)&&(j.config[d]=j.config[b]);try{g.exec(f)}catch(h){return w(C("fromtexteval", +"fromText eval for "+b+" failed: "+h,h,[b]))}P&&(M=!0);this.depMaps.push(e);i.completeLoad(d);n([d],l)}),f.load(a.name,n,l,j))}));i.enable(d,this);this.pluginMaps[d.id]=d},enable:function(){V[this.map.id]=this;this.enabling=this.enabled=!0;v(this.depMaps,u(this,function(a,b){var c,f;if("string"===typeof a){a=p(a,this.map.isDefine?this.map:this.map.parentMap,!1,!this.skipMap);this.depMaps[b]=a;if(c=m(L,a.id)){this.depExports[b]=c(this);return}this.depCount+=1;q(a,"defined",u(this,function(a){this.defineDep(b, +a);this.check()}));this.errback&&q(a,"error",u(this,this.errback))}c=a.id;f=h[c];!t(L,c)&&(f&&!f.enabled)&&i.enable(a,this)}));B(this.pluginMaps,u(this,function(a){var b=m(h,a.id);b&&!b.enabled&&i.enable(a,this)}));this.enabling=!1;this.check()},on:function(a,b){var c=this.events[a];c||(c=this.events[a]=[]);c.push(b)},emit:function(a,b){v(this.events[a],function(a){a(b)});"error"===a&&delete this.events[a]}};i={config:j,contextName:b,registry:h,defined:r,urlFetched:S,defQueue:A,Module:Z,makeModuleMap:p, +nextTick:g.nextTick,onError:w,configure:function(a){a.baseUrl&&"/"!==a.baseUrl.charAt(a.baseUrl.length-1)&&(a.baseUrl+="/");var b=j.shim,c={paths:!0,bundles:!0,config:!0,map:!0};B(a,function(a,b){c[b]?(j[b]||(j[b]={}),U(j[b],a,!0,!0)):j[b]=a});a.bundles&&B(a.bundles,function(a,b){v(a,function(a){a!==b&&(aa[a]=b)})});a.shim&&(B(a.shim,function(a,c){H(a)&&(a={deps:a});if((a.exports||a.init)&&!a.exportsFn)a.exportsFn=i.makeShimExports(a);b[c]=a}),j.shim=b);a.packages&&v(a.packages,function(a){var b, +a="string"===typeof a?{name:a}:a;b=a.name;a.location&&(j.paths[b]=a.location);j.pkgs[b]=a.name+"/"+(a.main||"main").replace(ia,"").replace(Q,"")});B(h,function(a,b){!a.inited&&!a.map.unnormalized&&(a.map=p(b))});if(a.deps||a.callback)i.require(a.deps||[],a.callback)},makeShimExports:function(a){return function(){var b;a.init&&(b=a.init.apply(ba,arguments));return b||a.exports&&da(a.exports)}},makeRequire:function(a,e){function j(c,d,m){var n,q;e.enableBuildCallback&&(d&&G(d))&&(d.__requireJsBuild= +!0);if("string"===typeof c){if(G(d))return w(C("requireargs","Invalid require call"),m);if(a&&t(L,c))return L[c](h[a.id]);if(g.get)return g.get(i,c,a,j);n=p(c,a,!1,!0);n=n.id;return!t(r,n)?w(C("notloaded",'Module name "'+n+'" has not been loaded yet for context: '+b+(a?"":". Use require([])"))):r[n]}J();i.nextTick(function(){J();q=s(p(null,a));q.skipMap=e.skipMap;q.init(c,d,m,{enabled:!0});D()});return j}e=e||{};U(j,{isBrowser:z,toUrl:function(b){var d,e=b.lastIndexOf("."),k=b.split("/")[0];if(-1!== +e&&(!("."===k||".."===k)||1e.attachEvent.toString().indexOf("[native code"))&&!Y?(M=!0,e.attachEvent("onreadystatechange",b.onScriptLoad)): +(e.addEventListener("load",b.onScriptLoad,!1),e.addEventListener("error",b.onScriptError,!1)),e.src=d,J=e,D?y.insertBefore(e,D):y.appendChild(e),J=null,e;if(ea)try{importScripts(d),b.completeLoad(c)}catch(m){b.onError(C("importscripts","importScripts failed for "+c+" at "+d,m,[c]))}};z&&!q.skipDataMain&&T(document.getElementsByTagName("script"),function(b){y||(y=b.parentNode);if(I=b.getAttribute("data-main"))return s=I,q.baseUrl||(E=s.split("/"),s=E.pop(),O=E.length?E.join("/")+"/":"./",q.baseUrl= +O),s=s.replace(Q,""),g.jsExtRegExp.test(s)&&(s=I),q.deps=q.deps?q.deps.concat(s):[s],!0});define=function(b,c,d){var e,g;"string"!==typeof b&&(d=c,c=b,b=null);H(c)||(d=c,c=null);!c&&G(d)&&(c=[],d.length&&(d.toString().replace(ka,"").replace(la,function(b,d){c.push(d)}),c=(1===d.length?["require"]:["require","exports","module"]).concat(c)));if(M){if(!(e=J))N&&"interactive"===N.readyState||T(document.getElementsByTagName("script"),function(b){if("interactive"===b.readyState)return N=b}),e=N;e&&(b|| +(b=e.getAttribute("data-requiremodule")),g=F[e.getAttribute("data-requirecontext")])}(g?g.defQueue:R).push([b,c,d])};define.amd={jQuery:!0};g.exec=function(b){return eval(b)};g(q)}})(this); diff --git a/searx/static/oscar/js/scripts.js b/searx/static/oscar/js/scripts.js index 6c3a10a74..37285c9c9 100644 --- a/searx/static/oscar/js/scripts.js +++ b/searx/static/oscar/js/scripts.js @@ -7,6 +7,13 @@ */ +requirejs.config({ +baseUrl: '/static/oscar/js', +paths: { +app: '../app' +} +}); + if(searx.autocompleter) { searx.searchResults = new Bloodhound({ datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'), @@ -61,4 +68,56 @@ $(document).ready(function(){ source: searx.searchResults.ttAdapter() }); } + + $(".searx_init_map").on( "click", function( event ) { + var leaflet_target = $(this).data('leaflet-target'); + var map_lon = $(this).data('map-lon'); + var map_lat = $(this).data('map-lat'); + var map_zoom = $(this).data('map-zoom'); + 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) { + var 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/oscar/img/map"; + + // init map + var map = L.map(leaflet_target); + + // create the tile layer with correct attribution + var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; + var osmAttrib='Map data © OpenStreetMap contributors'; + var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 19, attribution: osmAttrib}); + + // init map view + if(map_bounds) { + // TODO hack: https://github.com/Leaflet/Leaflet/issues/2021 + setTimeout(function () { + map.fitBounds(map_bounds); + }, 0); + } 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(osm); + + if(map_geojson) + L.geoJson(map_geojson).addTo(map); + //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/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html new file mode 100644 index 000000000..734f9066c --- /dev/null +++ b/searx/templates/courgette/result_templates/map.html @@ -0,0 +1,13 @@ +
+ + {% if result['favicon'] %} + + {% endif %} + +
+

{{ result.title|safe }}

+ {% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} +

{% if result.content %}{{ result.content|safe }}
{% endif %}

+

{{ result.pretty_url }}

+
+
diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html new file mode 100644 index 000000000..78221aa01 --- /dev/null +++ b/searx/templates/default/result_templates/map.html @@ -0,0 +1,13 @@ +
+ + {% if result['favicon'] %} + + {% endif %} + +
+

{{ result.title|safe }}

+

{{ result.pretty_url }} cached

+ {% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} +

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

+
+
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 544820060..8c4dd3edc 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -10,7 +10,8 @@ - + + diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 3b0963816..018a29e0e 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -4,5 +4,7 @@ {% if result.content %}

{{ result.content|safe }}

{% endif %} +
+ {{ result.engine }}

{{ result.pretty_url }}

diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index 5570a3143..578df4595 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -14,6 +14,7 @@ {% if result.content %}

{{ result.content|safe }}

{% endif %}
+
{{ result.engine }}

{{ result.pretty_url }}

diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html new file mode 100644 index 000000000..3385f5ba7 --- /dev/null +++ b/searx/templates/oscar/result_templates/map.html @@ -0,0 +1,18 @@ +

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

+ +{% if result.publishedDate %}{% endif %} + +{% if result.content %}

{{ result.content|safe }}

{% endif %} + +{% if result.latitude and result.longitude %} + + +
+
+
+{% endif %} + +
+ +{{ result.engine }} +

{{ result.pretty_url }}

diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index 903d304eb..1be66e75a 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -10,5 +10,7 @@ {% if result.content %}

{{ result.content|safe }}

{% endif %} +
+ {{ result.engine }}

{{ result.pretty_url }}

diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 1a9b60717..4d711ea71 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -9,5 +9,7 @@
+
+ {{ result.engine }}

{{ result.pretty_url }}

From b2c976a5a33f234de1f5c67de0e04034c21c20d8 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Sun, 2 Nov 2014 22:35:06 +0100 Subject: [PATCH 02/11] [enh] template_oscar: maxZoom if fitting bounds --- searx/static/oscar/js/scripts.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/searx/static/oscar/js/scripts.js b/searx/static/oscar/js/scripts.js index 37285c9c9..4058fc039 100644 --- a/searx/static/oscar/js/scripts.js +++ b/searx/static/oscar/js/scripts.js @@ -100,7 +100,9 @@ $(document).ready(function(){ if(map_bounds) { // TODO hack: https://github.com/Leaflet/Leaflet/issues/2021 setTimeout(function () { - map.fitBounds(map_bounds); + map.fitBounds(map_bounds, { + maxZoom:17 + }); }, 0); } else if (map_lon && map_lat) { if(map_zoom) @@ -113,8 +115,8 @@ $(document).ready(function(){ if(map_geojson) L.geoJson(map_geojson).addTo(map); - //if(map_bounds) - // L.rectangle(map_bounds, {color: "#ff7800", weight: 3, fill:false}).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 From 2e7723a6c1ce51c6b3830470164ac818126760ae Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 3 Nov 2014 10:39:47 +0100 Subject: [PATCH 03/11] [enh] oscar_template: improve result visualisation * highlight parts of result * add link to archiv.to * fix little bugs * add little icons * change style of "show map" button --- searx/static/oscar/css/leaflet.min.css | 4 +-- searx/static/oscar/css/oscar.min.css | 5 ++++ searx/static/oscar/less/oscar/cursor.less | 4 +++ searx/static/oscar/less/oscar/results.less | 29 +++++++++++++++++++ searx/templates/oscar/base.html | 2 +- .../oscar/result_templates/default.html | 7 +++-- .../oscar/result_templates/images.html | 2 +- .../templates/oscar/result_templates/map.html | 16 ++++++---- .../oscar/result_templates/torrent.html | 5 ++-- .../oscar/result_templates/videos.html | 9 ++++-- 10 files changed, 66 insertions(+), 17 deletions(-) diff --git a/searx/static/oscar/css/leaflet.min.css b/searx/static/oscar/css/leaflet.min.css index 417e0e8e7..bca0c58b9 100644 --- a/searx/static/oscar/css/leaflet.min.css +++ b/searx/static/oscar/css/leaflet.min.css @@ -55,8 +55,8 @@ .leaflet-touch .leaflet-control-zoom-in{font-size:22px} .leaflet-touch .leaflet-control-zoom-out{font-size:24px} .leaflet-control-layers{box-shadow:0 1px 5px rgba(0,0,0,0.4);background:#fff;border-radius:5px} -.leaflet-control-layers-toggle{background-image:url(images/layers.png);width:36px;height:36px} -.leaflet-retina .leaflet-control-layers-toggle{background-image:url(images/layers-2x.png);background-size:26px 26px} +.leaflet-control-layers-toggle{background-image:url(../img/map/layers.png);width:36px;height:36px} +.leaflet-retina .leaflet-control-layers-toggle{background-image:url(../img/map/layers-2x.png);background-size:26px 26px} .leaflet-touch .leaflet-control-layers-toggle{width:44px;height:44px} .leaflet-control-layers .leaflet-control-layers-list,.leaflet-control-layers-expanded .leaflet-control-layers-toggle{display:none} .leaflet-control-layers-expanded .leaflet-control-layers-list{display:block;position:relative} diff --git a/searx/static/oscar/css/oscar.min.css b/searx/static/oscar/css/oscar.min.css index 5d2c24e63..1afd3e866 100644 --- a/searx/static/oscar/css/oscar.min.css +++ b/searx/static/oscar/css/oscar.min.css @@ -3,11 +3,15 @@ body{margin-bottom:80px} .footer{position:absolute;bottom:0;width:100%;height:60px} input[type=checkbox]:checked~.label_hide_if_checked{display:none} input[type=checkbox]:not(:checked)~.label_hide_if_not_checked{display:none} +.result_header{margin-bottom:5px;margin-top:20px}.result_header .favicon{margin-bottom:-3px} +.result_header a{vertical-align:bottom}.result_header a .highlight{font-weight:bold} +.result-content .highlight{font-weight:bold} .result-default{clear:both} .result-images{float:left !important} .img-thumbnail{margin:5px;max-height:128px;min-height:128px} .result-videos{clear:both} .result-torrents{clear:both} +.result-map{clear:both} .suggestion_item{margin:2px 5px} .result_download{margin-right:5px} #pagination{margin-top:30px;padding-bottom:50px} @@ -15,3 +19,4 @@ input[type=checkbox]:not(:checked)~.label_hide_if_not_checked{display:none} .infobox .infobox_part:last-child{margin-bottom:0} .search_categories{margin:10px 0;text-transform:capitalize} .cursor-text{cursor:text !important} +.cursor-pointer{cursor:pointer !important} diff --git a/searx/static/oscar/less/oscar/cursor.less b/searx/static/oscar/less/oscar/cursor.less index c7e3191d8..cbc1ea6fc 100644 --- a/searx/static/oscar/less/oscar/cursor.less +++ b/searx/static/oscar/less/oscar/cursor.less @@ -2,3 +2,7 @@ .cursor-text { cursor: text !important; } + +.cursor-pointer { + cursor: pointer !important; +} diff --git a/searx/static/oscar/less/oscar/results.less b/searx/static/oscar/less/oscar/results.less index 06c8a1740..9ca2109bc 100644 --- a/searx/static/oscar/less/oscar/results.less +++ b/searx/static/oscar/less/oscar/results.less @@ -1,3 +1,27 @@ + +.result_header { + margin-bottom:5px; + margin-top:20px; + + .favicon { + margin-bottom:-3px; + } + + a { + vertical-align: bottom; + + .highlight { + font-weight:bold; + } + } +} + +.result-content { + .highlight { + font-weight:bold; + } +} + // default formating of results .result-default { clear: both; @@ -24,6 +48,11 @@ clear: both; } +// map formating of results +.result-map { + clear: both; +} + // suggestion .suggestion_item { margin: 2px 5px; diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 8c4dd3edc..0acece9d2 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -66,6 +66,6 @@ {% if autocomplete %}{% endif %} - --> + diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 018a29e0e..3fe9b913c 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,8 +1,11 @@ -

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

+{% from 'oscar/macros.html' import icon %} + +

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} +{{ icon('link') }} {{ _('cached') }} -{% if result.content %}

{{ result.content|safe }}

{% endif %} +{% if result.content %}

{{ result.content|safe }}

{% endif %}
diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index 578df4595..c1b9e9b01 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -11,7 +11,7 @@
{{ result.title }} - {% if result.content %}

{{ result.content|safe }}

{% endif %} + {% if result.content %}

{{ result.content|safe }}

{% endif %}
diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 3385f5ba7..45aa76356 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -1,12 +1,16 @@ -

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

+{% from 'oscar/macros.html' import icon %} + +

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} +{{ icon('link') }} {{ _('cached') }} +{% if (result.latitude and result.longitude) or result.boundingbox %} + • +{% endif %} + +{% if result.content %}

{{ result.content|safe }}

{% endif %} -{% if result.content %}

{{ result.content|safe }}

{% endif %} - -{% if result.latitude and result.longitude %} - - +{% if (result.latitude and result.longitude) or result.boundingbox %}
diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index 1be66e75a..60d8f2987 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -1,14 +1,15 @@ {% from 'oscar/macros.html' import icon %} -

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

+

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} +{{ icon('link') }} {{ _('cached') }}

{{ icon('transfer') }} {{ _('Seeder') }} {{ result.seed }}, {{ _('Leecher') }} {{ result.leech }}

{{ icon('magnet') }} magnet link

-{% if result.content %}

{{ result.content|safe }}

{% endif %} +{% if result.content %}

{{ result.content|safe }}

{% endif %}
diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 4d711ea71..f69134d6f 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -1,11 +1,14 @@ -

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

+{% from 'oscar/macros.html' import icon %} + +

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} - +{{ icon('link') }} {{ _('cached') }} +
- {% if result.content %}

{{ result.content|safe }}

{% endif %} + {% if result.content %}

{{ result.content|safe }}

{% endif %}
From c38917bb2a472429f78cd00fffb5e7057ceecc02 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 3 Nov 2014 18:46:58 +0100 Subject: [PATCH 04/11] [enh] template_oscar: show addressdata if possible --- searx/engines/openstreetmap.py | 27 ++++++++++++++++++- searx/static/oscar/css/oscar.min.css | 2 +- searx/static/oscar/less/oscar/results.less | 2 ++ .../templates/oscar/result_templates/map.html | 24 ++++++++++++++++- 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py index d73a116ba..e5deba1e5 100644 --- a/searx/engines/openstreetmap.py +++ b/searx/engines/openstreetmap.py @@ -15,7 +15,7 @@ categories = ['map'] paging = False # search-url -url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1' +url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1&addressdetails=1' result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}' @@ -47,6 +47,30 @@ def response(resp): geojson = {u'type':u'Point', u'coordinates':[r['lon'],r['lat']]} + address_raw = r.get('address') + address = {} + + # get name + if r['class'] == 'amenity' or\ + r['class'] == 'shop' or\ + r['class'] == 'tourism' or\ + r['class'] == 'leisure': + if address_raw.get('address29'): + address = {'name':address_raw.get('address29')} + else: + address = {'name':address_raw.get(r['type'])} + + # add rest of adressdata, if something is already found + if address.get('name'): + address.update({'house_number':address_raw.get('house_number'), + 'road':address_raw.get('road'), + 'locality':address_raw.get('town', address_raw.get('village')), + 'postcode':address_raw.get('postcode'), + 'country':address_raw.get('country'), + 'country_code':address_raw.get('country_code')}) + else: + address = None + # append result results.append({'template': 'map.html', 'title': title, @@ -55,6 +79,7 @@ def response(resp): 'latitude': r['lat'], 'boundingbox': r['boundingbox'], 'geojson': geojson, + 'address': address, 'url': url}) # return results diff --git a/searx/static/oscar/css/oscar.min.css b/searx/static/oscar/css/oscar.min.css index 1afd3e866..b8d6fba15 100644 --- a/searx/static/oscar/css/oscar.min.css +++ b/searx/static/oscar/css/oscar.min.css @@ -5,7 +5,7 @@ input[type=checkbox]:checked~.label_hide_if_checked{display:none} input[type=checkbox]:not(:checked)~.label_hide_if_not_checked{display:none} .result_header{margin-bottom:5px;margin-top:20px}.result_header .favicon{margin-bottom:-3px} .result_header a{vertical-align:bottom}.result_header a .highlight{font-weight:bold} -.result-content .highlight{font-weight:bold} +.result-content{margin-top:5px}.result-content .highlight{font-weight:bold} .result-default{clear:both} .result-images{float:left !important} .img-thumbnail{margin:5px;max-height:128px;min-height:128px} diff --git a/searx/static/oscar/less/oscar/results.less b/searx/static/oscar/less/oscar/results.less index 9ca2109bc..08500b3ff 100644 --- a/searx/static/oscar/less/oscar/results.less +++ b/searx/static/oscar/less/oscar/results.less @@ -17,6 +17,8 @@ } .result-content { + margin-top: 5px; + .highlight { font-weight:bold; } diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 45aa76356..2c1e549e3 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -7,7 +7,29 @@ {% if (result.latitude and result.longitude) or result.boundingbox %} • {% endif %} - + +{% if result.address %} +

+ {% if result.address.name %} + {{ result.address.name }}
+ {% endif %} + {% if result.address.road %} + + {% if result.address.house_number %}{{ result.address.house_number }}, {% endif %} + {{ result.address.road }} +
+ {% endif %} + {% if result.address.locality %} + {{ result.address.locality }}, + {% if result.address.postcode %} {{ result.address.postcode }}{% endif %} +
+ {% endif %} + {% if result.address.country %} + {{ result.address.country }} + {% endif %} +

+{% endif %} + {% if result.content %}

{{ result.content|safe }}

{% endif %} {% if (result.latitude and result.longitude) or result.boundingbox %} From 3b7b106684a1dc899823bcef533e5892f7a813da Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 3 Nov 2014 18:47:18 +0100 Subject: [PATCH 05/11] [enh] template_oscar: add layer to leaflet map --- searx/static/oscar/js/scripts.js | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/searx/static/oscar/js/scripts.js b/searx/static/oscar/js/scripts.js index 4058fc039..b37c72857 100644 --- a/searx/static/oscar/js/scripts.js +++ b/searx/static/oscar/js/scripts.js @@ -92,9 +92,17 @@ $(document).ready(function(){ var map = L.map(leaflet_target); // create the tile layer with correct attribution - var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; - var osmAttrib='Map data © OpenStreetMap contributors'; - var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 19, attribution: osmAttrib}); + var osmMapnikUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; + var osmMapnikAttrib='Map data © OpenStreetMap 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 © OpenStreetMap contributors | Tiles Courtesy of MapQuest '; + 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 © OpenStreetMap contributors | Tiles Courtesy of MapQuest | 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}); // init map view if(map_bounds) { @@ -111,7 +119,16 @@ $(document).ready(function(){ map.setView(new L.LatLng(map_lat, map_lon),8); } - map.addLayer(osm); + map.addLayer(osmMapnik); + + var baseLayers = { + "OSM Mapnik": osmMapnik, + "MapQuest": osmMapquest/*, + "MapQuest Open Aerial": osmMapquestOpenAerial*/ + }; + + L.control.layers(baseLayers).addTo(map); + if(map_geojson) L.geoJson(map_geojson).addTo(map); From bc12a76fbbfdb4769a254cda5e3cfdf262765107 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 3 Nov 2014 18:53:04 +0100 Subject: [PATCH 06/11] [fix] use address.city if possible --- searx/engines/openstreetmap.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py index e5deba1e5..db0fbfe75 100644 --- a/searx/engines/openstreetmap.py +++ b/searx/engines/openstreetmap.py @@ -64,7 +64,9 @@ def response(resp): if address.get('name'): address.update({'house_number':address_raw.get('house_number'), 'road':address_raw.get('road'), - 'locality':address_raw.get('town', address_raw.get('village')), + 'locality':address_raw.get('city', + address_raw.get('town', + address_raw.get('village'))), 'postcode':address_raw.get('postcode'), 'country':address_raw.get('country'), 'country_code':address_raw.get('country_code')}) From 9274a590452f0510a263f864f466d0ed7a746358 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 3 Nov 2014 18:57:48 +0100 Subject: [PATCH 07/11] [fix] template_oscar: improve visualisation of video-results --- searx/templates/oscar/result_templates/videos.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index f69134d6f..0d6cf50aa 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -7,7 +7,7 @@
- + {% if result.content %}

{{ result.content|safe }}

{% endif %}
From c0fc248213066ef0ad4ed439d570b225b78afd44 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 3 Nov 2014 19:00:56 +0100 Subject: [PATCH 08/11] [enh] template_oscar: improve visualisation of torrent results --- searx/templates/oscar/result_templates/torrent.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index 60d8f2987..a234a176a 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -5,9 +5,9 @@ {% if result.publishedDate %}{% endif %} {{ icon('link') }} {{ _('cached') }} -

{{ icon('transfer') }} {{ _('Seeder') }} {{ result.seed }}, {{ _('Leecher') }} {{ result.leech }}

- -

{{ icon('magnet') }} magnet link

+

{{ icon('transfer') }} {{ _('Seeder') }} {{ result.seed }}, {{ _('Leecher') }} {{ result.leech }} +
+{{ icon('magnet') }} magnet link

{% if result.content %}

{{ result.content|safe }}

{% endif %} From 46dd502592f5ad09fab761c9311065b72ee3e55d Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Tue, 4 Nov 2014 12:58:12 +0100 Subject: [PATCH 09/11] [fix][template][oscar] print ',' only if postcode is found --- searx/templates/oscar/result_templates/map.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 2c1e549e3..a7c37dd59 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -20,8 +20,8 @@
{% endif %} {% if result.address.locality %} - {{ result.address.locality }}, - {% if result.address.postcode %} {{ result.address.postcode }}{% endif %} + {{ result.address.locality }} + {% if result.address.postcode %}, {{ result.address.postcode }}{% endif %}
{% endif %} {% if result.address.country %} From 4b75d41f864b9d127aa88c962b7ce849ee3b0b51 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Wed, 19 Nov 2014 14:59:30 +0100 Subject: [PATCH 10/11] [enh][oscar_template] loading map informations from overpass-api --- searx/engines/openstreetmap.py | 4 + searx/static/oscar/img/loader.gif | Bin 0 -> 14190 bytes searx/static/oscar/js/scripts.js | 84 +++++++++++++++++- .../templates/oscar/result_templates/map.html | 36 +++++++- 4 files changed, 120 insertions(+), 4 deletions(-) create mode 100644 searx/static/oscar/img/loader.gif diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py index db0fbfe75..f727ca8ea 100644 --- a/searx/engines/openstreetmap.py +++ b/searx/engines/openstreetmap.py @@ -39,6 +39,9 @@ def response(resp): url = result_base_url.format(osm_type=osm_type, osm_id=r['osm_id']) + osm = {'type':osm_type, + 'id':r['osm_id']} + geojson = r.get('geojson') # if no geojson is found and osm_type is a node, add geojson Point @@ -82,6 +85,7 @@ def response(resp): 'boundingbox': r['boundingbox'], 'geojson': geojson, 'address': address, + 'osm': osm, 'url': url}) # return results diff --git a/searx/static/oscar/img/loader.gif b/searx/static/oscar/img/loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..3980ff00b1bc7d845ea080629a1702c5a6d1ca11 GIT binary patch literal 14190 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"; + switch(row) { + case "phone": + case "fax": + newHtml += "" + element.tags[row] + ""; + break; + case "email": + newHtml += "" + element.tags[row] + ""; + break; + case "website": + case "url": + newHtml += "" + element.tags[row] + ""; + break; + case "wikidata": + newHtml += "" + element.tags[row] + ""; + break; + case "wikipedia": + if(element.tags[row].indexOf(":") != -1) { + newHtml += "" + element.tags[row] + ""; + break; + } + default: + newHtml += element.tags[row]; + break; + } + newHtml += ""; + } + } + $(result_table).html(newHtml); + $(result_table).removeClass('hidden'); + $(result_table_loadicon).addClass('hidden'); + } + }) + .fail(function() { + alert( "could not load " ); + }) + } + } + + // this event occour only once per element + $( this ).off( event ); + }); $(".searx_init_map").on( "click", function( event ) { var leaflet_target = $(this).data('leaflet-target'); @@ -119,7 +201,7 @@ $(document).ready(function(){ map.setView(new L.LatLng(map_lat, map_lon),8); } - map.addLayer(osmMapnik); + map.addLayer(osmMapquest); var baseLayers = { "OSM Mapnik": osmMapnik, diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index a7c37dd59..531146dc6 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -3,13 +3,25 @@

{% if result['favicon'] %} {% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{% endif %} + {{ icon('link') }} {{ _('cached') }} + {% if (result.latitude and result.longitude) or result.boundingbox %} • {% endif %} +{% if result.osm and (result.osm.type and result.osm.id) %} + • +{% endif %} + +{# {% if (result.latitude and result.longitude) %} + • +{% endif %} #} + +
+ {% if result.address %} -

+

{% if result.address.name %} {{ result.address.name }}
{% endif %} @@ -27,11 +39,29 @@ {% if result.address.country %} {{ result.address.country }} {% endif %} -

+

{% endif %} -{% if result.content %}

{{ result.content|safe }}

{% endif %} +{% if result.osm and (result.osm.type and result.osm.id) %} +
+
Loading ...
+ + + +
+{% endif %} +{# {% if (result.latitude and result.longitude) %} +
+ Longitude: {{ result.longitude }}
+ Latitude: {{ result.latitude }} +
+{% endif %} #} + +{% if result.content %}

{{ result.content|safe }}

{% endif %} + +
+ {% if (result.latitude and result.longitude) or result.boundingbox %}
From 807db97690e8421c0995860ec9644a8bbe084cba Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Wed, 19 Nov 2014 15:48:13 +0100 Subject: [PATCH 11/11] [enh][translation] update translation files and add german translation --- searx/translations/de/LC_MESSAGES/messages.mo | Bin 4779 -> 5181 bytes searx/translations/de/LC_MESSAGES/messages.po | 93 +++++++++++------- searx/translations/en/LC_MESSAGES/messages.mo | Bin 4632 -> 4814 bytes searx/translations/en/LC_MESSAGES/messages.po | 37 +++++-- searx/translations/es/LC_MESSAGES/messages.mo | Bin 4827 -> 5009 bytes searx/translations/es/LC_MESSAGES/messages.po | 37 +++++-- searx/translations/fr/LC_MESSAGES/messages.mo | Bin 4841 -> 5023 bytes searx/translations/fr/LC_MESSAGES/messages.po | 37 +++++-- searx/translations/hu/LC_MESSAGES/messages.mo | Bin 4754 -> 4936 bytes searx/translations/hu/LC_MESSAGES/messages.po | 37 +++++-- searx/translations/it/LC_MESSAGES/messages.mo | Bin 4781 -> 4963 bytes searx/translations/it/LC_MESSAGES/messages.po | 37 +++++-- searx/translations/ja/LC_MESSAGES/messages.mo | Bin 4673 -> 4855 bytes searx/translations/ja/LC_MESSAGES/messages.po | 37 +++++-- searx/translations/nl/LC_MESSAGES/messages.mo | Bin 4744 -> 4926 bytes searx/translations/nl/LC_MESSAGES/messages.po | 37 +++++-- 16 files changed, 270 insertions(+), 82 deletions(-) diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo index eea1b1d0c61d17a7b4001efb9cfb084881cb5f99..2c65bc1217ffebd49c8bf7b783b5c9138921338e 100644 GIT binary patch delta 2565 zcmZ9MUx-vy9LLYzJ zwZ#}RBZ#786cnTqS9(w+l6+cw8Sp^}GDIRR2qZ&#Fp46d`ut|bRT^gQ=bn4c`Tf4X z@A=(1-F0Dk>F0TkM--o7evk7zGebuAJ{y{p;;VYOJP2Qg55X<48Sa97Rg%jr=)hBO zFPslMA5dxud>ZmdZG#J80?t#ar1o;t&Vz%n1s;Kt-~^O}XCYs8p35WfLjCy_C<3n6 z`74x!w;_R5Bb&QnCzLq-TtvWD$PzUS=aOHIawE!fP=rKqBYY3eh8Lj-y9{OHPjD{0 zQJ?=CwlZ!YNE>W}bKqhq>wBO$yB3PTVfZl2$UOPger}}VccCQuL?+;IxD=j*33v(a zfr}_x1WZ6#{~=^b9fczJ1Y8Esz}4^yl**f!Y=kXP;qa2C)F>2TDJaeq>ho_yiGKh}{EuhjzdSg~0||5rN}|(H z8uBZ+95xZH6ZXKv4N7f-65tw}MfeRUz41Gg#52jtR@DYY&;ocKJ_#4WYj82V(~AGH zZ~+G<6J1c6ryo8FcS5nc2qnP*$X;~}iqJ2hboW^(iN1qU(2sTAgdL3kf^zoFG)OmG z2u1i%i5sbWxc*=llmu@=3Ft%is(o+}z7Iw4Whm>eLlJTdits<6IMYZc%X}*oM;?O` zXBm|B&%u?j)XR-1%RwyO6Uqf-=B9!%)p)}* z)y5SmlX7fYWn9mODr0+IEC@)iBJYioa>m~+%Rj+ z^LowNb!(nI*VVGWp|>*Wr)^;MxNG&MLXeL=!>BTqv_TXY^5}6Jq^;krHyG^%Hq-lr z6Gg>v-Kte-TOMv&-SNuE$ZIS6{EV#5+sG-fx_qcV$-&yvihH`Dp?NdcgIwCTUfl=SeZH zuU>M!v^IWKnHuynSY#r%;4e`Un$w8bHfDn`vZqRVF2LSPaT<%-LafV4%t8 zqa|vqN!tnQMtXT@b59XFLa50_?wBiQFl5F|A{DsBNXL0?JP-dW=d+%ha&qiKEJlRn zOUOu1#9C^_?UuID5^8LawMpN_MwPIZdKC2_%=2QudXll6q())E%LbOPI%~tC+;G}G z_g7?mbh1Yc5)-$gaZbn$Bb_lGZnDoaamM;RYQT?p5WnuF-7INpzE~YbCP1;;Q3#mE zk*rnyHgvOos0KnEas=Xd)eVZHRr-xoI93Q8Lqfl&Jg5D3sa9#yhEkrdcACJiCfOWE zXvlMf*t*kt%uaVm(h_7M&Z0IQ>r7=T5Z|<%mwi!Ha}@)3%tT?)sZ4VAIuI8)1`dJL z-P$p!TvFZxXB+R9q&Y_8z@Vr0$KYSGhe zfn}Lk%&ouFJ-XI{)i%=G#TuVxmp=r*>Q~Zc12>b=ywh}@7^vk{&D!zGl+U?RjY~tZ TFPPr91tYSBz_sPfyn+7!9$YOB delta 1512 zcmYMzU1(Ex7{~FawM~<_zSz=Qa7rq(tZ_o38^3T=Q zv$KkiYs(I9vnv{Fo*4H{D(-BEkh-|8e8xa zY{wzg&MzXrnq3axuVay<>}J?8jtYDibqwy~Bz%Ng;AhkVzap1Sa8m-mqbg8JboJMu zHdK$AHxspPE3U!0*ot4ossB_S&eE{I#B3C`ll9D2Vky*bo<#-Piwv=0R07}ODLjrU z?Z;%H!`6ce{5j6ReW){W0vquns)FN{)L#Lf(x8BUpfddr)gIx8RG{ghEul$Nz(t{} zu#NX#)H+|I5;z#XA4Qh5)2IzzKrXvlKb2K(&E}kMY3I3oDi&J6q!X zY}yNsM`s7GYhDJ!vE41BM>e~BVu$D3#vS?5E4|xnNvhzo&QtPlqFJWDFSuRX)6m^N ckWJ-WVujnH0e&G>@NI4IV|+vKXWd8t102G>o&W#< diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po index 658e6dcd6..40add9114 100644 --- a/searx/translations/de/LC_MESSAGES/messages.po +++ b/searx/translations/de/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-01 21:11+0100\n" +"POT-Creation-Date: 2014-11-19 15:14+0100\n" "PO-Revision-Date: 2014-03-15 18:40+0000\n" "Last-Translator: pointhi\n" "Language-Team: German " @@ -216,13 +216,13 @@ msgstr "Suchmaschinenstatistik" msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "a privacy-respecting, hackable metasearch engine" -msgstr "" +msgstr "eine privatsphären respektierende, hackbare Metasuchmaschine" #: searx/templates/oscar/navbar.html:6 msgid "Toggle navigation" @@ -230,7 +230,7 @@ msgstr "" #: searx/templates/oscar/navbar.html:15 msgid "home" -msgstr "" +msgstr "Startseite" #: searx/templates/oscar/preferences.html:11 msgid "General" @@ -238,19 +238,19 @@ msgstr "Allgemein" #: searx/templates/oscar/preferences.html:12 msgid "Engines" -msgstr "" +msgstr "Suchmaschinen" #: searx/templates/oscar/preferences.html:36 msgid "What language do you prefer for search?" -msgstr "" +msgstr "Welche Sprache bevorzugst du für die Suche?" #: searx/templates/oscar/preferences.html:47 msgid "Change the language of the layout" -msgstr "" +msgstr "Ändere die Sprache des Layouts" #: searx/templates/oscar/preferences.html:60 msgid "Find stuff as you type" -msgstr "" +msgstr "finde Sachen während der Eingabe" #: searx/templates/oscar/preferences.html:70 msgid "" @@ -258,14 +258,17 @@ msgid "" "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\"" " rel=\"external\">learn more about request methods" msgstr "" +"ändere wie Formulare übertragen werden, lerne mehr über Anfragemethoden" #: searx/templates/oscar/preferences.html:81 msgid "Change searx layout" -msgstr "" +msgstr "ändere das Aussehen von searx" #: searx/templates/oscar/results.html:6 msgid "Search results" -msgstr "" +msgstr "Suchergebnisse" #: searx/templates/oscar/results.html:73 msgid "Links" @@ -273,31 +276,31 @@ msgstr "" #: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7 msgid "Start search" -msgstr "" +msgstr "Suche starten" #: searx/templates/oscar/search_full.html:11 msgid "Show search filters" -msgstr "" +msgstr "Suchfilter anzeigen" #: searx/templates/oscar/search_full.html:11 msgid "Hide search filters" -msgstr "" +msgstr "Suchfilter verstecke" #: searx/templates/oscar/stats.html:2 msgid "stats" -msgstr "" +msgstr "Statistiken" #: searx/templates/oscar/messages/first_time.html:4 #: searx/templates/oscar/messages/no_results.html:5 #: searx/templates/oscar/messages/save_settings_successfull.html:5 #: searx/templates/oscar/messages/unknow_error.html:5 msgid "Close" -msgstr "" +msgstr "Schließen" #: searx/templates/oscar/messages/first_time.html:6 #: searx/templates/oscar/messages/no_data_available.html:3 msgid "Heads up!" -msgstr "" +msgstr "Information!" #: searx/templates/oscar/messages/first_time.html:7 msgid "It look like you are using searx first time." @@ -305,55 +308,79 @@ msgstr "" #: searx/templates/oscar/messages/js_disabled.html:2 msgid "Warning!" -msgstr "" +msgstr "Warnung!" #: searx/templates/oscar/messages/js_disabled.html:3 msgid "Please enable JavaScript to use full functionality of this site." -msgstr "" +msgstr "Bitte aktiviere JavaScript um alle möglichkeiten dieser Seite zu nutzen." #: searx/templates/oscar/messages/no_data_available.html:4 msgid "There is currently no data available. " -msgstr "" +msgstr "Es sind derzeit keine Daten vorhanden." #: searx/templates/oscar/messages/no_results.html:7 msgid "Sorry!" -msgstr "" +msgstr "Entschuldigung!" #: searx/templates/oscar/messages/no_results.html:8 msgid "" "we didn't find any results. Please use another query or search in more " "categories." -msgstr "" +msgstr "Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen " +"anderen Suchbegriff oder Suche das gewünschte in einer anderen Kategorie." #: searx/templates/oscar/messages/save_settings_successfull.html:7 msgid "Well done!" -msgstr "" +msgstr "Gut gemacht!" #: searx/templates/oscar/messages/save_settings_successfull.html:8 msgid "Settings saved successfully." -msgstr "" +msgstr "Einstellungen wurden erfolgreich gespeichert." #: searx/templates/oscar/messages/unknow_error.html:7 msgid "Oh snap!" -msgstr "" +msgstr "Verdammt!" #: searx/templates/oscar/messages/unknow_error.html:8 msgid "Something went wrong." -msgstr "" +msgstr "Irgendetwas ist falsch gelaufen." -#: searx/templates/oscar/result_templates/images.html:20 -msgid "Get image" -msgstr "" +#: searx/templates/oscar/result_templates/default.html:6 +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/oscar/result_templates/videos.html:6 +msgid "cached" +msgstr "cached" #: searx/templates/oscar/result_templates/images.html:21 -msgid "View source" -msgstr "" +msgid "Get image" +msgstr "Bild ansehen" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/images.html:22 +msgid "View source" +msgstr "Seite besuchen" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "show map" +msgstr "Karte anzeigen" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "hide map" +msgstr "Karte verstecken" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "show details" +msgstr "Details anzeigen" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "hide details" +msgstr "Details verstecke" + +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" msgstr "" diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo index c150e852db3820c19536b221385a8783ead3a190..ca6febf423461760c3e75d98efb918561543b7c5 100644 GIT binary patch delta 1522 zcmb`_%S%*Y7{~EPn<<^qykt#_tO>lPNtOoL1*0;$xfoj{xtV6hW@yq(p@?#z%OX$; zM4Ck)5>tz;Ai+i8N{Z-8HMKB{geWKoAt;0veSdkVf1u&a`J8j!_kEt{J?BZ5JS$DS zFLVtWzX1Pb{6{i%_wTpKZN_1nIW53#n1g#T8xJ6d9paRQQA}YME<)dYvz1tdJhFXQ zj4fDbmar}^@_BF`y*P+UFpNrg8#!!@(-Itao~Ka-OgVl+C7eM5n~TNO=tITX&PfIA zMW$E)3&?M+T&VIRs6u+M5ig(zAD{|*fm-+u3-F^e{sVKl&mc%1=HWtIftp`~db9PY z0t2`h+ci#pJI#f5d=8c9vIg)fmfmFOm_A@5=Zx{2n)8tlz5YeLPx&tet+7!~IgCl&AkHU0&a zXa-X_i~0mZRHddI&E@@T;%gqLE8n7;XBO29IebX%q!?Lim8gX4QH5?nHRTTHc^j&L zuww@*;Yn27KCH$eRGcRXE>u7o6>t*uZKqL{e@7Ma3mY+)4&$X*Gpevw)Vc_2UECS( zMfPA9k;ATVB81&Q%^yQGWn!EQRXB<2%5TmD7g@DqFDlVe)WQ-h!zxr$22f3T9aTUk zC(SQHZNQHzxDv~;4%c8CvhjrVbD`!LKqW}d4cHLs6{S#x+(HGshnhcun*R{hl+RI3 z`4aU;-=OAAp+3nps<5x9H}mt)coUQPFiPM-CGa`-epH~qY~y bf;$5fo={fp27hgRLv7t?jrX(re?|TcDSV~! delta 1351 zcmZwFUr3Wt7{~FaIc54WvY zQNTsFY14u{U@H?S6Ox#LBw=DCC$@ENYhS=9RrsFVGSO3*{F zFxFue@vWJLcHD*v)S&@9fQ{IPeRu(n;0!8(oorw4w7V~9g?zF?!XKx@LN?OLcnmc@h}!WGPGTN)v=OpUu_aLN^`eUH zFsdf>* z*2|ziSwAZAv#3PQJ2X0ITthZ*Z%~=dp(cJpP5k1HuOKn4ib_+lZQ@3k#Zd3Jp^7bq zN-%>ew$twT7;3{;P;s0Ici;gw((w>gY_q6hYamS};GiblMD5@nD&ZnFVF?pBkJ@>F zNvpMhdJdybrrzyuKoWK=PD91kf-1IF)Py~#1=>+ZpGGCHA9Vs5cRY*Q(J9otQPfFX zL={^BRc!B2wYK`b(z)E3QA-bxlshY5d#eXd=CUI;m>tfZJDwX)1-i$hp~vH$!4tkj Sa$9RMl}wgP!KKRozxNmK5qz`& diff --git a/searx/translations/en/LC_MESSAGES/messages.po b/searx/translations/en/LC_MESSAGES/messages.po index e48f36927..313bf5069 100644 --- a/searx/translations/en/LC_MESSAGES/messages.po +++ b/searx/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-01 21:11+0100\n" +"POT-Creation-Date: 2014-11-19 15:14+0100\n" "PO-Revision-Date: 2014-01-30 15:22+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -208,11 +208,11 @@ msgstr "" msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -333,19 +333,42 @@ msgstr "" msgid "Something went wrong." msgstr "" -#: searx/templates/oscar/result_templates/images.html:20 -msgid "Get image" +#: searx/templates/oscar/result_templates/default.html:6 +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/oscar/result_templates/videos.html:6 +msgid "cached" msgstr "" #: searx/templates/oscar/result_templates/images.html:21 +msgid "Get image" +msgstr "" + +#: searx/templates/oscar/result_templates/images.html:22 msgid "View source" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/map.html:10 +msgid "show map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "hide map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "show details" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "hide details" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" msgstr "" diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.mo index 6490fa14884bd2792f60d3dbfe173caa1996592f..f6fc7c3684bca2fcfc6800dc5dad84c298afce89 100644 GIT binary patch delta 1521 zcmaLWOGs346vy#njj3biyNS#)XjDu^Es35?C7G25T9DL6$FVUr^FfIuLl1Y6hDbs! z60=Pzkzll_MTCpMD6%%1K}3|ah{6^{(Dzr@+BMAF&%OW0Ip_bs|C#n)$q3CRxcZDw zIloo>h8OAS-)CF68DHDZB?5QjQrwSGcm(-cHJ3;X;t)1tB6^mXt;O|7la*pBR$ziz z$eOu{qv0Y(V;?HP04m`q^0jd;%khEJK7}e^#_>HW;b$bUxtN@d9#otnE-K&vGQ`R; zp8QtHjViB471D-2>_RtApbC4An)n*y@txEE4P$r?BSLN!{PU>z z-EQ_@4gEAI&=4xoZPbChi_x4-3^njDY6bPU65G&+-KZ5kL#=q)@dIkyywe}YNmd~#$YRZl zly;Bc06!0&{EZ4!Md72T1}v>s;;5+&qHI?sou$`lB8hMnZF&adZ1%0$sH9I wnZG$Lzi>9}@jg1GlbU2jQ>J1@PMQl5Qs`|xBs8T1hYh5KVdR{#dQ3MshC2i`u!9sn2SRgz-2gz0h~o1`%SS5wNY4Y#8L)T06(KptzR$iX((-iu1$tn(5o;B{nS8^IEsM6L4;mB26LF%ONI#J5x` z$~+I1NIq8M7W85lDzP5a#6HZ#3$Fhr`gnhUOK}XB;4{?tdDO`+pc3>DEE{t$iTGAR zMLRA-1*%pD?!^LZzy|EbMw~$40AgVz|3bEpO0p%(anJhn)o1iqtAz(aKPXP`EejheR>wQdoHa1$2cDKF>0 zoXQ;<2II`0qIS~4Y$bLawa`fl1v-uD??;B(H5|er)Y0xC3thH@sK7m_lQ@HUcn`C1 z8g&WZ`Z)i5Dt~BDz;*m^as%qJmAUs?)Q&^WCRD&?)Nk31C3qe+{}C#Ian#PIQRAMY zHt-Qw;FlPcYAWg69POwM*^KRXhEW5fuD=hJ$Q2}KyMZiW_fdhyP?v22mEe0+;2*Bv z#|_u|S*R0@1*mA^Ml8T`+=q?WhPP3dEtf(QicveLKqb5tb;Pw;icwU8gQ#`yqQ;Nl zzmq}Tk#S^P%%-U5lD%{tuTTT$P!kuB$39aibN#u=$$Y4BtC7uF0qV#rTzeIUc;AM_ zco}o?30h4g(s9CS+B=7LBu*vxnp-2`PHPFbhogrg1C`$0!&kk@aVe$2HJgK#!Qk+% bv~x)rHPIu-TDv+rZKoS|)PH#3jeqnnj5C6~ diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po index 89293d7a6..c619a3826 100644 --- a/searx/translations/es/LC_MESSAGES/messages.po +++ b/searx/translations/es/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-01 21:11+0100\n" +"POT-Creation-Date: 2014-11-19 15:14+0100\n" "PO-Revision-Date: 2014-09-08 11:01+0000\n" "Last-Translator: Alejandro León Aznar\n" "Language-Team: Spanish " @@ -214,11 +214,11 @@ msgstr "Estadísticas del motor de búsqueda" msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -339,19 +339,42 @@ msgstr "" msgid "Something went wrong." msgstr "" -#: searx/templates/oscar/result_templates/images.html:20 -msgid "Get image" +#: searx/templates/oscar/result_templates/default.html:6 +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/oscar/result_templates/videos.html:6 +msgid "cached" msgstr "" #: searx/templates/oscar/result_templates/images.html:21 +msgid "Get image" +msgstr "" + +#: searx/templates/oscar/result_templates/images.html:22 msgid "View source" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/map.html:10 +msgid "show map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "hide map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "show details" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "hide details" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" msgstr "" diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo index 947eb2b31861319afaa6a4d10f0c97d27f034ae0..f06331e279cb6b814dad34233c2d94596d6f7888 100644 GIT binary patch delta 1523 zcmZ|OOGs2v9LMov&G?#39kqcnkn;5K@S(Kmnftl-JpTXxIrq$$+$;If_g>ea z;p6AGl;8L~J^lM^a2vzdY~+%Fn{WYc$0Xd1e9e9?i5SLF?7$54#T&B%3y~(X6SJ`% zy~adM2RCUn^q~g_Q3-}o32z`@bBD_!yl>m5PzA)SpHT^?k-)~q@g1h)N83MxDLls!Bo$L}AudCWFGlTbIjTTE zW?@MEGsQjXEA%a6Z>e~uf!?5utLm0C8|QbvqogB=|&yC9#r59)?wQ|W}hFR3VUpQjY=3p zz4K`-!gvmf;*>?XQ2~{xmDgYnZHA-1{pI4Xfl&KszJcaVwg30C3=YM$??1b!or`Dn}| zzGYES=EbN)R$~M=VF1sf5<8C?cp3BXn(I$u4)2d~5x&5MIF9;$61B6_s04ikE5Jfb zC%#ou(TX>q0!7q;yRZzKu^BsYAC93Cs9^c}ehboM+ffNOVhHzRHO5gZ??+C}p1Jp7 z^hnBHyN)qb;5VpiFoAyjh??LNYJwT$u~`Zw@DsHIKBB8X7qy@Q)VNisdCRd0tFRoq z0_=Ygl?OCDOfh?jn)no>l~^ZgqAm&ry5ibzA)nek?7>H`cW$!a{cd73C_8G zKa;Ro7C`N&S42evOR)?qFp7F1xDs^y^)Dn)X%D%AH8)cAUA!riE& zxrTS6Tu^i>EP49F~xpr diff --git a/searx/translations/fr/LC_MESSAGES/messages.po b/searx/translations/fr/LC_MESSAGES/messages.po index f4f8bb1f8..6c92ff6eb 100644 --- a/searx/translations/fr/LC_MESSAGES/messages.po +++ b/searx/translations/fr/LC_MESSAGES/messages.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-01 21:11+0100\n" +"POT-Creation-Date: 2014-11-19 15:14+0100\n" "PO-Revision-Date: 2014-09-07 21:24+0000\n" "Last-Translator: Adam Tauber \n" "Language-Team: French " @@ -216,11 +216,11 @@ msgstr "Statistiques du moteur" msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -341,19 +341,42 @@ msgstr "" msgid "Something went wrong." msgstr "" -#: searx/templates/oscar/result_templates/images.html:20 -msgid "Get image" +#: searx/templates/oscar/result_templates/default.html:6 +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/oscar/result_templates/videos.html:6 +msgid "cached" msgstr "" #: searx/templates/oscar/result_templates/images.html:21 +msgid "Get image" +msgstr "" + +#: searx/templates/oscar/result_templates/images.html:22 msgid "View source" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/map.html:10 +msgid "show map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "hide map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "show details" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "hide details" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" msgstr "" diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.mo index dc3e457f7b7c6ce5d9ef1c7f4b8fb61ca1cb3dbf..0cbdd85ab88263ab28d50b0204a09278626b8a6b 100644 GIT binary patch delta 1507 zcmZwFOGs2v9LMovj-!tG7+(YV$R28?m=g+W1p|taSalvk1MiubUb_JF2Clc5=m|Te-RGcPmDxeh^ zV*KbPziH<|m0v^^GKfCBg)V%JD(oF<;wN}TfEL>749U9;$)x_7ogh9kq~A- z#<2nQ3BI5X8wK?w$rGu zE|bW~*7zJ$o}H*eY3=1f6*i+*c*Y*khg$g%D&dITK89ty-^DO4U=!}9Y84*krh=}b z7BGsMKaS;i53BJNvICY`U+8P%sP&TTNVpPBi)M2YZ&8tTpN}t`|X!p0; z{U?#orVX_N7f?HN1(Q|!C=W_7hDtDn+L1Ww(>y~J^aB0(26aZZF-TimmoxX>@xigL zGuRmkb(wIqJ2YUdCteE?3-k0Rf@l_b z)rL)kBoZ41T@(ylcwvDTQIQZ)LMUA%6;#mohc7hVozHpCzvnsUJuic|w!{_#-rL6S z5dRwfBObl||1EpX@_1dr0{o68_#2C`kWTdnCT0O{S)ZteHz!}b6kh7P~#U-C;J(dpod@;Sc&<> zw?-=3aSJL?SRHr}gV>3kcnQ039+kjWwy*KKkS5!QO1J~-u^XFl1hw-t^408_`~CuB zBxSR1$2=B{f@|swJK`h4zw&EU4qB8%2O6V7A2VNSrfFJ9z3Y#&EI)MSyx)&c)*rJmD!Ob5)WYNLfT^_sHjO;?ltMe5L!HE1RG=l)PQRg!JePA-dlBlg zm7%`<31rhYjMnBj{THmQFFLa~Z_ewFoN{`jcCxpx_gs$?Z}sh;8S@q76gG!8Z40%A kLNk-aUHRpaO!BnTf5tLNXRyb~B>VcK@s>b$JQW!K2a2(UO#lD@ diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po index b3977a477..665efa66c 100644 --- a/searx/translations/hu/LC_MESSAGES/messages.po +++ b/searx/translations/hu/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-01 21:11+0100\n" +"POT-Creation-Date: 2014-11-19 15:14+0100\n" "PO-Revision-Date: 2014-09-07 21:30+0000\n" "Last-Translator: Adam Tauber \n" "Language-Team: Hungarian " @@ -213,11 +213,11 @@ msgstr "Kereső statisztikák" msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -338,19 +338,42 @@ msgstr "" msgid "Something went wrong." msgstr "" -#: searx/templates/oscar/result_templates/images.html:20 -msgid "Get image" +#: searx/templates/oscar/result_templates/default.html:6 +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/oscar/result_templates/videos.html:6 +msgid "cached" msgstr "" #: searx/templates/oscar/result_templates/images.html:21 +msgid "Get image" +msgstr "" + +#: searx/templates/oscar/result_templates/images.html:22 msgid "View source" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/map.html:10 +msgid "show map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "hide map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "show details" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "hide details" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" msgstr "" diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.mo index 2adfd31cebcab95a56cb29c2f19fe75c1296aa25..59799b504c68430f8b965267860e16f157329068 100644 GIT binary patch delta 1522 zcmZ|OOGs2v9LMpajW&*%?a%BjDbmoO*7X<8Z}=9p$+s9g2F-! zp;}1JBGQ5ccRdyn6t$?NT2ur@i`=-WozVAZr`psob3gaI{{R0y_so> z6Eof1WYBRAQ*jiPU>ue34)QfKTvp(H+dqpc;Jx)LD&ag5*tl3+f?iadS}rP}0hwX~ zm`Q%q!i_3FhAN~FtMNQ~@CmB0m#BpwFcZJn@gJB*JAokSn2yVFHEMn-YGce4>Su?F={n^A}FC@SG;RDvPff64Ywpb}16XHan- z;VPWP5}e1y9gh)R1^7?_i&3Yy617EjxE33+8hcPrIBk7^O86ADL$6V1V-B@`!M2k* z+2k}UQF)3`hcZ^mjVi21J$b90(2v^E0qX_Ze--`o-@s;kjE6CgtV%q{MelwXRlqe= z!4p`7cd;DbBJpF!&EslfE~>Hu)D!t^e;KNf&9+^KI&6)$-Gn-n2T?oOii+c)wm6F9 zGJU8*hHU!^CYf6PUfd|bEmR>hw*7E%0*A%=3ImM4!$K@(+jJ%xvZuef-nce|f}w~L zHf`-ur`H^HI-QFOS$46eI?9PdFo%}P% pimI&@o2GrKCz8u-*l<^t%a{{)hRp%DN8 delta 1356 zcmYMyOGs2<7{>9p8J%?0(h)DDfn%l?1I=V@tUwn@LPDcKi!zEDQy3LA4cr_mrA=*| z6s%38h9upvRs{}585Oq3RTm+;ZH%r2WkLUkPBff3zwdUw_x&!f%df0;76K_l#;<{Y zG5>y#YX5(WDQ2luKj3owikY~C>6k{R`UAYuun@;Fh`Bh6L41xp_M6vg^!oV5%&{Pa zY#KIU25v_Mh@t}SM;>e8m5=Ridp|0H)2_p)fESR7?IwnB7B$Z|R06+{$2>IV5Z}@% zDDxszB4t>Eo6(QGsKkz=K0Jdtc-HN|gjv*Y;7Xjv75D@-egU|qga9aFpT}EmES^6&2GE(BswHz z_uY;;RN$wmYw!%c_!2e2E7SzJ1GFxP%JeLK zVYJ$Kyz`jVc63kGr9Mo_YH5qdy6s4;Bi3~=o~ZWMCz64J#C89tv~Z+kW28C~nVQJx Z^#u-h9_ne2bsTN`H#U}N2sATz^bbz?g&_a{ diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po index 3b84301a4..f67aa3a44 100644 --- a/searx/translations/it/LC_MESSAGES/messages.po +++ b/searx/translations/it/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-01 21:11+0100\n" +"POT-Creation-Date: 2014-11-19 15:14+0100\n" "PO-Revision-Date: 2014-09-08 08:19+0000\n" "Last-Translator: dp \n" "Language-Team: Italian " @@ -214,11 +214,11 @@ msgstr "Statistiche dei motori" msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -339,19 +339,42 @@ msgstr "" msgid "Something went wrong." msgstr "" -#: searx/templates/oscar/result_templates/images.html:20 -msgid "Get image" +#: searx/templates/oscar/result_templates/default.html:6 +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/oscar/result_templates/videos.html:6 +msgid "cached" msgstr "" #: searx/templates/oscar/result_templates/images.html:21 +msgid "Get image" +msgstr "" + +#: searx/templates/oscar/result_templates/images.html:22 msgid "View source" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/map.html:10 +msgid "show map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "hide map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "show details" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "hide details" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" msgstr "" diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo index 348a3a902fb35623a6b2a689ee08302acf36a641..1a863e7b4145d38bffdaa9db036c4f6b5e8537f1 100644 GIT binary patch delta 1506 zcmZwGOGs346vy#n&6sZ;Q-?~+$`>W3kwo@DFp?g&7%P$rn#S=#miYi7vVqK1MS_Sf zY9Zw+agpFA5&{c~3?m_m%taDNEyCzQtG>VdTbqXK{oMcSob$i;@1vX_xsms&o<8Fj z;4hQE;bm(5`|a|YaoKKeE3g6+@F2$GapbZy++wf+hp+`#qCeVfJ#I$2tO~QR8dJ?8 z*1|&y9ak|P`%no6Q3*$o%f`56;6v9xjVj=s^CK$Z7bLKGSX_vHRGhusRKOu*iUrU| zeyia@m7hfw(vIcWjdAz{RoF|^!Ws18oE!g+iL|2#l8niigzHfAi%@U26jfjV)3HwD zT`<5BTb zFrooJ4{XA+P=(~80&Ybu*oj(DjyfKdxEv3l)*nXAJA&l08dPB+)SGE`Z{x$Ih9XgfMsKc{>ItyMtq;`^lthEiOgj-OBZbu!;J+A*Ks(@3@dQ`#| zRNQVX!~s;C#}OV>z$7Z*E7Z4ri>mxHs*rD3j?tVjUW!$s<_DZLsCB2^cq?*Qr}G99 z!fvD14WkZaWRwS0IE6Zub8f;f)Q+Rbt_4ZXbj+iji8_=Os6*M0D&Q;Xjd^Kk13py2 zt1%yQu^6k6_z}CzgAUI%RHB~60qaM-%Db*Tf(rNmHGcv%|EU|Fa_t%Coa_ID?8Sb% z{usW4+R5m#3jR-d&`xtu2}*DcmZ3h)F;t?H7{Cw~;27#q&W_G|UVAo$f}w_Rt<^O) zh1;w?d_LS7Y_f*N+HiJlxINg|)VA0-7rf9r8M{BNp}FJlK${v2jHbn+$6hG^YUJTot;9HgU-&h-c!Sp}tm$EDc>+SN5{|1V7pGp7# delta 1362 zcmYMyO-PhM9LMqT@oin*Qfn==Aj8xRq1|3CR-{ponV<<36p;rlVRJ(vp+gTnyEm&t zn}(+>(hk-^)=m-`MnVUrf)0j8JVh6)Ls5_geSb92^6c}OmuF`FGxPtsRGKqr z__grgz(3`v_W!q>V@xj9&zO(jun1SM00VTYzm!)1*W)Nw;u@UAN_>kv<`1upn4QNM zV_Z{7p_qo9ScnHv3$&pYJdHf2i&q(*x9urZ09UO;s0BxmiOnR|;Vf#N@2CKNBad-t zEMa|9KtYjLpaQAF2Hb@~yod_y3TogrEWw+$e+)y^CvY`B!Bseq`hE#@vL8_aIxH5( zGR$LrQ%6BN-ho=EK^=GmtFay1@e-cIIaB~!*}lHtgEW~#sDRtB22WuWQ>dLkLT=4W z+4?lP1ZAGvjycrAuTg2RfZ4c+n&3TZf=|d}mU$_FAE*;>SY7?as11ct<2Iw_t;M6b z4QtU0a{lWmjMLDcWy}m}z-~q>utwBGO}w<=F;xE<)Q-Dw6cebU4HJcuErR;48I^2p zsGLZkuGm8bo(^&Tj5W7u(1H(8kxrtLZOXR4LItp3{eW8V3uls6cvM3JnyJ$mY#6)PQ;G8`Qu>+y51nWWTIIDilpQYFq@BY*AEzEvRJc zu>Jk04PUl(cfb~IU^N}XsAQW)CEHrUQ~(!HN9Lh+a2*x!Ev&)27{wQ;1y)eG5MZ$C zA=C+$quQ&GfL#-@A4LB(n7!5mw!ImN#hkG1=WIQJn#jcpOref^1a%T)sAPMHN;ch- zaxJ3!YK+Gd{id;}FEd*-;ACFr?{h+3-SN&obGEamv$rFjt`9b4hJ(dffoN>g_E>!^ mmYFDgms{p12Yv63@7?p0\n" "Language-Team: ja \n" @@ -208,11 +208,11 @@ msgstr "" msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -333,19 +333,42 @@ msgstr "" msgid "Something went wrong." msgstr "" -#: searx/templates/oscar/result_templates/images.html:20 -msgid "Get image" +#: searx/templates/oscar/result_templates/default.html:6 +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/oscar/result_templates/videos.html:6 +msgid "cached" msgstr "" #: searx/templates/oscar/result_templates/images.html:21 +msgid "Get image" +msgstr "" + +#: searx/templates/oscar/result_templates/images.html:22 msgid "View source" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/map.html:10 +msgid "show map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "hide map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "show details" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "hide details" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" msgstr "" diff --git a/searx/translations/nl/LC_MESSAGES/messages.mo b/searx/translations/nl/LC_MESSAGES/messages.mo index 8b1706b5025f95398b06d8f81643bf272f9f4a42..eede062cfce195e1a1d5c97f8ab4461fac63a0fc 100644 GIT binary patch delta 1525 zcmZ|NSx8h-9LMp$HtxBMR+E)xi%X@Zkq?%El_<6u8kAJhsMki^(vhM_hE^n^B9RPw z5fxfQLLrJMqK6)$9s&u13W=BMLX;Y}|@5xCi-JJ&$M%;0ShN3i=|=mf$L6$hKn|)?l(( z$U12xF>o5=upgCR5S4HY`Pm&F^YDQ?K8Y&ewd)5|!f7P1d03o_K2)4C9x7lP@`_cX zm;6>sLzTCn3hBmDJcF_L1Xb7z)WSFD#rN*~SB$40Mvz2I!~|T7dOsg^vPGx@t8p$i zX`cLcoQ8IM3YF-RCh!_&;Sko~Q{0Q`Y+D5!L%n|A^Tu z{3Hx%!bgKmSQ@I3OjN)%s0Hg$3rbPfqXK8)7S#G3sP}duxvUmdSOe;0I^6jlRQ!{u z_!nb2e+>*Upg<$2M7K~EavXCof@nU>#~Wd0<){GDELP#)QE|e^ro;)TLKe6##}WGZ zs82A7x|AQ|Ie#UN<%4Bl66)I&Vk%ak?t~vzKo=_EIaHySQJ3gu_4zn)Vg~(A0MICy+U%>JGVdM z_J5$>k6~B3l%XUVsxS|gcq8hC-KZn2LnUl+#}8u`{T|$p!&rym+(=zYKM#F^AgYiM zYJD$eV;>gaedNxB>@y9Wzziz!H`EdSLZhYFTedr%i@KD>s5m94IGbE6 zkxko9R3QgYpP~h$tjz2v4J9~%N^rsLUqJ;NMt!TBSdHVj6eBn`omfuF#3#>7&&mdW zL%?aYrsh^BXa}8kr_0}Jf#yahqtWU1H@60VciQ}i`ku#B&IxoJ`7;qzM-x-t)V{pf v>FC1ZjKZRIg=;4=p`c@q4DqVXTAIW7ykM$vN@vg delta 1353 zcmYMyPe@cz6vy%7_+la|Vg`d64{^)DLLA31ZoqjA<05j|Uv675IgL4H zaSPMPrDGpv;Sp4TI#j@B|pzP{~*$3$508^VF@;3IrgJ={sj4I_S8Mk zVw|Mxg&SBv1%8V<1|KjPKcW^`LM`wGxonx668MFxK!E5P&qZx0A2qKSwQeca<8Ca) zOF`dC#wTR+R>TRCJ5dw&V<8?wO+1ObYNy?^@1A>6?_Wk8wjor4_fUan z-1s}BShk3Y6aVT4Rxm=xZ*0Oa^=Z}%sKb^(eS)8;MAlFXq%v57xmb<|P-mbWRRJGW zxo*_FJ~uvqBoenl8aiyFs0p`FJGtYWL~^o+sDQJmlD|Tg`aNn#OQ`wZUH>ZTu&rS+ z)>3a(qEmIRj>XRRTD9LbeKhrDN_J~|%i_@% diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po index 1598dfc52..eb7f5b2a6 100644 --- a/searx/translations/nl/LC_MESSAGES/messages.po +++ b/searx/translations/nl/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: searx\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-11-01 21:11+0100\n" +"POT-Creation-Date: 2014-11-19 15:14+0100\n" "PO-Revision-Date: 2014-09-09 15:33+0000\n" "Last-Translator: André Koot \n" "Language-Team: Dutch " @@ -214,11 +214,11 @@ msgstr "Zoekmachinestatistieken" msgid "Answers" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "Powered by" msgstr "" -#: searx/templates/oscar/base.html:61 +#: searx/templates/oscar/base.html:62 msgid "a privacy-respecting, hackable metasearch engine" msgstr "" @@ -339,19 +339,42 @@ msgstr "" msgid "Something went wrong." msgstr "" -#: searx/templates/oscar/result_templates/images.html:20 -msgid "Get image" +#: searx/templates/oscar/result_templates/default.html:6 +#: searx/templates/oscar/result_templates/map.html:7 +#: searx/templates/oscar/result_templates/torrent.html:6 +#: searx/templates/oscar/result_templates/videos.html:6 +msgid "cached" msgstr "" #: searx/templates/oscar/result_templates/images.html:21 +msgid "Get image" +msgstr "" + +#: searx/templates/oscar/result_templates/images.html:22 msgid "View source" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/map.html:10 +msgid "show map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:10 +msgid "hide map" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "show details" +msgstr "" + +#: searx/templates/oscar/result_templates/map.html:14 +msgid "hide details" +msgstr "" + +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Seeder" msgstr "" -#: searx/templates/oscar/result_templates/torrent.html:7 +#: searx/templates/oscar/result_templates/torrent.html:8 msgid "Leecher" msgstr ""