@speleotica/frcsdata 3.0.1 → 4.0.1

package/parseFrcsSurveyFile.js

@@ -1,117 +1,95 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = parseFrcsSurveyFile;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _asyncIterator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncIterator"));
-
 var _parseSegment = require("parse-segment");
-
 var _unitized = require("@speleotica/unitized");
-
 var _FrcsShot = require("./FrcsShot");
-
+function _asyncIterator(iterable) { var method, async, sync, retry = 2; for ("undefined" != typeof Symbol && (async = Symbol.asyncIterator, sync = Symbol.iterator); retry--;) { if (async && null != (method = iterable[async])) return method.call(iterable); if (sync && null != (method = iterable[sync])) return new AsyncFromSyncIterator(method.call(iterable)); async = "@@asyncIterator", sync = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
+function AsyncFromSyncIterator(s) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var done = r.done; return Promise.resolve(r.value).then(function (value) { return { value: value, done: done }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(s) { this.s = s, this.n = s.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, "return": function _return(value) { var ret = this.s["return"]; return void 0 === ret ? Promise.resolve({ value: value, done: !0 }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments)); }, "throw": function _throw(value) { var thr = this.s["return"]; return void 0 === thr ? Promise.reject(value) : AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(s); }
 function parseNumber(s, unit) {
   var value = parseFloat(s);
   if (isNaN(value)) return null;
   return new _unitized.UnitizedNumber(value, unit);
 }
-
 function parseAzimuth(s, unit) {
   var parsed = parseNumber(s, unit);
   return (parsed === null || parsed === void 0 ? void 0 : parsed.get(_unitized.Angle.degrees)) === 360 ? _unitized.Unitize.degrees(0) : parsed;
 }
-
 function parseKind(kind) {
   switch (kind) {
     case 'H':
       return _FrcsShot.FrcsShotKind.Horizontal;
-
     case 'D':
       return _FrcsShot.FrcsShotKind.Diagonal;
-
     default:
       return _FrcsShot.FrcsShotKind.Normal;
   }
 }
-
 function parseLengthUnit(unit) {
   switch (unit) {
     case 'FI':
       return _unitized.Length.inches;
-
+    case 'FF':
     case 'FT':
       return _unitized.Length.feet;
-
+    case 'MT':
     case 'M ':
       return _unitized.Length.meters;
   }
-
   return null;
 }
-
 function parseAngleUnit(unit) {
   switch (unit) {
     case 'D':
       return _unitized.Angle.degrees;
-
     case 'G':
       return _unitized.Angle.gradians;
-
     case 'M':
       return _unitized.Angle.milsNATO;
   }
-
   return null;
-} // determines if a cell contains a valid station name.
-
+}
 
+// determines if a cell contains a valid station name.
 function isValidStation(s) {
   return /^\s*\S+\s*$/.test(s);
-} // determines if a cell contains a valid unsigned integer.
-
-
+}
+// determines if a cell contains a valid unsigned integer.
 function isValidUInt(s) {
   return /^\s*[0-9]+\s*$/.test(s);
-} // determines if a cell contains a valid float.
-
-
+}
+// determines if a cell contains a valid float.
 function isValidFloat(s) {
   return /^\s*[-+]?([0-9]+(\.[0-9]*)?|\.[0-9]+)\s*$/.test(s);
-} // determines if a cell contains a valid unsigned float or whitespace.
-
-
+}
+// determines if a cell contains a valid unsigned float or whitespace.
 function isValidOptFloat(s) {
   return /^\s*[-+]?[0-9]*(\.[0-9]*)?\s*$/.test(s);
-} // determines if a cell contains a valid unsigned float or whitespace.
-
-
+}
+// determines if a cell contains a valid unsigned float or whitespace.
 function isValidOptUFloat(s) {
   return /^\s*[0-9]*(\.[0-9]*)?\s*$/.test(s);
-} // determines if a cell contains a valid unsigned float.
-
-
+}
+// determines if a cell contains a valid unsigned float.
 function isValidUFloat(s) {
   return /^\s*([0-9]+(\.[0-9]*)?|\.[0-9]+)\s*$/.test(s);
-} // determines if a cell contains a valid inclination or whitespace.
-
-
+}
+// determines if a cell contains a valid inclination or whitespace.
 function isValidOptInclination(s) {
   return /^\s*[-+]?[0-9]*(\.[0-9]*)?\s*$/.test(s);
 }
-
 function parseLrud(s, unit) {
   var value = parseFloat(s);
   return !Number.isFinite(value) || value < 0 ? null : new _unitized.UnitizedNumber(value, unit);
 }
