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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-11-01 14:16:46 +01:00
commit b99a857edc
124 changed files with 1731 additions and 921 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/ImgurToPanoramax.ts
View file

@ -24,7 +24,7 @@ import { UploadableTag } from "../src/Logic/Tags/TagTypes"
export class ImgurToPanoramax extends Script {
private readonly panoramax = new PanoramaxUploader(
Constants.panoramax.url,
Constants.panoramax.token,
Constants.panoramax.token
)
private readonly alreadyUploaded: Record<string, string> = {}
@ -41,7 +41,7 @@ export class ImgurToPanoramax extends Script {
constructor() {
super(
"Queries OSM for 'imgur'-images, uploads them to Panoramax and creates a changeset to update OSM",
"Queries OSM for 'imgur'-images, uploads them to Panoramax and creates a changeset to update OSM"
)
}
@ -51,7 +51,7 @@ export class ImgurToPanoramax extends Script {
sequences: {
id: string
"stats:items": { count: number }
}[],
}[]
): Promise<UploadableTag | undefined> {
const v = feat.properties[key]
if (!v) {
@ -64,7 +64,6 @@ export class ImgurToPanoramax extends Script {
return new And([new Tag(key.replace("image", panohash), panohash), new Tag(key, "")])
}
let path: string = undefined
if (existsSync(this._imageDirectory + "/" + imageHash + ".jpg")) {
path = this._imageDirectory + "/" + imageHash + ".jpg"
@ -101,7 +100,7 @@ export class ImgurToPanoramax extends Script {
const file = new MyFile([], path)
file.stream = function() {
file.stream = function () {
return handle.readableWebStream()
}
@ -111,7 +110,7 @@ export class ImgurToPanoramax extends Script {
GeoOperations.centerpointCoordinates(feat),
author,
true,
sequence,
sequence
)
this.alreadyUploaded[imageHash] = result.value
await handle.close()
@ -156,7 +155,7 @@ export class ImgurToPanoramax extends Script {
{
theme: "image-mover",
changeType: "link-image",
},
}
)
changes.push(...(await action.CreateChangeDescriptions()))
converted++
@ -166,7 +165,7 @@ export class ImgurToPanoramax extends Script {
const modifiedObjectsFresh = <OsmObject[]>(
(
await Promise.all(
modif.map((id) => new OsmObjectDownloader().DownloadObjectAsync(id)),
modif.map((id) => new OsmObjectDownloader().DownloadObjectAsync(id))
)
).filter((m) => m !== "deleted")
)
@ -174,7 +173,7 @@ export class ImgurToPanoramax extends Script {
changes,
modifiedObjectsFresh,
false,
[],
[]
)
const cs = Changes.buildChangesetXML("0", modifiedObjects)
writeFileSync("imgur_to_panoramax.osc", cs, "utf8")

10
scripts/generateLayouts.ts
View file

@ -10,7 +10,11 @@ import ScriptUtils from "./ScriptUtils"
import { Utils } from "../src/Utils"
import SpecialVisualizations from "../src/UI/SpecialVisualizations"
import Constants from "../src/Models/Constants"
import { AvailableRasterLayers, EditorLayerIndexProperties, RasterLayerPolygon } from "../src/Models/RasterLayers"
import {
AvailableRasterLayers,
EditorLayerIndexProperties,
RasterLayerPolygon,
} from "../src/Models/RasterLayers"
import { ImmutableStore } from "../src/Logic/UIEventSource"
import * as eli from "../public/assets/data/editor-layer-index.json"
import * as layers_global from "../src/assets/global-raster-layers.json"
@ -267,10 +271,10 @@ class GenerateLayouts extends Script {
}
const urls: string[] = []
const regex = /{switch:([^}]+)}/
const rasterLayers: {properties: RasterLayerProperties}[] = [
const rasterLayers: { properties: RasterLayerProperties }[] = [
AvailableRasterLayers.defaultBackgroundLayer,
...eli.features,
bing,
bing,
...eli_global.map((properties) => ({ properties })),
...layers_global.layers.map((properties) => ({ properties })),
]