Add friendly confirm message on newly created points

This commit is contained in:
Pieter Vander Vennet 2022-11-07 23:12:31 +01:00
parent 5c28ce2995
commit ccf3bb3993
6 changed files with 63 additions and 30 deletions

View file

@ -3,9 +3,11 @@
*/
import { UIEventSource } from "./UIEventSource"
import { GeoJSONObject } from "@turf/turf"
import {Feature, Point} from "geojson";
import {OsmTags} from "../Models/OsmFeature";
export class ElementStorage {
public ContainingFeatures = new Map<string, any>()
public ContainingFeatures = new Map<string, Feature<Point, OsmTags >>()
private _elements = new Map<string, UIEventSource<any>>()
constructor() {}

View file

@ -4,6 +4,7 @@ import { TagsFilter } from "./TagsFilter"
export class Tag extends TagsFilter {
public key: string
public value: string
public static newlyCreated = new Tag("_newly_created","yes") ;
constructor(key: string, value: string) {
super()
this.key = key

View file

@ -27,6 +27,7 @@ import Loading from "../Base/Loading"
import Hash from "../../Logic/Web/Hash"
import { GlobalFilter } from "../../Logic/State/MapState"
import { WayId } from "../../Models/OsmFeature"
import {Tag} from "../../Logic/Tags/Tag";
/*
* The SimpleAddUI is a single panel, which can have multiple states:
@ -97,10 +98,11 @@ export default class SimpleAddUI extends Toggle {
const presetsOverview = SimpleAddUI.CreateAllPresetsPanel(selectedPreset, state)
async function createNewPoint(
tags: any[],
tags: Tag[],
location: { lat: number; lon: number },
snapOntoWay?: OsmWay
): Promise<void> {
tags.push(Tag.newlyCreated)
const newElementAction = new CreateNewNodeAction(tags, location.lat, location.lon, {
theme: state.layoutToUse?.id ?? "unkown",
changeType: "create",
@ -109,9 +111,8 @@ export default class SimpleAddUI extends Toggle {
await state.changes.applyAction(newElementAction)
selectedPreset.setData(undefined)
isShown.setData(false)
state.selectedElement.setData(
state.allElements.ContainingFeatures.get(newElementAction.newElementId)
)
const selectedFeature = state.allElements.ContainingFeatures.get(newElementAction.newElementId)
state.selectedElement.setData(selectedFeature)
Hash.hash.setData(newElementAction.newElementId)
}

View file

@ -118,7 +118,6 @@ export default class ConfirmLocationOfPoint extends Combine {
preset.icon(),
new Combine([
confirmText,
Translations.t.general.add.warnVisibleForEveryone.Clone().SetClass("alert"),
]).SetClass("flex flex-col")
)
.SetClass("font-bold break-words")
@ -139,8 +138,11 @@ export default class ConfirmLocationOfPoint extends Combine {
)
})
const warn = Translations.t.general.add.warnVisibleForEveryone.Clone().SetClass("alert w-full block");
if (preciseInput !== undefined) {
confirmButton = new Combine([preciseInput, confirmButton])
confirmButton = new Combine([preciseInput, warn, confirmButton])
} else {
confirmButton = new Combine([warn, confirmButton])
}
const openLayerControl = new SubtleButton(

View file

@ -17,6 +17,9 @@ import MoveWizard from "./MoveWizard"
import Toggle from "../Input/Toggle"
import Lazy from "../Base/Lazy"
import FeaturePipelineState from "../../Logic/State/FeaturePipelineState"
import {Tag} from "../../Logic/Tags/Tag";
import Svg from "../../Svg";
import Translations from "../i18n/Translations";
export default class FeatureInfoBox extends ScrollableFullScreen {
public constructor(
@ -79,7 +82,7 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
state: FeaturePipelineState
): BaseUIElement {
let questionBoxes: Map<string, QuestionBox> = new Map<string, QuestionBox>()
const t = Translations.t.general
const allGroupNames = Utils.Dedup(layerConfig.tagRenderings.map((tr) => tr.group))
if (state?.featureSwitchUserbadge?.data ?? true) {
const questionSpecs = layerConfig.tagRenderings.filter((tr) => tr.id === "questions")
@ -98,7 +101,29 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
}
}
const allRenderings = []
const withQuestion = layerConfig.tagRenderings.filter(tr => tr.question !== undefined).length
const allRenderings: BaseUIElement[] = [
new VariableUiElement(
tags.map(data => data[Tag.newlyCreated.key]).map(isCreated => {
if (isCreated !== Tag.newlyCreated.value) {
return undefined
}
const els = []
const thanks =
new Combine([
Svg.party_svg().SetClass("w-12 h-12 shrink-0 p-1 m-1 bg-white rounded-full block"),
t.newlyCreated
]).SetClass("flex w-full thanks content-center")
els.push(thanks)
if (withQuestion > 0) {
els.push(t.feelFreeToSkip)
}
return new Combine(els).SetClass("pb-4 mb-4 border-b block border-black")
})
)
]
for (let i = 0; i < allGroupNames.length; i++) {
const groupName = allGroupNames[i]

View file

@ -170,6 +170,7 @@
"error": "Something went wrong",
"example": "Example",
"examples": "Examples",
"feelFreeToSkip": "You can add or update more information below, but feel free <b>to skip questions</b> you don't know the answer to.",
"fewChangesBefore": "Please, answer a few questions of existing features before adding a new feature.",
"getStartedLogin": "Log in with OpenStreetMap to get started",
"getStartedNewAccount": " or <a href='https://www.openstreetmap.org/user/new' target='_blank'>create a new account</a>",
@ -204,6 +205,7 @@
"streetcomplete": "Another, similar application is <a href='https://play.google.com/store/apps/details?id=de.westnordost.streetcomplete' class='underline hover:text-blue-800' class='underline hover:text-blue-800' target='_blank'>StreetComplete</a>."
},
"nameInlineQuestion": "The name of this {category} is $$$",
"newlyCreated": "You just created this element! Thanks for sharing this info with the world and helping people worldwide.",
"next": "Next",
"noMatchingMapping": "No entries mapped your search…",
"noNameCategory": "{category} without a name",