Display GeoJSON Coastline

13,29d12 < $sih=""; < $rih=""; < < function oururlencode($instuff) { < $outstuff=''; < $dotbits=explode('.', $instuff); < if (sizeof($dotbits) > 1) { < $outstuff=$instuff; < for ($ii=1; $ii 3) { < $outstuff=str_replace('.' . explode(',', explode(' ', $dotbits[$ii])[0])[0], '.' . substr(explode(',', explode(' ', $dotbits[$ii])[0])[0],0,3), $outstuff); < } < } < return urlencode($outstuff); < } < return urlencode($instuff); < } 51,78d33 < if (file_exists('population.geojson')) { < $rbits=explode(']}}', file_get_contents('./population.geojson')); < for ($irr=1; $irr<(-1 + sizeof($rbits)); $irr++) { < $hdrbit=explode('{"type":"Feature', $rbits[-1 + $irr])[-1 + sizeof(explode('{"type":"Feature', $rbits[-1 + $irr]))]; < $hbits=explode(',"NAME":"', $hdrbit); < if (sizeof($hbits) > 1) { < if (strpos($sih, ' id=' . str_replace('+','%20',urlencode(explode('"', $hbits[1])[0])) . ' ') === false) { < $sih.=''; < } < } < } < } < < if (file_exists('rivers.geojson')) { < $rbits=explode(']]}}', file_get_contents('./rivers.geojson')); < for ($irr=1; $irr<(-1 + sizeof($rbits)); $irr++) { < $hdrbit=explode('{"type":"Feature', $rbits[-1 + $irr])[-1 + sizeof(explode('{"type":"Feature', $rbits[-1 + $irr]))]; < $hbits=explode(',"name":"', $hdrbit); < if (sizeof($hbits) > 1) { < if (strpos($sih, 'id=river' . str_replace('+','%20',urlencode(explode('"', $hbits[1])[0])) . '>') === false) { < $rih.=''; < } else { < $rih=str_replace(' id=river' . str_replace('+','%20', oururlencode(explode('"', $hbits[1])[0])) . '>', str_replace('+','%20', urlencode(str_replace('[','', str_replace(']','', str_replace('],[', ',', str_replace(']],[[', ' ', explode(']]}', explode(':[[',$hdrbit)[1])[0])))))) . ' id=river' . str_replace('+','%20',urlencode(explode('"', $hbits[1])[0])) . '>', $rih); < } < } < } < } < 96c51 < $htmlis="Display GeoJSON Coastline --- > $htmlis="Display GeoJSON Coastline 103c58 < var populations='', apopulations=[], jguess=-1, jsofar=' ', isokto=true, both=false, jlastn='', idone=false; --- > var populations='', apopulations=[], jguess=-1, jsofar=' ', isokto=true, both=false, jlastn=''; 106d60 < if (!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) document.getElementById('srivs').innerHTML=''; 238,239d191 < } else if (!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < morehuh=confirm(what + ' See these on a map? ' + ourlong); 241c193 < morehuh=confirm(what + ' See these on a map? '); --- > morehuh=confirm(what + ' See these on a map? ' + ourlong); 247,248d198 < } else if (!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < morehuh=confirm(what.replace(/\)/g,') ') + ' See these on a map? ' + ourl); 250c200 < morehuh=confirm(what.replace(/\)/g,') ') + ' See these on a map? '); --- > morehuh=confirm(what.replace(/\)/g,') ') + ' See these on a map? ' + ourl); 392d341 < 394,500d342 < function plotarivervia(aname, thecontent) { < var found=-1, ifnd=0; < var rbits=thecontent.split(']]}}'); < var murraytotal=0.0; < llist=''; < thecontent=''; < var hdrbit='', hbits=[]; < lastn=''; < for (var irr=1; irr<(-1 + rbits.length); irr++) { < hdrbit=rbits[-1 + irr].split('{' + String.fromCharCode(34) + 'type' + String.fromCharCode(34) + ':' + String.fromCharCode(34) + 'Feature')[eval(-1 + rbits[-1 + irr].split('{' + String.fromCharCode(34) + 'type' + String.fromCharCode(34) + ':' + String.fromCharCode(34) + 'Feature').length)] + ''; < //alert(hdrbit); < hbits=hdrbit.split(',' + String.fromCharCode(34) + 'name' + String.fromCharCode(34) + ':' + String.fromCharCode(34) + aname + String.fromCharCode(34)); < if (hbits.length > 1) { < //if ((!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i) || eval('' + arivers.length) <= 200)) { < if (lastn != aname) { < lastn=aname; < found=-1; < if (arivers.length > 0) { < for (ifnd=0; ifnd= 0) { < //if (lastn == 'Murray') { < // console.log(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < //} < if (1 == 1 || !navigator.userAgent.match(/Android|BlackBerry|iPhone|iPaJUNJKd|iPod|Opera Mini|IEMobile/i)) { < llist+=' ' + lessit(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < } < } else { < //if (lastn == 'Murray') { < // console.log(lastn + ':' + hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < //} < llist=(lastn + ':' + lessit(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,''))); < } < } else if (1 == 1 || !navigator.userAgent.match(/Android|BlackBerry|iPhone|iPaJUNKd|iPod|Opera Mini|IEMobile/i)) { < //if (lastn == 'Murray') { < // console.log(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < //} < llist+=' ' + lessit(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < } < //} < } < } < plottheriver(found, llist) < } < < function populateriversvia(ts) { < if (document.getElementById('srivs').innerHTML.trim() == '') { < var found=-1, ifnd=0; < var rbits=ts.split(']]}}'); < var murraytotal=0.0; < var hdrbit='', hbits=[]; < lastn=''; < for (var irr=1; irr<(-1 + rbits.length); irr++) { < hdrbit=rbits[-1 + irr].split('{' + String.fromCharCode(34) + 'type' + String.fromCharCode(34) + ':' + String.fromCharCode(34) + 'Feature')[eval(-1 + rbits[-1 + irr].split('{' + String.fromCharCode(34) + 'type' + String.fromCharCode(34) + ':' + String.fromCharCode(34) + 'Feature').length)] + ''; < //alert(hdrbit); < hbits=hdrbit.split(',' + String.fromCharCode(34) + 'name' + String.fromCharCode(34) + ':' + String.fromCharCode(34)); < if (hbits.length > 1) { < if ((!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPaJUNKd|iPod|Opera Mini|IEMobile/i) || eval('' + arivers.length) <= 200)) { < if (lastn != hbits[1].split(String.fromCharCode(34))[0]) { < lastn=hbits[1].split(String.fromCharCode(34))[0]; < found=-1; < if (arivers.length > 0) { < for (ifnd=0; ifnd= 0) { < //if (lastn == 'Murray') { < // console.log(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < //} < if (!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPaJUNKd|iPod|Opera Mini|IEMobile/i)) { < arivers[found]+=' ' + lessit(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < } < } else { < //if (lastn == 'Murray') { < // console.log(lastn + ':' + hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < //} < arivers.push(lastn + ':' + lessit(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,''))); < } < } else if (!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPaJUNKd|iPod|Opera Mini|IEMobile/i)) { < //if (lastn == 'Murray') { < // console.log(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < //} < arivers[-1 + arivers.length]+=' ' + lessit(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < } < } < } < } < rbits=[]; < if (document.getElementById('srivs').innerHTML.trim() != '') { < arivers=[]; < } < } < lastn=''; < //if (navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < // alert(arivers.length); < //} < //return; < //plotariver(getariver()); < if (!idone) { idone=true; if (document.getElementById('srivs').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { getapopulation(); } else { getariver(); } } < } 503d344 < if (document.getElementById('srivs').innerHTML.trim() == '') { 508,509c349 < var hdrbit='', hbits=[]; < lastn=''; --- > var lastn='', hdrbit='', hbits=[]; 515c355 < if ((!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPaJUNKd|iPod|Opera Mini|IEMobile/i) || eval('' + arivers.length) <= 200)) { --- > if ((!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i) || eval('' + arivers.length) <= 200)) { 527,530c367,370 < //if (lastn == 'Murray') { < // console.log(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < //} < if (!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPaJUNKd|iPod|Opera Mini|IEMobile/i)) { --- > if (lastn == 'Murray') { > console.log(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); > } > if (!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { 534,536c374,376 < //if (lastn == 'Murray') { < // console.log(lastn + ':' + hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < //} --- > if (lastn == 'Murray') { > console.log(lastn + ':' + hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); > } 539,542c379,382 < } else if (!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPaJUNKd|iPod|Opera Mini|IEMobile/i)) { < //if (lastn == 'Murray') { < // console.log(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < //} --- > } else if (1 == 1 || !navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { > if (lastn == 'Murray') { > console.log(hdrbit.split(':[[')[1].replace(/\]\]\,\[\[/g,' ').replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); > } 549,552d388 < if (document.getElementById('srivs').innerHTML.trim() != '') { < arivers=[]; < } < } 559c395 < if (!idone) { idone=true; if (document.getElementById('srivs').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { getapopulation(); } else { getariver(); } } --- > if (!idone) { idone=true; getariver(); } 562c398 < function lessitp(maybe) { --- > function lessit(maybe) { 564c400 < if (document.getElementById('spops').innerHTML.trim() != '' || navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { --- > if (navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { 568,607d403 < if (ic == 1) { < acsvs=[]; < if (document.getElementById(encodeURIComponent(jlastn))) { < document.getElementById(encodeURIComponent(jlastn)).value+=encodeURIComponent(' ' + altmaybe); < } else { < document.getElementById('spops').innerHTML+=''; < } < return ''; //altmaybe; < } < altmaybed=','; < } < acsvs=[]; < return ''; //altmaybe; < } < return maybe; < } < < function lessit(maybe) { < var altmaybe='', xaltmaybe='', altmaybed='', sls=[], isls=0; < if (document.getElementById('srivs').innerHTML.trim() != '' || navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < var acsvs=maybe.split(','); < for (var ic=0; ic 1) { < document.getElementById(encodeURIComponent('river' + lastn)).value+=encodeURIComponent(' ' + altmaybed + sls[0] + ' ' + sls[1]); < } else { < document.getElementById(encodeURIComponent('river' + lastn)).value+=encodeURIComponent(' ' + altmaybed + xaltmaybe); < } < } else if (eval('' + sls.length) > 1) { < document.getElementById('srivs').innerHTML+=''; < } else { < document.getElementById('srivs').innerHTML+=''; < } < } else { < if (ic == 1) { acsvs=[]; return altmaybe; } < } 611d406 < if (document.getElementById('srivs').innerHTML.trim() != '') { return ''; } 617,663d411 < function populatepopulationsvia(ts) { < console.log('here in populatepopulationsvia'); < if (document.getElementById('spops').innerHTML.trim() == '') { < var found=-1, ifnd=0; < var rbits=ts.split(']}}'); < //populations=''; < var hdrbit='', hbits=[]; < jlastn=''; < for (var irr=1; irr<(-1 + rbits.length); irr++) { < hdrbit=rbits[-1 + irr].split('{' + String.fromCharCode(34) + 'type' + String.fromCharCode(34) + ':' + String.fromCharCode(34) + 'Feature')[eval(-1 + rbits[-1 + irr].split('{' + String.fromCharCode(34) + 'type' + String.fromCharCode(34) + ':' + String.fromCharCode(34) + 'Feature').length)] + ''; < //alert(hdrbit); < hbits=hdrbit.split(',' + String.fromCharCode(34) + 'NAME' + String.fromCharCode(34) + ':' + String.fromCharCode(34)); < if (hbits.length > 1) { < if (jlastn != hbits[1].split(String.fromCharCode(34))[0]) { < jlastn=hbits[1].split(String.fromCharCode(34))[0]; < found=-1; < if (apopulations.length > 0) { < for (ifnd=0; ifnd= 0) { < //if (jlastn == 'Sydney') { console.log(hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); } < apopulations[found]+=' ' + lessitp(hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < } else { < //if (jlastn == 'Sydney') { console.log(jlastn + ':' + hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); } < apopulations.push(jlastn + ':' + lessitp(hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,''))); < } < } else { < //if (jlastn == 'Sydney') { console.log(hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); } < apopulations[-1 + apopulations.length]+=' ' + lessitp(hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); < } < } < } < if (document.getElementById('spops').innerHTML.trim() != '') { < //console.log(document.getElementById('spops').innerHTML); < apopulations=[]; < } < rbits=[]; < } < jlastn=''; < //return; < //plotariver(getariver()); < } < 668,669c416 < var hdrbit='', hbits=[]; < jlastn=''; --- > var jlastn='', hdrbit='', hbits=[]; 686c433 < //if (jlastn == 'Sydney') { console.log(hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); } --- > if (jlastn == 'Sydney') { console.log(hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); } 689c436 < //if (jlastn == 'Sydney') { console.log(jlastn + ':' + hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); } --- > if (jlastn == 'Sydney') { console.log(jlastn + ':' + hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); } 693c440 < //if (jlastn == 'Sydney') { console.log(hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); } --- > if (jlastn == 'Sydney') { console.log(hdrbit.split(':[')[1].replace(/\]\,\[/g,',').replace(/\[/g,'').replace(/\]/g,'')); } 698,700d444 < if (document.getElementById('spops').innerHTML.trim() != '') { < apopulations=[]; < } 708d451 < console.log('here in getariver'); 712,717c455 < if (document.getElementById('srivs').innerHTML.trim() != '' && !idone) { idone=true; } < if (!idone) { document.getElementById('ifrivers').src='./rivers.geojson'; } else if (arivers.length > 0 || document.getElementById('srivs').innerHTML.trim() != '') { < < if (document.getElementById('srivs').innerHTML.trim() != '') { // || navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < iguess=Math.floor(Math.random() * eval(-1 + eval('' + document.getElementById('srivs').innerHTML.split(' if (!idone) { document.getElementById('ifrivers').src='./rivers.geojson'; } else if (arivers.length > 0) { 719d456 < } 722,724d458 < if (document.getElementById('srivs').innerHTML.trim() != '') { < iguess=Math.floor(Math.random() * eval(-1 + eval('' + document.getElementById('srivs').innerHTML.split('')[0].replace(String.fromCharCode(34),'').replace(String.fromCharCode(34),'')).replace(/^river/g,''); < } else { 734,737d463 < } < if (navigator.userAgent.match(/Android|BlackBerry|iPhone|iPaJUNKd|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifriverstwo').src='./rivers.geojson?name=' + encodeURIComponent(lastn); < } else { 739d464 < } 745d469 < 747d470 < console.log('here in getapopulation jsofar=' + jsofar + ' opt count=' + document.getElementById('spops').innerHTML.split('')[0].replace(String.fromCharCode(34),'').replace(String.fromCharCode(34),'')); < if (!document.getElementById(encodeURIComponent(jlastn))) { < while (jsofar.indexOf(',' + jguess + ',') != -1) { < if (document.getElementById('spops').innerHTML.trim() != '' || navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < jguess=Math.floor(Math.random() * eval(-1 + eval('' + document.getElementById('spops').innerHTML.split('')[0].replace(String.fromCharCode(34),'').replace(String.fromCharCode(34),'')); < } < } else { 781d481 < } 787c487 < --- > 794,799c494 < var retthis=null; < if (document.getElementById(encodeURIComponent('river' + lastn))) { < retthis=prompt('What is the name of this new blue river plotted on the world map? ' + midbit + ' Enter ? to get given more time looking at (longitude,latitude) = (' + decodeURIComponent(document.getElementById(encodeURIComponent('river' + lastn)).value).split(',')[0] + ',' + decodeURIComponent(document.getElementById(encodeURIComponent('river' + lastn)).value).split(',')[1].split(' ')[0] + ')', ''); < } else { < retthis=prompt('What is the name of this new blue river plotted on the world map? ' + midbit + ' Enter ? to get given more time looking at (longitude,latitude) = (' + arivers[iguess].split(':')[1].split(',')[0] + ',' + arivers[iguess].split(':')[1].split(',')[1] + ')', ''); < } --- > var retthis=prompt('What is the name of this new blue river plotted on the world map? ' + midbit + ' Enter ? to get given more time looking at (longitude,latitude) = (' + arivers[iguess].split(':')[1].split(',')[0] + ',' + arivers[iguess].split(':')[1].split(',')[1] + ')', ''); 807,810c502 < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < setTimeout(getapopulation, 9000); --- > getapopulation(); 813,818c505 < if (retthis.trim() != retthis && !origboth) { < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < both=true; < } --- > if (retthis.trim() != retthis && !origboth) { both=true; } 825,834c512 < if (retthis != '' && !origboth) { < isokto=true; < both=true; < if (navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < if (document.getElementById('spops').innerHTML.trim() == '') { document.getElementById('ifrivers').src='./population.geojson'; } < setTimeout(getapopulation, 9000); < } else { < getapopulation(); < } < } --- > if (retthis != '' && !origboth) { isokto=true; both=true; getapopulation(); } 836,842c514 < if (retthis.trim() != retthis && !origboth) { < both=true; < thing='population'; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; thing='population'; } 847,853c519 < if (retthis.trim() != retthis && !origboth) { < both=true; < thing='population'; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; thing='population'; } 857,863c523 < if (retthis.trim() != retthis && !origboth) { < both=true; < thing='population'; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; thing='population'; } 868,874c528 < if (retthis.trim() != retthis && !origboth) { < both=true; < thing='population'; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; thing='population'; } 878,884c532 < if (retthis.trim() != retthis && !origboth) { < both=true; < thing='population'; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; thing='population'; } 889c537 < if (both && !origboth) { isitok=true; setTimeout(getapopulation, 9000); return ''; } else if (both) { setTimeout(getapopulation, 9000); return ''; } --- > if (both && !origboth) { isitok=true; getapopulation(); return ''; } else if (both) { return ''; } 894,927d541 < function plottheriver(ariverswhich) { < if (both) { isokto=true; } < if (isokto) { contexta.clearRect(0,0,360,180); } < if (both) { isokto=false; } < lastn=ariverswhich.split(':')[0]; < var rest=ariverswhich.split(':')[1]; < var consolelog=''; < //console.log(rest); < var restlonglat=[]; //rest.split(','); < var therest=rest.split(' '); < //alert(eval(180.0 + eval('' + restlonglat[0])) + ',' + eval(90.0 - eval('' + restlonglat[1]))); < for (var jrrr=0; jrrr= eval('' + restlonglat.length)) { context.stroke(); } < } < } < contexta.stroke(); < } < } < 929d542 < var rest=''; 933,935d545 < if (document.getElementById(encodeURIComponent('river' + lastn))) { < rest=decodeURIComponent(document.getElementById(encodeURIComponent('river' + lastn)).value); //.split(' ')[0]; < } else { 937,938c547 < rest=arivers[which].split(':')[1]; < } --- > var rest=arivers[which].split(':')[1]; 940c549 < //console.log(rest); --- > console.log(rest); 973,1009c582 < if (iois.src.indexOf('rivers.geojson?name=') != -1) { < plotarivervia(lastn, aconto.body.innerHTML); < } else if (iois.src.indexOf('rivers.geojson') != -1) { < if (1 == 1) { < populateriversvia(aconto.body.innerHTML); < } else { < rivers='' + aconto.body.innerHTML; < setTimeout(populaterivers, 500); < } < if (!navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < iois.src='./population.geojson'; < } < } else if (iois.src.indexOf('population.geojson') != -1) { // && !navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < if (1 == 1) { < populatepopulationsvia(aconto.body.innerHTML); < if (navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < getapopulation(); < } < } else { < populations='' + aconto.body.innerHTML; < setTimeout(populatepopulations, 500); < } < } < } < } < } < } < < function getthejsontwo(iois) { < if (iois.src.indexOf('.geojson') != -1) { < var aconto = (iois.contentWindow || iois.contentDocument); < if (aconto != null) { < if (aconto.document) { aconto = aconto.document; } < if (aconto.body != null) { < if (iois.src.indexOf('rivers.geojson?name=') != -1) { < plotarivervia(lastn, aconto.body.innerHTML); < } else if (iois.src.indexOf('rivers.geojson') != -1) { --- > if (iois.src.indexOf('rivers.geojson') != -1) { 1028,1033c601 < var retthis=''; < if (document.getElementById(encodeURIComponent(jlastn))) { < retthis=prompt('What is the name of this new red population area plotted on the world map? ' + midbit + ' Enter ? to get given more time looking at (longitude,latitude) = (' + decodeURIComponent(document.getElementById(encodeURIComponent(jlastn)).value) + ')', ''); < } else { < retthis=prompt('What is the name of this new red population area plotted on the world map? ' + midbit + ' Enter ? to get given more time looking at (longitude,latitude) = (' + apopulations[jguess].split(':')[1].split(',')[0] + ',' + apopulations[jguess].split(':')[1].split(',')[1] + ')', ''); < } --- > var retthis=prompt('What is the name of this new red population area plotted on the world map? ' + midbit + ' Enter ? to get given more time looking at (longitude,latitude) = (' + apopulations[jguess].split(':')[1].split(',')[0] + ',' + apopulations[jguess].split(':')[1].split(',')[1] + ')', ''); 1044,1049c612 < if (retthis.trim() != retthis && !origboth) { < both=true; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; } 1056,1063c619 < if (retthis != '' && !origboth) { < isokto=true; < both=true; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < getariver(); < } --- > if (retthis != '' && !origboth) { isokto=true; both=true; getariver(); } 1065,1071c621 < if (retthis.trim() != retthis && !origboth) { < both=true; < thing='river'; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; thing='river'; } 1076,1082c626 < if (retthis.trim() != retthis && !origboth) { < both=true; < thing='river'; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; thing='river'; } 1086,1092c630 < if (retthis.trim() != retthis && !origboth) { < both=true; < thing='river'; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; thing='river'; } 1097,1103c635 < if (retthis.trim() != retthis && !origboth) { < both=true; < thing='river'; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; thing='river'; } 1107,1113c639 < if (retthis.trim() != retthis && !origboth) { < both=true; < thing='river'; < if (document.getElementById('spops').innerHTML.trim() == '' && navigator.userAgent.match(/Android|BlackBerry|iPhone|iPad|iPod|Opera Mini|IEMobile/i)) { < document.getElementById('ifrivers').src='./population.geojson'; < } < } --- > if (retthis.trim() != retthis && !origboth) { both=true; thing='river'; } 1119c645 < if (both && (!origboth || 6 == 6)) { isitok=true; getariver(); return ''; } --- > if (both && !origboth) { isitok=true; getariver(); return ''; } 1125d650 < var rest='', restlonglat=[]; 1128,1130d652 < if (document.getElementById(encodeURIComponent(jlastn))) { < rest=decodeURIComponent(document.getElementById(encodeURIComponent(jlastn)).value).split(' ')[0]; < } else { 1132,1133c654,655 < rest=apopulations[which].split(':')[1].split(' ')[0]; < } --- > var rest=apopulations[which].split(':')[1]; > var restlonglat=[]; //rest.split(','); 1137,1138c659 < console.log(rest + ': ' + restlonglat[0] + ',' + restlonglat[1]); < contexta.fillRect(eval(180.0 + eval('' + restlonglat[0])), eval(90.0 - eval('' + restlonglat[1])),2,2); --- > contexta.fillRect(eval(180.0 + eval('' + restlonglat[0])), eval(90.0 - eval('' + restlonglat[1])),1,1); 1167,1170c688 < < < < "; --- > ";