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

chore: automated housekeeping...

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-06-18 21:40:01 +02:00
parent 94c61744c0
commit 04c8ccb0d2
89 changed files with 2353 additions and 1390 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Logic/Actors/InitialMapPositioning.ts
View file

@ -66,15 +66,19 @@ export default class InitialMapPositioning {
defaultLon,
"The initial/current longitude of the app"
)
const geouri = QueryParameters.GetQueryParameter("geouri", undefined, "Alternative format to set lat/lon; but with an entire geouri instead. ")
console.log("geouri", geouri.data, !!geouri.data)
if (geouri.data) {
const geouri = QueryParameters.GetQueryParameter(
"geouri",
undefined,
"Alternative format to set lat/lon; but with an entire geouri instead. "
)
console.log("geouri", geouri.data, !!geouri.data)
if (geouri.data) {
try {
const url = new URL("geo:"+decodeURIComponent(geouri.data))
const [latN, lonN] = url.pathname.split(",").map(n => parseFloat(n))
const url = new URL("geo:" + decodeURIComponent(geouri.data))
const [latN, lonN] = url.pathname.split(",").map((n) => parseFloat(n))
lat.set(latN)
lon.set(lonN)
if(url.searchParams.has("q")){
if (url.searchParams.has("q")) {
QueryParameters.GetQueryParameter("q", undefined).set(url.searchParams.get("q"))
}
} catch (e) {

5
src/Logic/ImageProviders/GenericImageProvider.ts
View file

@ -35,8 +35,9 @@ export default class GenericImageProvider extends ImageProvider {
id: value,
isSpherical: undefined,
originalAttribute: {
key, value
}
key,
value,
},
},
]
}

2
src/Logic/ImageProviders/ImageProvider.ts
View file

@ -26,7 +26,7 @@ export interface ProvidedImage {
host?: string
isSpherical: boolean
license?: LicenseInfo
originalAttribute?: {key: string, value: string}
originalAttribute?: { key: string; value: string }
}
export interface PanoramaView {

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

@ -180,13 +180,13 @@ export class ImageUploadManager {
queue = [...queue]
while (queue.length > 0) {
const currentItem = queue.shift()
if(!currentItem){
if (!currentItem) {
continue
}
const uploadOk = await this.handleQueueItem(currentItem)
if(uploadOk){
if (uploadOk) {
this._queue.delete(currentItem)
}else{
} else {
// Our local 'queue' is a copy where we've removed the failed item from
// A next attempt to 'uploadQueue' will retry the upload
}
@ -255,7 +255,7 @@ export class ImageUploadManager {
if (properties === undefined) {
const downloaded = await new OsmObjectDownloader(
this._osmConnection.Backend(),
this._changes,
this._changes
).DownloadObjectAsync(args.featureId)
if (downloaded === "deleted") {
this._queue.delete(args)
@ -264,16 +264,10 @@ export class ImageUploadManager {
this._featureProperties.trackFeature(downloaded.asGeoJson())
properties = this._featureProperties.getStore(args.featureId)
}
const action = new LinkImageAction(
args.featureId,
result.key,
result.value,
properties,
{
theme: args.layoutId ?? properties?.data?.["_orig_theme"] ?? this._theme.id,
changeType: "add-image",
},
)
const action = new LinkImageAction(args.featureId, result.key, result.value, properties, {
theme: args.layoutId ?? properties?.data?.["_orig_theme"] ?? this._theme.id,
changeType: "add-image",
})
await this._changes.applyAction(action)
await this._changes.flushChanges("Image upload completed")
return true

2
src/Logic/ImageProviders/Imgur.ts
View file

@ -33,7 +33,7 @@ export class Imgur extends ImageProvider {
provider: this,
id: value,
isSpherical: false,
originalAttribute: {key, value}
originalAttribute: { key, value },
},
]
}

7
src/Logic/ImageProviders/Mapillary.ts
View file

@ -246,7 +246,7 @@ export class Mapillary extends ImageProvider {
response.camera_type === "spherical" || response.camera_type === "equirectangular",
lat: geometry.coordinates[1],
lon: geometry.coordinates[0],
originalAttribute: {key, value}
originalAttribute: { key, value },
}
}
@ -260,14 +260,15 @@ export class Mapillary extends ImageProvider {
return Mapillary.createLink(location, 17, image.id)
}
/**
* Returns true if we are in firefox strict mode (or if we are offline)
* @private
*/
private static async checkStrictMode(): Promise<boolean> {
try {
const result = await fetch("https://scontent-bru2-1.xx.fbcdn.net/m1/v/t6/Xn8-ISUUYQyBD9FyACzPFRGZnBJRqIFmnQ_yd7FU6vxFYwD21fvAcZwDQoMzsScxcQyCWeBviKpWO4nX8yf--neJDvVjC4JlQtfBYb6TrpXQTniyafSFeZeePT_NVx3H6gMjceEvXHyvBqOOcCB_xQ?stp=c2048.2048.2000.988a_s1000x1000&_nc_gid=E2oHnrAtHutVvjaIm9qDLg&_nc_oc=AdkcScR9HuKt1X_K5-GrUeR5Paj8d7MsNFFYEBSmgc0IiBey_wS3RiNJpflWIKaQzNE&ccb=10-5&oh=00_AfNJ1Ki1IeGdUMxdFUc3ZX9VYIVFxVfXZ9MUATU3vj_RJw&oe=686AF002&_nc_sid=201bca")
const result = await fetch(
"https://scontent-bru2-1.xx.fbcdn.net/m1/v/t6/Xn8-ISUUYQyBD9FyACzPFRGZnBJRqIFmnQ_yd7FU6vxFYwD21fvAcZwDQoMzsScxcQyCWeBviKpWO4nX8yf--neJDvVjC4JlQtfBYb6TrpXQTniyafSFeZeePT_NVx3H6gMjceEvXHyvBqOOcCB_xQ?stp=c2048.2048.2000.988a_s1000x1000&_nc_gid=E2oHnrAtHutVvjaIm9qDLg&_nc_oc=AdkcScR9HuKt1X_K5-GrUeR5Paj8d7MsNFFYEBSmgc0IiBey_wS3RiNJpflWIKaQzNE&ccb=10-5&oh=00_AfNJ1Ki1IeGdUMxdFUc3ZX9VYIVFxVfXZ9MUATU3vj_RJw&oe=686AF002&_nc_sid=201bca"
)
console.log("Not blocked, got a forbidden", result.status)
return false
} catch (e) {

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

@ -174,7 +174,7 @@ export default class PanoramaxImageProvider extends ImageProvider {
}
const providedImage = await this.getInfo(value)
providedImage.alt_id = alt_id
providedImage.originalAttribute = {key, value}
providedImage.originalAttribute = { key, value }
return [providedImage]
}

6
src/Logic/ImageProviders/WikidataImageProvider.ts
View file

@ -61,9 +61,9 @@ export class WikidataImageProvider extends ImageProvider {
allImages.push(promises)
}
const resolved = await Promise.all(Utils.NoNull(allImages))
const flattened = resolved.flatMap( x => x)
if(flattened.length === 1){
flattened[0].originalAttribute = {key, value}
const flattened = resolved.flatMap((x) => x)
if (flattened.length === 1) {
flattened[0].originalAttribute = { key, value }
}
return flattened
}

4
src/Logic/ImageProviders/WikimediaImageProvider.ts
View file

@ -221,8 +221,8 @@ export class WikimediaImageProvider extends ImageProvider {
id: image,
isSpherical: false,
}
if(key && value){
providedImage.originalAttribute = {key, value}
if (key && value) {
providedImage.originalAttribute = { key, value }
}
return providedImage
}

31
src/Logic/State/UserRelatedState.ts
View file

@ -269,20 +269,23 @@ export default class UserRelatedState {
)
this.language = this.osmConnection.getPreference("language")
this.showTags = this.osmConnection.getPreference("show_tags")
this.showTagsB = this.showTags.map(showTags => {
if (showTags === "always" || showTags === "full") {
return true
}
if (showTags === "no") {
return false
}
const userdetails = this.osmConnection.userDetails.data
if (!userdetails) {
return false
}
const csCount = userdetails.csCount
return csCount >= Constants.userJourney.tagsVisibleAt
}, [this.osmConnection.userDetails])
this.showTagsB = this.showTags.map(
(showTags) => {
if (showTags === "always" || showTags === "full") {
return true
}
if (showTags === "no") {
return false
}
const userdetails = this.osmConnection.userDetails.data
if (!userdetails) {
return false
}
const csCount = userdetails.csCount
return csCount >= Constants.userJourney.tagsVisibleAt
},
[this.osmConnection.userDetails]
)
this.showCrosshair = this.osmConnection.getPreference("show_crosshair")
this.fixateNorth = this.osmConnection.getPreference("fixate-north")
this.morePrivacy = this.osmConnection.getPreference("more_privacy", { defaultValue: "no" })

48
src/Logic/State/UserSettingsMetaTagging.ts
View file

@ -1,14 +1,42 @@
import { Utils } from "../../Utils"
/** This code is autogenerated - do not edit. Edit ./assets/layers/usersettings/usersettings.json instead */
export class ThemeMetaTagging {
public static readonly themeName = "usersettings"
public static readonly themeName = "usersettings"
public metaTaggging_for_usersettings(feat: {properties: Record<string, string>}) {
Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_md', () => feat.properties._description.match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)?.at(1) )
Utils.AddLazyProperty(feat.properties, '_d', () => feat.properties._description?.replace(/&lt;/g,'<')?.replace(/&gt;/g,'>') ?? '' )
Utils.AddLazyProperty(feat.properties, '_mastodon_candidate_a', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.href.match(/mastodon|en.osm.town/) !== null)[0]?.href }) (feat) )
Utils.AddLazyProperty(feat.properties, '_mastodon_link', () => (feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName("a")).filter(a => a.getAttribute("rel")?.indexOf('me') >= 0)[0]?.href})(feat) )
Utils.AddLazyProperty(feat.properties, '_mastodon_candidate', () => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a )
feat.properties['__current_backgroun'] = 'initial_value'
}
}
public metaTaggging_for_usersettings(feat: { properties: Record<string, string> }) {
Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_md", () =>
feat.properties._description
.match(/\[[^\]]*\]\((.*(mastodon|en.osm.town).*)\).*/)
?.at(1)
)
Utils.AddLazyProperty(
feat.properties,
"_d",
() => feat.properties._description?.replace(/&lt;/g, "<")?.replace(/&gt;/g, ">") ?? ""
)
Utils.AddLazyProperty(feat.properties, "_mastodon_candidate_a", () =>
((feat) => {
const e = document.createElement("div")
e.innerHTML = feat.properties._d
return Array.from(e.getElementsByTagName("a")).filter(
(a) => a.href.match(/mastodon|en.osm.town/) !== null
)[0]?.href
})(feat)
)
Utils.AddLazyProperty(feat.properties, "_mastodon_link", () =>
((feat) => {
const e = document.createElement("div")
e.innerHTML = feat.properties._d
return Array.from(e.getElementsByTagName("a")).filter(
(a) => a.getAttribute("rel")?.indexOf("me") >= 0
)[0]?.href
})(feat)
)
Utils.AddLazyProperty(
feat.properties,
"_mastodon_candidate",
() => feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a
)
feat.properties["__current_backgroun"] = "initial_value"
}
}

