fixed dependency issues and tests

cossatot · Aug 8, 2023 · fae1f1e · fae1f1e
1 parent 4960fa9
commit fae1f1e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 20 deletions.
diff --git a/Project.toml b/Project.toml
@@ -16,6 +16,7 @@ Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Mustache = "ffc61752-8dc7-55ee-8c37-f3e9cdd09e70"
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
 PolygonOps = "647866c9-e3ac-4575-94e7-e3d426903924"
+Proj = "c94c279d-25a6-4763-9509-64d165bea63e"
 PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
 Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
 Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"

diff --git a/src/elastic.jl b/src/elastic.jl
@@ -7,7 +7,7 @@ import Base.Threads.@spawn
 import Base.Threads.@threads
 
 using ..Oiler
-using ..Oiler: Fault, VelocityVectorSphere, fault_oblique_merc, get_gnss_vels,
+using ..Oiler: Fault, VelocityVectorSphere, get_gnss_vels,
     get_coords_from_vel_array, az_to_angle, okada
 
 

diff --git a/src/faults.jl b/src/faults.jl
@@ -8,7 +8,7 @@ import Distributions: MvNormal
 
 using Oiler
 using ..Oiler: VelocityVectorSphere, average_azimuth, az_to_angle,
-    angle_difference, rotate_velocity, EARTH_RAD_KM, oblique_merc, PoleCart,
+    angle_difference, rotate_velocity, EARTH_RAD_KM, PoleCart,
     PoleSphere
 
 const direction_map = Dict{String,Float64}("N" => 0.0,

diff --git a/src/geom.jl b/src/geom.jl
@@ -2,14 +2,15 @@ module Geom
 
 export azimuth, gc_distance, average_azimuth, az_to_angle, angle_to_az,
     angle_difference, rotate_velocity, rotate_xy_vec, oblique_merc
-
 import Statistics: mean
 #import Proj: CRS, Transformation
 
 using Oiler
 using ..Oiler: EARTH_RAD_KM
 using LinearAlgebra
 
+using Proj: CRS, Transformation
+
 struct LineString
     coords::Array{Float64,2}
 end
@@ -312,22 +313,21 @@ function get_oblique_merc(lon1, lat1, lon2, lat2)
 end
 
 
-# deprecated but don't want to delete quite yet
-#function oblique_merc(lons, lats, lon1, lat1, lon2, lat2)
-#    wgs84 = "+proj=longlat +datum=WGS84 +nodefs"
-#    omerc = get_oblique_merc(lon1, lat1, lon2, lat2)
-#    trans = Transformation(wgs84, omerc; always_xy=true)
-#
-#
-#    x = zeros(size(lons))
-#    y = zeros(size(lons))
-#
-#    for i in eachindex(lons)
-#        @inbounds x[i], y[i] = trans(lons[i], lats[i])
-#    end
-#
-#    (x, y)
-#end
+function oblique_merc(lons, lats, lon1, lat1, lon2, lat2)
+    wgs84 = "+proj=longlat +datum=WGS84 +nodefs"
+    omerc = get_oblique_merc(lon1, lat1, lon2, lat2)
+    trans = Transformation(wgs84, omerc; always_xy=true)
+
+
+    x = zeros(size(lons))
+    y = zeros(size(lons))
+
+    for i in eachindex(lons)
+        @inbounds x[i], y[i] = trans(lons[i], lats[i])
+    end
+
+    (x, y)
+end
 
 
 function bearing(final_lon, final_lat, start_lon, start_lat)

diff --git a/src/tris.jl b/src/tris.jl
@@ -5,7 +5,7 @@ export Tri
 using Setfield
 using LinearAlgebra
 
-import Proj: Transformation#Projection, transform
+# import Proj: Transformation#Projection, transform
 
 using ..Oiler
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,3 +1,6 @@
+using Pkg
+Pkg.activate("..")
+
 using Test
 
 using Oiler