Fix: #5053 - wrong canonical formatting for PLAC:FORM

fisharebest · Nov 29, 2024 · ca7e3cf · ca7e3cf
1 parent bda3570
commit ca7e3cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/Elements/PlaceHierarchy.php b/app/Elements/PlaceHierarchy.php
@@ -50,7 +50,7 @@ class PlaceHierarchy extends AbstractElement
     public function canonical(string $value): string
     {
         $value = parent::canonical($value);
-        $value = preg_replace('/[, ]+/', ', ', $value);
+        $value = preg_replace('/[, ]*,[, ]*/', ', ', $value);
 
         return trim($value, ', ');
     }

diff --git a/tests/app/Elements/PlaceHierarchyTest.php b/tests/app/Elements/PlaceHierarchyTest.php
@@ -37,9 +37,7 @@ public static function setupBeforeClass(): void
 
     public function testCanonical(): void
     {
-        self::assertSame('Foo, bAr, baZ', self::$element->canonical('Foo  bAr  baZ'));
-        self::assertSame('Foo, bAr, baZ', self::$element->canonical("\t Foo\t bAr \tbaZ\t "));
-        self::assertSame('Foo, bAr, baZ', self::$element->canonical("\nFoo \n\r bAr \r\n baZ\r"));
         self::assertSame('Foo, Bar, Baz', self::$element->canonical(',,Foo,Bar , , Baz,  '));
+        self::assertSame('City State, Country or Territory', self::$element->canonical(' City  State,, Country or Territory,'));
     }
 }