Updated for v2 (#28)

* Updated for v2 * Updated tests for v2
Placekey · Feb 9, 2024 · 97360c3 · 97360c3
1 parent 684a6a3
commit 97360c3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/placekey/placekey.py b/placekey/placekey.py
@@ -46,8 +46,8 @@
 TUPLE_REGEX = '[' + ALPHABET + REPLACEMENT_CHARS + ']{3}'
 WHERE_REGEX = re.compile(
     '^' + '-'.join([FIRST_TUPLE_REGEX, TUPLE_REGEX, TUPLE_REGEX]) + '$')
-WHAT_REGEX = re.compile('^[' + ALPHABET + ']{3,}(-[' + ALPHABET + ']{3,})?$')
-
+WHAT_REGEX_V1 = re.compile('^[' + ALPHABET + ']{3,}(-[' + ALPHABET + ']{3,})?$')
+WHAT_REGEX_V2 = re.compile('^[01][abcdefghijklmnopqrstuvwxyz234567]{9}$')
 
 def _get_header_int():
     """
@@ -341,7 +341,7 @@ def placekey_format_is_valid(placekey):
         return False
 
     if what:
-        return _where_part_is_valid(where) and bool(WHAT_REGEX.match(what))
+        return _where_part_is_valid(where) and (bool(WHAT_REGEX_V1.match(what)) or bool(WHAT_REGEX_V2.match(what)))
     else:
         return _where_part_is_valid(where)
 

diff --git a/placekey/tests/test_api.py b/placekey/tests/test_api.py
@@ -98,7 +98,7 @@ def test_lookup_placekeys(self):
         self.assertListEqual(
             self.pk_api.lookup_placekeys(places),
             [
-                {'query_id': 'place_0', 'placekey': '22g@5vg-7gq-5mk'},
+                {'query_id': 'place_0', 'placekey': '0rsdbudq45@5vg-7gq-5mk'},
                 {'query_id': 'thisqueryidaloneiscustom', 'placekey': '227-223@5vg-82n-pgk'},
                 {'query_id': 'place_2', 'placekey': '@5vg-82n-kzz'}
             ]

diff --git a/placekey/tests/test_placekey.py b/placekey/tests/test_placekey.py
@@ -224,6 +224,10 @@ def test_placekey_format_is_valid(self):
                         'long poi encoding with where')
         self.assertTrue(pk.placekey_format_is_valid('22222222-zzzzzzzzz@5vg-7gq-tvz'),
                         'long address and poi encoding with where')
+        self.assertTrue(pk.placekey_format_is_valid('0rsdbudq45@5vg-7gt-tn5'),
+                        'version 2 encoding with where beginning with 0')
+        self.assertTrue(pk.placekey_format_is_valid('1rsdbudq45@5vg-7gt-tn5'),
+                        'version 2 encoding beginning with 1')
 
         self.assertFalse(pk.placekey_format_is_valid('@abc'), 'short where part')
         self.assertFalse(pk.placekey_format_is_valid('abc-xyz'), 'short where part')
@@ -238,6 +242,8 @@ def test_placekey_format_is_valid(self):
                          'short address encoding')
         self.assertFalse(pk.placekey_format_is_valid('222-zz@abc-234-xyz'),
                          'short poi encoding')
+        self.assertFalse(pk.placekey_format_is_valid('7rsdbudq45@5vg-7gt-tn5'),
+                        'version 2 encoding illegal leading character(7)')
 
         self.assertFalse(pk.placekey_format_is_valid('@abc-234-xyz'), 'invalid where value')
         self.assertFalse(pk.placekey_format_is_valid('@@5vg-7gq-tvz'), 'multiple @ in placekey')