diff --git a/GPS/data/koeki.geojson b/GPS/data/koeki.geojson
index a23e221..7e5db04 100644
--- a/GPS/data/koeki.geojson
+++ b/GPS/data/koeki.geojson
@@ -7,14 +7,14 @@
"_umap_options": {
"color": "orange"
},
- "description": "やっしょーまかしょ",
- "name": "ホール玄関前"
+ "name": "12月19日の入口",
+ "description": "ばばんばばんばんばん"
},
"geometry": {
"type": "Point",
"coordinates": [
- 139.819672,
- 38.892056
+ 139.819098,
+ 38.893705
]
}
},
@@ -30,8 +30,8 @@
"geometry": {
"type": "Point",
"coordinates": [
- 139.821716,
- 38.8915
+ 139.821609,
+ 38.89148
]
}
},
@@ -41,14 +41,14 @@
"_umap_options": {
"color": "orange"
},
- "name": "12月19日の入口",
- "description": "ばばんばばんばんばん"
+ "description": "やっしょーまかしょ",
+ "name": "ホール玄関前"
},
"geometry": {
"type": "Point",
"coordinates": [
- 139.819098,
- 38.893705
+ 139.819672,
+ 38.892056
]
}
}
diff --git a/GPS/data/team-1-2.geojson b/GPS/data/team-1-2.geojson
index 0caad26..5146346 100644
--- a/GPS/data/team-1-2.geojson
+++ b/GPS/data/team-1-2.geojson
@@ -4,14 +4,17 @@
{
"type": "Feature",
"properties": {
- "description": "みちびきやガリレオで使っているとげとげアンテナのことをなんという?",
- "name": "松・梅-01"
+ "description": "Q1",
+ "name": "松・梅-01",
+ "_umap_options": {
+ "showLabel": null
+ }
},
"geometry": {
"type": "Point",
"coordinates": [
- 139.823127,
- 38.89163
+ 139.822928,
+ 38.891605
]
}
},
diff --git a/GPS/data/team-3-4.geojson b/GPS/data/team-3-4.geojson
index ce397ff..a1024d6 100644
--- a/GPS/data/team-3-4.geojson
+++ b/GPS/data/team-3-4.geojson
@@ -10,8 +10,8 @@
"geometry": {
"type": "Point",
"coordinates": [
- 139.82325,
- 38.892248
+ 139.823191,
+ 38.892294
]
}
},
@@ -39,7 +39,7 @@
"type": "Point",
"coordinates": [
139.822767,
- 38.890682
+ 38.890665
]
}
}
diff --git a/GPS/data/team-5-6.geojson b/GPS/data/team-5-6.geojson
index f0a2786..33636c8 100644
--- a/GPS/data/team-5-6.geojson
+++ b/GPS/data/team-5-6.geojson
@@ -4,7 +4,7 @@
{
"type": "Feature",
"properties": {
- "description": "準天頂衛星初号機の名前は?",
+ "description": "",
"name": "菖蒲・牡丹-01"
},
"geometry": {
diff --git a/GPS/data/team-7-8.geojson b/GPS/data/team-7-8.geojson
index 2fdb772..c10d008 100644
--- a/GPS/data/team-7-8.geojson
+++ b/GPS/data/team-7-8.geojson
@@ -24,8 +24,8 @@
"geometry": {
"type": "Point",
"coordinates": [
- 139.824704,
- 38.892711
+ 139.824532,
+ 38.892912
]
}
},
diff --git a/GPS/data/team-9-10.geojson b/GPS/data/team-9-10.geojson
index ac3f9f5..061861b 100644
--- a/GPS/data/team-9-10.geojson
+++ b/GPS/data/team-9-10.geojson
@@ -24,8 +24,8 @@
"geometry": {
"type": "Point",
"coordinates": [
- 139.825214,
- 38.892127
+ 139.825197,
+ 38.892072
]
}
},
diff --git a/GPS/gps.js b/GPS/gps.js
index e2543e3..6d0c7a0 100644
--- a/GPS/gps.js
+++ b/GPS/gps.js
@@ -57,6 +57,7 @@
};
}
}
+ // {description: "desc", coordinates: [lon, lat]}
goals[areaname] = goal;
if (Object.keys(area)[0] == areaname)
switchArea(areaname);
@@ -75,8 +76,15 @@
else
mymap.setMaxBounds(null);
}
+ var vMarkers = [];
function switchArea(areaname, label) {
- if (label) {
+ let visibleMode = location.href.match(/\?markers$/);
+ if (visibleMode) {
+ while (vMarkers.length > 0) {
+ vMarkers.pop().remove();
+ }
+ }
+ if (label && !visibleMode) {
if (confirm(`${label}マップに切り替えます`)) {
for (let b of document.querySelectorAll(".areaselect"))
b.classList.add("hidden");
@@ -102,6 +110,11 @@
for (let point of Object.keys(glist)) {
let val = glist[point], coord = val.coordinates;
opts += `\n`;
+ if (visibleMode) {
+ let lon = coord[0], lat = coord[1]
+ let mrk = L.marker([lat, lon]).bindPopup(point).addTo(mymap);
+ vMarkers.push(mrk);
+ }
}
sel.innerHTML = opts;
}
@@ -255,7 +268,7 @@
let plist = goals[areaname],
desc = plist[pname].description, msg = "見つかった!";
if (desc && desc > "") {
- msg += "
この場所のメッセージは
" +
+ msg += "
この場所に隠されているものは
" +
"「"+ desc + "」
です。
" +
"★見つけたアイテムは必ず回収して下さい★"
//console.log(`pname=${pname}, gp=${goals[pname]}`)
@@ -308,3 +321,4 @@
mapInit();
storageInit();
});
+
diff --git a/GPS/serviceworker.js b/GPS/serviceworker.js
index c3382f5..509063f 100644
--- a/GPS/serviceworker.js
+++ b/GPS/serviceworker.js
@@ -1,4 +1,4 @@
-var cacheName = 'jd-jaxa-gps-cache-2022-10-28h';
+var cacheName = 'jd-jaxa-gps-cache-2022-11-02b';
var filesToCache = [
'./',
'./index.html',