Merge branch 'dipdir_fix'

Author: RoyThomsonMonash

conda/meta.yaml

@@ -4,7 +4,7 @@
 package:
   name: "{{ name|lower }}"
 #   version: "{{ environ.get('GIT_DESCRIBE_TAG', '') }}"
-  version: "1.3.4"
+  version: "1.3.5"
 
 source:
   git_url: https://github.com/Loop3D/map2loop-2

map2loop/__init__.py

@@ -8,7 +8,7 @@
 # import map2loop
 # map2loop._clut_path = newpath
 
-__version__ = "1.3.4"
+__version__ = "1.3.5"
 
 geology_loopdata = {
     "WA": "http://13.211.217.129:8080/geoserver/loop/wfs?service=WFS&version=1.0.0&request=GetFeature&typeName=loop:500k_geol_28350&bbox={BBOX_STR}&srs=EPSG:28350&outputFormat=shape-zip",

map2loop/m2l_utils.py

@@ -952,12 +952,7 @@ def ddd2dircos(dip, dipdir):
 
 
 def dircos2ddd(l, m, n):
-    if m > 0:
-        dipdir = (360 + degrees(atan2(l, m))) % 360
-    elif m < 0:
-        dipdir = (540 + degrees(atan2(l, m))) % 360
-    else:
-        dipdir = 90
+    dipdir = degrees(atan2(l, m)) % 360
     dip = 90 - degrees(asin(n))
     if dip > 90:
         dip = 180 - dip

map2loop/project.py

@@ -224,7 +224,7 @@ def __init__(
             "formation_thickness": True,
             "polarity": False,
             "strat_offset": True,
-            "contact_dips": True,
+            "contact_dips": False,
             "drillholes": False,
             "cover_contacts": True,
             "cover_orientations": True,