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

Improve 'relocate'-dialog

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-12-15 20:27:20 +01:00
parent 530d746bb7
commit c1223b6244
1 changed files with 48 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

59
UI/Popup/MoveWizard.ts
View file

@ -1,24 +1,28 @@
import { SubtleButton } from "../Base/SubtleButton"
import {SubtleButton} from "../Base/SubtleButton"
import Combine from "../Base/Combine"
import Svg from "../../Svg"
import { OsmConnection } from "../../Logic/Osm/OsmConnection"
import {OsmConnection} from "../../Logic/Osm/OsmConnection"
import Toggle from "../Input/Toggle"
import { UIEventSource } from "../../Logic/UIEventSource"
import {UIEventSource} from "../../Logic/UIEventSource"
import Translations from "../i18n/Translations"
import { VariableUiElement } from "../Base/VariableUIElement"
import { Translation } from "../i18n/Translation"
import {VariableUiElement} from "../Base/VariableUIElement"
import {Translation} from "../i18n/Translation"
import BaseUIElement from "../BaseUIElement"
import LocationInput from "../Input/LocationInput"
import Loc from "../../Models/Loc"
import { GeoOperations } from "../../Logic/GeoOperations"
import { OsmObject } from "../../Logic/Osm/OsmObject"
import { Changes } from "../../Logic/Osm/Changes"
import {GeoOperations} from "../../Logic/GeoOperations"
import {OsmObject} from "../../Logic/Osm/OsmObject"
import {Changes} from "../../Logic/Osm/Changes"
import ChangeLocationAction from "../../Logic/Osm/Actions/ChangeLocationAction"
import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"
import MoveConfig from "../../Models/ThemeConfig/MoveConfig"
import { ElementStorage } from "../../Logic/ElementStorage"
import {ElementStorage} from "../../Logic/ElementStorage"
import AvailableBaseLayers from "../../Logic/Actors/AvailableBaseLayers"
import BaseLayer from "../../Models/BaseLayer"
import SearchAndGo from "../BigComponents/SearchAndGo";
import ChangeTagAction from "../../Logic/Osm/Actions/ChangeTagAction";
import {And} from "../../Logic/Tags/And";
import {Tag} from "../../Logic/Tags/Tag";
interface MoveReason {
text: Translation | string
@ -26,9 +30,11 @@ interface MoveReason {
icon: BaseUIElement
changesetCommentValue: string
lockBounds: true | boolean
includeSearch: false | boolean
background: undefined | "map" | "photo" | string | string[]
startZoom: number
minZoom: number
eraseAddressFields: false | boolean
}
export default class MoveWizard extends Toggle {
@ -62,8 +68,10 @@ export default class MoveWizard extends Toggle {
changesetCommentValue: "relocated",
lockBounds: false,
background: undefined,
includeSearch: true,
startZoom: 12,
minZoom: 6,
eraseAddressFields: true
})
}
if (options.enableImproveAccuracy) {
@ -73,9 +81,11 @@ export default class MoveWizard extends Toggle {
icon: Svg.crosshair_svg(),
changesetCommentValue: "improve_accuracy",
lockBounds: true,
includeSearch: false,
background: "photo",
startZoom: 17,
minZoom: 16,
eraseAddressFields: false
})
}
@ -141,6 +151,7 @@ export default class MoveWizard extends Toggle {
loc,
new UIEventSource(background)
).data
const locationInput = new LocationInput({
minZoom: reason.minZoom,
centerLocation: loc,
@ -152,12 +163,19 @@ export default class MoveWizard extends Toggle {
locationInput.installBounds(0.05, true)
}
let searchPanel: BaseUIElement = undefined
if (reason.includeSearch) {
searchPanel = new SearchAndGo({
leafletMap: locationInput.leafletMap
})
}
locationInput.SetStyle("height: 17.5rem")
const confirmMove = new SubtleButton(Svg.move_confirm_svg(), t.confirmMove)
confirmMove.onClick(() => {
confirmMove.onClick(async () => {
const loc = locationInput.GetValue().data
state.changes.applyAction(
await state.changes.applyAction(
new ChangeLocationAction(featureToMove.properties.id, [loc.lon, loc.lat], {
reason: reason.changesetCommentValue,
theme: state.layoutToUse.id,
@ -165,11 +183,30 @@ export default class MoveWizard extends Toggle {
)
featureToMove.properties._lat = loc.lat
featureToMove.properties._lon = loc.lon
if (reason.eraseAddressFields) {
await state.changes.applyAction(
new ChangeTagAction(featureToMove.properties.id,
new And([new Tag("addr:housenumber", ""),
new Tag("addr:street", ""),
new Tag("addr:city", ""),
new Tag("addr:postcode","")]
),
featureToMove.properties,
{
changeType: "relocated",
theme: state.layoutToUse.id,
}
)
)
}
state.allElements.getEventSourceById(id).ping()
currentStep.setData("moved")
})
const zoomInFurhter = t.zoomInFurther.SetClass("alert block m-6")
return new Combine([
searchPanel,
locationInput,
new Toggle(
confirmMove,