Merge pull request #213 from MIT-AI-Accelerator/gnadt

Gnadt

Artifacts.toml

@@ -8,43 +8,35 @@ lazy = true
 
 [EMM720_World]
 git-tree-sha1 = "a6974631e103f52b9c73cb303c480fe0a3f679c5"
-lazy = true
+lazy = false
 
     [[EMM720_World.download]]
     sha256 = "38d7ae8d1ab08e7a7366db73a5981690cfb99b00054da616b65c773545a713e7"
     url = "https://www.dropbox.com/s/l7w1ro00jfo8ojm/EMM720_World_v1.tar.gz"
 
 [NAMAD_305]
 git-tree-sha1 = "814e1f622f6b6d80b8e098931b309759ce00543c"
-lazy = true
+lazy = false
 
     [[NAMAD_305.download]]
     sha256 = "8abe7156b3873dd191faa1898364f4604778ea89cbbc1ca9ced36795fbc4cf8b"
     url = "https://www.dropbox.com/s/8j34yrncscdx267/NAMAD_305_v1.tar.gz"
 
-[color_scale_usgs]
-git-tree-sha1 = "c5c40cc4466c735d56fae919f25b8afd041d9507"
-lazy = true
-
-    [[color_scale_usgs.download]]
-    sha256 = "fd2c45d2d1f1f30b8e5e22326aa5ad8b3130dd10fe3014161336e65a6e5a2f10"
-    url = "https://www.dropbox.com/s/qut264xs2vq9jfu/color_scale_usgs_v1.tar.gz"
-
-[icon_circle]
-git-tree-sha1 = "85f92c044d691e15289f71883e1c2990cfe25fca"
+[ottawa_area_maps]
+git-tree-sha1 = "bf360d29207d6468a8cf783269191bda2cf1f679"
 lazy = true
 
-    [[icon_circle.download]]
-    sha256 = "cc239976b26f08b220384b6ba90e23322c5ef45e95be04895fc64e0c1d1f9454"
-    url = "https://www.dropbox.com/s/2oy55okzl4awfyx/icon_circle_v1.tar.gz"
+    [[ottawa_area_maps.download]]
+    sha256 = "16b24621e535b2c9ed0f161cf45e605fb5029883c28d7ca6fa3815d548606c2c"
+    url = "https://www.dropbox.com/scl/fi/466coruraj5um9qilrvpq/ottawa_area_maps_v2.tar.gz?rlkey=74fh2ekf39z3xrj9jbo2zoso9"
 
-[ottawa_area_maps]
-git-tree-sha1 = "c6359e53cc368d06e387d81b9726dba26dd1a4be"
+[ottawa_area_maps_gxf]
+git-tree-sha1 = "cc4f60945a2da360aae2e2d52f85d9fa552caf72"
 lazy = true
 
-    [[ottawa_area_maps.download]]
-    sha256 = "50816ba0f6feacc5ec784ad4eaf1e568d75b0c5dd51b940e08ca7f58a93aaa19"
-    url = "https://www.dropbox.com/s/ql3m59eajuhugbi/ottawa_area_maps_v1.tar.gz"
+    [[ottawa_area_maps_gxf.download]]
+    sha256 = "a3416e090270dd5f93f3717a833029195dc4f86c49f823cc6a0b85aa60f40d05"
+    url = "https://www.dropbox.com/scl/fi/1f8kmj17uo0nmy7xc0k6m/ottawa_area_maps_gxf_v1.tar.gz?rlkey=bfs5x64sjy668p7pkuomly0k8"
 
 [sgl_2020_train]
 git-tree-sha1 = "c3f3d3462514a6c52576cf8017a650ea9d10e64b"
@@ -56,8 +48,16 @@ lazy = true
 
 [sgl_fields]
 git-tree-sha1 = "1d46dc48ad1026df78a42a24d743de6796aa52d8"
