Changes between Version 2 and Version 3 of Rules/UkrainePhoneNumbers

Timestamp:

2022-05-23T20:15:07+02:00 (4 years ago)

Author:

andygol

Comment:

Added check for key existence; improvements in regex

Rules/UkrainePhoneNumbers

@@ -8 +8 @@
     author: "andygol";
     link: "https://josm.openstreetmap.de/wiki/Rules/UkrainePhoneNumbers";
-    min-josm-version: "11424";
+    min-josm-version: "11424"; /* due to territory selectors */
     baselanguage: "en"; 
 }
@@ -16 +16 @@
 }
 
-*[number_of_tags() > 1][/^(contact:)?(phone|fax)(?!:UA)$/!~/^((?=\+\b380[0-9 ]{12}\b)(?=.*(\+\b380 (?:\d{2} \d{3} \d{4}|\d{3} \d{2} \d{4}|\d{4} \d{2} \d{3})\b))((\+\b380 (?:\d{2} \d{3} \d{4}|\d{3} \d{2} \d{4}|\d{4} \d{2} \d{3})\b));?)*$/][inside("UA")] {
-    throwWarning: tr("\"phone\" tag");
-    group: tr("Incorrect phone number");
+*[/^(contact:)?(phone|fax)(?!:UA)$/][/^(contact:)?(phone|fax)(?!:UA)$/ !~ /^((;?(?=(\+\b380 [3-9][0-9][0-9 ]{9}\b)|(0 800 \d{3} \d{3}))(?=.*((0 800 \d{3} \d{3})|(\+\b380 (?:\d{2} \d{3} \d{4}|\d{3} \d{2} \d{4}|\d{4} \d{2} \d{3})\b)))((0 800 \d{3} \d{3})|(\+\b380 (?:\d{2} \d{3} \d{4}|\d{3} \d{2} \d{4}|\d{4} \d{2} \d{3})\b)))*)$/][inside("UA")] {
+    throwWarning: tr("Incorrect \"phone\" tag");
     suggestAlternative: tr("format +380⎵44⎵123⎵4567;+380⎵352⎵12⎵3456;+380⎵5345⎵12⎵345");
     assertMatch: "node phone=+380 44 366 7002";
@@ -24 +23 @@
 }
 
-*[number_of_tags() > 1][/^phone$/=~/^((0 800 \d{3} \d{3});?)*$/][inside("UA")] {
-    throwError: tr("\"phone\" tag");
-    group: tr("Use \"phone:UA\" key for toll free phones instead");
+*[/^phone$/ =~ /^((0 800 \d{3} \d{3});?)*$/][inside("UA")] {
+    throwError: tr("{0}", "");
+    group: tr("A toll-free phone number is listed in the \"phone\" tag");
     fixChangeKey: "phone=>phone:UA";
     assertMatch: "node phone=0 800 500 609";