diff options
| -rw-r--r-- | core/views_caves.py | 26 | ||||
| -rw-r--r-- | parsers/survex.py | 4 |
2 files changed, 17 insertions, 13 deletions
diff --git a/core/views_caves.py b/core/views_caves.py index b409831..41831bd 100644 --- a/core/views_caves.py +++ b/core/views_caves.py @@ -505,16 +505,18 @@ def prospecting_image(request, name): img.save(response, "PNG") return response -STATIONS = {} -poslineregex = re.compile("^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$") -def LoadPos(): - call([settings.CAVERN, "--output=%s/all.3d" % settings.SURVEX_DATA, "%s/all.svx" % settings.SURVEX_DATA]) - call([settings.THREEDTOPOS, '%sall.3d' % settings.SURVEX_DATA], cwd = settings.SURVEX_DATA) - posfile = open("%sall.pos" % settings.SURVEX_DATA) - posfile.readline()#Drop header - for line in posfile.readlines(): - r = poslineregex.match(line) - if r: - x, y, z, name = r.groups() - STATIONS[name] = (x, y, z) +# Not used. +# All imported using parsers.survex.LoadPos() now +# STATIONS = {} +# poslineregex = re.compile("^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$") +# def LoadPos(): +# call([settings.CAVERN, "--output=%s/all.3d" % settings.SURVEX_DATA, "%s/all.svx" % settings.SURVEX_DATA]) +# call([settings.THREEDTOPOS, '%sall.3d' % settings.SURVEX_DATA], cwd = settings.SURVEX_DATA) +# posfile = open("%sall.pos" % settings.SURVEX_DATA) +# posfile.readline()#Drop header +# for line in posfile.readlines(): +# r = poslineregex.match(line) +# if r: +# x, y, z, name = r.groups() +# STATIONS[name] = (x, y, z) diff --git a/parsers/survex.py b/parsers/survex.py index 907b183..3dc9d16 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -227,7 +227,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): # print(insp+'QM notes %s' % qm_notes) # If the QM isn't resolved (has a resolving station) then load it - if not qm_resolve_section or qm_resolve_section is not '-' or qm_resolve_section is not 'None': + if not qm_resolve_section or qm_resolve_section != '-' or qm_resolve_section is not 'None': from_section = models.SurvexBlock.objects.filter(name=qm_from_section) # If we can find a section (survex note chunck, named) if len(from_section) > 0: @@ -480,6 +480,8 @@ def LoadPos(): all survey point positions. Then lookup each position by name to see if we have it in the database and if we do, then save the x/y/z coordinates. If we don't have it in the database, print an error message and discard it. + This is ONLY ever used for entrance and fixedpts locations for the prospecting map: + about 600 points out of 32,000. """ topdata = settings.SURVEX_DATA + settings.SURVEX_TOPNAME print((' - Generating a list of Pos from %s.svx and then loading...' % (topdata))) |