Merge pull request #70 from ncss-tech/single-digit-phfield

add support for single digit pH
ncss-tech · Oct 26, 2023 · 288ef33 · 288ef33
2 parents dc9c537 + 1bcb8bb
commit 288ef33
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/R/parseOSD_functions.R b/R/parseOSD_functions.R
@@ -171,7 +171,7 @@
 .parse_pH <- function(text) {
 
   # combine into capturing REGEX
-  ph.regex <- '\\(ph\\s?([0-9]\\.[0-9])\\)'
+  ph.regex <- '\\(ph\\s?([0-9]\\.?[0-9]?)\\)'
 
   # get matches
   m <- stringi::stri_match(text, regex = ph.regex, mode = 'first', opts_regex = list(case_insensitive = TRUE))

diff --git a/inst/extdata/OSD/E/ETACH.json b/inst/extdata/OSD/E/ETACH.json
@@ -110,7 +110,7 @@
         "moist_rupture": "friable",
         "coherence": "NA",
         "cf_class": "very gravelly",
-        "pH": "NA",
+        "pH": 5,
         "pH_class": "very strongly acid",
         "eff_class": "NA",
         "distinctness": "abrupt",

diff --git a/inst/extdata/OSD/F/FLATBUSH.json b/inst/extdata/OSD/F/FLATBUSH.json
@@ -110,7 +110,7 @@
         "moist_rupture": "friable",
         "coherence": "NA",
         "cf_class": "NA",
-        "pH": "NA",
+        "pH": 5,
         "pH_class": "very strongly acid",
         "eff_class": "NA",
         "distinctness": "clear",

diff --git a/inst/extdata/OSD/G/GRAFEN.json b/inst/extdata/OSD/G/GRAFEN.json
@@ -110,7 +110,7 @@
         "moist_rupture": "friable",
         "coherence": "NA",
         "cf_class": "extremely stony",
-        "pH": "NA",
+        "pH": 7,
         "pH_class": "neutral",
         "eff_class": "NA",
         "distinctness": "clear",

diff --git a/inst/extdata/OSD/H/HEREFORD.json b/inst/extdata/OSD/H/HEREFORD.json
@@ -133,7 +133,7 @@
         "moist_rupture": "friable",
         "coherence": "NA",
         "cf_class": "NA",
-        "pH": "NA",
+        "pH": 8,
         "pH_class": "moderately alkaline",
         "eff_class": "noneffervescent",
         "distinctness": "clear",

diff --git a/inst/extdata/OSD/H/HIVAL.json b/inst/extdata/OSD/H/HIVAL.json
@@ -110,7 +110,7 @@
         "moist_rupture": "friable",
         "coherence": "NA",
         "cf_class": "NA",
-        "pH": "NA",
+        "pH": 8,
         "pH_class": "moderately alkaline",
         "eff_class": "NA",
         "distinctness": "clear",

diff --git a/inst/extdata/OSD/M/MARINEPARK.json b/inst/extdata/OSD/M/MARINEPARK.json
@@ -87,7 +87,7 @@
         "moist_rupture": "friable",
         "coherence": "NA",
         "cf_class": "NA",
-        "pH": "NA",
+        "pH": 5,
         "pH_class": "very strongly acid",
         "eff_class": "NA",
         "distinctness": "clear",
@@ -110,7 +110,7 @@
         "moist_rupture": "friable",
         "coherence": "NA",
         "cf_class": "gravelly",
-        "pH": "NA",
+        "pH": 5,
         "pH_class": "very strongly acid",
         "eff_class": "NA",
         "distinctness": "clear",

diff --git a/inst/extdata/OSD/M/MECCAPASS.json b/inst/extdata/OSD/M/MECCAPASS.json
@@ -156,7 +156,7 @@
         "moist_rupture": "friable",
         "coherence": "NA",
         "cf_class": "extremely gravelly",
-        "pH": "NA",
+        "pH": 8,
         "pH_class": "moderately alkaline",
         "eff_class": "violently effervescent",
         "distinctness": "clear",

diff --git a/inst/extdata/OSD/R/RIRIE.json b/inst/extdata/OSD/R/RIRIE.json
@@ -225,7 +225,7 @@
         "moist_rupture": "friable",
         "coherence": "NA",
         "cf_class": "NA",
-        "pH": "NA",
+        "pH": 9,
         "pH_class": "very strongly alkaline",
         "eff_class": "strongly effervescent",
         "distinctness": "NA",

diff --git a/inst/extdata/OSD/T/TUFFIT.json b/inst/extdata/OSD/T/TUFFIT.json
@@ -133,7 +133,7 @@
         "moist_rupture": "friable",
         "coherence": "NA",
         "cf_class": "NA",
-        "pH": "NA",
+        "pH": 9,
         "pH_class": "NA",
         "eff_class": "NA",
         "distinctness": "NA",

diff --git a/inst/extdata/OSD/T/TURPIN.json b/inst/extdata/OSD/T/TURPIN.json
@@ -179,7 +179,7 @@
         "moist_rupture": "NA",
         "coherence": "NA",
         "cf_class": "NA",
-        "pH": "NA",
+        "pH": 10,
         "pH_class": "very strongly alkaline",
         "eff_class": "violently effervescent",
         "distinctness": "NA",

diff --git a/inst/extdata/OSD/T/TWICK.json b/inst/extdata/OSD/T/TWICK.json
@@ -87,7 +87,7 @@
         "moist_rupture": "firm",
         "coherence": "NA",
         "cf_class": "cobbly",
-        "pH": "NA",
+        "pH": 8,
         "pH_class": "moderately alkaline",
         "eff_class": "slightly effervescent",
         "distinctness": "abrupt",

diff --git a/inst/extdata/OSD/V/VYLACH.json b/inst/extdata/OSD/V/VYLACH.json
@@ -156,7 +156,7 @@
         "moist_rupture": "firm",
         "coherence": "strongly cemented",
         "cf_class": "NA",
-        "pH": "NA",
+        "pH": 8,
         "pH_class": "moderately alkaline",
         "eff_class": "NA",
         "distinctness": "abrupt",