update error check

README.md

@@ -5,3 +5,7 @@
 
 * 2024/07/09
 * * 初版公開。OSMのデータはリアルタイム取得とする（後でスタティック化予定）
+
+* 2024/07/11
+* * overpass.openstreetmap.jp のメンテナンスに合わせてエラー処理を追加
+* 

data/config-system.jsonc

@@ -7,8 +7,8 @@
     },
     "system": {
         "OverPassServer": [
-            "https://maps.mail.ru/osm/tools/overpass/api/interpreter",
             "https://overpass.openstreetmap.jp/api/interpreter",
+            "https://maps.mail.ru/osm/tools/overpass/api/interpreter",
             "https://overpass.kumi.systems/api/interpreter",
             "https://overpass-api.de/api/interpreter"
         ]

initialize.js

@@ -109,10 +109,12 @@ window.addEventListener("DOMContentLoaded", function () {
 			let osmids = poiCont.pois().acts.map(act => { return act.osmid })
 			osmids = osmids.filter(Boolean)
 			if (osmids.length > 0 && !Conf.static.mode) {
-				OvPassCnt.getOsmIds(osmids).then(geojson => {
+				basic.retry(() => OvPassCnt.getOsmIds(osmids),5).then(geojson => {
 					poiCont.add_geojson(geojson)
 					poiCont.setActlnglat()
 					init_close()
+				}).catch(() => {
+					console.log("???")
 				})
 			} else {
 				poiCont.setActlnglat()

lib/basiclib.js

@@ -59,6 +59,14 @@ class Basic {
         return Array.from(elems.keys()).filter(Boolean);
     }
 
+    retry(func, retryCount) {   // Promise失敗時にリトライする
+        let promise = func();
+        for (let i = 1; i <= retryCount; ++i) {
+            promise = promise.catch(func);
+        }
+        return promise;
+    }
+
     getWikipedia(lang, url) {      // get wikipedia contents
         return new Promise((resolve, reject) => {
             let encurl = encodeURI(url);

lib/overpasslib.js

@@ -82,9 +82,9 @@ class OverPassControl {
 			Object.keys(pois).forEach(category => {
 				if (pois[category] !== "") params += `${category}(id:${pois[category].slice(0, -1)});`;
 			});
-			let url = Conf.system.OverPassServer[OvPassCnt.UseServer] + '?data=[out:json][timeout:30];' + params + ');out body meta;>;out skel;';
+			let url = Conf.system.OverPassServer[OvPassCnt.UseServer] + '?data=[out:json][timeout:20];' + params + ');out body meta;>;out skel;';
 			console.log("OvPassCnt: GET: " + url);
-			$.ajax({ "type": 'GET', "dataType": 'json', "url": url, "cache": false }).done(function (osmxml) {
+			$.ajax({ "type": 'GET', "dataType": 'json', "url": url, "cache": false, timeout: 20000 }).done(function (osmxml) {
 				console.log("OvPassCnt: getOsmIds: done.");
 				if (osmxml.elements.length == 0) { resolve(); return };
 				let geojson = osmtogeojson(osmxml, { flatProperties: true });