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

Fix typo in method name, fix conflicted doctests

Browse source
This commit is contained in:
pietervdvn 2022-06-20 11:26:55 +02:00
parent 00026768f2
commit 5bafbbd3d2
4 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Logic/Osm/OsmConnection.ts
View file

@ -314,7 +314,7 @@ export class OsmConnection {
} }
public addCommentToNode(id: number | string, text: string): Promise<void> { public addCommentToNote(id: number | string, text: string): Promise<void> {
if (this._dryRun.data) { if (this._dryRun.data) {
console.warn("Dryrun enabled - not actually adding comment ", text, "to note ", id) console.warn("Dryrun enabled - not actually adding comment ", text, "to note ", id)
return new Promise((ok) => { return new Promise((ok) => {

8
Logic/Tags/TagUtils.ts
View file

@ -216,19 +216,11 @@ export class TagUtils {
* *
* TagUtils.Tag("xyz<5").matchesProperties({xyz: 4}) // => true * TagUtils.Tag("xyz<5").matchesProperties({xyz: 4}) // => true
* TagUtils.Tag("xyz<5").matchesProperties({xyz: 5}) // => false * TagUtils.Tag("xyz<5").matchesProperties({xyz: 5}) // => false
<<<<<<< HEAD
* *
* // RegexTags must match values with newlines * // RegexTags must match values with newlines
* TagUtils.Tag("note~.*aed.*").matchesProperties({note: "Hier bevindt zich wss een defibrillator. \\n\\n De aed bevindt zich op de 5de verdieping"}) // => true * TagUtils.Tag("note~.*aed.*").matchesProperties({note: "Hier bevindt zich wss een defibrillator. \\n\\n De aed bevindt zich op de 5de verdieping"}) // => true
* TagUtils.Tag("note~i~.*aed.*").matchesProperties({note: "Hier bevindt zich wss een defibrillator. \\n\\n De AED bevindt zich op de 5de verdieping"}) // => true * TagUtils.Tag("note~i~.*aed.*").matchesProperties({note: "Hier bevindt zich wss een defibrillator. \\n\\n De AED bevindt zich op de 5de verdieping"}) // => true
*
=======
* *
* // RegexTags must match values with newlines
* TagUtils.Tag("note~.*aed.*").matchesProperties({note: "Hier bevindt zich wss een defibrillator. \\n\\n De aed bevindt zich op de 5de verdieping"}) // => true
* TagUtils.Tag("note~i~.*aed.*").matchesProperties({note: "Hier bevindt zich wss een defibrillator. \\n\\n De AED bevindt zich op de 5de verdieping"}) // => true
*
>>>>>>> master
* // Must match case insensitive * // Must match case insensitive
* TagUtils.Tag("name~i~somename").matchesProperties({name: "SoMeName"}) // => true * TagUtils.Tag("name~i~somename").matchesProperties({name: "SoMeName"}) // => true
*/ */

2
UI/ImportFlow/ImportViewerGui.ts
View file

@ -112,7 +112,7 @@ class MassAction extends Combine {
predicate: p => p.status === "open", predicate: p => p.status === "open",
action: async p => { action: async p => {
const txt = textField.GetValue().data const txt = textField.GetValue().data
state.osmConnection.addCommentToNode(p.id, txt) state.osmConnection.addCommentToNote(p.id, txt)
} }
}, },
shown: "Add comment to every open note" shown: "Add comment to every open note"

4
UI/SpecialVisualizations.ts
View file

@ -949,7 +949,7 @@ export default class SpecialVisualizations {
await state.osmConnection.reopenNote(id, txt.data) await state.osmConnection.reopenNote(id, txt.data)
await state.osmConnection.closeNote(id) await state.osmConnection.closeNote(id)
} else { } else {
await state.osmConnection.addCommentToNode(id, txt.data) await state.osmConnection.addCommentToNote(id, txt.data)
} }
NoteCommentElement.addCommentTo(txt.data, tags, state) NoteCommentElement.addCommentTo(txt.data, tags, state)
txt.setData("") txt.setData("")
@ -1045,7 +1045,7 @@ export default class SpecialVisualizations {
const uploader = new ImgurUploader(url => { const uploader = new ImgurUploader(url => {
isUploading.setData(false) isUploading.setData(false)
state.osmConnection.addCommentToNode(id, url) state.osmConnection.addCommentToNote(id, url)
NoteCommentElement.addCommentTo(url, tags, state) NoteCommentElement.addCommentTo(url, tags, state)
}) })