Add support for 'contact:email','contact:phone' and 'contact:website' (write to 'email', 'phone' and 'website' if changed) - fix #601; remove 'tel:' from phone addresses - fix #602; small fixes to tag preview in case of deletion

This commit is contained in:
Pieter Vander Vennet 2022-01-05 17:08:35 +01:00
parent a35b1d34f4
commit 4fd30d1a62
4 changed files with 39 additions and 7 deletions

View file

@ -59,7 +59,7 @@ export class And extends TagsFilter {
} }
asHumanString(linkToWiki: boolean, shorten: boolean, properties) { asHumanString(linkToWiki: boolean, shorten: boolean, properties) {
return this.and.map(t => t.asHumanString(linkToWiki, shorten, properties)).join("&"); return this.and.map(t => t.asHumanString(linkToWiki, shorten, properties)).filter(x => x !== "").join("&");
} }
isUsableAsAnswer(): boolean { isUsableAsAnswer(): boolean {

View file

@ -48,7 +48,7 @@ export class Tag extends TagsFilter {
} }
if(v === "" || v === undefined){ if(v === "" || v === undefined){
// This tag will be removed if in the properties, so we indicate this with special rendering // This tag will be removed if in the properties, so we indicate this with special rendering
if(currentProperties !== undefined && (currentProperties[this.key] ?? "") !== ""){ if(currentProperties !== undefined && (currentProperties[this.key] ?? "") === ""){
// This tag is not present in the current properties, so this tag doesn't change anything // This tag is not present in the current properties, so this tag doesn't change anything
return "" return ""
} }

View file

@ -406,9 +406,17 @@ export default class ValidatedTextField {
if (str === undefined) { if (str === undefined) {
return false; return false;
} }
if(str.startsWith("tel:")){
str = str.substring("tel:".length)
}
return parsePhoneNumberFromString(str, (country())?.toUpperCase() as any)?.isValid() ?? false return parsePhoneNumberFromString(str, (country())?.toUpperCase() as any)?.isValid() ?? false
}, },
(str, country: () => string) => parsePhoneNumberFromString(str, (country())?.toUpperCase() as any).formatInternational(), (str, country: () => string) => {
if(str.startsWith("tel:")){
str = str.substring("tel:".length)
}
return parsePhoneNumberFromString(str, (country())?.toUpperCase() as any).formatInternational();
},
undefined, undefined,
"tel" "tel"
), ),

View file

@ -71,9 +71,17 @@
"ca": "Quin és el telèfon de {name}?" "ca": "Quin és el telèfon de {name}?"
}, },
"render": "<a href='tel:{phone}'>{phone}</a>", "render": "<a href='tel:{phone}'>{phone}</a>",
"mappings": [
{
"if": "contact:phone~*",
"then": "<a href='tel:{contact:phone}'>{contact:phone}</a>",
"hideInAnswer": true
}
],
"freeform": { "freeform": {
"key": "phone", "key": "phone",
"type": "phone" "type": "phone",
"addExtraTags": ["contact:phone="]
} }
}, },
"osmlink": { "osmlink": {
@ -140,9 +148,17 @@
"hu": "Mi a(z) {name} e-mail címe?", "hu": "Mi a(z) {name} e-mail címe?",
"ca": "Quina és l'adreça de correu electrònic de {name}?" "ca": "Quina és l'adreça de correu electrònic de {name}?"
}, },
"mappings": [
{
"if": "contact:email~*",
"then": "<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>",
"hideInAnswer": true
}
],
"freeform": { "freeform": {
"key": "email", "key": "email",
"type": "email" "type": "email",
"addExtraTags": ["contact:email="]
} }
}, },
"website": { "website": {
@ -168,8 +184,16 @@
"render": "<a href='{website}' target='_blank'>{website}</a>", "render": "<a href='{website}' target='_blank'>{website}</a>",
"freeform": { "freeform": {
"key": "website", "key": "website",
"type": "url" "type": "url",
} "addExtraTags": ["contact:website="]
},
"mappings": [
{
"if": "contact:website~*",
"then": "<a href='{contact:website}' target='_blank'>{contact:website}</a>",
"hideInAnswer": true
}
]
}, },
"wheelchair-access": { "wheelchair-access": {
"question": { "question": {