From 19000043dd9b0f8ad57d4ef39ff505e5da36631c Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Fri, 13 Jan 2023 12:00:15 -0100 Subject: [PATCH 1/3] Rather be slow than not-working. --- src/geointerface.jl | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/geointerface.jl b/src/geointerface.jl index 82baf0b..2de509e 100644 --- a/src/geointerface.jl +++ b/src/geointerface.jl @@ -1,8 +1,5 @@ # Geometry GI.isgeometry(g::Type{<:Geometry}) = true -GI.coordinates(::GI.AbstractGeometryTrait, g::Geometry) = collect(coordinates(g)) -# resolve ambiguity with GeoInterface fallback -GI.coordinates(::GI.AbstractPointTrait, g::Geometry) = collect(coordinates(g)) GI.geomtrait(g::Point) = GI.PointTrait() GI.geomtrait(g::LineString) = GI.LineStringTrait() From 53dd745863b1899cc68db7eb7ce1e271f9b4d644 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Fri, 13 Jan 2023 12:18:56 -0100 Subject: [PATCH 2/3] Don't use slow GI.coordinates internally. --- src/json.jl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/json.jl b/src/json.jl index 90e4fd1..b1453da 100644 --- a/src/json.jl +++ b/src/json.jl @@ -61,19 +61,19 @@ function _lower(obj) nothing end end -_lower(::GI.AbstractPointTrait, obj) = (type = "Point", coordinates = GI.coordinates(obj)) +_lower(::GI.AbstractPointTrait, obj) = (type="Point", coordinates=coordinates(obj)) _lower(::GI.AbstractLineStringTrait, obj) = - (type = "LineString", coordinates = GI.coordinates(obj)) + (type="LineString", coordinates=coordinates(obj)) _lower(::GI.AbstractPolygonTrait, obj) = - (type = "Polygon", coordinates = GI.coordinates(obj)) + (type="Polygon", coordinates=coordinates(obj)) _lower(::GI.AbstractMultiPointTrait, obj) = - (type = "MultiPoint", coordinates = GI.coordinates(obj)) + (type="MultiPoint", coordinates=coordinates(obj)) _lower(::GI.AbstractMultiLineStringTrait, obj) = - (type = "Polygon", coordinates = GI.coordinates(obj)) + (type="Polygon", coordinates=coordinates(obj)) _lower(::GI.AbstractMultiPolygonTrait, obj) = - (type = "MultiPolygon", coordinates = collect(GI.coordinates(obj))) + (type="MultiPolygon", coordinates=collect(coordinates(obj))) _lower(::GI.AbstractGeometryCollectionTrait, obj) = - (type = "GeometryCollection", geometries = _lower.(GI.getgeom(obj))) + (type="GeometryCollection", geometries=_lower.(GI.getgeom(obj))) _add_bbox(::Nothing, nt::NamedTuple) = nt function _add_bbox(ext::Extents.Extent, nt::NamedTuple) From 6a79e5de86dd7bb6e5a5549aff940d83e4e718e4 Mon Sep 17 00:00:00 2001 From: Maarten Pronk Date: Fri, 13 Jan 2023 13:35:33 -0100 Subject: [PATCH 3/3] Reverted. --- src/json.jl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/json.jl b/src/json.jl index b1453da..90e4fd1 100644 --- a/src/json.jl +++ b/src/json.jl @@ -61,19 +61,19 @@ function _lower(obj) nothing end end -_lower(::GI.AbstractPointTrait, obj) = (type="Point", coordinates=coordinates(obj)) +_lower(::GI.AbstractPointTrait, obj) = (type = "Point", coordinates = GI.coordinates(obj)) _lower(::GI.AbstractLineStringTrait, obj) = - (type="LineString", coordinates=coordinates(obj)) + (type = "LineString", coordinates = GI.coordinates(obj)) _lower(::GI.AbstractPolygonTrait, obj) = - (type="Polygon", coordinates=coordinates(obj)) + (type = "Polygon", coordinates = GI.coordinates(obj)) _lower(::GI.AbstractMultiPointTrait, obj) = - (type="MultiPoint", coordinates=coordinates(obj)) + (type = "MultiPoint", coordinates = GI.coordinates(obj)) _lower(::GI.AbstractMultiLineStringTrait, obj) = - (type="Polygon", coordinates=coordinates(obj)) + (type = "Polygon", coordinates = GI.coordinates(obj)) _lower(::GI.AbstractMultiPolygonTrait, obj) = - (type="MultiPolygon", coordinates=collect(coordinates(obj))) + (type = "MultiPolygon", coordinates = collect(GI.coordinates(obj))) _lower(::GI.AbstractGeometryCollectionTrait, obj) = - (type="GeometryCollection", geometries=_lower.(GI.getgeom(obj))) + (type = "GeometryCollection", geometries = _lower.(GI.getgeom(obj))) _add_bbox(::Nothing, nt::NamedTuple) = nt function _add_bbox(ext::Extents.Extent, nt::NamedTuple)