Commit d0a28592 authored by Niels Holt's avatar Niels Holt

Merge branch 'release/3.5.1'

parents c6d1f18b 4131bf8a
......@@ -29,19 +29,20 @@
<script src="leaflet.js"></script>
<script type="text/javascript">
var hash = window.location.hash.slice(1),
search = window.location.search,
searchUC = search.toUpperCase(),
href = window.location.href,
hrefArray = href.split('/'),
isEn = search.toUpperCase().indexOf('LANG=EN') > -1;
var search = window.location.search,
isEn = search.toUpperCase().indexOf('LANG=EN') > -1,
baseHRef = window.location.href;
hrefArray.pop();
hrefArray.pop();
baseHRef = baseHRef.replace( window.location.hash, '');
baseHRef = baseHRef.replace( window.location.search, '');
baseHRef = baseHRef.replace( 'index.html', '');
baseHRef = baseHRef.replace( '/select', '');
baseHRef = baseHRef + 'index.html' + (isEn ? '?lang=en' : '') + '#domain=';
hrefArray.push('index.html');
function getHref( domain ){ return hrefArray.join('/') + search + '#domain=' + domain + (hash ? '&' + hash : ''); }
function getHref( domain ){
return baseHRef + domain;
}
//Set lang-class and title
document.body.className = isEn ? 'lang-en' : 'lang-da';
......@@ -49,7 +50,7 @@
//List of areas
var areas = [
{ da: 'Global', en:'Global', href: getHref('global'), bounds: [[90.0, -180.0], [-90.0, 180.0]] },
{ da: 'Global', en:'Global', href: getHref('global'), bounds: [[90.0, -180.0] , [-90.0, 180.0]] },
{ da: 'Europa', en:'Europe', href: getHref('europe'), bounds: [[85.9585, -85.9219], [28.0437, 41.9063]] },
{ da: 'Danmark', en:'Denmark', href: getHref('denmark'), bounds: [[61.0157, -3.3618], [ 52.8558, 24.5214]] },
{ da: 'Grønland', en:'Greenland', href: getHref('greenland'), bounds: [[76.7605, -61.2158], [ 58.6198, -16.2158]] },
......@@ -99,8 +100,10 @@
//For debug map.on('click', function(e){ console.log('mouse:',e.latlng, 'map-center', map.getCenter(), 'map-zoom', map.getZoom()); });
L.tileLayer('https://tiles{s}.fcoo.dk/tiles/tiles_bckgrnd_512_mercator_201508030000/{z}/{x}/{y}.png', {minZoom: minZoom, maxZoom: maxZoom, subdomains:['01','02','03'], tileSize:512, continuousWorld: false }).addTo(map);
// L.tileLayer('https://tiles{s}.fcoo.dk/tiles/tiles_top_512_mercator_201508030000/{z}/{x}/{y}.png', {maxZoom: 18, minZoom: minZoom, maxZoom: maxZoom, subdomains:['01','02','03'], tileSize:512, continuousWorld: false }).addTo(map);
L.tileLayer(
'https://tiles{s}.fcoo.dk/tiles/tiles_bckgrnd_512_mercator_201508030000/{z}/{x}/{y}.png',
{minZoom: minZoom, maxZoom: maxZoom, subdomains:['01','02','03'], tileSize:512, continuousWorld: false
}).addTo(map);
for (i=0; i<areas.length; i++ ){
var area = areas[i],
......
{
"name": "ifm-maps",
"version": "3.5.0",
"version": "3.5.1",
"homepage": "https://github.com/FCOO/ifm-maps",
"authors": [
"Jesper Baasch-Larsen jla@fcoo.dk",
......
{
"name": "ifm-maps",
"version": "3.5.0",
"version": "3.5.1",
"homepage": "https://github.com/FCOO/ifm-maps",
"authors": [
"Jesper Baasch-Larsen jla@fcoo.dk",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment