diff --git a/suiro/catgps.js b/suiro/catgps.js index e7a34ba..37f5043 100644 --- a/suiro/catgps.js +++ b/suiro/catgps.js @@ -22,9 +22,9 @@ var point = L.marker(mymap.getCenter()); // - var stop = document.getElementById("gps_off"); - - var gps = document.getElementById("gps_on"); + document.getElementById("switch1").checked=false; + var gps = document.getElementById("off"); + var nowTrying = null; var doflag=true; @@ -63,6 +63,10 @@ function countDown(){ if (doflag){ alert("周りに注意して使用して下さい"); + gps.id="on"; + //console.log(gps.id); + var stop = document.getElementById("on"); + stop.addEventListener("click", stopCountDown, false); //alert(""+naiyo[0]+"") tryGetGPS(); } else{ @@ -74,6 +78,9 @@ function stopCountDown() { doflag=false; + stop.id="off"; + gps.addEventListener("click", countDown, false); + //console.log(stop.id); //countD.textContent = "stop!"; //ser.innerHTML = "startボタンをもう一度押すと始まります"; } @@ -127,6 +134,6 @@ } gps.addEventListener("click", countDown, false); - stop.addEventListener("click", stopCountDown, false); + }; document.addEventListener("DOMContentLoaded", game, false); diff --git a/suiro/load_date.js b/suiro/load_date.js index 1237eb7..8012ee7 100644 --- a/suiro/load_date.js +++ b/suiro/load_date.js @@ -3,6 +3,54 @@ //マップの中心にする座標 var M_info=document.getElementById("mak_info"); +var select_btm=document.getElementById("info_btm"); +var cicle=document.getElementsByClassName("maru"); +var maks=document.getElementsByClassName("mki-intext"); + + +function changeTab(){ + //var targetid =it_a[0].href.substring(it_a[0].href.indexOf('#')+1,it_a[0].href.length); + //console.log(a); + //console.log(b); + if (this.href==undefined){ + var num=this.children[0].id; + var point_num="Point"+num; + var Points=document.getElementById(point_num); + console.log(this); + if (Points==null){} + else{ + targetid=point_num; + } + }else{ + var targetid =this.href.substring(this.href.indexOf('#')+1,this.href.length); + + } + if(targetid==undefined){} + else{ + for(i=1;i

'+tose+'

'; movie=""; usepan.push(pos); mkname.push(name); - var mak=layer.bindPopup(coment); - M_Icon(count,movie,mak,Icon_img,color,Ic_color,radius); + layer.bindPopup(coment); + M_Icon(count,movie,layer,Icon_img,color,Ic_color,radius); count++; }else{ - var SMC=Set_Contents(tose); - var coment='

'+name+'

'+SMC[0]+'

'; var movie=SMC[1]; usepan.push(pos); mkname.push(name); - var mak=layer.bindPopup(coment); + //layer.bindPopup(coment); + //'+tobas+' + layer.bindPopup(type_name); + //onclick="click_EV('+Point_id+',['+pos[1]+','+pos[0]+'])"; + var tobas=''+side_id+''; + //cicle[side_id-1].style.color="red"; + var coment='

'+name+'

'+SMC[0]+'

'; M_info.innerHTML+=coment; - mak.name=name; - M_Icon(count,movie,mak,Icon_img,color,Ic_color,radius); + //var ids=document.getElementById(Point_id); + select_btm.innerHTML+=tobas; + layer.name=name; + M_Icon(count,movie,layer,Icon_img,color,Ic_color,radius); count++; - mak_click(mak,mymap); + side_id++; + mak_click(layer,mymap); } }else{ var coment='

'+name+'

'+tose+'

'; @@ -299,14 +356,14 @@ //alert(m[i]); kasyo.push(pos[i]); naiyo.push(tose); - ten.push(mak); + ten.push(layer); //alert(naiyo); }; // LineStringでの座標を細かくとる }else { kasyo.push(pos); //この関数外に変数を持って行くために使用 naiyo.push(tose); - ten.push(mak); + ten.push(layer); } @@ -315,12 +372,51 @@ }); var gpxLayer = omnivore.geojson('suiro.geojson', null, customLayer).on('ready', function() { + + + //var aaa=document.getElementsByClassName("maru"); + //console.log(aaa); Boxes(mymap,usepan,ten,mkname); + var unko=[],anko=[]; + for(i=0;i --> - + @@ -43,8 +28,7 @@ @@ -56,12 +40,27 @@ marker's infomation -
-
- +
+
+ + +