diff options
Diffstat (limited to 'parsers/survex.py')
| -rw-r--r-- | parsers/survex.py | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/parsers/survex.py b/parsers/survex.py index 35e09b8..b7158aa 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -10,6 +10,8 @@ from django.utils.timezone import make_aware import troggle.settings as settings import troggle.core.models as models +import troggle.core.models_caves as models_caves +import troggle.core.models_survex as models_survex from troggle.parsers.people import GetPersonExpeditionNameLookup from troggle.core.views_caves import MapLocations @@ -26,7 +28,7 @@ def LoadSurvexLineLeg(survexblock, stardata, sline, comment, cave): ssfrom = survexblock.MakeSurvexStation(ls[stardata["from"]]) ssto = survexblock.MakeSurvexStation(ls[stardata["to"]]) - survexleg = models.SurvexLeg(block=survexblock, stationfrom=ssfrom, stationto=ssto) + survexleg = models_survex.SurvexLeg(block=survexblock, stationfrom=ssfrom, stationto=ssto) # this next fails for two surface survey svx files which use / for decimal point # e.g. '29/09' in the tape measurement, or use decimals but in brackets, e.g. (06.05) if stardata["type"] == "normal": @@ -153,7 +155,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): pos_cave = '%s-%s' % (path_match.group(1), path_match.group(2)) # print(insp+'Match') # print(insp+os_cave) - cave = models.getCaveByReference(pos_cave) + cave = models_caves.getCaveByReference(pos_cave) if cave: survexfile.cave = cave svxlines = '' @@ -188,7 +190,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): wallet = "0" + wallet refscan = "%s#%s%s" % (yr, letterx, wallet ) #print(insp+' - Wallet ;ref - %s - looking for survexscansfolder' % refscan) - survexscansfolders = models.SurvexScansFolder.objects.filter(walletname=refscan) + survexscansfolders = models_survex.SurvexScansFolder.objects.filter(walletname=refscan) if survexscansfolders: survexblock.survexscansfolder = survexscansfolders[0] #survexblock.refscandir = "%s/%s%%23%s" % (mref.group(1), mref.group(1), mref.group(2)) @@ -228,15 +230,15 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): # If the QM isn't resolved (has a resolving station) then load it if not qm_resolve_section or qm_resolve_section != '-' or qm_resolve_section != 'None': - from_section = models.SurvexBlock.objects.filter(name=qm_from_section) + from_section = models_survex.SurvexBlock.objects.filter(name=qm_from_section) # If we can find a section (survex note chunck, named) if len(from_section) > 0: # print(insp+from_section[0]) - from_station = models.SurvexStation.objects.filter(block=from_section[0], name=qm_from_station) + from_station = models_survex.SurvexStation.objects.filter(block=from_section[0], name=qm_from_station) # If we can find a from station then we have the nearest station and can import it if len(from_station) > 0: # print(insp+from_station[0]) - qm = models.QM.objects.create(number=qm_no, + qm = models_caves.QM.objects.create(number=qm_no, nearest_station=from_station[0], grade=qm_grade.upper(), location_description=qm_notes) @@ -261,7 +263,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): assert (int(yr)>1960 and int(yr)<2039), "Wallet year out of bounds: %s" % yr assert (int(wallet)<100), "Wallet number more than 100: %s" % wallet refscan = "%s#%s%s" % (yr, letterx, wallet) - survexscansfolders = models.SurvexScansFolder.objects.filter(walletname=refscan) + survexscansfolders = models_survex.SurvexScansFolder.objects.filter(walletname=refscan) if survexscansfolders: survexblock.survexscansfolder = survexscansfolders[0] survexblock.save() @@ -299,12 +301,12 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): if path_match: pos_cave = '%s-%s' % (path_match.group(1), path_match.group(2)) # print(insp+pos_cave) - cave = models.getCaveByReference(pos_cave) + cave = models_caves.getCaveByReference(pos_cave) if cave: survexfile.cave = cave else: print((insp+' - No match in DB (i) for %s, so loading..' % includepath)) - includesurvexfile = models.SurvexFile(path=includepath) + includesurvexfile = models_survex.SurvexFile(path=includepath) includesurvexfile.save() includesurvexfile.SetDirectory() if includesurvexfile.exists(): @@ -322,7 +324,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): if path_match: pos_cave = '%s-%s' % (path_match.group(1), path_match.group(2)) # print(insp+pos_cave) - cave = models.getCaveByReference(pos_cave) + cave = models_caves.getCaveByReference(pos_cave) if cave: survexfile.cave = cave else: @@ -331,7 +333,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): name = line.lower() print((insp+' - Begin found for: ' + name)) # print(insp+'Block cave: ' + str(survexfile.cave)) - survexblockdown = models.SurvexBlock(name=name, begin_char=fin.tell(), parent=survexblock, survexpath=survexblock.survexpath+"."+name, cave=survexfile.cave, survexfile=survexfile, totalleglength=0.0) + survexblockdown = models_survex.SurvexBlock(name=name, begin_char=fin.tell(), parent=survexblock, survexpath=survexblock.survexpath+"."+name, cave=survexfile.cave, survexfile=survexfile, totalleglength=0.0) survexblockdown.save() survexblock.save() survexblock = survexblockdown @@ -376,7 +378,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): personexpedition = survexblock.expedition and GetPersonExpeditionNameLookup(survexblock.expedition).get(tm.lower()) if (personexpedition, tm) not in teammembers: teammembers.append((personexpedition, tm)) - personrole = models.SurvexPersonRole(survexblock=survexblock, nrole=mteammember.group(1).lower(), personexpedition=personexpedition, personname=tm) + personrole = models_survex.SurvexPersonRole(survexblock=survexblock, nrole=mteammember.group(1).lower(), personexpedition=personexpedition, personname=tm) personrole.expeditionday = survexblock.expeditionday if personexpedition: personrole.person=personexpedition.person @@ -384,7 +386,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines): elif cmd == "title": #print(insp+' - Title found: ') - survextitle = models.SurvexTitle(survexblock=survexblock, title=line.strip('"'), cave=survexfile.cave) + survextitle = models_survex.SurvexTitle(survexblock=survexblock, title=line.strip('"'), cave=survexfile.cave) survextitle.save() pass @@ -431,14 +433,14 @@ def LoadAllSurvexBlocks(): print(' - Flushing All Survex Blocks...') - models.SurvexBlock.objects.all().delete() - models.SurvexFile.objects.all().delete() - models.SurvexDirectory.objects.all().delete() - models.SurvexEquate.objects.all().delete() - models.SurvexLeg.objects.all().delete() - models.SurvexTitle.objects.all().delete() - models.SurvexPersonRole.objects.all().delete() - models.SurvexStation.objects.all().delete() + models_survex.SurvexBlock.objects.all().delete() + models_survex.SurvexFile.objects.all().delete() + models_survex.SurvexDirectory.objects.all().delete() + models_survex.SurvexEquate.objects.all().delete() + models_survex.SurvexLeg.objects.all().delete() + models_survex.SurvexTitle.objects.all().delete() + models_survex.SurvexPersonRole.objects.all().delete() + models_survex.SurvexStation.objects.all().delete() print(" - Data flushed") # Clear the data issues as we are reloading @@ -450,12 +452,12 @@ def LoadAllSurvexBlocks(): # Redirect sys.stdout to the file sys.stdout = open('loadsurvexblks.log', 'w') - survexfile = models.SurvexFile(path=settings.SURVEX_TOPNAME, cave=None) + survexfile = models_survex.SurvexFile(path=settings.SURVEX_TOPNAME, cave=None) survexfile.save() survexfile.SetDirectory() #Load all - survexblockroot = models.SurvexBlock(name="root", survexpath="", begin_char=0, cave=None, survexfile=survexfile, totalleglength=0.0) + survexblockroot = models_survex.SurvexBlock(name="root", survexpath="", begin_char=0, cave=None, survexfile=survexfile, totalleglength=0.0) survexblockroot.save() fin = survexfile.OpenFile() textlines = [ ] @@ -545,14 +547,14 @@ def LoadPos(): for line in posfile.readlines(): r = poslineregex.match(line) if r: - x, y, z, id = r.groups() # easting, northing, altitude, survexstation + x, y, z, id = r.groups() if id in notfoundbefore: skip[id] = 1 else: for sid in mappoints: if id.endswith(sid): try: - ss = models.SurvexStation.objects.lookup(id) + ss = models_survex.SurvexStation.objects.lookup(id) ss.x = float(x) ss.y = float(y) ss.z = float(z) |