From 5990e944bf2b457d79d016864675990180c1121b Mon Sep 17 00:00:00 2001
From: busroutemap <kotokotaro@gmail.com>
Date: Sat, 14 Mar 2020 19:21:48 +0900
Subject: [PATCH 1/2] =?UTF-8?q?js=E3=81=8B=E3=82=89json=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index c93ff5c..6cc8856 100644
--- a/index.html
+++ b/index.html
@@ -29,10 +29,6 @@
     <!-- 上のhash.jsは外部プラグイン -->
     <!-- ここから独自 -->
     <link rel="stylesheet" href="add/main.css">
-    <script src="stopinfo/js/data11.js"></script>
-    <script src="stopinfo/js/data12.js"></script>
-    <script src="stopinfo/js/data21.js"></script>
-    <script src="stopinfo/js/data22.js"></script>
     <style>
         .icon1 {
         width: 30px;
@@ -68,8 +64,40 @@
         className: 'icon1',
         iconAnchor: [13, 13]
     });
+    const loadjson = (addURL)=>{
+        const baseURL = "https://busroutemap.github.io/ttrmap/";
+        // var data;
+        return fetch(baseURL+addURL)
+        .then(response=> {
+            if (response.ok){
+                // httpレスポンスからjsonを抽出
+                return response.json();
+            } else{
+                Promise.reject(new Error("error"))
+            }
+        })
+        .catch(e=>{
+            console.log(e.message);
+        });
+    }
     //---------------------------------------------
-    function init() {
+    const init = async()=> {
+        let pAll = [];
+        pAll.push(loadjson("stopinfo/data_11.json"));
+        pAll.push(loadjson("stopinfo/data_12.json"));
+        pAll.push(loadjson("stopinfo/data_21.json"));
+        pAll.push(loadjson("stopinfo/data_22.json"));
+        var data11,data12,data21,data22;
+        await Promise.all(pAll)
+        .catch(e=>{
+            console.log(e);
+        })
+        .then(r=>{
+            data11 = r[0];
+            data12 = r[1];
+            data21 = r[2];
+            data22 = r[3];
+        });
         map = L.map('map01', { 
             zoomControl: false,
             minZoom: 11,

From 18a27e0a37b991a80be400bbf25bd4b2ae7be9f6 Mon Sep 17 00:00:00 2001
From: busroutemap <kotokotaro@gmail.com>
Date: Sat, 14 Mar 2020 19:26:51 +0900
Subject: [PATCH 2/2] =?UTF-8?q?v1.9.1=E3=81=AEchangelog=E8=A8=98=E8=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03dea6d..e7895c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,11 +18,17 @@
 - 主要地表示レイヤーの追加検討中
 ### Changed
 - ちょっと地図が重い気がするので修正したい
+- geojsonとかにしたい気もするけど作業未定
 ### Deprecated
-- 将来的にバス停の元データをjsからjsonまたはgeojsonへ移行予定
+- 問題なければjsデータを削除予定
 ### Removed
 ### Fixed
 
+## [1.9.1] 2020/03/14
+### Changed
+- バス停データ形式をjsからjsonに変更
+    - 色々あり変更してなかった
+
 ## [1.9.0] 2020/03/07
 ### Added
 - 狭域タイルを新規作成