use GeoInterface plot macros (#473)

* use GeoInterface plot macros

* no GIRecipes

* bugfix

* needs GeoInterface 1.5

Author: rafaqz

Project.toml

@@ -14,18 +14,18 @@ Extents = "411431e0-e8b7-467b-b5e0-f676ba4f2910"
 GDAL = "add2ef01-049f-52c4-9ee2-e494f65e021a"
 GeoFormatTypes = "68eda718-8dee-11e9-39e7-89f7f65f511f"
 GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
-GeoInterfaceMakie = "0edc0954-3250-4c18-859d-ec71c1660c08"
-GeoInterfaceRecipes = "0329782f-3d07-4b52-b9f6-d3137cf03c7a"
 ImageCore = "a09fc81d-aa75-5fe9-8630-4744c3626534"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 
 [weakdeps]
 JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
+RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 
 [extensions]
-ArchGDALMakieExt = "Makie"
 ArchGDALJLD2Ext = "JLD2"
+ArchGDALMakieExt = "Makie"
+ArchGDALRecipesBaseExt = "RecipesBase"
 
 [compat]
 CEnum = "0.4, 0.5"
@@ -35,15 +35,10 @@ DiskArrays = "0.3, 0.4"
 Extents = "0.1"
 GDAL = "1.7"
 GeoFormatTypes = "0.4.2"
-GeoInterface = "1"
-GeoInterfaceMakie = "0.1"
-GeoInterfaceRecipes = "1.0"
+GeoInterface = "1.5"
 ImageCore = "0.8, 0.9, 0.10"
-Makie = "0.20, 0.21, 0.22, 0.23, 0.24"
-Tables = "1"
 JLD2 = "0.4, 0.5"
+Makie = "0.23, 0.24"
+Tables = "1"
+RecipesBase = "1"
 julia = "1.10"
-
-[extras]
-Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
-JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"

ext/ArchGDALMakieExt.jl

@@ -1,7 +1,10 @@
 module ArchGDALMakieExt
-using GeoInterfaceMakie: GeoInterfaceMakie
-using ArchGDAL: ArchGDAL
 
-GeoInterfaceMakie.@enable ArchGDAL.IGeometry
-GeoInterfaceMakie.@enable ArchGDAL.Geometry
+import ArchGDAL
+import GeoInterface
+import Makie
+
+GeoInterface.@enable_makie Makie ArchGDAL.IGeometry
+GeoInterface.@enable_makie Makie ArchGDAL.Geometry
+
 end

ext/ArchGDALRecipesBaseExt.jl

@@ -0,0 +1,10 @@
+module ArchGDALRecipesBaseExt
+
+import ArchGDAL
+import GeoInterface
+import RecipesBase
+
+GeoInterface.@enable_plots RecipesBase ArchGDAL.IGeometry
+GeoInterface.@enable_plots RecipesBase ArchGDAL.Geometry
+
+end

src/ArchGDAL.jl

@@ -4,7 +4,6 @@ using Dates
 using GDAL: GDAL
 using GeoFormatTypes: GeoFormatTypes
 import GeoInterface
-using GeoInterfaceRecipes
 using Tables: Tables
 using ImageCore: Normed, N0f8, N0f16, N0f32, ImageCore
 using ColorTypes: ColorTypes

src/geointerface.jl

@@ -79,7 +79,6 @@ let pointtypes = (wkbPoint, wkbPoint25D, wkbPointM, wkbPointZM),
     GeoInterface.geometry(feat::AbstractFeature) = getgeom(feat, 0)
 
     GeoInterface.isgeometry(::Type{<:AbstractGeometry}) = true
-    @enable_geo_plots AbstractGeometry
     GeoInterface.is3d(::GeometryTraits, geom::AbstractGeometry) = is3d(geom)
     function GeoInterface.ismeasured(::GeometryTraits, geom::AbstractGeometry)
         return ismeasured(geom)