Merge pull request #84 from ncss-tech/osd-multiline1

feat: OSD: add detection and logging of multiline formatting in typical pedon

Author: brownag

DESCRIPTION

@@ -9,7 +9,7 @@ Imports: curl, xml2, jsonlite, rvest, stringi, tibble, dplyr, pdftools, data.tab
 License: GPL-3
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Suggests: knitr, rmarkdown, testthat
 URL: https://github.com/ncss-tech/SoilKnowledgeBase, https://ncss-tech.github.io/SoilKnowledgeBase
 BugReports: https://github.com/ncss-tech/SoilKnowledgeBase/issues

R/create_OSD.R

@@ -365,16 +365,16 @@ validateOSD <- function(logfile, filepath) {
 #' @param logfile Path to log file; default: \code{file.path(output_dir, "OSD/OSD.log")}
 #' @param input_dir Default: \code{'OSD'}; files matching pattern are listed recursively
 #' @param pattern Argument passed to \code{list.files} when \code{osd_files} is not specified
-#' @param output_dir Default: \code{'inst/extdata'}; folder to create alphabetical folder structure with JSON files
+#' @param output_dir Default: \code{'inst/extdata/OSD'}; folder to create alphabetical folder structure with JSON files
 #' @param osd_files Default \code{NULL}; Optional over-ride vector of file names for testing
 #'
 #' @return A logical vector equal in length to the number of input files.
 #' @export
 #' @importFrom jsonlite toJSON
-osd_to_json <- function(logfile = file.path(output_dir, "OSD/OSD.log"),
+osd_to_json <- function(logfile = file.path(output_dir, "OSD.log"),
                         input_dir = 'OSD',
                         pattern = "txt",
-                        output_dir = "inst/extdata",
+                        output_dir = "inst/extdata/OSD",
                         osd_files = NULL) {
 
   if (!is.null(osd_files)) {
@@ -390,7 +390,7 @@ osd_to_json <- function(logfile = file.path(output_dir, "OSD/OSD.log"),
 
     x <- validateOSD(logfile, filepath)
 
-    parsed.OSD <- .doParseOSD(x)
+    parsed.OSD <- .doParseOSD(x, logfile, filepath)
 
     # SPC-style components from parseOSD returned as nested data.frames in JSON
     x$SITE <- I(list(parsed.OSD$`site-data`))

R/parseOSD_functions.R

@@ -10,7 +10,7 @@
 #' @param x a _list_ result of SoilKnowledgeBase::validateOSD()
 #' @keywords internal
 #' @noRd
-.doParseOSD <- function(x) {
+.doParseOSD <- function(x, logfile = "OSD.log", filename = "FOO.txt") {
   # # get data
   # res <- soilDB:::.getLocalOSD(x, path)
   #
@@ -22,10 +22,10 @@
   # l[['section-indices']] <- .findSectionIndices(res)
 
   l <- list()
-  l[['site-data']] <- .extractSiteData(x)
+  l[['site-data']] <- .extractSiteData(x, logfile, filename)
   tp <- strsplit(as.character(x$`TYPICAL PEDON`$content), "\n")
   if (length(tp) > 0)
-    l[['hz-data']] <- .extractHzData(tp[[1]])
+    l[['hz-data']] <- .extractHzData(tp[[1]], logfile, filename)
   else
     l[['hz-data']] <- data.frame(name = NA)
 
@@ -269,7 +269,7 @@
 
 # parse important pieces from sections
 # x: list of section chunks
-.extractSiteData <- function(x) {
+.extractSiteData <- function(x, logfile = "OSD.log", filename = "FOO.txt") {
 
   ## drainage class
 
@@ -302,7 +302,7 @@
 
 
 #' @importFrom stringi stri_match_all
-.extractHzData <- function(tp) {
+.extractHzData <- function(tp, logfile = "OSD.log", filename = "FOO.txt") {
 
   # detect horizons with both top and bottom depths
   hz.rule <- "([\\^\\'\\/a-zA-Z0-9]+(?: and [\\^\\'\\/a-zA-Z0-9]+)?)\\s*[-=\u2014]+\\s*([Ol0-9.]+)\\s*?(to|-)?\\s+?([Ol0-9.]+)\\s*?(in|inches|cm|centimeters)"
@@ -345,14 +345,23 @@
   # note that dry/moist may not always be present
   color.rule <- "\\(([Ol0-9]?[\\.]?[Ol0-9]?[B|G|Y|R|N]+) *([Ol0-9\\.]+) */([Ol0-9]*) *\\)\\s?(dry|moist|)"
 
-  # ID actual lines of horizon information
-  hz.idx <- unique(c(grep(hz.rule, tp), grep(hz.rule.no.bottom, tp)))
+  # eliminate empty lines within typical pedon
+  tp <- tp[nzchar(trimws(tp))]
+  
+  # ID starting lines of horizon information
+  hz.idx <- sort(unique(c(grep(hz.rule, tp), grep(hz.rule.no.bottom, tp))))
 
   # the first line of the TYPICAL PEDON section should not appear in this index
   first.line.flag <- which(hz.idx == 1)
   if (length(first.line.flag) > 0) {
     hz.idx <- hz.idx[-first.line.flag]
   }
+  
+  check.multiline <- diff(hz.idx) > 1
+  if (any(check.multiline)) {
+    # multiline typical pedon horizon formatting (needs fix)
+    logmsg(logfile, paste0("CHECK MULTILINE TYPICAL PEDON: ", filename, " [number of multilines=", sum(check.multiline), "]"))
+  }
 
   # init empty lists to store hz data and colors
   hz.data <- list()

inst/extdata/OSD-error-reporting/RO/auburn-sections.csv

@@ -1,10 +1,74 @@
 "soilseriesname","errorkind","context","mlraoffice"
+"ACKWATER","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"AMELIA","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"ANDRY","MULTILINE TYPICAL PEDON","[number of multilines=6]","auburn, al"
+"ANNISTON","MULTILINE TYPICAL PEDON","[number of multilines=4]","auburn, al"
+"BASSFIELD","MULTILINE TYPICAL PEDON","[number of multilines=5]","auburn, al"
+"BEARKNOB","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"BOWMANTOWN","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"BREWTON","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
 "BUGLEY","DUPLICATION OF HEADERS","[RANGE IN CHARACTERISTICS:]","auburn, al"
 "BUGLEY","DUPLICATE STANDARD SECTIONS","[RANGE IN CHARACTERISTICS]","auburn, al"
 "BURTON","DUPLICATE STANDARD SECTIONS","[ADDITIONAL DATA]","auburn, al"
+"BUSSY","MULTILINE TYPICAL PEDON","[number of multilines=7]","auburn, al"
+"CANTUCHE","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"CHIPOLA","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"CHISCA","MULTILINE TYPICAL PEDON","[number of multilines=7]","auburn, al"
+"CITICO","MULTILINE TYPICAL PEDON","[number of multilines=6]","auburn, al"
+"CLOUDLAND","MULTILINE TYPICAL PEDON","[number of multilines=4]","auburn, al"
+"COLUMBUS","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
 "CRAGGEY","DUPLICATE STANDARD SECTIONS","[ADDITIONAL DATA]","auburn, al"
+"DAWHOO","MULTILINE TYPICAL PEDON","[number of multilines=4]","auburn, al"
+"DEBUTE","MULTILINE TYPICAL PEDON","[number of multilines=7]","auburn, al"
 "DUCKBOTTOM","DUPLICATION OF HEADERS","[TAXONOMIC CLASS: Very-fine, kaolinitic, acid, thermic Fluvaquentic Endoaquepts]","auburn, al"
+"DURALDE","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"ELLZEY","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"ELRED","MULTILINE TYPICAL PEDON","[number of multilines=6]","auburn, al"
+"ENCROW","MULTILINE TYPICAL PEDON","[number of multilines=2]","auburn, al"
+"EVANGELINE","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"FLEMINGTON","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"FRED","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"FREDONIA","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"GAINESVILLE","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"GOODWILL","MULTILINE TYPICAL PEDON","[number of multilines=6]","auburn, al"
+"GRASMERE","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
 "GUNDY","DUPLICATE STANDARD SECTIONS","[REMARKS]","auburn, al"
+"HANCEVILLE","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"HEIGHTS","MULTILINE TYPICAL PEDON","[number of multilines=6]","auburn, al"
+"HILOLO","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"HOBCAW","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"HOBONNY","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"KETONA","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"KIAWAH","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"LOCUST","MULTILINE TYPICAL PEDON","[number of multilines=5]","auburn, al"
 "MICAVILLE","DUPLICATE STANDARD SECTIONS","[ADDITIONAL DATA]","auburn, al"
 "MIMMS","DUPLICATION OF HEADERS","[TAXONOMIC CLASS: Fine, kaolinitic, acid, thermic Fluvaquentic Endoaquepts]","auburn, al"
+"MONACAN","MULTILINE TYPICAL PEDON","[number of multilines=4]","auburn, al"
+"MONTEOCHA","MULTILINE TYPICAL PEDON","[number of multilines=6]","auburn, al"
+"MUCKALEE","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"NAHUNTA","MULTILINE TYPICAL PEDON","[number of multilines=2]","auburn, al"
+"NECTAR","MULTILINE TYPICAL PEDON","[number of multilines=4]","auburn, al"
+"NEMOURS","MULTILINE TYPICAL PEDON","[number of multilines=6]","auburn, al"
+"NOBLETON","MULTILINE TYPICAL PEDON","[number of multilines=6]","auburn, al"
+"OLENO","MULTILINE TYPICAL PEDON","[number of multilines=6]","auburn, al"
+"PECKISH","MULTILINE TYPICAL PEDON","[number of multilines=8]","auburn, al"
+"PERDIDO","MULTILINE TYPICAL PEDON","[number of multilines=2]","auburn, al"
+"PILGRIMS","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"POUNCEY","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"RION","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"SATSUMA","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"SHADYGROVE","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"SOLWAY","MULTILINE TYPICAL PEDON","[number of multilines=5]","auburn, al"
+"STERRETT","MULTILINE TYPICAL PEDON","[number of multilines=4]","auburn, al"
+"STUCKEY","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"TADLOCK","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
 "TILLERY","DUPLICATE STANDARD SECTIONS","[ADDITIONAL DATA]","auburn, al"
+"TILLOU","MULTILINE TYPICAL PEDON","[number of multilines=7]","auburn, al"
+"TOTIER","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"TUCKAHOE","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"VERDUN","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"VERO","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"WADMALAW","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"
+"WESTWEGO","MULTILINE TYPICAL PEDON","[number of multilines=7]","auburn, al"
+"WOLFGAP","MULTILINE TYPICAL PEDON","[number of multilines=3]","auburn, al"
+"YADKIN","MULTILINE TYPICAL PEDON","[number of multilines=1]","auburn, al"

inst/extdata/OSD-error-reporting/RO/bozeman-hz.csv

@@ -76,8 +76,8 @@
 "BOSSBURG","30a2",137,173,"2.5Y","6","2","2.5Y","4","2"
 "BROADAX","Apl",0,10,"10YR","4","2","10YR","2","2"
 "BROMO","Al",0,10,"l0YR","6",NA,"l0YR","3",NA
-"BROMO","AB",10,10,"l0YR","5","2","l0YR","3","2"
-"BROMO","0",10,58,NA,NA,NA,NA,NA,NA
+"BROMO","0",10,10,NA,NA,NA,NA,NA,NA
+"BROMO","AB",10,58,"l0YR","5","2","l0YR","3","2"
 "BROMO","2Bsb1",58,89,"l0YR","6","4","l0YR","3","3"
 "BROMO","2Bsb2",89,152,"l0YR","7","4","l0YR","4","4"
 "BROMO","A2",NA,10,"l0YR","5","3","l0YR","3","3"
@@ -104,6 +104,7 @@
 "CHICKAMAN","0i",0,5,NA,NA,NA,NA,NA,NA
 "CINEBAR","0a",3,4,NA,NA,NA,NA,NA,NA
 "CINEBAR","0i",4,3,NA,NA,NA,NA,NA,NA
+"CINNAMON","Oa",8,8,NA,NA,NA,NA,NA,NA
 "CINNAMON","Oi",10,8,NA,NA,NA,NA,NA,NA
 "CISPUS","A",0,5,"l0YR","5","2","l0YR","3","2"
 "CISPUS","2Bwb",109,152,"l0YR","6","3","l0YR","4","4"
@@ -125,9 +126,9 @@
 "CRACKERCREEK","2Btbl",41,53,"10YR","5","4","10YR","3","3"
 "CRIMS","20e1",23,51,"10YR","3","1","10YR","2","1"
 "CRIMS","20e2",51,102,"10YR","3","1","2.5Y","3","2"
-"CRINKER","02",3,8,NA,NA,NA,NA,NA,NA
+"CRINKER","02",3,3,NA,NA,NA,NA,NA,NA
 "CRINKER","01",8,3,NA,NA,NA,NA,NA,NA
-"CROQUIB","0",5,15,NA,NA,NA,NA,NA,NA
+"CROQUIB","0",5,5,NA,NA,NA,NA,NA,NA
 "CRUTCH","0i",0,3,NA,NA,NA,NA,NA,NA
 "CRUTCH","0e",3,5,NA,NA,NA,NA,NA,NA
 "CULVING","Bwl",13,23,"10YR","6","3","10YR","4","2"
@@ -182,7 +183,7 @@
 "FELTNER","Cca",30,41,"l0YR","6","4","10YR","5","4"
 "FERN CLIFF","02",5,0,NA,NA,NA,NA,NA,NA
 "FERN CLIFF","O1",10,5,NA,NA,NA,NA,NA,NA
-"FERNHAVEN","0i",10,30,NA,NA,NA,NA,NA,NA
+"FERNHAVEN","0i",10,10,NA,NA,NA,NA,NA,NA
 "FERTEG","0",8,13,NA,NA,NA,NA,NA,NA
 "FIVES","01",5,10,NA,NA,NA,NA,NA,NA
 "FLANNERY","Oi",4,3,NA,NA,NA,NA,NA,NA
@@ -191,7 +192,7 @@
 "FORDCREEK","Btl",15,41,"10YR","6","3","10YR","3","4"
 "FORDCREEK","Cr",104,NA,NA,NA,NA,NA,NA,NA
 "FORDCREEK","Al",NA,8,"10YR","5","3","10YR","3","3"
-"FORSYTH","0a",3,5,NA,NA,NA,NA,NA,NA
+"FORSYTH","0a",3,3,NA,NA,NA,NA,NA,NA
 "FORSYTH","0e",5,3,NA,NA,NA,NA,NA,NA
 "FORTRAN","A",0,8,"l0YR","5","3","l0YR","3","3"
 "FORTRAN","Oi",8,3,NA,NA,NA,NA,NA,NA
@@ -228,10 +229,10 @@
 "HIGHHORN","0i",0,8,NA,NA,NA,NA,NA,NA
 "HOOTER","0e",5,0,NA,NA,NA,NA,NA,NA
 "HOOTER","0i",8,5,NA,NA,NA,NA,NA,NA
-"HOVDE","A",0,23,NA,NA,NA,"l0YR","3","2"
-"HOVDE","2C4",99,152,"l0YR","4","2","l0YR","3","2"
-"HOVDE","2C2",NA,74,"l0YR","5","3","l0YR","4","3"
-"HOVDE","0i",NA,1554,NA,NA,NA,NA,NA,NA
+"HOVDE","A",0,9,NA,NA,NA,"l0YR","3","2"
+"HOVDE","2C4",39,60,"l0YR","4","2","l0YR","3","2"
+"HOVDE","0i",NA,NA,NA,NA,NA,NA,NA,NA
+"HOVDE","2C2",NA,29,"l0YR","5","3","l0YR","4","3"
 "HOZOMEEN","Oi",15,13,NA,NA,NA,NA,NA,NA
 "HUCKLE","Bwl",10,20,"10YR","5","4","10YR","3","4"
 "HUMSKEL","01",3,5,NA,NA,NA,NA,NA,NA
@@ -242,7 +243,7 @@
 "ILLABOT","01",8,3,NA,NA,NA,NA,NA,NA
 "INDART","0i",0,8,NA,NA,NA,NA,NA,NA
 "INDART","0e",8,10,NA,NA,NA,NA,NA,NA
-"JACKMAN","0i",10,38,NA,NA,NA,NA,NA,NA
+"JACKMAN","0i",10,10,NA,NA,NA,NA,NA,NA
 "JACKNIFE","Btl",48,86,"7.5YR","3","2","7.5YR","3","2"
 "JENKINS","02",3,0,NA,NA,NA,NA,NA,NA
 "JENKINS","01",5,8,NA,NA,NA,NA,NA,NA
@@ -282,15 +283,17 @@
 "LAGALL","0i",0,3,NA,NA,NA,NA,NA,NA
 "LANTERN","0i",0,5,NA,NA,NA,NA,NA,NA
 "LASSEL","Clca",30,46,"10YR","6","3","10YR","5","3"
-"LASTANCE","0e",3,5,NA,NA,NA,"10YR","2","1"
-"LASTANCE","0i",5,30,NA,NA,NA,NA,NA,NA
+"LASTANCE","0e",3,3,NA,NA,NA,"10YR","2","1"
+"LASTANCE","0i",5,5,NA,NA,NA,NA,NA,NA
 "LEADVILLE","0i",0,8,NA,NA,NA,NA,NA,NA
 "LEADVILLE","0e",8,10,NA,NA,NA,NA,NA,NA
 "LEGAULT","0e",0,3,NA,NA,NA,NA,NA,NA
 "LEMAH","0e",0,1,NA,NA,NA,NA,NA,NA
+"LEMOLO","Oa",13,13,NA,NA,NA,"10YR","2","1"
 "LEMOLO","Oi",15,13,NA,NA,NA,NA,NA,NA
 "LITTLESALMON","2Cl",79,109,"10YR","5","2","10YR","6","2"
 "LOLOPEAK","0i",0,8,NA,NA,NA,NA,NA,NA
+"LONESTAR","Oa",5,5,NA,NA,NA,NA,NA,NA
 "LONESTAR","Oi",8,5,NA,NA,NA,NA,NA,NA
 "LOPER","Oa",5,0,NA,NA,NA,NA,NA,NA
 "LOWERCREEK","01 and 02",3,8,NA,NA,NA,NA,NA,NA
@@ -333,12 +336,12 @@
 "NATKIM","0i",0,1,NA,NA,NA,NA,NA,NA
 "NATKIM","0e",1,3,NA,NA,NA,NA,NA,NA
 "NELSON","Alp",0,23,"10YR","6","2","10YR","4","2"
-"NETRAC","Al",0,5,"l0YR","5",NA,"l0YR","3",NA
-"NETRAC","Cl",5,18,"l0YR","8","3","l0YR","5",NA
-"NETRAC","2Alb",18,NA,"l0YR","4","3","l0YR","3","2"
+"NETRAC","Al",0,2,"l0YR","5",NA,"l0YR","3",NA
+"NETRAC","Cl",2,7,"l0YR","8","3","l0YR","5",NA
+"NETRAC","2Alb",7,NA,"l0YR","4","3","l0YR","3","2"
+"NETRAC","0l",NA,NA,NA,NA,NA,NA,NA,NA
 "NETRAC","2B2b",NA,NA,"l0YR","5","3","l0YR","3","4"
-"NETRAC","2C2",NA,152,"l0YR","4","3","l0YR","3","4"
-"NETRAC","0l",NA,1554,NA,NA,NA,NA,NA,NA
+"NETRAC","2C2",NA,60,"l0YR","4","3","l0YR","3","4"
 "NEVINE","0i",0,3,NA,NA,NA,NA,NA,NA
 "NEVINE","A",3,3,"10YR","6","2","10YR","4","2"
 "NEWAUKUM","A",0,23,"l0YR","4","3","l0YR","2","2"
@@ -392,6 +395,7 @@
 "PLATORO","B3ca",38,46,"1OYR","5","3","1OYR","4","3"
 "PLATORO","Clca",46,66,"10YR","5","3","10YR","4","3"
 "POOSE","Oe",5,0,NA,NA,NA,NA,NA,NA
+"POTCHUB","Oa",18,18,NA,NA,NA,NA,NA,NA
 "POTCHUB","Oi",23,18,NA,NA,NA,NA,NA,NA
 "POTCHUB","Bsl",33,43,"7.5YR","7","6","7.5YR","5","6"
 "PRATHER","Bt1",NA,66,"10YR","5","8","7.5YR","4","4"
@@ -422,11 +426,11 @@
 "RARICK","02",5,8,NA,NA,NA,NA,NA,NA
 "RARICK","01",8,5,NA,NA,NA,NA,NA,NA
 "RATON","Al",0,13,"10YR","3","2","10YR","2","2"
-"RAUGHT","Al",0,5,"5YR","4","2","5YR","3","2"
-"RAUGHT","AB",18,NA,"5YR","5","3","5YR","3","3"
+"RAUGHT","Al",0,2,"5YR","4","2","5YR","3","2"
+"RAUGHT","AB",7,NA,"5YR","5","3","5YR","3","3"
+"RAUGHT","Oe",NA,NA,NA,NA,NA,NA,NA,NA
 "RAUGHT","BA",NA,NA,"5YR","5","4","5YR","3","4"
-"RAUGHT","Bt",NA,165,"5YR","5","4","2.5YR","3","6"
-"RAUGHT","Oe",NA,1554,NA,NA,NA,NA,NA,NA
+"RAUGHT","Bt",NA,65,"5YR","5","4","2.5YR","3","6"
 "RAWAH","Clca",51,76,"2.5YR","6","4","2.5YR","5","4"
 "REDCLOUD","C1ca",56,91,"1OYR","7","3","1OYR","5","3"
 "REDCLOUD","A1",NA,30,"7.5YR","5","3","7.5YR","3","3"
@@ -435,8 +439,8 @@
 "REVEL","Bs",10,89,"l0YR","5","4","7.5YR","4","4"
 "REVEL","2Cr",89,NA,NA,NA,NA,NA,NA,NA
 "REVEL","Oi",NA,1,NA,NA,NA,NA,NA,NA
+"REVEL","Oa",NA,NA,NA,NA,NA,NA,NA,NA
 "REVEL","C",NA,89,"l0YR","6","4","l0YR","4","4"
-"REVEL","Oa",NA,1554,NA,NA,NA,NA,NA,NA
 "RINEARSON","0",3,8,NA,NA,NA,NA,NA,NA
 "RINKER","0a",3,5,NA,NA,NA,NA,NA,NA
 "RINKER","0i",13,3,NA,NA,NA,NA,NA,NA
@@ -463,13 +467,13 @@
 "SARATON","A1",NA,13,"7.5YR","5","4","7.5YR","4","4"
 "SAUK","0a",3,8,NA,NA,NA,NA,NA,NA
 "SAUK","0i",10,3,NA,NA,NA,NA,NA,NA
-"SAUVOLA","A",0,66,"l0YR","3","2",NA,NA,NA
-"SAUVOLA","Bt2",66,81,"l0YR","5","3",NA,NA,NA
-"SAUVOLA","Bt3",81,109,"l0YR","5","3",NA,NA,NA
-"SAUVOLA","BC",109,152,"l0YR","5","3",NA,NA,NA
+"SAUVOLA","A",0,26,"l0YR","3","2",NA,NA,NA
+"SAUVOLA","Bt2",26,32,"l0YR","5","3",NA,NA,NA
+"SAUVOLA","Bt3",32,43,"l0YR","5","3",NA,NA,NA
+"SAUVOLA","BC",43,60,"l0YR","5","3",NA,NA,NA
+"SAUVOLA","Oe",NA,NA,NA,NA,NA,NA,NA,NA
 "SAUVOLA","ABt",NA,NA,"l0YR","3","3",NA,NA,NA
-"SAUVOLA","Bt1",NA,66,"l0YR","5","3",NA,NA,NA
-"SAUVOLA","Oe",NA,1554,NA,NA,NA,NA,NA,NA
+"SAUVOLA","Bt1",NA,26,"l0YR","5","3",NA,NA,NA
 "SAWATCH","01",15,20,NA,NA,NA,NA,NA,NA
 "SAWATCH","Allg",NA,20,"10YR","4","2","7.5YR","5","6"
 "SAXON","Oi",23,10,NA,NA,NA,NA,NA,NA
@@ -508,8 +512,8 @@
 "SKATE","B2lir",6,18,"l0YR","5","4","l0YR","4","3"
 "SKATE","B22ir",18,99,"l0YR","5","8","7.5YR","5","8"
 "SKATE","3Cl",99,124,NA,NA,NA,"2.5Y","4","4"
+"SKATE","0l and 02",NA,NA,NA,NA,NA,NA,NA,NA
 "SKATE","2B2irb",NA,99,"l0YR","6","6","l0YR","4","6"
-"SKATE","0l and 02",NA,1554,NA,NA,NA,NA,NA,NA
 "SKOOKUMHOUSE","0i",3,28,NA,NA,NA,NA,NA,NA
 "SKYKOMISH","Oi",10,8,NA,NA,NA,NA,NA,NA
 "SLY","0i",0,2,NA,NA,NA,NA,NA,NA
@@ -518,20 +522,21 @@
 "SNOHOMISH","Apl",0,18,"10YR","6","2","10YR","3","2"
 "SODACREEK","Oi",3,0,NA,NA,NA,NA,NA,NA
 "SOLO","Oe",5,0,NA,NA,NA,NA,NA,NA
-"SORENSEN","Oi",NA,1554,NA,NA,NA,NA,NA,NA
 "SPANA","2Cl",74,91,"10YR","6","2","10YR","4","2"
 "SPIEDEN","Cl",91,122,"2.5Y","6","3","2.5Y","3","3"
 "SPOKEL","0i",0,3,NA,NA,NA,NA,NA,NA
 "SPOKEL","0e",3,5,NA,NA,NA,NA,NA,NA
+"SPRINGSTEEN","Oa",5,5,NA,NA,NA,NA,NA,NA
 "SPRINGSTEEN","Oi",13,5,NA,NA,NA,NA,NA,NA
-"SQUALICUM","A",0,8,"l0YR","5","3","l0YR","3","2"
-"SQUALICUM","Bs1",8,76,"l0YR","7","6","l0YR","4","6"
-"SQUALICUM","Bs2",NA,76,"l0YR","7","6","l0YR","3","6"
-"SQUALICUM","Oi",NA,1554,NA,NA,NA,NA,NA,NA
-"SQUALLY","Al",0,160,"7.5YR","5","4","7.5YR","3","3"
-"SQUALLY","C",160,190,"l0YR","6","3","l0YR","4","3"
-"SQUALLY","B2",NA,160,"l0YR","6","6","5YR","3","4"
-"SQUALLY","0l",NA,1554,NA,NA,NA,NA,NA,NA
+"SQUALICUM","A",0,3,"l0YR","5","3","l0YR","3","2"
+"SQUALICUM","Bs1",3,30,"l0YR","7","6","l0YR","4","6"
+"SQUALICUM","Oi",NA,NA,NA,NA,NA,NA,NA,NA
+"SQUALICUM","Bs2",NA,30,"l0YR","7","6","l0YR","3","6"
+"SQUALLY","Al",0,63,"7.5YR","5","4","7.5YR","3","3"
+"SQUALLY","C",63,75,"l0YR","6","3","l0YR","4","3"
+"SQUALLY","0l",NA,NA,NA,NA,NA,NA,NA,NA
+"SQUALLY","B2",NA,63,"l0YR","6","6","5YR","3","4"
+"SQUIRES","Oa",3,3,NA,NA,NA,NA,NA,NA
 "ST. ELMO","Clca",25,76,"10YR","7","3",NA,NA,NA
 "ST. ELMO","A1",NA,25,"7.5YR","5","2",NA,NA,NA
 "ST. MARTIN","0i",5,10,NA,NA,NA,NA,NA,NA
@@ -642,6 +647,7 @@
 "WARRENTON","0",8,28,NA,NA,NA,"N","2",NA
 "WEDGEMONT","Bsl",5,51,"10YR","7","3","10YR","5","3"
 "WELCOME","E",0,5,NA,NA,NA,"l0YR","4","3"
+"WELCOME","Oa",5,5,NA,NA,NA,NA,NA,NA
 "WELCOME","Bs1",5,15,NA,NA,NA,"l0YR","3","4"
 "WELCOME","Oi",8,5,NA,NA,NA,NA,NA,NA
 "WELCOME","Bs2",15,69,NA,NA,NA,"l0YR","3","6"