5326d48 review feedback: p-location instead of h-geo

snarfed · snarfed · commit 66c982cc5f4c · 2016-03-18T12:56:12.000-07:00
diff --git a/granary/microformats2.py b/granary/microformats2.py
@@ -133,7 +133,7 @@ def object_to_json(obj, trim_nulls=True, entry_class='h-entry',
   # TODO: more tags. most will be p-category?
   ret = {
     'type': (['h-card'] if obj_type == 'person'
-             else ['h-card', 'h-geo'] if obj_type == 'place'
+             else ['h-card', 'p-location'] if obj_type == 'place'
              else [entry_class]),
     'properties': {
       'uid': [obj.get('id', '')],
@@ -243,8 +243,7 @@ def json_to_object(mf2):
   }
 
   mf2_types = mf2.get('type') or []
-  mf2_type = ('location' if 'h-geo' in mf2_types
-              else 'person' if 'h-card' in mf2_types
+  mf2_type = ('location' if 'h-geo' in mf2_types or 'p-location' in mf2_types
               else mf2util.post_type_discovery(mf2))
   as_type, as_verb = mf2_type_to_as_type.get(mf2_type, (None, None))
 
@@ -505,7 +504,7 @@ def hcard_to_html(hcard, parent_props=[]):
   photo = prop.get('photo')
   return HCARD.substitute(
     prop,
-    types=' '.join(parent_props + hcard['type']),
+    types=' '.join(util.uniquify(parent_props + hcard['type'])),
     photo=img(photo, 'u-photo', '') if photo else '',
     linked_name=maybe_linked_name(hcard['properties']))
 
diff --git a/granary/test/test_facebook.py b/granary/test/test_facebook.py
@@ -831,7 +831,7 @@ def tag_uri(name):
 </a>
 <span class="summary">my link caption</span>
 </p>
-<span class="p-location h-card h-geo">
+<span class="p-location h-card">
   <a class="p-name u-url" href="https://www.facebook.com/113785468632283">Lake Merced</a>
 
 </span>
diff --git a/granary/test/test_instagram.py b/granary/test/test_instagram.py
@@ -394,7 +394,7 @@ def tag_uri(name):
 <img class="thumbnail" src="http://attach/image/big" alt="" />
 </a>
 </p>
-<span class="p-location h-card h-geo">
+<span class="p-location h-card">
   <a class="p-name u-url" href="https://instagram.com/explore/locations/520640/">Le Truc</a>
 
 </span>
diff --git a/granary/test/test_microformats2.py b/granary/test/test_microformats2.py
@@ -221,7 +221,7 @@ def test_render_content_omits_tags_without_urls(self):
   def test_render_content_location(self):
     self.assert_equals("""\
 foo
-<span class="p-location h-card h-geo">
+<span class="p-location h-card">
   <a class="p-name u-url" href="http://my/place">My place</a>
 
 </span>
diff --git a/granary/test/test_twitter.py b/granary/test/test_twitter.py
@@ -527,7 +527,7 @@ def tag_uri(name):
 <img class="thumbnail" src="http://p.twimg.com/picture3" alt="" />
 </a>
 </p>
-<span class="p-location h-card h-geo">
+<span class="p-location h-card">
 <a class="p-name u-url" href="https://maps.google.com/maps?q=32.4004416,-98.9852672">Carcassonne, Aude</a>
 
 </span>
diff --git a/granary/test/testdata/comment.mf2.html b/granary/test/testdata/comment.mf2.html
@@ -9,7 +9,7 @@
   foo bar baz
   </div>
 
-  <span class="p-location h-card h-geo">
+  <span class="p-location h-card">
     <a class="p-name u-url" href="https://maps.google.com/maps?q=32.4004416,-98.9852672">Carcassonne, Aude</a>
 
   </span>
diff --git a/granary/test/testdata/comment.mf2.json b/granary/test/testdata/comment.mf2.json
@@ -7,7 +7,7 @@
     "content": [{"value": "foo bar baz", "html": "foo bar baz"}],
     "in-reply-to": ["http://example.com/original/post"],
     "location": [{
-      "type": ["h-card", "h-geo"],
+      "type": ["h-card", "p-location"],
       "properties": {
         "uid": ["31cb9e7ed29dbe52"],
         "name": ["Carcassonne, Aude"],
diff --git a/granary/test/testdata/note.mf2.html b/granary/test/testdata/note.mf2.html
@@ -17,7 +17,7 @@
   </div>
 
   <img class="u-photo" src="http://example.com/blog-post-123/image" alt="attachment" />
-  <span class="p-location h-card h-geo">
+  <span class="p-location h-card">
     <a class="p-name u-url" href="https://maps.google.com/maps?q=32.4004416,-98.9852672">Carcassonne, Aude</a>
 
   </span>
diff --git a/granary/test/testdata/note.mf2.json b/granary/test/testdata/note.mf2.json
@@ -25,7 +25,7 @@
     }],
 
     "location": [{
-      "type": ["h-card", "h-geo"],
+      "type": ["h-card", "p-location"],
       "properties": {
         "uid": ["31cb9e7ed29dbe52"],
         "name": ["Carcassonne, Aude"],
diff --git a/granary/test/testdata/note_with_person_tag.mf2.html b/granary/test/testdata/note_with_person_tag.mf2.html
@@ -5,7 +5,7 @@
 
   </div>
 
-  <span class="u-category h-card h-card">
+  <span class="u-category h-card">
   <a class="p-name u-url" href="https://alice">Alice</a>
 
   </span>
