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

Feat: add script to upload images to panoramax and remove 'imgur'-links

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-10-23 18:41:32 +02:00
parent c1c2390694
commit 4233bd7618
5 changed files with 467 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Logic/ImageProviders/Panoramax.ts
View file

@ -45,9 +45,8 @@ export default class PanoramaxImageProvider extends ImageProvider {
* @private
*/
private async getInfoFromMapComplete(id: string): Promise<{ data: ImageData, url: string }> {
const sequence = "6e702976-580b-419c-8fb3-cf7bd364e6f8" // We always reuse this sequence
const url = `https://panoramax.mapcomplete.org/`
const data = await PanoramaxImageProvider.defaultPanoramax.imageInfo(id, sequence)
const data = await PanoramaxImageProvider.defaultPanoramax.imageInfo(id)
return { url, data }
}
@ -163,27 +162,24 @@ export default class PanoramaxImageProvider extends ImageProvider {
}
export class PanoramaxUploader implements ImageUploader {
private readonly _panoramax: AuthorizedPanoramax
public readonly panoramax: AuthorizedPanoramax
maxFileSizeInMegabytes = 100 * 1000 * 1000 // 100MB
constructor(url: string, token: string) {
this._panoramax = new AuthorizedPanoramax(url, token)
this.panoramax = new AuthorizedPanoramax(url, token)
}
async uploadImage(blob: File, currentGps: [number, number], author: string, noblur: boolean = false): Promise<{
async uploadImage(blob: File, currentGps: [number, number], author: string, noblur: boolean = false, sequenceId?: string ): Promise<{
key: string;
value: string;
absoluteUrl: string
}> {
// https://panoramax.openstreetmap.fr/api/docs/swagger#/
let hasDate = false
let hasGPS = false
let [lon, lat] = currentGps
let datetime = new Date().toISOString()
try {
const tags = await ExifReader.load(blob)
hasDate = tags?.DateTime !== undefined
const [[latD], [latM], [latS, latSDenom]] =<[[number,number],[number,number],[number,number]]> tags?.GPSLatitude.value
const [[lonD], [lonM], [lonS, lonSDenom]] =<[[number,number],[number,number],[number,number]]> tags?.GPSLongitude.value
lat = latD + latM / 60 + latS / (3600 * latSDenom)
@ -198,12 +194,12 @@ export class PanoramaxUploader implements ImageUploader {
}
const p = this._panoramax
const defaultSequence = (await p.mySequences())[0]
console.log("Upload options are", lon, lat, datetime)
const p = this.panoramax
const defaultSequence: {id: string, "stats:items":{count:number}} = (await p.mySequences()).find(s => s.id === (sequenceId ?? "6e702976-580b-419c-8fb3-cf7bd364e6f8"))
console.log("Upload options are", lon, lat, datetime, blob)
const img = <ImageData>await p.addImage(blob, defaultSequence, {
lon: Utils.Round7(lon),
lat: Utils.Round7(lat),
lon,
lat,
datetime,
isBlurred: noblur,
exifOverride: {

16
src/Logic/Osm/Changes.ts
View file

@ -297,6 +297,18 @@ export class Changes {
newObjects: OsmObject[]
modifiedObjects: OsmObject[]
deletedObjects: OsmObject[]
}{
return Changes.createChangesetObjectsStatic(changes, downloadedOsmObjects, ignoreNoCreate, this.previouslyCreated)
}
public static createChangesetObjectsStatic(
changes: ChangeDescription[],
downloadedOsmObjects: OsmObject[],
ignoreNoCreate: boolean = false,
previouslyCreated : OsmObject[]
): {
newObjects: OsmObject[]
modifiedObjects: OsmObject[]
deletedObjects: OsmObject[]
} {
/**
* This is a rather complicated method which does a lot of stuff.
@ -322,7 +334,7 @@ export class Changes {
states.set(o.type + "/" + o.id, "unchanged")
}
for (const o of this.previouslyCreated) {
for (const o of previouslyCreated) {
objects.set(o.type + "/" + o.id, o)
states.set(o.type + "/" + o.id, "unchanged")
}
@ -372,7 +384,7 @@ export class Changes {
throw "Hmm? This is a bug"
}
objects.set(id, osmObj)
this.previouslyCreated.push(osmObj)
previouslyCreated.push(osmObj)
}
const state = states.get(id)