stud

commit 60e237afb4b402f88737275fc3df67dca49fba58 (tree)
parent 8da4071f7d27cfeb9c12f2337d770d8384623f7c
Author: Motiejus Jakštys <desired.mta@gmail.com>
Date:   Sun, 24 Nov 2019 22:34:43 +0200

add material, fixups in deg.py

Diffstat:
A
Karto/material/Poligonometrijos_skaiciavimu_pvz.pdf
 | 
0

M
misc/deg.py
 | 
5
+----

2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/Karto/material/Poligonometrijos_skaiciavimu_pvz.pdf b/Karto/material/Poligonometrijos_skaiciavimu_pvz.pdf
Binary files differ.
diff --git a/misc/deg.py b/misc/deg.py
@@ -7,13 +7,10 @@ class Deg(namedtuple('Deg', ['deg', 'mm', 'ss'])):
         return "%03d-%02d-%.1f" % (self.deg, self.mm, self.ss)
 
 def guess(inp):
-    if isinstance(inp, Dec):
-        return inp
-
     if isinstance(inp, str) and '-' in inp:
         deg, mm, ss = inp.split('-')
         ddeg, dmm, dss = Dec(deg), Dec(mm), Dec(ss)
-        return deg + dmm/60 + dss/3600
+        return ddeg + dmm/60 + dss/3600
     else:
         return Dec(instr)