source.postprocess_object: handle non-dict location value

fixes https://console.cloud.google.com/errors/detail/CNyy0Nu4rt62fA;locations=global;time=P30D?project=bridgy-federated

Author: snarfed

granary/source.py

@@ -647,28 +647,32 @@ def postprocess_activity(activity, mentions=False):
 
   @staticmethod
   def postprocess_object(obj, mentions=False):
-    """Does source-independent post-processing of an object, in place.
+    """Does source-independent post-processing of an AS1 object, in place.
 
     * Populates ``location.position`` based on latitude and longitude.
     * Optionally interprets HTML links in content with text starting with ``@``,
       eg ``@user`` or ``@user.com`` or ``@[email protected]``, as @-mentions
       and adds ``mention`` tags for them.
 
     Args:
-      obj (dict)
+      obj (dict): AS1 object
       mentions (boolean): whether to detect @-mention links and convert them to
         mention tags
 
     Returns:
       dict: ``obj``, modified in place
     """
     loc = obj.get('location')
-    if loc:
+    if loc and isinstance(loc, dict) and 'position' not in loc:
       lat = loc.get('latitude')
       lon = loc.get('longitude')
-      if lat and lon and not loc.get('position'):
-        # ISO 6709 location string. details: http://en.wikipedia.org/wiki/ISO_6709
-        loc['position'] = '%0+10.6f%0+11.6f/' % (lat, lon)
+      if lat is not None and lon is not None:
+        try:
+          # ISO 6709 location string. details: http://en.wikipedia.org/wiki/ISO_6709
+          loc['position'] = '%0+2f%0+2f/' % (float(lat), float(lon))
+        except ValueError:
+          # couldn't convert lat or lon to float
+          pass
 
     if mentions:
       # @-mentions to mention tags

granary/tests/test_as2.py

@@ -374,7 +374,7 @@ def test_lat_lon_float(self):
         'displayName': 'California',
         'longitude': -76.507450,
         'latitude': 38.3004,
-        'position': '+38.300400-076.507450/',
+        'position': '+38.300400-76.507450/',
       },
     }, as2.to_as1({
       '@context': ['https://www.w3.org/ns/activitystreams'],

granary/tests/test_microformats2.py

@@ -752,7 +752,7 @@ def test_to_as1_with_location_hcard(self):
       'objectType': 'place',
       'latitude': 50.820641,
       'longitude': -0.149522,
-      'position': '+50.820641-000.149522/',
+      'position': '+50.820641-0.149522/',
       'displayName': 'Timeless Coffee Roasters',
       'url': 'https://kylewm.com/venues/timeless-coffee-roasters-oakland-california',
     }, obj['location'])
@@ -797,7 +797,7 @@ def _test_to_as1_with_location(self, props):
     self.assertEqual({
       'latitude': 50.820641,
       'longitude': -0.149522,
-      'position': '+50.820641-000.149522/',
+      'position': '+50.820641-0.149522/',
       'objectType': 'place',
     }, obj.get('location'))
 

granary/tests/test_source.py

@@ -385,6 +385,30 @@ def test_postprocess_object_mention_existing_tag(self):
     self.assert_equals(expected, Source.postprocess_object(obj))
     self.assert_equals(expected, Source.postprocess_object(obj, mentions=True))
 
+  def test_postprocess_object_location(self):
+    obj = {
+      'location': {
+        'latitude': -1.23,
+        'longitude': 4.56,
+      },
+    }
+    obj_with_pos = {  # because postprocess_object modifies obj
+      'location': {
+        'latitude': -1.23,
+        'longitude': 4.56,
+        'position': '-1.230000+4.560000/',
+      },
+    }
+
+    self.assert_equals(obj_with_pos, Source.postprocess_object(obj_with_pos))
+    self.assert_equals(obj_with_pos, Source.postprocess_object(obj))
+
+  def test_postprocess_object_location_not_dict(self):
+    obj = {
+      'location': 'asdf',
+    }
+    self.assert_equals(obj, Source.postprocess_object(obj))
+
   def test_html_to_text_empty(self):
     self.assertEqual('', html_to_text(None))
     self.assertEqual('', html_to_text(''))

granary/tests/testdata/note.as-from-mf2.json

@@ -25,6 +25,6 @@
     "objectType": "place",
     "latitude": 50.820641,
     "longitude": -0.149522,
-    "position": "+50.820641-000.149522/"
+    "position": "+50.820641-0.149522/"
   }
 }

granary/tests/testdata/note.as.json

@@ -20,7 +20,7 @@
     "url": "https://maps.google.com/maps?q=32.4004416,-98.9852672",
     "latitude": 50.820641,
     "longitude": -0.149522,
-    "position": "+50.820641-000.149522/"
+    "position": "+50.820641-0.149522/"
   },
   "tags": [{
     "url": "http://my/link",

granary/tests/testdata/note.as2.json

@@ -25,7 +25,7 @@
     "url": "https://maps.google.com/maps?q=32.4004416,-98.9852672",
     "latitude": 50.820641,
     "longitude": -0.149522,
-    "position": "+50.820641-000.149522/"
+    "position": "+50.820641-0.149522/"
   },
   "tag": [{
     "url": "http://my/link",

granary/tests/testdata/note.mf2.json

@@ -30,7 +30,7 @@
         "name": ["Carcassonne, Aude"],
         "url": ["https://maps.google.com/maps?q=32.4004416,-98.9852672"],
         "latitude": ["+50.820641"],
-        "longitude": ["-000.149522"]
+        "longitude": ["-0.149522"]
       }
     }]
   }