Fix tick label formatter, switch to Proj (#109)

* Try to create a better inverse transformation * Fix latlong format * Update version, switch from Proj4 to Proj * using Proj * Revert change to inverse transform, deal with it later Co-authored-by: Martijn Visser <[email protected]>
MakieOrg · Jul 23, 2022 · aa1eb03 · aa1eb03
1 parent c615b67
commit aa1eb03
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "GeoMakie"
 uuid = "db073c08-6b98-4ee5-b6a4-5efafb3259c6"
 authors = ["Makie.jl Contributors"]
-version = "0.4.1"
+version = "0.4.2"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -12,7 +12,7 @@ GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
-Proj4 = "9a7e659c-8ee8-5706-894e-f68f43bc57ea"
+Proj = "c94c279d-25a6-4763-9509-64d165bea63e"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
@@ -24,7 +24,7 @@ GeoJSON = "0.5"
 GeometryBasics = "0.4.1"
 ImageIO = "0.6"
 Makie = "0.17.1"
-Proj4 = "0.7"
+Proj = "1.0"
 Reexport = "1"
 StructArrays = "0.4, 0.5, 0.6"
 julia = "1.6"

diff --git a/src/GeoMakie.jl b/src/GeoMakie.jl
@@ -25,9 +25,7 @@ const attributes = Makie.attributes
 const volume = Makie.volume
 const Mesh = GeometryBasics.Mesh
 const Text = Makie.Text
-using Proj4
-const Proj = Proj4
-# using Proj
+using Proj
 
 # Quick fix for Makie
 Makie.to_colormap(::Nothing) = nothing

diff --git a/src/utils.jl b/src/utils.jl
@@ -163,9 +163,9 @@ function longitude_format(nums)
     labels = fill("", length(nums))
     for i in 1:length(nums)
         east_or_west = if nums[i] < 0
-            'E'
-        elseif nums[i] > 0
             'W'
+        elseif nums[i] > 0
+            'E'
         else
             ' '
         end