potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Move from Schema.org Place to AS Place with Schema.org properties

Browse source 
See https://socialhub.activitypub.rocks/t/how-to-represent-places-in-an-event/413

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-12-18 11:03:04 +01:00
parent 8bfa95bdd0
commit 814c9ab53b
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/service/activity_pub/converter/address.ex
View file

@ -35,11 +35,11 @@ defmodule Mobilizon.Service.ActivityPub.Converter.Address do
}) })
end end
if is_nil(object["geo"]) do if is_nil(object["latitude"]) or is_nil(object["longitude"]) do
res res
else else
geo = %Geo.Point{ geo = %Geo.Point{
coordinates: {object["geo"]["latitude"], object["geo"]["longitude"]}, coordinates: {object["latitude"], object["longitude"]},
srid: 4326 srid: 4326
} }
@ -70,11 +70,9 @@ defmodule Mobilizon.Service.ActivityPub.Converter.Address do
if is_nil(address.geom) do if is_nil(address.geom) do
res res
else else
Map.put(res, "geo", %{ res
"type" => "GeoCoordinates", |> Map.put("latitude", address.geom.coordinates |> elem(0))
"latitude" => address.geom.coordinates |> elem(0), |> Map.put("longitude", address.geom.coordinates |> elem(1))
"longitude" => address.geom.coordinates |> elem(1)
})
end end
end end
end end

6
lib/service/activity_pub/utils.ex
View file

@ -41,17 +41,11 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
"@id" => "sc:location", "@id" => "sc:location",
"@type" => "sc:Place" "@type" => "sc:Place"
}, },
"Place" => "sc:Place",
"PostalAddress" => "sc:PostalAddress", "PostalAddress" => "sc:PostalAddress",
"GeoCoordinates" => "sc:GeoCoordinates",
"address" => %{ "address" => %{
"@id" => "sc:address", "@id" => "sc:address",
"@type" => "sc:PostalAddress" "@type" => "sc:PostalAddress"
}, },
"geo" => %{
"@id" => "sc:geo",
"@type" => "sc:GeoCoordinates"
},
"addressCountry" => "sc:addressCountry", "addressCountry" => "sc:addressCountry",
"addressRegion" => "sc:addressRegion", "addressRegion" => "sc:addressRegion",
"postalCode" => "sc:postalCode", "postalCode" => "sc:postalCode",