Changes between Version 5 and Version 6 of Rules/Pictures

Timestamp:

2026-09-19T22:48:45+02:00 (10 days ago)

Author:

wangi

Comment:

move checks into the rules; per #24894

Rules/Pictures

@@ -16 +16 @@
     throwError: tr("mapillary tag should only contain image ID instead of full URL");
     fixAdd: concat("mapillary=", get(regexp_match(".*pKey=([0-9]{15,19}).*", tag("mapillary")),1));
+    assertMatch: "node mapillary=https://www.mapillary.com/app/?pKey=1410083070176035&focus=photo";
+    assertMatch: "node mapillary=https://www.mapillary.com/app/?pKey=277755748254846";
+    assertNoMatch: "node mapillary=1410083070176035";
+    assertNoMatch: "node mapillary=8fX3-aB9vQ2kLm5nR7tYwZ";
 }
 
 *[mapillary][mapillary=~/^[A-Za-z0-9_-]{22}$/] {
     throwWarning: tr("mapillary tag contains a legacy image key, which Mapillary no longer resolves; replace it by the numeric image ID");
+    assertMatch: "node mapillary=8fX3-aB9vQ2kLm5nR7tYwZ";
+    assertNoMatch: "node mapillary=1410083070176035";
+    assertNoMatch: "node mapillary=https://www.mapillary.com/app/?pKey=277755748254846";
 }
 
 *[mapillary][mapillary!~/^[0-9]{15,19}$/][mapillary!~/pKey=[0-9]{15,19}/][mapillary!~/^[A-Za-z0-9_-]{22}$/] {
     throwError: tr("mapillary tag should only contain image ID (15 to 19 digits)");
+    assertMatch: "node mapillary=1";
+    assertMatch: "node mapillary=abc";
+    assertMatch: "node mapillary=12345678901234567890";
+    assertNoMatch: "node mapillary=823115609853912";
+    assertNoMatch: "node mapillary=1410083070176035";
+    assertNoMatch: "node mapillary=12345678901234567";
+    assertNoMatch: "node mapillary=1234567890123456789";
+    assertNoMatch: "node mapillary=https://www.mapillary.com/app/?pKey=1410083070176035";
+    assertNoMatch: "node mapillary=8fX3-aB9vQ2kLm5nR7tYwZ";
 }
 
 *[flickr][flickr!~/^https:\/\/www.flickr.com\/photos\/[0-9]+@[A-Z0-9]+\/[0-9]+$/] {
     throwError: tr("flickr tag should contain full image URL");
+    assertMatch: "node flickr=12345678901";
+    assertNoMatch: "node flickr=https://www.flickr.com/photos/12345678@N01/12345678901";
 }