14
src/Models/RasterLayers.ts
View file

@ -69,15 +69,13 @@ export class AvailableRasterLayers {
console.log("Invalid layers:", JSON.stringify(joined.filter((l) => !l.id)))
throw "Detected invalid global layer with invalid id"
}
return joined.map(
(properties) => {
return <RasterLayerPolygon>{
type: "Feature",
properties,
geometry: BBox.global.asGeometry(),
}
return joined.map((properties) => {
return <RasterLayerPolygon>{
type: "Feature",
properties,
geometry: BBox.global.asGeometry(),
}
)
})
}
/**

32
src/Models/ThemeConfig/Conversion/PrepareLayer.ts
View file

@ -170,7 +170,10 @@ class DetectInline extends DesugaringStep<QuestionableTagRenderingConfigJson> {
export class AddQuestionBox extends DesugaringStep<LayerConfigJson> {
constructor() {
super("AddQuestionBox", "Adds a 'questions'-object if no question element is added yet. Will ignore all elements which were previously asked for (and questions labeled with 'hidden')")
super(
"AddQuestionBox",
"Adds a 'questions'-object if no question element is added yet. Will ignore all elements which were previously asked for (and questions labeled with 'hidden')"
)
}
/**
@ -210,14 +213,12 @@ export class AddQuestionBox extends DesugaringStep<LayerConfigJson> {
(sp) => sp.args.length === 0 || sp.args[0].trim() === ""
)
if (noLabels.length > 1) {
context.err(
"Multiple 'questions'-visualisations found which would show _all_ questions. Don't do this - questions will be shown twice. Did you perhaps import all questions from another layer?",
"Multiple 'questions'-visualisations found which would show _all_ questions. Don't do this - questions will be shown twice. Did you perhaps import all questions from another layer?"
)
}
/**
* We want to construct a questionbox that shows all leftover questions.
* For this, we need to determine what those leftover questions _are_ in the first place.
@ -227,14 +228,14 @@ export class AddQuestionBox extends DesugaringStep<LayerConfigJson> {
// ALl labels that are used in this layer
const allLabels = new Set(
json.tagRenderings.flatMap(
(tr) => (<QuestionableTagRenderingConfigJson>tr).labels ?? []
)
json.tagRenderings.flatMap(
(tr) => (<QuestionableTagRenderingConfigJson>tr).labels ?? []
)
)
/**
* The essence of all questionboxes: what is whitelisted, what is blacklisted?
*/
const questionBoxes: { blacklist: string[], whitelist: string[] }[] = []
const questionBoxes: { blacklist: string[]; whitelist: string[] }[] = []
for (const questionSpecial of questionSpecials) {
if (typeof questionSpecial === "string") {
// Probably a header or something
@ -273,7 +274,7 @@ export class AddQuestionBox extends DesugaringStep<LayerConfigJson> {
for (const { blacklist, whitelist } of questionBoxes) {
if (whitelist.length > 0 && blacklist.length == 0) {
// All questions from "whitelist" are guaranteed to be used here
whitelist.forEach(label => usedLabels.add(label))
whitelist.forEach((label) => usedLabels.add(label))
}
}
@ -281,12 +282,14 @@ export class AddQuestionBox extends DesugaringStep<LayerConfigJson> {
* Can we say that the whitelisted items are fully consumed?
*/
let needsEvaluation = true
let toEvaluate = questionBoxes.filter(q => q.whitelist.length > 0 && q.blacklist.length > 0)
let toEvaluate = questionBoxes.filter(
(q) => q.whitelist.length > 0 && q.blacklist.length > 0
)
while (needsEvaluation && toEvaluate.length > 0) {
needsEvaluation = false
const toReEvaluate = []
for (const { blacklist, whitelist } of toEvaluate) {
const blacklistRest = blacklist.filter(label => !usedLabels.has(label))
const blacklistRest = blacklist.filter((label) => !usedLabels.has(label))
if (blacklistRest.length == 0) {
// All items from the blacklist have been handled by a different questionbox
// We can safely say that all whitelisted items are consumed
@ -294,7 +297,7 @@ export class AddQuestionBox extends DesugaringStep<LayerConfigJson> {
// Even better: this questionbox will show all leftover questions
return json
}
whitelist.forEach(label => {
whitelist.forEach((label) => {
usedLabels.add(label)
})
needsEvaluation = true
@ -312,11 +315,12 @@ export class AddQuestionBox extends DesugaringStep<LayerConfigJson> {
context.err(
"Could not calculate a non-ambiguous leftover questions block. A {questions()}-special rendering is found which has both a whitelist and a blacklist; where the blacklist was not fully consumed by other tagRenderings\n\t" +
JSON.stringify(toEvaluate)+"\n\tConsumed labels are: "+Array.from(usedLabels).join(", "),
JSON.stringify(toEvaluate) +
"\n\tConsumed labels are: " +
Array.from(usedLabels).join(", ")
)
}
/* At this point, we know which question labels are not yet handled and which already are handled, and we
* know there is no previous catch-all questions
*/

17
src/Models/ThemeConfig/DependencyCalculator.ts
View file

@ -6,17 +6,24 @@ import SpecialVisualizations from "../../UI/SpecialVisualizations"
import { LayerConfigJson } from "./Json/LayerConfigJson"
export default class DependencyCalculator {
/**
* For every tagRendering in the listed layers, determines in what layers they end up
*/
public static tagRenderingImportedBy(questionedLayer: LayerConfig, layers: LayerConfig[]): Map<string, {
layer: string
}[]> {
public static tagRenderingImportedBy(
questionedLayer: LayerConfig,
layers: LayerConfig[]
): Map<
string,
{
layer: string
}[]
> {
const result: Map<string, { layer: string }[]> = new Map()
for (const layer of layers) {
const hasRightContext = layer.tagRenderings.filter(tr => tr._definedIn !== undefined && tr?._definedIn?.[0] === questionedLayer.id)
const hasRightContext = layer.tagRenderings.filter(
(tr) => tr._definedIn !== undefined && tr?._definedIn?.[0] === questionedLayer.id
)
for (const tr of hasRightContext) {
const id = tr._definedIn[1]
if (!result.has(id)) {

35
src/Models/ThemeConfig/LayerConfig.ts
View file

@ -438,17 +438,23 @@ export default class LayerConfig extends WithContextLoader {
)
}
public generateDocumentation(
{ usedInThemes = [], layerIsNeededBy, dependencies = [], addedByDefault = false, canBeIncluded = true, lang = "en", reusedTagRenderings }: {
usedInThemes?: string[],
layerIsNeededBy?: Map<string, string[]>,
dependencies?: { context?: string; reason: string; neededLayer: string }[],
addedByDefault?: boolean,
canBeIncluded?: boolean,
reusedTagRenderings?: Map<string, {layer: string}[]>,
lang?: string
}
): string {
public generateDocumentation({
usedInThemes = [],
layerIsNeededBy,
dependencies = [],
addedByDefault = false,
canBeIncluded = true,
lang = "en",
reusedTagRenderings,
}: {
usedInThemes?: string[]
layerIsNeededBy?: Map<string, string[]>
dependencies?: { context?: string; reason: string; neededLayer: string }[]
addedByDefault?: boolean
canBeIncluded?: boolean
reusedTagRenderings?: Map<string, { layer: string }[]>
lang?: string
}): string {
const extraProps: string[] = []
extraProps.push("This layer is shown at zoomlevel **" + this.minzoom + "** and higher")
@ -669,7 +675,12 @@ export default class LayerConfig extends WithContextLoader {
this.generateDocumentationQuickTable(),
...this.tagRenderings
.filter((tr) => tr.labels.indexOf("ignore_docs") < 0)
.map((tr) => tr.generateDocumentation(lang, reusedTagRenderings?.get(tr.id)?.map(l => l.layer))),
.map((tr) =>
tr.generateDocumentation(
lang,
reusedTagRenderings?.get(tr.id)?.map((l) => l.layer)
)
),
...filterDocs,
].join("\n\n")
}

11
src/Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -1020,10 +1020,11 @@ export default class TagRenderingConfig {
...this.labels.map((label) => "`" + label + "`"),
].join(" ")
}
let reuse : string = undefined
if(usedInLayers?.length > 0){
reuse = [`This tagRendering is used in ${usedInLayers.length} layers:`,
...usedInLayers.map(l => `[${l}](./Layers/${l}.md)`)
let reuse: string = undefined
if (usedInLayers?.length > 0) {
reuse = [
`This tagRendering is used in ${usedInLayers.length} layers:`,
...usedInLayers.map((l) => `[${l}](./Layers/${l}.md)`),
].join(" ")
}
@ -1038,7 +1039,7 @@ export default class TagRenderingConfig {
condition,
labels,
"",
reuse
reuse,
]).join("\n")
}

5
src/Models/ThemeViewState/WithLayoutSourceState.ts
View file

@ -131,8 +131,9 @@ export class WithLayoutSourceState extends WithSelectedElementState {
protected setSelectedElement(feature: Feature) {
// The given feature might be a partial one from the cache
if(feature !== undefined){
feature = this.indexedFeatures.featuresById.data?.get(feature?.properties?.id) ?? feature
if (feature !== undefined) {
feature =
this.indexedFeatures.featuresById.data?.get(feature?.properties?.id) ?? feature
}
super.setSelectedElement(feature)
}

2
src/Models/ThemeViewState/WithSearchState.ts
View file

@ -17,11 +17,9 @@ export class WithSearchState extends WithVisualFeedbackState {
this.searchState = new SearchState(this)
this.initHotkeysSearch()
this.displaySearchLayer()
}
private displaySearchLayer() {
const source = this.searchState.locationResults
const flayer = this.layerState.filteredLayers.get("search")
this.featureProperties.trackFeatureSource(source)

2
src/UI/Base/LoadingPlaceholder.svelte
View file

@ -3,7 +3,7 @@
</script>
<div class="relative h-80 w-60">
<div class="h-full w-full animate-pulse interactive" />
<div class="interactive h-full w-full animate-pulse" />
<div class="absolute top-0 flex h-full w-full items-center justify-center">
<Loading />
</div>

32
src/UI/BigComponents/GpsElementHelper.svelte
View file

@ -16,9 +16,8 @@
function showFor(timeoutSeconds: number = 5) {
open = true
window.setTimeout(() => {
open = false
},
timeoutSeconds * 1000)
open = false
}, timeoutSeconds * 1000)
}
mapIsDragged.addCallback(() => {
@ -28,27 +27,30 @@
}
})
gpsState.requestMoment.stabilized(50).addCallback(() => {
if(gpsState.gpsAvailable.data && gpsState.allowMoving.data){
if (gpsState.gpsAvailable.data && gpsState.allowMoving.data) {
return
}
showFor(5)
})
let explanation = gpsState.gpsStateExplanation
onDestroy(
explanation.stabilized(50).addCallbackD(
expl => {
if (expl) {
showFor(5)
} else {
open = false
}
},
),
explanation.stabilized(50).addCallbackD((expl) => {
if (expl) {
showFor(5)
} else {
open = false
}
})
)
</script>
<Popover reference={undefined} trigger=null placement="left" transition={e => fade(e, {duration: 150})} bind:open>
<Popover
reference={undefined}
trigger="null"
placement="left"
transition={(e) => fade(e, { duration: 150 })}
bind:open
>
<div class="break-words" style="max-width: calc( 100vw - 8rem)">
<Tr t={$explanation} />
</div>

19
src/UI/BigComponents/WelcomeBack.svelte
View file

@ -1,5 +1,4 @@
<script lang="ts">
import { Popover } from "flowbite-svelte"
import { fade } from "svelte/transition"
import { OsmConnection } from "../../Logic/Osm/OsmConnection"
@ -8,23 +7,28 @@
export let state: { osmConnection: OsmConnection }
let userdetails = state.osmConnection.userDetails
userdetails.addCallbackAndRunD(ud => {
userdetails.addCallbackAndRunD((ud) => {
if (ud) {
open = true
window.setTimeout(() => {
open = false
open = false
}, 5000)
}
})
</script>
<Popover class="mt-4 z-50" defaultClass="py-2 px-3 w-fit " trigger=null placement="bottom"
transition={e => fade(e, {duration: 150})} bind:open>
<Popover
class="z-50 mt-4"
defaultClass="py-2 px-3 w-fit "
trigger="null"
placement="bottom"
transition={(e) => fade(e, { duration: 150 })}
bind:open
>
{#if $userdetails !== undefined}
<div style="width: max-content" class="flex items-center">
{#if $userdetails.img}
<img src={$userdetails.img } alt="profile picture" class="w-8 h-8 rounded-full mr-4" />
<img src={$userdetails.img} alt="profile picture" class="mr-4 h-8 w-8 rounded-full" />
{/if}
<div>
<div>Welcome back</div>
@ -35,4 +39,3 @@
</div>
{/if}
</Popover>

37
src/UI/Image/AttributedImage.svelte
View file

@ -50,26 +50,21 @@
async function detectErrorReason() {
try {
const response = await fetch(
image.url,
{
headers: {
"Accept": "image/avif,image/webp,*/*",
},
const response = await fetch(image.url, {
headers: {
Accept: "image/avif,image/webp,*/*",
},
)
})
if (response.status === 404) {
notFound = true
}
} catch
(e) {
} catch (e) {
console.log("Could not load image while trying to remediate", e)
}
}
async function onError() {
Mapillary.isInStrictMode().addCallbackAndRunD(isStrict => {
Mapillary.isInStrictMode().addCallbackAndRunD((isStrict) => {
isInStrictMode.set(isStrict)
return true // unregister
})
@ -82,16 +77,16 @@
onDestroy(
showBigPreview.addCallbackAndRun((shown) => {
state?.guistate?.setPreviewedImage(shown ? image : undefined)
}),
})
)
if (previewedImage) {
onDestroy(
previewedImage.addCallbackAndRun((previewedImage) => {
showBigPreview.set(
previewedImage !== undefined &&
(previewedImage?.id ?? previewedImage?.url) === (image.id ?? image.url),
(previewedImage?.id ?? previewedImage?.url) === (image.id ?? image.url)
)
}),
})
)
}
@ -135,17 +130,17 @@
</div>
</Popup>
{#if error}
<div class="h-80 w-60 interactive flex flex-col justify-center items-center p-4 text-center">
<div class="interactive flex h-80 w-60 flex-col items-center justify-center p-4 text-center">
{#if notFound}
<div class="alert flex items-center">
<TriangleOutline class="shrink-0 h-8 w-8" />
<TriangleOutline class="h-8 w-8 shrink-0" />
Not found
</div>
This image is probably incorrect or deleted.
<slot name="not-found-extra" />
{:else}
<div class="alert flex items-center">
<TriangleOutline class="shrink-0 h-8 w-8" />
<TriangleOutline class="h-8 w-8 shrink-0" />
<Tr t={Translations.t.image.loadingFailed} />
</div>
{#if image.provider.name.toLowerCase() === "mapillary" && $isInStrictMode}
@ -153,7 +148,7 @@
{:else if $isInStrictMode}
<Tr t={Translations.t.image.strictProtectionDetected} />
{image.provider.name}
<div class="subtle text-sm mt-8">{image.url}</div>
<div class="subtle mt-8 text-sm">{image.url}</div>
{/if}
{/if}
</div>
@ -225,10 +220,10 @@
</div>
</div>
{:else if image.status === "hidden"}
<div class="h-80 w-60 flex flex-col justify-center items-center break-words p-4 text-center">
<TriangleOutline class="w-8 h-8 subtle" />
<div class="flex h-80 w-60 flex-col items-center justify-center break-words p-4 text-center">
<TriangleOutline class="subtle h-8 w-8" />
<Tr t={Translations.t.image.reported} />
<button class="text-sm" on:click={() => ignoreHidden = true}>
<button class="text-sm" on:click={() => (ignoreHidden = true)}>
<Tr t={Translations.t.image.showAnyway} />
</button>
</div>

4
src/UI/Image/DeletableImage.svelte
View file

@ -65,7 +65,7 @@
}
async function unlink() {
const {key} = image.originalAttribute
const { key } = image.originalAttribute
await state?.changes?.applyAction(
new ChangeTagAction(tags.data.id, new Tag(key, ""), tags.data, {
changeType: "delete-image",
@ -95,7 +95,7 @@
<div class="my-4">
<AccordionSingle noBorder>
<div slot="header" class="flex text-sm">
<Tr t={t.requestDeletion}/>
<Tr t={t.requestDeletion} />
</div>
<div class="interactive flex flex-col p-2">
<h3>

4
src/UI/Image/NearbyImages.svelte
View file

@ -157,7 +157,9 @@
type: "Feature",
geometry: { type: "Point", coordinates: GeoOperations.centerpointCoordinates(feature) },
properties: <HotspotProperties>{
name: layer.title?.GetRenderValue(feature.properties)?.Subs(feature.properties)?.txt ?? "Feature",
name:
layer.title?.GetRenderValue(feature.properties)?.Subs(feature.properties)?.txt ??
"Feature",
focus: true,
},
},

11
src/UI/InputElement/Helpers/OpeningHoursInput.svelte
View file

@ -31,16 +31,15 @@
const state = new OpeningHoursState(value, prefix, postfix)
let expanded = new UIEventSource(false)
</script>
<Popup bodyPadding="p-0" shown={expanded}>
<OHTable value={state.normalOhs} />
<div class="absolute w-full flex justify-center" style="bottom: -3rem">
<button class=" primary " on:click={() => expanded.set(false)}>
<Check class="m-0 h-6 w-6 shrink-0 p-0" color="white" />
<Tr t={Translations.t.general.confirm}/>
</button>
<div class="absolute flex w-full justify-center" style="bottom: -3rem">
<button class=" primary" on:click={() => expanded.set(false)}>
<Check class="m-0 h-6 w-6 shrink-0 p-0" color="white" />
<Tr t={Translations.t.general.confirm} />
</button>
</div>
</Popup>

5
src/UI/Map/MapLibreAdaptor.ts
View file

@ -757,10 +757,11 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
if (!showScale) {
if (this.scaleControl) {
try {
map.removeControl(this.scaleControl)
} catch (e) {
console.warn("Could not remove scale control, underlying map might have had a reset")
console.warn(
"Could not remove scale control, underlying map might have had a reset"
)
}
this.scaleControl = undefined
}

3
src/UI/NotFound.svelte
View file

@ -10,8 +10,7 @@
<div class="flex h-full w-full flex-col items-center justify-center p-8">
<div class="flex flex-col items-center">
<World class="w-full h-auto"/>
<World class="h-auto w-full" />
<h1>
<Tr t={Translations.t.general["404"]} />
</h1>

8
src/UI/OpeningHours/OpeningHours.ts
View file

@ -466,9 +466,8 @@ changes // => [[36000,61200], ["10:00", "17:00"]]
*/
public static allChangeMoments(
ranges: OpeningRange[][],
includeOpenEnds = false,
includeOpenEnds = false
): [number[], string[]] {
const changeHours: number[] = []
const changeHourText: string[] = []
@ -477,7 +476,6 @@ changes // => [[36000,61200], ["10:00", "17:00"]]
for (const weekday of ranges) {
for (const range of weekday) {
if (!(range.openEnd || range.isOpen || range.isSpecial)) {
continue
}
@ -494,7 +492,7 @@ changes // => [[36000,61200], ["10:00", "17:00"]]
)
}
if(range.openEnd && !includeOpenEnds){
if (range.openEnd && !includeOpenEnds) {
continue
}
@ -572,7 +570,7 @@ changes // => [[36000,61200], ["10:00", "17:00"]]
public static createOhObject(
tags: Record<string, string | number> & { _lat: number; _lon: number; _country?: string },
textToParse: string,
country: string,
country: string
) {
return new opening_hours(
textToParse,

5
src/UI/OpeningHours/Visualisation/OpeningHoursRangeElement.svelte
View file

@ -14,11 +14,12 @@
let startOfDay: Date = new Date(range.startDate)
startOfDay.setHours(0, 0, 0, 0)
let startpoint = (range.startDate.getTime() - startOfDay.getTime()) / 1000 - earliestOpen
let width = (100 * (range.endDate.getTime() - range.startDate.getTime()) / 1000) / availableArea
let width = (100 * (range.endDate.getTime() - range.startDate.getTime())) / 1000 / availableArea
let startPercentage = (100 * startpoint) / availableArea
</script>
{#if range.openEnd}
<div class="ohviz-range open-end" style={`left:${startPercentage}%; width:${width}%`}/>
<div class="ohviz-range open-end" style={`left:${startPercentage}%; width:${width}%`} />
{:else if !range.isOpen && !range.isSpecial}
<div class="ohviz-day-off">{textToShow}</div>
{:else}

13
src/UI/Popup/TagRendering/Questionbox.svelte
View file

@ -46,7 +46,7 @@
}
let baseQuestions = (layer?.tagRenderings ?? [])?.filter(
(tr) => tr.question !== undefined && allowed(tr.labels),
(tr) => tr.question !== undefined && allowed(tr.labels)
)
/**
@ -128,16 +128,19 @@
<div slot="header" class="small subtle text-sm">
Questionbox debug info: labels (whitelist) : {onlyForLabels?.join(",")}
</div>
<div class="flex flex-col" >
<div class="flex flex-col">
<div>
notForLabes (blacklist): {notForLabels?.join(",")} ;
</div>
<div>
baseQuestions: {baseQuestions.length === 0 ? "NONE" : baseQuestions.map(q => q.id)?.join(",")} ;
baseQuestions: {baseQuestions.length === 0
? "NONE"
: baseQuestions.map((q) => q.id)?.join(",")} ;
</div>
<div>
questionsMeetingConditions: {$questionsToAsk.length === 0 ? "NONE" : baseQuestions.map(q => q.id)?.join(",")}
questionsMeetingConditions: {$questionsToAsk.length === 0
? "NONE"
: baseQuestions.map((q) => q.id)?.join(",")}
;
</div>
</div>

4
src/UI/Popup/TagRendering/SpecialTranslation.svelte
View file

@ -62,7 +62,9 @@
"due to",
e
)
return new FixedUiElement("Could not construct visualization "+specpart.func.funcName+" due to "+e)
return new FixedUiElement(
"Could not construct visualization " + specpart.func.funcName + " due to " + e
)
}
}
}

6
src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
View file

@ -313,7 +313,7 @@
let featureSwitchIsTesting = state?.featureSwitchIsTesting ?? new ImmutableStore(false)
let featureSwitchIsDebugging =
state?.featureSwitches?.featureSwitchIsDebugging ?? new ImmutableStore(false)
let showTags : Store<boolean> = state?.userRelatedState?.showTagsB ?? new ImmutableStore(false)
let showTags: Store<boolean> = state?.userRelatedState?.showTagsB ?? new ImmutableStore(false)
let question = config.question
let hideMappingsUnlessSearchedFor =
config.mappings.length > 8 && config.mappings.some((m) => m.priorityIf !== undefined)
@ -565,9 +565,7 @@
<Tr t={Translations.t.unknown.title} />
</h2>
<Tr t={Translations.t.unknown.explanation} />
<If
condition={state.userRelatedState?.showTagsB}
>
<If condition={state.userRelatedState?.showTagsB}>
<div class="subtle">
<Tr t={Translations.t.unknown.removedKeys} />
<TagHint tags={$onMarkUnknown} />

12
src/UI/ThemeViewGUI.svelte
View file

@ -180,16 +180,18 @@
let apiState = state?.osmConnection?.apiIsOnline ?? new ImmutableStore("online")
let mapIsDragged: UIEventSource<void> = new UIEventSource(undefined)
function onMapDragged(){
function onMapDragged() {
mapIsDragged.ping()
}
</script>
<main>
<div class="absolute left-0 top-0 h-screen w-screen" style="background-color: #f0efdd" />
<!-- Main map -->
<div class="absolute left-0 top-0 h-screen w-screen overflow-hidden" use:dragDetection={() => onMapDragged()}>
<div
class="absolute left-0 top-0 h-screen w-screen overflow-hidden"
use:dragDetection={() => onMapDragged()}
>
<MaplibreMap map={maplibremap} mapProperties={mapproperties} autorecovery={true} />
</div>
@ -321,7 +323,7 @@
</div>
{/if}
</div>
<GpsElementHelper reference = "#gps-control-button" {state} {mapIsDragged}/>
<GpsElementHelper reference="#gps-control-button" {state} {mapIsDragged} />
</If>
<If condition={state.mapProperties.showScale}>
<div class="h-6">
@ -354,7 +356,7 @@
on:keydown={forwardEventToMap}
>
<MenuIcon class="h-6 w-6 cursor-pointer" />
<WelcomeBack {state}/>
<WelcomeBack {state} />
</MapControlButton>
<MapControlButton

4
src/Utils/dragDetection.ts
View file

@ -1,5 +1,4 @@
export function dragDetection(htmlElement: HTMLElement, callback: () => {}) {
let isDown = false
let threshold = 5
let start = null
@ -30,7 +29,6 @@ export function dragDetection(htmlElement: HTMLElement, callback: () => {}) {
})
return {
destroy: () => {
},
destroy: () => {},
}
}

2
src/assets/contributors.json
View file

@ -1,7 +1,7 @@
{
"contributors": [
{
"commits": 9857,
"commits": 9968,
"contributor": "Pieter Vander Vennet"
},
{

24
src/assets/schemas/layerconfigmeta.json
View file

@ -11013,10 +11013,6 @@
"if": "value=hydrant",
"then": "hydrant - Map layer to show fire hydrants."
},
{
"if": "value=ice_cream",
"then": "ice_cream - A place where ice cream is sold over the counter"
},
{
"if": "value=id_presets",
"then": "id_presets - Layer containing various presets and questions generated by ID. These are meant to be reused in other layers by importing the tagRenderings with `id_preset.<tagrendering>"
@ -11377,10 +11373,6 @@
"if": "value=dentist",
"then": "dentist - This layer shows dentist offices"
},
{
"if": "value=doctors",
"then": "doctors - This layer shows doctor offices"
},
{
"if": "value=ghostsign",
"then": "ghostsign - Layer showing disused signs on buildings"
@ -11389,10 +11381,6 @@
"if": "value=hospital",
"then": "hospital - A layer showing hospital grounds"
},
{
"if": "value=pharmacy",
"then": "pharmacy - A layer showing pharmacies, which (probably) dispense prescription drugs"
},
{
"if": "value=physiotherapist",
"then": "physiotherapist - This layer shows physiotherapists"
@ -11441,10 +11429,22 @@
"if": "value=cafe_pub",
"then": "cafe_pub - A layer showing cafés and pubs where one can gather around a drink. The layer asks for some relevant questions"
},
{
"if": "value=doctors",
"then": "doctors - This layer shows doctor offices"
},
{
"if": "value=food",
"then": "food - A layer showing restaurants and fast-food amenities (with a special rendering for friteries)"
},
{
"if": "value=ice_cream",
"then": "ice_cream - A place where ice cream is sold over the counter"
},
{
"if": "value=pharmacy",
"then": "pharmacy - A layer showing pharmacies, which (probably) dispense prescription drugs"
},
{
"if": "value=shops",
"then": "shops - A shop"

72
src/assets/schemas/layoutconfigmeta.json
View file

@ -892,10 +892,6 @@
"if": "value=hydrant",
"then": "<b>hydrant</b> (builtin) - Map layer to show fire hydrants."
},
{
"if": "value=ice_cream",
"then": "<b>ice_cream</b> (builtin) - A place where ice cream is sold over the counter"
},
{
"if": "value=id_presets",
"then": "<b>id_presets</b> (builtin) - Layer containing various presets and questions generated by ID. These are meant to be reused in other layers by importing the tagRenderings with `id_preset.<tagrendering>"
@ -1256,10 +1252,6 @@
"if": "value=dentist",
"then": "<b>dentist</b> (builtin) - This layer shows dentist offices"
},
{
"if": "value=doctors",
"then": "<b>doctors</b> (builtin) - This layer shows doctor offices"
},
{
"if": "value=ghostsign",
"then": "<b>ghostsign</b> (builtin) - Layer showing disused signs on buildings"
@ -1268,10 +1260,6 @@
"if": "value=hospital",
"then": "<b>hospital</b> (builtin) - A layer showing hospital grounds"
},
{
"if": "value=pharmacy",
"then": "<b>pharmacy</b> (builtin) - A layer showing pharmacies, which (probably) dispense prescription drugs"
},
{
"if": "value=physiotherapist",
"then": "<b>physiotherapist</b> (builtin) - This layer shows physiotherapists"
@ -1320,10 +1308,22 @@
"if": "value=cafe_pub",
"then": "<b>cafe_pub</b> (builtin) - A layer showing cafés and pubs where one can gather around a drink. The layer asks for some relevant questions"
},
{
"if": "value=doctors",
"then": "<b>doctors</b> (builtin) - This layer shows doctor offices"
},
{
"if": "value=food",
"then": "<b>food</b> (builtin) - A layer showing restaurants and fast-food amenities (with a special rendering for friteries)"
},
{
"if": "value=ice_cream",
"then": "<b>ice_cream</b> (builtin) - A place where ice cream is sold over the counter"
},
{
"if": "value=pharmacy",
"then": "<b>pharmacy</b> (builtin) - A layer showing pharmacies, which (probably) dispense prescription drugs"
},
{
"if": "value=shops",
"then": "<b>shops</b> (builtin) - A shop"
@ -13681,10 +13681,6 @@
"if": "value=hydrant",
"then": "hydrant - Map layer to show fire hydrants."
},
{
"if": "value=ice_cream",
"then": "ice_cream - A place where ice cream is sold over the counter"
},
{
"if": "value=id_presets",
"then": "id_presets - Layer containing various presets and questions generated by ID. These are meant to be reused in other layers by importing the tagRenderings with `id_preset.<tagrendering>"
@ -14045,10 +14041,6 @@
"if": "value=dentist",
"then": "dentist - This layer shows dentist offices"
},
{
"if": "value=doctors",
"then": "doctors - This layer shows doctor offices"
},
{
"if": "value=ghostsign",
"then": "ghostsign - Layer showing disused signs on buildings"
@ -14057,10 +14049,6 @@
"if": "value=hospital",
"then": "hospital - A layer showing hospital grounds"
},
{
"if": "value=pharmacy",
"then": "pharmacy - A layer showing pharmacies, which (probably) dispense prescription drugs"
},
{
"if": "value=physiotherapist",
"then": "physiotherapist - This layer shows physiotherapists"
@ -14109,10 +14097,22 @@
"if": "value=cafe_pub",
"then": "cafe_pub - A layer showing cafés and pubs where one can gather around a drink. The layer asks for some relevant questions"
},
{
"if": "value=doctors",
"then": "doctors - This layer shows doctor offices"
},
{
"if": "value=food",
"then": "food - A layer showing restaurants and fast-food amenities (with a special rendering for friteries)"
},
{
"if": "value=ice_cream",
"then": "ice_cream - A place where ice cream is sold over the counter"
},
{
"if": "value=pharmacy",
"then": "pharmacy - A layer showing pharmacies, which (probably) dispense prescription drugs"
},
{
"if": "value=shops",
"then": "shops - A shop"
@ -35506,10 +35506,6 @@
"if": "value=hydrant",
"then": "hydrant - Map layer to show fire hydrants."
},
{
"if": "value=ice_cream",
"then": "ice_cream - A place where ice cream is sold over the counter"
},
{
"if": "value=id_presets",
"then": "id_presets - Layer containing various presets and questions generated by ID. These are meant to be reused in other layers by importing the tagRenderings with `id_preset.<tagrendering>"
@ -35870,10 +35866,6 @@
"if": "value=dentist",
"then": "dentist - This layer shows dentist offices"
},
{
"if": "value=doctors",
"then": "doctors - This layer shows doctor offices"
},
{
"if": "value=ghostsign",
"then": "ghostsign - Layer showing disused signs on buildings"
@ -35882,10 +35874,6 @@
"if": "value=hospital",
"then": "hospital - A layer showing hospital grounds"
},
{
"if": "value=pharmacy",
"then": "pharmacy - A layer showing pharmacies, which (probably) dispense prescription drugs"
},
{
"if": "value=physiotherapist",
"then": "physiotherapist - This layer shows physiotherapists"
@ -35934,10 +35922,22 @@
"if": "value=cafe_pub",
"then": "cafe_pub - A layer showing cafés and pubs where one can gather around a drink. The layer asks for some relevant questions"
},
{
"if": "value=doctors",
"then": "doctors - This layer shows doctor offices"
},
{
"if": "value=food",
"then": "food - A layer showing restaurants and fast-food amenities (with a special rendering for friteries)"
},
{
"if": "value=ice_cream",
"then": "ice_cream - A place where ice cream is sold over the counter"
},
{
"if": "value=pharmacy",
"then": "pharmacy - A layer showing pharmacies, which (probably) dispense prescription drugs"
},
{
"if": "value=shops",
"then": "shops - A shop"

14
src/assets/translators.json
View file

@ -41,7 +41,7 @@
"contributor": "danieldegroot2"
},
{
"commits": 67,
"commits": 68,
"contributor": "Supaplex"
},
{
@ -112,6 +112,10 @@
"commits": 16,
"contributor": "macpac"
},
{
"commits": 15,
"contributor": "Lukáš Jelínek"
},
{
"commits": 15,
"contributor": "Ettore Atalan"
@ -132,10 +136,6 @@
"commits": 14,
"contributor": "J. Lavoie"
},
{
"commits": 13,
"contributor": "Lukáš Jelínek"
},
{
"commits": 13,
"contributor": "Weblate Admin"
@ -604,6 +604,10 @@
"commits": 2,
"contributor": "Leo Alcaraz"
},
{
"commits": 1,
"contributor": "ERyPTION"
},
{
"commits": 1,
"contributor": "POG"