From 0a1ad5a630d7bb9daf2de0254629163fd8b0ec14 Mon Sep 17 00:00:00 2001 From: Endo-Yuanteng <210224788+Endo-Yuanteng@users.noreply.github.com> Date: Fri, 9 Jan 2026 08:42:44 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=82=A6=E3=82=A9=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=81=AE=E3=83=9E?= =?UTF-8?q?=E3=83=BC=E3=82=AB=E3=83=BC=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/app.ts b/src/app.ts index 93f75b5..d2d50b7 100644 --- a/src/app.ts +++ b/src/app.ts @@ -59,7 +59,19 @@ map.on("click", (e) => { // ウォーターサーバーのボタンの機能実装 const hiddenWSMarkers: L.Marker[] = [ L.marker([1560,1560]), + L.marker([1351,2680]), + L.marker([1351,2650]), + L.marker([1494,2823]), + L.marker([1529,2688]), + L.marker([1567,2689]), + L.marker([1668,2991]), + L.marker([1390,2065]), + L.marker([1645,2200]), L.marker([1026,2812]), + L.marker([1160,1318]), + L.marker([1500,860]), + L.marker([1340,2788]), + L.marker([505,2826]), ]; let wsMarkersVisible = false; const wsbtn = document.getElementById("wsMarker")!; From d8751b617d89a768f3f8dada6aabe6f9f96fa9dd Mon Sep 17 00:00:00 2001 From: Endo-Yuanteng <210224788+Endo-Yuanteng@users.noreply.github.com> Date: Fri, 9 Jan 2026 08:45:22 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BE=8B=E3=81=AE=E3=83=9E=E3=83=BC?= =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=82=92=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app.ts b/src/app.ts index d2d50b7..64c1f97 100644 --- a/src/app.ts +++ b/src/app.ts @@ -103,7 +103,7 @@ vmbtn.addEventListener("click", () => { vmMarkersVisible = !vmMarkersVisible; }); // 例:図書館にマーカー(画像座標で指定) -L.marker([900, 1900]).addTo(map).bindPopup("一号館"); +//L.marker([900, 1900]).addTo(map).bindPopup("一号館"); // 透明のポリゴンを置いて、ポップアップにHTMLを埋め込む const library = L.polygon( [ From f7ec948b9e5e70477752c05e00d539a50445dde8 Mon Sep 17 00:00:00 2001 From: Endo-Yuanteng <210224788+Endo-Yuanteng@users.noreply.github.com> Date: Fri, 13 Feb 2026 14:37:54 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E8=87=AA=E8=B2=A9=E6=A9=9F=E3=81=AE?= =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=AB=E3=83=BC=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=80=81ws=E3=81=AE=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.ts | 39 ++++++++++++++++++------------ src/assets/marker-icon-orange.png | Bin 0 -> 1862 bytes 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 src/assets/marker-icon-orange.png diff --git a/src/app.ts b/src/app.ts index 64c1f97..59d3ad4 100644 --- a/src/app.ts +++ b/src/app.ts @@ -58,20 +58,20 @@ map.on("click", (e) => { }); // ウォーターサーバーのボタンの機能実装 const hiddenWSMarkers: L.Marker[] = [ - L.marker([1560,1560]), - L.marker([1351,2680]), - L.marker([1351,2650]), - L.marker([1494,2823]), - L.marker([1529,2688]), - L.marker([1567,2689]), - L.marker([1668,2991]), - L.marker([1390,2065]), - L.marker([1645,2200]), - L.marker([1026,2812]), - L.marker([1160,1318]), - L.marker([1500,860]), - L.marker([1340,2788]), - L.marker([505,2826]), + L.marker([1560,1560]).bindPopup("駒場図書館 1F"), + L.marker([1351,2680]).bindPopup("コミプラ 1F"), + L.marker([1351,2650]).bindPopup("コミプラ 2F"), + L.marker([1494,2823]).bindPopup("キャンパスプラザA棟 1F"), + L.marker([1529,2688]).bindPopup("第2体育館 1F"), + L.marker([1567,2689]).bindPopup("第2体育館 2F"), + L.marker([1668,2991]).bindPopup("第1体育館 2F"), + L.marker([1390,2065]).bindPopup("8号館 1F"), + L.marker([1645,2200]).bindPopup("21 KOMCEE West B1F"), + L.marker([1026,2812]).bindPopup("5号館 1F"), + L.marker([1160,1318]).bindPopup("13号館 1F"), + L.marker([1500,860]).bindPopup("15号館 1F"), + L.marker([1340,2788]).bindPopup("生協購買部"), + L.marker([505,2826]).bindPopup("数理科学研究科棟 1F"), ]; let wsMarkersVisible = false; const wsbtn = document.getElementById("wsMarker")!; @@ -86,9 +86,16 @@ wsbtn.addEventListener("click", () => { wsMarkersVisible = !wsMarkersVisible; }); // 自動販売機のボタンの機能実装 +const orangeIcon = L.icon({ + iconUrl: "/src/assets/marker-icon-orange.png", + iconSize: [25,41], + iconAnchor: [12.5,41] +}); const hiddenVMMarkers: L.Marker[] = [ - L.marker([1060,1496]), - L.marker([1088,1648]), + L.marker([1097,1504], {icon: orangeIcon}), + L.marker([1096,1625], {icon: orangeIcon}), + L.marker([1762,2443], {icon: orangeIcon}), + L.marker([1686,2536], {icon: orangeIcon}), ]; let vmMarkersVisible = false; const vmbtn = document.getElementById("vmMarker")!; diff --git a/src/assets/marker-icon-orange.png b/src/assets/marker-icon-orange.png new file mode 100644 index 0000000000000000000000000000000000000000..fbbce7b2ab1e5de921b5f5488960a333ed37d054 GIT binary patch literal 1862 zcmV-M2f6r(P)P001cn1^@s6z>|W`00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3tN{D;cm-z$E|x2GdDI zK~z}7rI%}rT~!sw|7-7a?z!ijduKYG>9ougD~4o{4_fFm#t_t)HU^^~-j9O{&6*ZVhgaj*XZKaKfQtWiz@B2KDefHkV54WAp?YwcH z{J-3@*ZS?X*WPR0L(GijjOX{iXSL4IP1>vx4kj7i(9UnXIKCWPS`6~X2j1I5Y(C4N zPcd`15F(b2tBua2wbqw{#vt)CYweGAe(l7oD}p?@io~{E+xCLQSHnUPVHkQ|-iL5< zAR;g`tkO_fgeZzsrCcIr{$|h_Jaqe){;ZdT{C?locQDDLuIs*Y?RDLO>quCwz$R4KyS;pC8MgYnVfC{yVL9qBti{GF4pF9`Yd-fcUipkKAFYLlzmJ6z6Un6$p+ zp39sM%7vJon$*)%lg2VW{*iC}?YTLS-`&5t!$|o?S65eS82Hdp32Y6PJ4i@4ehZ>R zVR&e;PI=jL$Ad2q0)V(O$w>L*La`+u_<5-61gz0u<~ah1d4IP?L)E6>=RFi#S{)Oc zXRi1b0PyVnTR+JpKd^RPyJzAuz_v+3I&fRskSlgT_^XgBcEAnWAe`Ksxh5{7qkXkU zLT*34d+Xf*K)=0jQ;>qj-?qLh$UA^Zt4-VBge|bhV|=QNdc6*<5=h5IP-sDCTLBUV zI;#NMUd@qLM52Mdf#D<%+wLR+w@Pv-Ec#H@F+j|o93oYOzM%nJf6ESRzWoy@uGxV4 z5|E`&L#m)`b_|f~YYW+<(bLn(!7w}l1Iw?;Lh zxGWMbD&+{2Z$;1hK0WV=di&-NA?&;X)0KK7KeOzuQ3wm3PvF~xWo-8Y7p&9fWP1+c zB*mH=w}6NiJi6<8wj(hbCip6uDu9}3?{8N*^`hcC#lkelXT>Zw{)@M z{!KS`3mZ>?O*VTuaKkp#Q^v*N8sa!cOZz(1rpF*17dLbj(Gob&$pkpNnh%mLgufc6 z|2b%o>26|XJax~;S2lFDZs{lpn7G^&Hai6A6dM;aV=0P;jKCHqDq97;_WOj~N8E_oK)T-b(29%z6o}fHRr37ha zYQfH)-^@UI51z^_I$_)LwX^21&_!DsKyzpwaik%{q}6XO^|z^er=LL2QH07vCM^+&+zi1 zkhu_j!}Z8A9_~GOs=Ocs0JO*-sMNHnL<%w&g1}44@d~I!3iW!XjWLg1>vIm|^FKII zA@JAx2IE+`0W3Gl$UdGrmXF@wJHnaBQ{EE@sZ>2W>1KPdW^1GuVLjV8(07*qoM6N<$f@n2+ ANB{r; literal 0 HcmV?d00001 From de8b1c63e88cdc5619557c3d5ab1de3cd0033c96 Mon Sep 17 00:00:00 2001 From: Endo-Yuanteng <210224788+Endo-Yuanteng@users.noreply.github.com> Date: Fri, 13 Feb 2026 14:48:06 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=81=97=E3=81=9F=E4=BD=8D=E7=BD=AE=E5=BA=A7=E6=A8=99=E3=82=92?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92?= =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=A2=E3=82=A6=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app.ts b/src/app.ts index 59d3ad4..4d696b4 100644 --- a/src/app.ts +++ b/src/app.ts @@ -49,13 +49,13 @@ navigator.geolocation.getCurrentPosition((position: GeolocationPosition) => { }); // クリックした位置の座標(マーカー配置の補助) -map.on("click", (e) => { - const { lat, lng } = e.latlng; // CRS.Simple でも lat=Y, lng=X - console.log("clicked:", lat, lng); - L.marker([lat, lng]) - .addTo(map) - .bindPopup(`X:${lat.toFixed(0)} Y:${lng.toFixed(0)}`); -}); +// map.on("click", (e) => { +// const { lat, lng } = e.latlng; // CRS.Simple でも lat=Y, lng=X +// console.log("clicked:", lat, lng); +// L.marker([lat, lng]) +// .addTo(map) +// .bindPopup(`X:${lat.toFixed(0)} Y:${lng.toFixed(0)}`); +// }); // ウォーターサーバーのボタンの機能実装 const hiddenWSMarkers: L.Marker[] = [ L.marker([1560,1560]).bindPopup("駒場図書館 1F"),