diff --git a/Karto/material/Poligonometrijos_skaiciavimu_pvz.pdf b/Karto/material/Poligonometrijos_skaiciavimu_pvz.pdf new file mode 100644 index 0000000..f900013 Binary files /dev/null and b/Karto/material/Poligonometrijos_skaiciavimu_pvz.pdf differ diff --git a/misc/deg.py b/misc/deg.py index 7b2f9a2..76f6e1f 100644 --- 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)