-lazy = true
+lazy = false
 
     [[sgl_fields.download]]
     sha256 = "48457ec7c58d83e028000487181c546955664583388fe91424acc09563723fdf"
     url = "https://www.dropbox.com/s/kuiri47pobzhp73/sgl_fields_v2.tar.gz"
+
+[util_files]
+git-tree-sha1 = "f12e9f7dd097517a8d310b696f61c5cc8128136d"
+lazy = false
+
+    [[util_files.download]]
+    sha256 = "77dc8ee85a7d407815891f3b565ebf23b69a71a7bbc5ffb8e05838c5e457a5dc"
+    url = "https://www.dropbox.com/scl/fi/zrn41h02ujl565lwsg67d/util_files_v1.tar.gz?rlkey=pi3frej6tyl1sokf5fg4eu8km"

Project.toml

@@ -1,6 +1,6 @@
 name = "MagNav"
 uuid = "f91b31a4-be4d-40e3-b767-4b8c09c10076"
-version = "1.1.0"
+version = "1.1.1"
 
 [deps]
 ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"

README.md

@@ -14,6 +14,15 @@
 
 MagNav.jl contains a full suite of tools for airborne Magnetic anomaly Navigation (MagNav), including flight path & INS data import or simulation, mapping, aeromagnetic compensation, and navigation. Julia source code files are in the [`src`](src) folder and examples are in the [`runs`](runs) folder. This package was developed as part of the [DAF-MIT Artificial Intelligence Accelerator](https://aia.mit.edu/). More information on this effort, including a list of relevant publications, is provided on the [challenge problem website](https://magnav.mit.edu/). The package has been tested on the long-term support (LTS) and latest stable versions of Julia, which may be downloaded from [here](https://julialang.org/downloads/).
 
+The package may be downloaded directly or installed using:
+
+```julia
+] add MagNav
+```
+
+NOTE: If any artifacts produce a hash mismatch error while downloading, simply navigate to the 
+`.julia/artifacts` folder and manually set the appropriate artifact folder name, e.g., `bf360d29207d6468a8cf783269191bda2cf1f679` for the ottawa_area_maps artifact.
+
 ## Data
 
 Publicly available flight data can be automatically downloaded within the package itself. This dataset can also be directly downloaded from [here](https://doi.org/10.5281/zenodo.4271803). See the [datasheet](readmes/datasheet_sgl_2020_train.pdf) for high-level information about this dataset. Details of the flight data are described in the readme files within the [`readmes`](readmes) folder.

runs/common_setup.jl

@@ -1,4 +1,5 @@
 ##* load MagNav & other packages commonly used in REPL =======================
+#*  adjust the environment activation location & install packages as needed
 using Pkg; Pkg.activate("../"); Pkg.instantiate()
 using Revise
 using MagNav
@@ -25,7 +26,7 @@ df_flight[!,:xyz_h5]   = convert.(String,df_flight[!,:xyz_h5])
 #* and make sure the file locations match up with the xyz_h5 column
 for (i,flight) in enumerate(df_flight.flight)
     if df_flight.xyz_type[i] == :XYZ20
-        df_flight.xyz_h5[i] = string(MagNav.sgl_2020_train(),"/$(flight)_train.h5")
+        df_flight.xyz_h5[i] = MagNav.sgl_2020_train()*"/$(flight)_train.h5"
     end
 end
 
@@ -37,7 +38,7 @@ df_map[!,:map_h5]   = convert.(String,df_map[!,:map_h5])
 #* to store/load the maps locally, uncomment the for loop below
 #* and make sure the file locations match up with the map_h5 column
 for (i,map_name) in enumerate(df_map.map_name)
-    df_map.map_h5[i] = string(MagNav.ottawa_area_maps(),"/$map_name.h5")
+    df_map.map_h5[i] = MagNav.ottawa_area_maps()*"/$map_name.h5"
 end
 
 ## all lines