Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Chore: update token, some code style improvements

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-06-11 15:06:45 +02:00
parent f0a5f62237
commit a753727559
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/GenerateSeries.ts
View file

@ -123,7 +123,7 @@ class StatsDownloader {
Referer: Referer:
"https://osmcha.org/?filters=%7B%22date__gte%22%3A%5B%7B%22label%22%3A%222020-07-05%22%2C%22value%22%3A%222020-07-05%22%7D%5D%2C%22editor%22%3A%5B%7B%22label%22%3A%22mapcomplete%22%2C%22value%22%3A%22mapcomplete%22%7D%5D%7D", "https://osmcha.org/?filters=%7B%22date__gte%22%3A%5B%7B%22label%22%3A%222020-07-05%22%2C%22value%22%3A%222020-07-05%22%7D%5D%2C%22editor%22%3A%5B%7B%22label%22%3A%22mapcomplete%22%2C%22value%22%3A%22mapcomplete%22%7D%5D%7D",
"Content-Type": "application/json", "Content-Type": "application/json",
Authorization: "Token 6e422e2afedb79ef66573982012000281f03dc91", Authorization: "Token 9cc11ad2868778272eadbb1a423ebb507184bc04",
DNT: "1", DNT: "1",
Connection: "keep-alive", Connection: "keep-alive",
TE: "Trailers", TE: "Trailers",
@ -135,7 +135,7 @@ class StatsDownloader {
ScriptUtils.erasableLog( ScriptUtils.erasableLog(
`Downloading stats for ${year}-${month}-${day}, page ${page} ${url}` `Downloading stats for ${year}-${month}-${day}, page ${page} ${url}`
) )
const result = await Utils.downloadJson(url, headers) const result = await Utils.downloadJson<{features: [], next: string}>(url, headers)
page++ page++
allFeatures.push(...result.features) allFeatures.push(...result.features)
if (result.features === undefined) { if (result.features === undefined) {
@ -201,11 +201,11 @@ class GenerateSeries extends Script {
const targetDir = args[0] ?? "../../git/MapComplete-data" const targetDir = args[0] ?? "../../git/MapComplete-data"
await this.downloadStatistics(targetDir + "/changeset-metadata") await this.downloadStatistics(targetDir + "/changeset-metadata")
await this.generateCenterPoints( this.generateCenterPoints(
targetDir + "/changeset-metadata", targetDir + "/changeset-metadata",
targetDir + "/mapcomplete-changes/", targetDir + "/mapcomplete-changes/",
{ {
zoomlevel: 8, zoomlevel: 8
} }
) )
} }
@ -248,10 +248,8 @@ class GenerateSeries extends Script {
const allPaths = readdirSync(sourceDir).filter( const allPaths = readdirSync(sourceDir).filter(
(p) => p.startsWith("stats.") && p.endsWith(".json") (p) => p.startsWith("stats.") && p.endsWith(".json")
) )
let allFeatures: ChangeSetData[] = [].concat( let allFeatures: ChangeSetData[] = allPaths.flatMap(
...allPaths.map(
(path) => JSON.parse(readFileSync(sourceDir + "/" + path, "utf-8")).features (path) => JSON.parse(readFileSync(sourceDir + "/" + path, "utf-8")).features
)
) )
allFeatures = allFeatures.filter( allFeatures = allFeatures.filter(
(f) => (f) =>
@ -270,7 +268,7 @@ class GenerateSeries extends Script {
f.properties.editor.toLowerCase().startsWith("mapcomplete")) f.properties.editor.toLowerCase().startsWith("mapcomplete"))
) )
allFeatures = allFeatures.filter((f) => f.properties.metadata?.theme !== "EMPTY CS") allFeatures = allFeatures.filter((f) => f.properties.metadata?.theme !== "EMPTY CS" && f.geometry.coordinates.length > 0)
const centerpoints = allFeatures.map((f) => GeoOperations.centerpoint(f)) const centerpoints = allFeatures.map((f) => GeoOperations.centerpoint(f))
console.log("Found", centerpoints.length, " changesets in total") console.log("Found", centerpoints.length, " changesets in total")