+
 /**
  * Parses a raw cdata.fr survey file.  These look like so:
  *
@@ -157,214 +135,229 @@ FI B  DD
 ...</pre>
  *
  */
-
-
 function parseFrcsSurveyFile(_x, _x2) {
   return _parseFrcsSurveyFile.apply(this, arguments);
 }
-
 function _parseFrcsSurveyFile() {
-  _parseFrcsSurveyFile = (0, _asyncToGenerator2["default"])(
-  /*#__PURE__*/
-  _regenerator["default"].mark(function _callee(file, // eslint-disable-line @typescript-eslint/no-explicit-any
+  _parseFrcsSurveyFile = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(file,
+  // eslint-disable-line @typescript-eslint/no-explicit-any
   lines) {
-    var cave, location, trips, errors, tripName, tripTeam, tripDate, inTripComment, tripCommentStartLine, tripCommentEndLine, tripComment, commentLines, trip, inBlockComment, section, getComment, lineNumber, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step, _value, _ret;
-
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            getComment = function _ref() {
-              if (!commentLines) return null;
-              var comment = commentLines.join('\n').trim();
-              commentLines = null;
-              return comment || null;
-            };
-
-            cave = null;
-            location = null;
-            trips = [];
-            errors = [];
-            inTripComment = true;
-            tripCommentStartLine = 1;
-            tripCommentEndLine = -1;
-            tripComment = [];
+    var cave, location, trips, errors, tripName, tripTeam, tripDate, inTripComment, tripCommentStartLine, tripCommentEndLine, tripComment, commentLines, trip, inBlockComment, section, getComment, lineNumber, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step, _ret;
+    return _regenerator["default"].wrap(function _callee$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          getComment = function _getComment() {
+            if (!commentLines) return null;
+            var comment = commentLines.join('\n').trim();
             commentLines = null;
-            trip = null;
-            inBlockComment = false;
-            lineNumber = 0;
-            _iteratorNormalCompletion = true;
-            _didIteratorError = false;
-            _context.prev = 15;
-
-            _loop = function _loop() {
-              var line = _value;
-              var errored = false;
-              var thisLineNumber = lineNumber;
-
-              var error = function error(message, startColumn, endColumn) {
-                errored = true;
-                errors.push(new _parseSegment.SegmentParseError(message, new _parseSegment.Segment({
-                  value: line,
-                  source: file,
-                  startLine: thisLineNumber,
-                  startCol: 0
-                }).substring(startColumn, endColumn)));
-              };
-
-              var validate = function validate(startColumn, endColumn, fieldName, validator) {
-                var field = line.substring(startColumn, endColumn);
-
-                if (!validator(field)) {
-                  error((field.trim() ? 'Invalid ' : 'Missing ') + fieldName, startColumn, endColumn);
-                }
-
-                return field;
-              };
-
-              lineNumber++;
-
-              if (lineNumber === 1) {
-                var match = /^\s*([^,]+)(,(.*))?/.exec(line);
-
-                if (match) {
-                  cave = match[1].trim();
-
-                  if (match[3]) {
-                    location = match[3].trim();
+            return comment || null;
+          };
+          cave = null;
+          location = null;
+          trips = [];
+          errors = [];
+          inTripComment = true;
+          tripCommentStartLine = 1;
+          tripCommentEndLine = -1;
+          tripComment = [];
+          commentLines = null;
+          trip = null;
+          inBlockComment = false;
+          lineNumber = 0;
+          _iteratorAbruptCompletion = false;
+          _didIteratorError = false;
+          _context2.prev = 15;
+          _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
+            var line, errored, thisLineNumber, error, validate, match, _match, k, team, month, day, year, _match2, part, distanceUnit, azimuthUnit, inclinationUnit, backsightAzimuthCorrected, backsightInclinationCorrected, hasBacksightAzimuth, hasBacksightInclination, _trip, shots, _trip$header, _azimuthUnit, _inclinationUnit, _distanceUnit, inches, fromStr, lStr, rStr, uStr, dStr, up, down, left, right, toStr, _shot, fromLrudMatch, fromLruds, _fromLrudMatch$1$trim, _fromLrudMatch$1$trim2, _left, _right, _up, _down, azmFsStr, azmBsStr, incFsStr, incBsStr, kind, distance, horizontalDistance, verticalDistance, frontsightInclination, backsightInclination, excludeDistance, isSplay, feetStr, inchesStr, invalid, _feetStr, h, v, d, _v, frontsightAzimuth, backsightAzimuth, shot;
+            return _regenerator["default"].wrap(function _loop$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  line = _step.value;
+                  errored = false;
+                  thisLineNumber = lineNumber;
+                  error = function error(message, startColumn, endColumn) {
+                    errored = true;
+                    errors.push(new _parseSegment.SegmentParseError(message, new _parseSegment.Segment({
+                      value: line,
+                      source: file,
+                      startLine: thisLineNumber,
+                      startCol: 0
+                    }).substring(startColumn, endColumn)));
+                  };
+                  validate = function validate(startColumn, endColumn, fieldName, validator) {
+                    var field = line.substring(startColumn, endColumn);
+                    if (!validator(field)) {
+                      error((field.trim() ? 'Invalid ' : 'Missing ') + fieldName, startColumn, endColumn);
+                    }
+                    return field;
+                  };
+                  lineNumber++;
+                  if (lineNumber === 1) {
+                    match = /^\s*([^,]+)(,(.*))?/.exec(line);
+                    if (match) {
+                      cave = match[1].trim();
+                      if (match[3]) {
+                        location = match[3].trim();
+                      }
+                    }
                   }
-                }
-              }
-
-              if (line.charAt(0) === ' ' && line.charAt(1) === '*') {
-                inTripComment = !inTripComment;
-
-                if (inTripComment) {
-                  section = undefined;
-                  tripComment = [];
-                  tripCommentStartLine = lineNumber;
-                } else {
-                  tripCommentEndLine = lineNumber;
-                }
-              } else if (inTripComment) {
-                if (lineNumber === tripCommentStartLine + 1) {
-                  tripName = line && line.trim();
-                } else if (lineNumber === tripCommentStartLine + 2) {
-                  var _match2 = /^(.+?)\s*[-.]\s*(\d+)\/(\d+)\/(\d+)$/.exec(line && line.trim());
-
+                  if (!(line.charAt(0) === ' ' && line.charAt(1) === '*')) {
+                    _context.next = 12;
+                    break;
+                  }
+                  inTripComment = !inTripComment;
+                  if (inTripComment) {
+                    section = undefined;
+                    tripComment = [];
+                    tripCommentStartLine = lineNumber;
+                  } else {
+                    tripCommentEndLine = lineNumber;
+                  }
+                  _context.next = 107;
+                  break;
+                case 12:
+                  if (!inTripComment) {
+                    _context.next = 18;
+                    break;
+                  }
+                  if (lineNumber === tripCommentStartLine + 1) {
+                    tripName = line && line.trim();
+                  } else if (lineNumber === tripCommentStartLine + 2) {
+                    _match = /^(.+?)\s*[-.]\s*(\d+)\/(\d+)\/(\d+)$/.exec(line && line.trim());
+                    if (_match) {
+                      k = 1;
+                      team = _match[k++];
+                      month = parseInt(_match[k++]);
+                      day = parseInt(_match[k++]);
+                      year = parseInt(_match[k++]);
+                      tripDate = new Date(year < 70 ? year + 2000 : year, month - 1, day);
+                      tripTeam = team.split(team.indexOf(';') >= 0 ? /\s*;\s*/g : /\s*,\s*/g);
+                    }
+                  } else if (lineNumber > 1) {
+                    tripComment.push(line);
+                  }
+                  _match2 = /^\*\*\*([^*])\*\*\*/.exec(line);
                   if (_match2) {
-                    var k = 1;
-                    var team = _match2[k++];
-                    var month = parseInt(_match2[k++]);
-                    var day = parseInt(_match2[k++]);
-                    var year = parseInt(_match2[k++]);
-                    tripDate = new Date(year < 70 ? year + 2000 : year, month - 1, day);
-                    tripTeam = team.split(team.indexOf(';') >= 0 ? /\s*;\s*/g : /\s*,\s*/g);
+                    section = _match2[1].trim();
                   }
-                } else if (lineNumber > 1) {
-                  tripComment.push(line);
-                }
-
-                var _match = /^\*\*\*([^*])\*\*\*/.exec(line);
-
-                if (_match) {
-                  section = _match[1].trim();
-                }
-              } else if (line.charAt(0) === '*') {
-                inBlockComment = !inBlockComment;
-                if (inBlockComment) commentLines = [];else if (commentLines) {
-                  var part = line.substring(1).trim();
-                  if (part && commentLines) commentLines.push(part);
-                }
-              } else if (inBlockComment) {
-                if (commentLines) commentLines.push(line);
-              } else if (lineNumber === tripCommentEndLine + 1) {
-                // FT CC DD
-                // 01234567
-                var distanceUnit = parseLengthUnit(line.slice(0, 2));
-
-                if (!distanceUnit) {
-                  distanceUnit = _unitized.Length.feet;
-                  error('Invalid distance unit', 0, 2);
-                }
-
-                var azimuthUnit = parseAngleUnit(line[6]);
-
-                if (!azimuthUnit) {
-                  azimuthUnit = _unitized.Angle.degrees;
-                  error('Invalid azimuth unit', 6, 7);
-                }
-
-                var inclinationUnit = parseAngleUnit(line[7]);
-
-                if (!inclinationUnit) {
-                  inclinationUnit = _unitized.Angle.degrees;
-                  error('Invalid inclination unit', 7, 8);
-                }
-
-                var backsightAzimuthCorrected = line[3] === 'C';
-                var backsightInclinationCorrected = line[4] === 'C';
-                var hasBacksightAzimuth = line[3] !== ' ' && line[3] !== '-';
-                var hasBacksightInclination = line[4] !== ' ' && line[4] !== '-';
-
-                if (!/[-CB ]/.test(line[3])) {
-                  error('Invalid backsight azimuth type', 3, 4);
-                }
-
-                if (!/[-CB ]/.test(line[4])) {
-                  error('Invalid backsight inclination type', 4, 5);
-                }
-
-                trip = {
-                  header: {
-                    name: tripName || '',
-                    comment: tripComment && tripComment.join('\n') || null,
-                    section: section,
-                    date: tripDate,
-                    team: tripTeam,
-                    distanceUnit: distanceUnit,
-                    azimuthUnit: azimuthUnit,
-                    inclinationUnit: inclinationUnit,
-                    backsightAzimuthCorrected: backsightAzimuthCorrected,
-                    backsightInclinationCorrected: backsightInclinationCorrected,
-                    hasBacksightAzimuth: hasBacksightAzimuth,
-                    hasBacksightInclination: hasBacksightInclination
-                  },
-                  shots: []
-                };
-                trips.push(trip);
-              } else if (trip) {
-                var _trip = trip,
-                    shots = _trip.shots,
-                    _trip$header = _trip.header,
-                    _azimuthUnit = _trip$header.azimuthUnit,
-                    _inclinationUnit = _trip$header.inclinationUnit;
-                var _distanceUnit = trip.header.distanceUnit;
-                var inches = _distanceUnit === _unitized.Length.inches;
-                if (inches) _distanceUnit = _unitized.Length.feet; // rigorously check the values in all the columns to make sure this
-                // is really a survey shot line, just in case any stray comments are
-                // not properly delimited.
-                // from station name
-
-                if (!/\S/.test(line.substring(5, 10))) return "continue";
-                var fromStr = validate(5, 10, 'from station', isValidStation); // Sadly I have found negative LRUD values in Chip's format and apparently
-                // his program doesn't fail on them, so I have to accept them here
-                // isValidOptFloat instead of isValidOptUFloat
-
-                var lStr = validate(40, 43, 'left', isValidOptFloat);
-                var rStr = validate(43, 46, 'right', isValidOptFloat);
-                var uStr = validate(46, 49, 'up', isValidOptFloat);
-                var dStr = validate(49, 52, 'down', isValidOptFloat);
-                if (errored) return "continue";
-                var up = parseLrud(uStr, _distanceUnit);
-                var down = parseLrud(dStr, _distanceUnit);
-                var left = parseLrud(lStr, _distanceUnit);
-                var right = parseLrud(rStr, _distanceUnit); // to station name
-
-                var toStr = line.substring(0, 5);
-
-                if (!toStr.trim()) {
-                  var _shot = {
+                  _context.next = 107;
+                  break;
+                case 18:
+                  if (!(line.charAt(0) === '*')) {
+                    _context.next = 23;
+                    break;
+                  }
+                  inBlockComment = !inBlockComment;
+                  if (inBlockComment) commentLines = [];else if (commentLines) {
+                    part = line.substring(1).trim();
+                    if (part && commentLines) commentLines.push(part);
+                  }
+                  _context.next = 107;
+                  break;
+                case 23:
+                  if (!inBlockComment) {
+                    _context.next = 27;
+                    break;
+                  }
+                  if (commentLines) commentLines.push(line);
+                  _context.next = 107;
+                  break;
+                case 27:
+                  if (!(lineNumber === tripCommentEndLine + 1)) {
+                    _context.next = 44;
+                    break;
+                  }
+                  // FT CC DD
+                  // 01234567
+                  distanceUnit = parseLengthUnit(line.slice(0, 2));
+                  if (!distanceUnit) {
+                    distanceUnit = _unitized.Length.feet;
+                    error('Invalid distance unit', 0, 2);
+                  }
+                  azimuthUnit = parseAngleUnit(line[6]);
+                  if (!azimuthUnit) {
+                    azimuthUnit = _unitized.Angle.degrees;
+                    error('Invalid azimuth unit', 6, 7);
+                  }
+                  inclinationUnit = parseAngleUnit(line[7]);
+                  if (!inclinationUnit) {
+                    inclinationUnit = _unitized.Angle.degrees;
+                    error('Invalid inclination unit', 7, 8);
+                  }
+                  backsightAzimuthCorrected = line[3] === 'C';
+                  backsightInclinationCorrected = line[4] === 'C';
+                  hasBacksightAzimuth = line[3] !== ' ' && line[3] !== '-';
+                  hasBacksightInclination = line[4] !== ' ' && line[4] !== '-';
+                  if (!/[-CB ]/.test(line[3])) {
+                    error('Invalid backsight azimuth type', 3, 4);
+                  }
+                  if (!/[-CB ]/.test(line[4])) {
+                    error('Invalid backsight inclination type', 4, 5);
+                  }
+                  trip = {
+                    header: {
+                      name: tripName || '',
+                      comment: tripComment && tripComment.join('\n') || null,
+                      section: section,
+                      date: tripDate,
+                      team: tripTeam,
+                      distanceUnit: distanceUnit,
+                      azimuthUnit: azimuthUnit,
+                      inclinationUnit: inclinationUnit,
+                      backsightAzimuthCorrected: backsightAzimuthCorrected,
+                      backsightInclinationCorrected: backsightInclinationCorrected,
+                      hasBacksightAzimuth: hasBacksightAzimuth,
+                      hasBacksightInclination: hasBacksightInclination
+                    },
+                    shots: []
+                  };
+                  trips.push(trip);
+                  _context.next = 107;
+                  break;
+                case 44:
+                  if (!trip) {
+                    _context.next = 107;
+                    break;
+                  }
+                  _trip = trip, shots = _trip.shots, _trip$header = _trip.header, _azimuthUnit = _trip$header.azimuthUnit, _inclinationUnit = _trip$header.inclinationUnit;
+                  _distanceUnit = trip.header.distanceUnit;
+                  inches = _distanceUnit === _unitized.Length.inches;
+                  if (inches) _distanceUnit = _unitized.Length.feet;
+
+                  // rigorously check the values in all the columns to make sure this
+                  // is really a survey shot line, just in case any stray comments are
+                  // not properly delimited.
+
+                  // from station name
+                  if (/\S/.test(line.substring(5, 10))) {
+                    _context.next = 51;
+                    break;
+                  }
+                  return _context.abrupt("return", "continue");
+                case 51:
+                  fromStr = validate(5, 10, 'from station', isValidStation); // Sadly I have found negative LRUD values in Chip's format and apparently
+                  // his program doesn't fail on them, so I have to accept them here
+                  // isValidOptFloat instead of isValidOptUFloat
+                  lStr = validate(40, 43, 'left', isValidOptFloat);
+                  rStr = validate(43, 46, 'right', isValidOptFloat);
+                  uStr = validate(46, 49, 'up', isValidOptFloat);
+                  dStr = validate(49, 52, 'down', isValidOptFloat);
+                  if (!errored) {
+                    _context.next = 58;
+                    break;
+                  }
+                  return _context.abrupt("return", "continue");
+                case 58:
+                  up = parseLrud(uStr, _distanceUnit);
+                  down = parseLrud(dStr, _distanceUnit);
+                  left = parseLrud(lStr, _distanceUnit);
+                  right = parseLrud(rStr, _distanceUnit); // to station name
+                  toStr = line.substring(0, 5);
+                  if (toStr.trim()) {
+                    _context.next = 67;
+                    break;
+                  }
+                  _shot = {
                     from: fromStr.trim(),
                     to: null,
                     kind: _FrcsShot.FrcsShotKind.Normal,
@@ -373,214 +366,212 @@ function _parseFrcsSurveyFile() {
                     backsightAzimuth: null,
                     frontsightInclination: null,
                     backsightInclination: null,
-                    left: left,
-                    right: right,
-                    up: up,
-                    down: down,
+                    fromLruds: {
+                      left: left,
+                      right: right,
+                      up: up,
+                      down: down
+                    },
                     excludeDistance: true,
                     comment: getComment()
                   };
                   shots.push(_shot);
-                  return "continue";
-                }
-
-                if (!isValidStation(toStr)) {
-                  error('Invalid station name', 0, 5);
-                } // azimuth and inclination
-
-
-                var azmFsStr = validate(19, 25, 'azimuth', isValidOptUFloat);
-                var azmBsStr = validate(25, 30, 'azimuth', isValidOptUFloat);
-                var incFsStr = line.substring(30, 35);
-                var incBsStr = line.substring(35, 40);
-                if (errored) return "continue";
-                var kind;
-                var distance;
-                var horizontalDistance;
-                var verticalDistance;
-                var frontsightInclination;
-                var backsightInclination;
-                var excludeDistance; // parse distance
-
-                if (inches) {
-                  var feetStr = line.substring(10, 14);
-                  var inchesStr = line.substring(14, 17); // feet and inches are not both optional
+                  return _context.abrupt("return", "continue");
+                case 67:
+                  if (!isValidStation(toStr)) {
+                    error('Invalid station name', 0, 5);
+                  }
+                  fromLrudMatch = new RegExp("^\\s+".concat(fromStr.trim().replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), "((\\s+(\\d+(\\.\\d*)?|\\.\\d+)){4})")).exec(line.substring(52));
+                  if (fromLrudMatch) {
+                    _fromLrudMatch$1$trim = fromLrudMatch[1].trim().split(/\s+/g).map(function (s) {
+                      return parseLrud(s, _distanceUnit);
+                    }), _fromLrudMatch$1$trim2 = (0, _slicedToArray2["default"])(_fromLrudMatch$1$trim, 4), _left = _fromLrudMatch$1$trim2[0], _right = _fromLrudMatch$1$trim2[1], _up = _fromLrudMatch$1$trim2[2], _down = _fromLrudMatch$1$trim2[3];
+                    fromLruds = {
+                      left: _left,
+                      right: _right,
+                      up: _up,
+                      down: _down
+                    };
+                  }
 
-                  if (!isValidUInt(feetStr) && !isValidUInt(inchesStr)) {
-                    var invalid = feetStr.trim() || inchesStr.trim();
-                    error(invalid ? 'Invalid distance' : 'Missing distance', 10, 17);
-                    return "continue";
-                  } // sometimes inches are omitted, hence the || 0...I'm assuming it's possible
+                  // azimuth and inclination
+                  azmFsStr = validate(19, 25, 'azimuth', isValidOptUFloat);
+                  azmBsStr = validate(25, 30, 'azimuth', isValidOptUFloat);
+                  incFsStr = line.substring(30, 35);
+                  incBsStr = line.substring(35, 40);
+                  if (!errored) {
+                    _context.next = 76;
+                    break;
+                  }
+                  return _context.abrupt("return", "continue");
+                case 76:
+                  if (!inches) {
+                    _context.next = 89;
+                    break;
+                  }
+                  feetStr = line.substring(10, 14);
+                  inchesStr = line.substring(14, 17); // feet and inches are not both optional
+                  if (!(!isValidUInt(feetStr) && !isValidUInt(inchesStr))) {
+                    _context.next = 83;
+                    break;
+                  }
+                  invalid = feetStr.trim() || inchesStr.trim();
+                  error(invalid ? 'Invalid distance' : 'Missing distance', 10, 17);
+                  return _context.abrupt("return", "continue");
+                case 83:
+                  // sometimes inches are omitted, hence the || 0...I'm assuming it's possible
                   // for feet to be omitted as well
-
-
                   distance = _unitized.Unitize.inches(parseFloat(inchesStr) || 0).add(_unitized.Unitize.feet(parseFloat(feetStr) || 0));
-                  kind = parseKind(line[17]); // NOTE there are two columns around here that can contain a *.
+                  kind = parseKind(line[17]);
+                  // NOTE there are two columns around here that can contain a *.
                   // I think they might represent different values, but thisis confused by
                   // the fact that for ft/in shots, if there is a D or H flag it occupies the
                   // first column that can contain a * for decimal feet shots
-
-                  excludeDistance = line[18] === '*';
-                } else {
+                  excludeDistance = line[18] === '*' || line[18] === 's';
+                  isSplay = line[18] === 's';
+                  _context.next = 94;
+                  break;
+                case 89:
                   // decimal feet are not optional
-                  var _feetStr = validate(10, 16, 'distance', isValidUFloat);
-
+                  _feetStr = validate(10, 16, 'distance', isValidUFloat);
                   distance = new _unitized.UnitizedNumber(parseFloat(_feetStr), _distanceUnit);
                   kind = parseKind(line[16]);
-                  excludeDistance = line[17] === '*';
-                }
-
-                if (kind !== _FrcsShot.FrcsShotKind.Normal) {
-                  validate(30, 35, 'vertical-distance', isValidFloat);
-                } // convert horizontal and diagonal shots to standard
-                // in this case incFs is the vertical offset between stations
-                // fortunately it appears we can always count on incFs being specified
-                // and incBs not being specified for these types of shots
-
-
-                if (kind === _FrcsShot.FrcsShotKind.Horizontal) {
-                  // distance is horizontal offset and incFsStr is vertical offset
-                  horizontalDistance = distance;
-                  var h = horizontalDistance.get(_distanceUnit);
-                  var v = parseFloat(incFsStr);
-                  verticalDistance = new _unitized.UnitizedNumber(v, _distanceUnit);
-                  distance = new _unitized.UnitizedNumber(Math.sqrt(h * h + v * v), _distanceUnit);
-                  frontsightInclination = _unitized.Angle.atan2(verticalDistance, horizontalDistance);
-                  backsightInclination = null;
-                } else if (kind === _FrcsShot.FrcsShotKind.Diagonal) {
-                  // distance is as usual, but incFsStr is vertical offset
-                  var d = distance.get(_distanceUnit);
-
-                  var _v = parseFloat(incFsStr);
-
-                  verticalDistance = new _unitized.UnitizedNumber(_v, _distanceUnit);
-                  frontsightInclination = _unitized.Angle.asin(_v / d);
-                  backsightInclination = null;
-                } else {
-                  // frontsight inclination
-                  validate(30, 35, 'inclination', isValidOptInclination); // frontsight inclination
-
-                  validate(35, 40, 'inclination', isValidOptInclination);
-                  frontsightInclination = parseNumber(incFsStr, _inclinationUnit);
-                  backsightInclination = parseNumber(incBsStr, _inclinationUnit);
-                }
-
-                if (errored) return "continue";
-                var frontsightAzimuth = parseAzimuth(azmFsStr, _azimuthUnit);
-                var backsightAzimuth = parseAzimuth(azmBsStr, _azimuthUnit);
-
-                if (!frontsightInclination && !backsightInclination) {
-                  frontsightInclination = _unitized.Unitize.degrees(0);
-                }
+                  excludeDistance = line[17] === '*' || line[17] === 's';
+                  isSplay = line[17] === 's';
+                case 94:
+                  if (kind !== _FrcsShot.FrcsShotKind.Normal) {
+                    validate(30, 35, 'vertical-distance', isValidFloat);
+                  }
 
-                var shot = {
-                  from: fromStr.trim(),
-                  to: toStr.trim(),
-                  kind: kind,
-                  distance: distance,
-                  frontsightAzimuth: frontsightAzimuth,
-                  backsightAzimuth: backsightAzimuth,
-                  frontsightInclination: frontsightInclination,
-                  backsightInclination: backsightInclination,
-                  left: left,
-                  right: right,
-                  up: up,
-                  down: down,
-                  excludeDistance: excludeDistance,
-                  comment: getComment()
-                };
-                if (horizontalDistance) shot.horizontalDistance = horizontalDistance;
-                if (verticalDistance) shot.verticalDistance = verticalDistance;
-                shots.push(shot);
+                  // convert horizontal and diagonal shots to standard
+                  // in this case incFs is the vertical offset between stations
+                  // fortunately it appears we can always count on incFs being specified
+                  // and incBs not being specified for these types of shots
+                  if (kind === _FrcsShot.FrcsShotKind.Horizontal) {
+                    // distance is horizontal offset and incFsStr is vertical offset
+                    horizontalDistance = distance;
+                    h = horizontalDistance.get(_distanceUnit);
+                    v = parseFloat(incFsStr);
+                    verticalDistance = new _unitized.UnitizedNumber(v, _distanceUnit);
+                    distance = new _unitized.UnitizedNumber(Math.sqrt(h * h + v * v), _distanceUnit);
+                    frontsightInclination = _unitized.Angle.atan2(verticalDistance, horizontalDistance);
+                    backsightInclination = null;
+                  } else if (kind === _FrcsShot.FrcsShotKind.Diagonal) {
+                    // distance is as usual, but incFsStr is vertical offset
+                    d = distance.get(_distanceUnit);
+                    _v = parseFloat(incFsStr);
+                    verticalDistance = new _unitized.UnitizedNumber(_v, _distanceUnit);
+                    frontsightInclination = _unitized.Angle.asin(_v / d);
+                    backsightInclination = null;
+                  } else {
+                    // frontsight inclination
+                    validate(30, 35, 'inclination', isValidOptInclination);
+                    // frontsight inclination
+                    validate(35, 40, 'inclination', isValidOptInclination);
+                    frontsightInclination = parseNumber(incFsStr, _inclinationUnit);
+                    backsightInclination = parseNumber(incBsStr, _inclinationUnit);
+                  }
+                  if (!errored) {
+                    _context.next = 98;
+                    break;
+                  }
+                  return _context.abrupt("return", "continue");
+                case 98:
+                  frontsightAzimuth = parseAzimuth(azmFsStr, _azimuthUnit);
+                  backsightAzimuth = parseAzimuth(azmBsStr, _azimuthUnit);
+                  if (!frontsightInclination && !backsightInclination) {
+                    frontsightInclination = _unitized.Unitize.degrees(0);
+                  }
+                  shot = {
+                    from: fromStr.trim(),
+                    to: toStr.trim(),
+                    kind: kind,
+                    distance: distance,
+                    frontsightAzimuth: frontsightAzimuth,
+                    backsightAzimuth: backsightAzimuth,
+                    frontsightInclination: frontsightInclination,
+                    backsightInclination: backsightInclination,
+                    toLruds: {
+                      left: left,
+                      right: right,
+                      up: up,
+                      down: down
+                    },
+                    excludeDistance: excludeDistance,
+                    comment: getComment()
+                  };
+                  if (isSplay) shot.isSplay = true;
+                  if (fromLruds) shot.fromLruds = fromLruds;
+                  if (horizontalDistance) shot.horizontalDistance = horizontalDistance;
+                  if (verticalDistance) shot.verticalDistance = verticalDistance;
+                  shots.push(shot);
+                case 107:
+                case "end":
+                  return _context.stop();
               }
-            };
-
-            _iterator = (0, _asyncIterator2["default"])(lines);
-
-          case 18:
-            _context.next = 20;
-            return _iterator.next();
-
-          case 20:
-            _step = _context.sent;
-            _iteratorNormalCompletion = _step.done;
-            _context.next = 24;
-            return _step.value;
-
-          case 24:
-            _value = _context.sent;
-
-            if (_iteratorNormalCompletion) {
-              _context.next = 32;
-              break;
-            }
-
-            _ret = _loop();
-
-            if (!(_ret === "continue")) {
-              _context.next = 29;
-              break;
-            }
-
-            return _context.abrupt("continue", 29);
-
-          case 29:
-            _iteratorNormalCompletion = true;
-            _context.next = 18;
+            }, _loop);
+          });
+          _iterator = _asyncIterator(lines);
+        case 18:
+          _context2.next = 20;
+          return _iterator.next();
+        case 20:
+          if (!(_iteratorAbruptCompletion = !(_step = _context2.sent).done)) {
+            _context2.next = 28;
             break;
-
-          case 32:
-            _context.next = 38;
+          }
+          return _context2.delegateYield(_loop(), "t0", 22);
+        case 22:
+          _ret = _context2.t0;
+          if (!(_ret === "continue")) {
+            _context2.next = 25;
             break;
-
-          case 34:
-            _context.prev = 34;
-            _context.t0 = _context["catch"](15);
-            _didIteratorError = true;
-            _iteratorError = _context.t0;
-
-          case 38:
-            _context.prev = 38;
-            _context.prev = 39;
-
-            if (!(!_iteratorNormalCompletion && _iterator["return"] != null)) {
-              _context.next = 43;
-              break;
-            }
-
-            _context.next = 43;
-            return _iterator["return"]();
-
-          case 43:
-            _context.prev = 43;
-
-            if (!_didIteratorError) {
-              _context.next = 46;
-              break;
-            }
-
-            throw _iteratorError;
-
-          case 46:
-            return _context.finish(43);
-
-          case 47:
-            return _context.finish(38);
-
-          case 48:
-            return _context.abrupt("return", {
-              cave: cave,
-              location: location,
-              trips: trips,
-              errors: errors
-            });
-
-          case 49:
-          case "end":
-            return _context.stop();
-        }
+          }
+          return _context2.abrupt("continue", 25);
+        case 25:
+          _iteratorAbruptCompletion = false;
+          _context2.next = 18;
+          break;
+        case 28:
+          _context2.next = 34;
+          break;
+        case 30:
+          _context2.prev = 30;
+          _context2.t1 = _context2["catch"](15);
+          _didIteratorError = true;
+          _iteratorError = _context2.t1;
+        case 34:
+          _context2.prev = 34;
+          _context2.prev = 35;
+          if (!(_iteratorAbruptCompletion && _iterator["return"] != null)) {
+            _context2.next = 39;
+            break;
+          }
+          _context2.next = 39;
+          return _iterator["return"]();
+        case 39:
+          _context2.prev = 39;
+          if (!_didIteratorError) {
+            _context2.next = 42;
+            break;
+          }
+          throw _iteratorError;
+        case 42:
+          return _context2.finish(39);
+        case 43:
+          return _context2.finish(34);
+        case 44:
+          return _context2.abrupt("return", {
+            cave: cave,
+            location: location,
+            trips: trips,
+            errors: errors
+          });
+        case 45:
+        case "end":
+          return _context2.stop();
       }
-    }, _callee, null, [[15, 34, 38, 48], [39,, 43, 47]]);
+    }, _callee, null, [[15, 30, 34, 44], [35,, 39, 43]]);
   }));
   return _parseFrcsSurveyFile.apply(this, arguments);
 }