loviuz/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Small fixes to the 'generateCache' script

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-10-03 02:11:06 +02:00
parent 5bcb879dfe
commit 23136f7e7a
4 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/ScriptUtils.ts
View file

@ -53,7 +53,7 @@ export default class ScriptUtils {
try {
headers = headers ?? {}
headers.accept = "application/json"
console.log("Fetching", url)
console.log("ScriptUtils.DownloadJson(", url.substring(0,40), url.length > 40 ? "...":"" ,")")
const urlObj = new URL(url)
https.get({
host: urlObj.host,
@ -72,7 +72,6 @@ export default class ScriptUtils {
res.addListener('end', function () {
const result = parts.join("")
try {
console.log("Fetched", result)
resolve(JSON.parse(result))
} catch (e) {
console.error("Could not parse the following as JSON:", result)

15
scripts/generateCache.ts
View file

@ -97,17 +97,16 @@ async function downloadRaw(targetdir: string, r: TileRange, theme: LayoutConfig,
try {
const json = await ScriptUtils.DownloadJSON(url)
if (json.elements.length === 0) {
console.log("Got an empty response!")
if ((<string>json.remark ?? "").startsWith("runtime error")) {
console.error("Got a runtime error: ", json.remark)
failed++;
}
if ((<string>json.remark ?? "").startsWith("runtime error")) {
console.error("Got a runtime error: ", json.remark)
failed++;
}else if (json.elements.length === 0) {
console.log("Got an empty response! Writing anyway")
}
} else {
console.log("Got the response - writing to ", filename)
writeFileSync(filename, JSON.stringify(json, null, " "));
}
} catch (err) {
console.log(url)
console.log("Could not download - probably hit the rate limit; waiting a bit. (" + err + ")")