Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not raise on unsuccessful cast #156

Merged
merged 5 commits into from
Apr 30, 2024
Merged

Do not raise on unsuccessful cast #156

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
290ab06
Do not raise on unsuccessful cast
marmor157 Mar 22, 2023
5124c88
Fix binary casting
marmor157 Mar 22, 2023
43c3ca0
Update lib/geo_postgis/geometry.ex
marmor157 Apr 29, 2024
e9a0eb3
Return error from `Geo.JSON.decode/1`
marmor157 Apr 30, 2024
57fb90f
Group `cast/1` together
marmor157 Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions lib/geo_postgis/geometry.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,31 @@ if Code.ensure_loaded?(Ecto.Type) do
def cast(%struct{} = geom) when struct in @geometries, do: {:ok, geom}

def cast(%{"type" => type, "coordinates" => _} = geom) when type in @types do
{:ok, Geo.JSON.decode!(geom)}
do_cast(geom)
end

def cast(%{"type" => "GeometryCollection", "geometries" => _} = geom) do
{:ok, Geo.JSON.decode!(geom)}
do_cast(geom)
end

def cast(geom) when is_binary(geom) do
{:ok, geom |> Geo.PostGIS.Config.json_library().decode!() |> Geo.JSON.decode!()}
do_cast(geom)
end

defp do_cast(geom) when is_binary(geom) do
with {:ok, geom} <- Geo.PostGIS.Config.json_library().decode(geom),
{:ok, result} <- Geo.JSON.decode(geom) do
{:ok, result}
else
_ -> :error
end
marmor157 marked this conversation as resolved.
Show resolved Hide resolved
end

defp do_cast(geom) do
case Geo.JSON.decode(geom) do
{:ok, result} -> {:ok, result}
{:error, _} -> :error
end
end

def cast(_), do: :error
Expand Down