diff --git a/Manifest.toml b/Manifest.toml index 693841d..e1e698a 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -44,9 +44,9 @@ version = "1.4.0" [[DataFrames]] deps = ["CategoricalArrays", "Compat", "DataAPI", "Future", "InvertedIndices", "IteratorInterfaceExtensions", "LinearAlgebra", "Markdown", "Missings", "PooledArrays", "PrettyTables", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] -git-tree-sha1 = "20159837c2e5e196793a313cd700b8199fd8f985" +git-tree-sha1 = "b46e1deb4592a5df7416b10dfcd6b01fb194ab9a" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -version = "0.22.1" +version = "0.22.2" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] @@ -99,16 +99,16 @@ uuid = "add2ef01-049f-52c4-9ee2-e494f65e021a" version = "1.1.5" [[GDAL_jll]] -deps = ["Artifacts", "Expat_jll", "GEOS_jll", "JLLWrappers", "LibCURL_jll", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "OpenJpeg_jll", "PROJ_jll", "Pkg", "SQLite_jll", "Zlib_jll", "Zstd_jll", "libwebp_jll", "nghttp2_jll"] -git-tree-sha1 = "02cb174bf3c7e5d4ba94cb6e5ac4360210558c70" +deps = ["Artifacts", "Expat_jll", "GEOS_jll", "JLLWrappers", "LibCURL_jll", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "OpenJpeg_jll", "PROJ_jll", "Pkg", "SQLite_jll", "Zlib_jll", "Zstd_jll", "nghttp2_jll"] +git-tree-sha1 = "a67b0219490283eae6b069bcf7741a31abbc604c" uuid = "a7073274-a066-55f0-b90d-d619367d196c" -version = "3.0.4+7" +version = "3.2.0+0" [[GEOS_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "e729fcedd71a19154df937127a97c19c0fe6d9d0" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "45d0ddfd29620ac9b2d1072801e90fb016c5f94c" uuid = "d604d12d-fa86-5845-992e-78dc15976526" -version = "3.8.1+0" +version = "3.9.0+0" [[GeoFormatTypes]] git-tree-sha1 = "bb75ce99c9d6fb2edd8ef8ee474991cdacf12221" @@ -121,12 +121,6 @@ git-tree-sha1 = "62f6ed44e73c11d10e282053d70b33b0ed8dcbe2" uuid = "cf35fbd7-0cd7-5166-be24-54bfbe79505f" version = "0.5.4" -[[Giflib_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "d47390bd2ca1e5ea4219a7aaedbf76f3ca58fde7" -uuid = "59f7168a-df46-5410-90c8-f2779963d0ec" -version = "5.1.4+1" - [[InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" @@ -143,9 +137,9 @@ uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" [[JLLWrappers]] -git-tree-sha1 = "c70593677bbf2c3ccab4f7500d0f4dacfff7b75c" +git-tree-sha1 = "04b49c556240b62d5a799e94c63d5fc14d3c07cd" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.1.3" +version = "1.1.4" [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] @@ -178,30 +172,6 @@ version = "1.9.0+3" [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" -[[Libgcrypt_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"] -git-tree-sha1 = "b391a18ab1170a2e568f9fb8d83bc7c780cb9999" -uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4" -version = "1.8.5+4" - -[[Libglvnd_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"] -git-tree-sha1 = "7739f837d6447403596a75d19ed01fd08d6f56bf" -uuid = "7e76a0d4-f3c7-5321-8279-8d96eeed0f29" -version = "1.3.0+3" - -[[Libgpg_error_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "ec7f2e8ad5c9fa99fc773376cdbc86d9a5a23cb7" -uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8" -version = "1.36.0+3" - -[[Libiconv_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8e924324b2e9275a51407a4e06deb3455b1e359f" -uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" -version = "1.16.0+7" - [[Libtiff_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] git-tree-sha1 = "291dd857901f94d683973cdf679984cdf73b56d0" @@ -303,11 +273,10 @@ uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" version = "1.1.1" [[Reexport]] -git-tree-sha1 = "3c2cb8d4320b2094d29f804b147845073d57a559" -repo-rev = "master" -repo-url = "https://github.com/simonster/Reexport.jl.git" +deps = ["Pkg"] +git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0" uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "0.2.0+" +version = "0.2.0" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -371,60 +340,6 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" -[[XML2_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"] -git-tree-sha1 = "be0db24f70aae7e2b89f2f3092e93b8606d659a6" -uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" -version = "2.9.10+3" - -[[XSLT_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Pkg", "XML2_jll"] -git-tree-sha1 = "2b3eac39df218762d2d005702d601cd44c997497" -uuid = "aed1982a-8fda-507f-9586-7b0439959a61" -version = "1.1.33+4" - -[[Xorg_libX11_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] -git-tree-sha1 = "5be649d550f3f4b95308bf0183b82e2582876527" -uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc" -version = "1.6.9+4" - -[[Xorg_libXau_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "4e490d5c960c314f33885790ed410ff3a94ce67e" -uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec" -version = "1.0.9+4" - -[[Xorg_libXdmcp_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "4fe47bd2247248125c428978740e18a681372dd4" -uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05" -version = "1.1.3+4" - -[[Xorg_libXext_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] -git-tree-sha1 = "b7c0aa8c376b31e4852b360222848637f481f8c3" -uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3" -version = "1.3.4+4" - -[[Xorg_libpthread_stubs_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "6783737e45d3c59a4a4c4091f5f88cdcf0908cbb" -uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74" -version = "0.1.0+3" - -[[Xorg_libxcb_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"] -git-tree-sha1 = "daf17f441228e7a3833846cd048892861cff16d6" -uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b" -version = "1.13.0+3" - -[[Xorg_xtrans_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "79c31e7844f6ecf779705fbc12146eb190b7d845" -uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" -version = "1.4.0+3" - [[Zlib_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "320228915c8debb12cb434c59057290f0834dbf6" @@ -443,12 +358,6 @@ git-tree-sha1 = "6abbc424248097d69c0c87ba50fcb0753f93e0ee" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" version = "1.6.37+6" -[[libwebp_jll]] -deps = ["Giflib_jll", "JpegTurbo_jll", "Libdl", "Libglvnd_jll", "Libtiff_jll", "Pkg", "libpng_jll"] -git-tree-sha1 = "ba19e70487d21c0c9224869d5be92498f1b9fae8" -uuid = "c5f90fcd-3b7e-5836-afba-fc50a0988cb2" -version = "1.1.0+0" - [[nghttp2_jll]] deps = ["Libdl", "Pkg"] git-tree-sha1 = "8e2c44ab4d49ad9518f359ed8b62f83ba8beede4" diff --git a/test/runtests.jl b/test/runtests.jl index f91eaa9..4fc8850 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -42,8 +42,8 @@ end # Save table with a few random points table = DataFrame(geom=createpoint.(coords), name="test") GDF.write("test_points.shp", table) - GDF.write("test_points.gpkg", table, "test_points") - GDF.write("test_points.geojson", table, "test_points") + GDF.write("test_points.gpkg", table, layer_name="test_points") + GDF.write("test_points.geojson", table, layer_name="test_points") ntable = GDF.read("test_points.shp") @test nrow(ntable) == 10 @@ -58,9 +58,9 @@ end t = GDF.read(fn) # Save table from reading - GDF.write("test_read.shp", t, "test_coastline") - GDF.write("test_read.gpkg", t, "test_coastline") - GDF.write("test_read.geojson", t, "test_coastline") + GDF.write("test_read.shp", t, layer_name="test_coastline") + GDF.write("test_read.gpkg", t, layer_name="test_coastline") + GDF.write("test_read.geojson", t, layer_name="test_coastline") end @@ -78,5 +78,6 @@ end table = DataFrame(geom=createpoint.([[0,0,0]]), name="test") reproject(table.geom, GFT.EPSG(4326), GFT.EPSG(28992)) @test GDF.AG.getpoint(table.geom[1], 0)[1] ≈ -587791.596556932 + GDF.write("test_reprojection.gpkg", table, crs=GFT.EPSG(28992)) end end