diff --git a/GPS/area.json b/GPS/area.json index a762754..d9cc58f 100644 --- a/GPS/area.json +++ b/GPS/area.json @@ -1,4 +1,11 @@ { + "koeki": { + "name": "練習用", + "_bounds": [[38.895784, 139.817548], [38.889605, 139.822848]], + "bounds": null, + "map": "gsi", + "geojson": "data/koeki.geojson" + }, "team-1-2": { "name": "松・梅", "map": "img/iimori.png", @@ -21,7 +28,7 @@ "name": "萩・芒", "map": "img/iimori.png", "bounds": [[38.894762, 139.818293], [38.888378, 139.826495]], - "geojson": "data/team-7" + "geojson": "data/team-7-8.geojson" }, "team-9-10": { "name": "菊・紅葉", @@ -34,11 +41,5 @@ "map": "img/yuza.png", "bounds": [[39.017937, 139.93102], [39.013269, 139.937029]], "geojson": "data/yuza.geojson" - }, - "koeki": { - "name": "KOEKI", - "bounds": [[38.895784, 139.817548], [38.889605, 139.822848]], - "map": "gsi", - "geojson": "data/koeki.geojson" } } diff --git a/GPS/data/koeki.geojson b/GPS/data/koeki.geojson index d1af04c..a23e221 100644 --- a/GPS/data/koeki.geojson +++ b/GPS/data/koeki.geojson @@ -7,14 +7,14 @@ "_umap_options": { "color": "orange" }, - "name": "p01", - "description": "やっしょーまかしょ" + "description": "やっしょーまかしょ", + "name": "ホール玄関前" }, "geometry": { "type": "Point", "coordinates": [ - 139.819541, - 38.893943 + 139.819672, + 38.892056 ] } }, @@ -24,14 +24,14 @@ "_umap_options": { "color": "orange" }, - "name": "p02", - "description": "らせらーらっせらー" + "description": "らせらーらっせらー", + "name": "GPS宝探し集合位置" }, "geometry": { "type": "Point", "coordinates": [ - 139.819197, - 38.894279 + 139.821716, + 38.8915 ] } }, @@ -41,16 +41,25 @@ "_umap_options": { "color": "orange" }, - "name": "p03", + "name": "12月19日の入口", "description": "ばばんばばんばんばん" }, "geometry": { "type": "Point", "coordinates": [ - 139.819195, - 38.892937 + 139.819098, + 38.893705 ] } } - ] + ], + "_umap_options": { + "displayOnLoad": true, + "browsable": true, + "remoteData": { + }, + "name": "koeki", + "description": "koeki.geojson", + "id": 2442295 + } } \ No newline at end of file diff --git a/GPS/index.html b/GPS/index.html index fdca0bb..7cebe1a 100644 --- a/GPS/index.html +++ b/GPS/index.html @@ -34,7 +34,7 @@

src,src2, css -html +area


diff --git a/GPS/serviceworker.js b/GPS/serviceworker.js index 25fc42e..2d3aeeb 100644 --- a/GPS/serviceworker.js +++ b/GPS/serviceworker.js @@ -1,9 +1,9 @@ -var cacheName = 'jd-jaxa-gps-cache-2022-10-10'; +var cacheName = 'jd-jaxa-gps-cache-2022-10-28g'; var filesToCache = [ './', './index.html', - './area.json', './gps.js', + './area.json', './gps.css', './img/iimori.png', './img/yuza.png', @@ -11,6 +11,11 @@ './data/yuza.geojson', './data/iimoriyama.geojson', './data/koeki.geojson', + './data/team-1-2.geojson', + './data/team-3-4.geojson', + './data/team-5-6.geojson', + './data/team-7-8.geojson', + './data/team-9-10.geojson' ]; self.addEventListener('install', function(event) { console.log('ServiceWorker installing');