From 0b8ddd924024e0a0bbfc03252cfa2b4785597e73 Mon Sep 17 00:00:00 2001
From: SilentSpike <SilentSpike100+Github@gmail.com>
Date: Thu, 6 Jun 2019 15:55:31 +0100
Subject: [PATCH] Fix email and website validation for empty values

---
 modules/validations/invalid_format.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/validations/invalid_format.js b/modules/validations/invalid_format.js
index 2d5d35105..16902ce19 100644
--- a/modules/validations/invalid_format.js
+++ b/modules/validations/invalid_format.js
@@ -8,16 +8,18 @@ export function validationFormatting() {
     var validation = function(entity, context) {
         var issues = [];
 
-        function isInvalidEmail(email) {
+        function isValidEmail(email) {
             // Same regex as used by HTML5 "email" inputs
             // Emails in OSM are going to be official so they should be pretty simple
             var valid_email = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
-            return !valid_email.test(email);
+
+            // An empty value is also acceptable
+            return (!email || valid_email.test(email));
         }
 
-        function isSchemeMissing(url) {
+        function isSchemePresent(url) {
             var valid_scheme = /^https?:\/\//i;
-            return !valid_scheme.test(url);
+            return (!url || valid_scheme.test(url));
         }
 
         function showReferenceEmail(selection) {
@@ -40,7 +42,8 @@ export function validationFormatting() {
 
         if (entity.tags.website) {
             // Multiple websites are possible
-            var websites = entity.tags.website.split(';').filter(isSchemeMissing);
+            // If ever we support ES6, arrow functions make this nicer
+            var websites = entity.tags.website.split(';').filter(function(x) { return !isSchemePresent(x); });
 
             if (websites.length) {
                 issues.push(new validationIssue({
@@ -62,7 +65,7 @@ export function validationFormatting() {
 
         if (entity.tags.email) {
             // Multiple emails are possible
-            var emails = entity.tags.email.split(';').filter(isInvalidEmail);
+            var emails = entity.tags.email.split(';').filter(function(x) { return !isValidEmail(x); });
 
             if (emails.length) {
                 issues.push(new validationIssue({