diff --git a/schemas/data/src/addition/CharacteristicName.json b/schemas/data/src/addition/CharacteristicName.json index ad43569..fed39a3 100644 --- a/schemas/data/src/addition/CharacteristicName.json +++ b/schemas/data/src/addition/CharacteristicName.json @@ -2,6 +2,7 @@ "2,4- & 2,5-Dichlorophenol", "2,3,4,5- & 2,3,5,6- Tetrachlorophenol", "3-Pyridinecarboxamide, N-(2,4-difluorophenyl)-2-[3-(trifluoromethyl)phenoxy]-", + "4-Hydroxy-chlorothalonil", "Ammonia, un-ionized", "BDE-049", "BDE-071", diff --git a/schemas/data/src/addition/MeasurementUnit.json b/schemas/data/src/addition/MeasurementUnit.json index 4719b77..8acae84 100644 --- a/schemas/data/src/addition/MeasurementUnit.json +++ b/schemas/data/src/addition/MeasurementUnit.json @@ -1,5 +1,6 @@ [ "per mil AIR", + "per mil NIST SRM 951a", "per mil VCDT", "per mil VPDB", "per mil VSMOW", diff --git a/schemas/data/src/addition/MethodSpeciation.json b/schemas/data/src/addition/MethodSpeciation.json index 0952f8c..3e2f4e6 100644 --- a/schemas/data/src/addition/MethodSpeciation.json +++ b/schemas/data/src/addition/MethodSpeciation.json @@ -1,5 +1,6 @@ [ "as Unspecified", + "of B", "of CH4", "of CO2", "of H2O", diff --git a/schemas/data/src/addition/ResultAnalyticalMethodContext.json b/schemas/data/src/addition/ResultAnalyticalMethodContext.json index c2b85c7..e399d2f 100644 --- a/schemas/data/src/addition/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/addition/ResultAnalyticalMethodContext.json @@ -5,6 +5,7 @@ "Oakton", "ON MECP", "PROPRIETARY", + "REED", "RBR", "Seal", "Solinst", diff --git a/schemas/data/src/locales/en-CA.ftl b/schemas/data/src/locales/en-CA.ftl index 3ef39d9..28fa911 100644 --- a/schemas/data/src/locales/en-CA.ftl +++ b/schemas/data/src/locales/en-CA.ftl @@ -110,15 +110,17 @@ qc-CharacteristicName-pH-ActivityType-Sample = The CharacteristicName "pH" canno qc-CharacteristicName-ResultAnalyticalMethodName = ResultAnalyticalMethodName is required for this data type. Please use that field to describe how ice-on and/or ice-off are defined qc-MonitoringLocationCoordinate-BoundingBox = Monitoring Location Latitude/Longitude is outside DataStream boundary -qc-ResultAnalyticalMethodContext-YSI-ActivityType = The ActivityType may not be appropriate for this ResultAnalyticalMethodContext. When ResultAnalyticalMethodContext is 'YSI', a field measurement is expected (e.g., ActivityType 'Field Msr/Obs-Portable Data Logger') +qc-ResultAnalyticalMethodContext-YSI-ActivityType = The ActivityType may not be appropriate for this ResultAnalyticalMethodContext. The selected ResultAnalyticalMethodContext is typically used in the field (e.g., ActivityType 'Field Msr/Obs-Portable Data Logger') qc-ResultDetectionQuantitationLimitMinimumMeasure-Minimum = ResultDetectionQuantitationLimitMeasure should not be below zero for the selected ResultDetectionQuantitationLimitUnit # qc-MonitoringLocationType-ActivityDepthHeightMeasure-Minimum = Depth should not exceed the maximum depth associated with the selected MonitoringLocationType (i.e. River/stream, Lake/pond) qc-ResultDetectionQuantitationLimitUnit-None = The unit for the CharacteristicName should be None +qc-CharacteristicName-Ratio-ResultDetectionQuantitationLimitUnit-None = The unit for the CharacteristicName should be None qc-ResultDetectionQuantitationLimitUnit-NoValue = ResultDetectionQuantitationLimitUnit is not needed when ResultDetectionQuantitationLimitMeasure is not populated qc-ResultDetectionQuantitationLimitUnit-Turbidity = ResultUnit should be used with CharacteristicName 'Turbidity' qc-ResultSampleFraction-ActivityMediaName-Sediment = If a sequential extraction was performed on a water sample, or particulates in a water sample, information regarding the reagents used should be indicated in the ResultComment, not the ResultSampleFraction. For guidance on how to select ResultSampleFraction in this case, please refer to our Best practices for submitting metal-series data to DataStream (https://datastream.org/en-ca/documentation/metal-series-data-guidance) # qc-ResultUnit-Elevation = The unit for the CharacteristicName should be an elevation. ** TODO: MASL not a unit, needs to be added to QC rule lists qc-ResultUnit-None = The unit for the CharacteristicName should be None +qc-CharacteristicName-Ratio-ResultUnit-None = The unit for the CharacteristicName should be None qc-ResultUnit-NoValue = ResultUnit is not needed when ResultValue is not populated qc-ResultUnit-Percent = The unit for the CharacteristicName is typically expressed as a % qc-ResultUnit-Turbidity = ResultUnit should be used with CharacteristicName 'Turbidity' diff --git a/schemas/data/src/logic/CharacteristicName-ResultSampleFraction.json b/schemas/data/src/logic/CharacteristicName-ResultSampleFraction.json index 8a0fa00..5ea52ce 100644 --- a/schemas/data/src/logic/CharacteristicName-ResultSampleFraction.json +++ b/schemas/data/src/logic/CharacteristicName-ResultSampleFraction.json @@ -17,6 +17,7 @@ "Ammonium", "Antimony", "Arsenic", + "Arsenite and Arsenate (Inorganic arsenic)", "Barium", "Beryllium", "Bismuth", diff --git a/schemas/data/src/quality-control/CharacteristicName-Metal-ResultSampleFraction.json b/schemas/data/src/quality-control/CharacteristicName-Metal-ResultSampleFraction.json index a977b17..882417c 100644 --- a/schemas/data/src/quality-control/CharacteristicName-Metal-ResultSampleFraction.json +++ b/schemas/data/src/quality-control/CharacteristicName-Metal-ResultSampleFraction.json @@ -12,6 +12,7 @@ "Aluminum", "Antimony", "Arsenic", + "Arsenite and Arsenate (Inorganic arsenic)", "Barium", "Beryllium", "Bismuth", diff --git a/schemas/data/src/quality-control/CharacteristicName-MethodSpeciation.json b/schemas/data/src/quality-control/CharacteristicName-MethodSpeciation.json index c710772..3126687 100644 --- a/schemas/data/src/quality-control/CharacteristicName-MethodSpeciation.json +++ b/schemas/data/src/quality-control/CharacteristicName-MethodSpeciation.json @@ -15,8 +15,11 @@ "Ammonia and ammonium", "Ammonia, un-ionized", "Ammonium", + "Bicarbonate", + "Calcium carbonate", "Carbon-13", "Carbon-13/Carbon-12 ratio", + "Carbonate", "delta carbon-13/carbon-12", "Delta nitrogen-15/nitrogen-14", "Delta oxygen-17/oxygen-16", @@ -25,6 +28,7 @@ "Deuterium", "Deuterium, delta", "Deuterium/Hydrogen ratio", + "Hydroxide", "Inorganic nitrogen (ammonia, nitrate and nitrite)", "Inorganic nitrogen (nitrate and nitrite)", "Kjeldahl nitrogen", @@ -39,6 +43,8 @@ "Oxygen-18/Oxygen-16 ratio", "Phosphorus, hydrolyzable", "Soluble Reactive Phosphorus (SRP)", + "Sulfate", + "Sulfide", "Sulfur-34", "Sulfur-34/Sulfur-32 ratio", "Total Nitrogen, mixed forms", diff --git a/schemas/data/src/quality-control/CharacteristicName-Ratio-ResultDetectionQuantitationLimitUnit-None.json b/schemas/data/src/quality-control/CharacteristicName-Ratio-ResultDetectionQuantitationLimitUnit-None.json new file mode 100644 index 0000000..1b2eddd --- /dev/null +++ b/schemas/data/src/quality-control/CharacteristicName-Ratio-ResultDetectionQuantitationLimitUnit-None.json @@ -0,0 +1,40 @@ +{ + "$id": "https://datastream.org/schema/data/quality-control/CharacteristicName-Ratio-ResultDetectionQuantitationLimitUnit-None.json", + "title": "CharacteristicName-Ratio-ResultDetectionQuantitationLimitUnit-None", + "description": "Ratio Characteristics that require None as unit.", + "errorMessage": "qc-CharacteristicName-Ratio-ResultDetectionQuantitationLimitUnit-None", + "if": { + "type": "object", + "unevaluatedProperties": true, + "properties": { + "CharacteristicName": { + "enum": [ + "Coliform/Streptococcus ratio, fecal", + "Anion/cation ratio", + "Cation/anion ratio", + "Sodium adsorption ratio [(Na)/(sq root of 1/2 Ca + Mg)]", + "Spectral slope ratio", + "Uranium-234/Uranium-238 ratio", + "Carbon-13/Carbon-12 ratio", + "Deuterium/Hydrogen ratio", + "Nitrogen-15/Nitrogen-14 ratio", + "Oxygen-18/Oxygen-16 ratio", + "Strontium-87/Strontium-86, ratio", + "Sulfur-34/Sulfur-32 ratio" + ] + }, + "ResultDetectionQuantitationLimitMeasure": true + }, + "required": ["CharacteristicName", "ResultDetectionQuantitationLimitMeasure"] + }, + "then": { + "type": "object", + "unevaluatedProperties": true, + "properties": { + "ResultDetectionQuantitationLimitUnit": { + "enum": ["None"] + } + }, + "required": ["ResultDetectionQuantitationLimitUnit"] + } +} diff --git a/schemas/data/src/quality-control/CharacteristicName-Ratio-ResultUnitNone.json b/schemas/data/src/quality-control/CharacteristicName-Ratio-ResultUnitNone.json new file mode 100644 index 0000000..dd9cf9b --- /dev/null +++ b/schemas/data/src/quality-control/CharacteristicName-Ratio-ResultUnitNone.json @@ -0,0 +1,40 @@ +{ + "$id": "https://datastream.org/schema/data/quality-control/CharacteristicName-Ratio-ResultUnit-None.json", + "title": "CharacteristicName-Ratio-ResultUnit-None", + "description": "Ratio Characteristics that require None as unit.", + "errorMessage": "qc-CharacteristicName-Ratio-ResultUnit-None", + "if": { + "type": "object", + "unevaluatedProperties": true, + "properties": { + "CharacteristicName": { + "enum": [ + "Coliform/Streptococcus ratio, fecal", + "Anion/cation ratio", + "Cation/anion ratio", + "Sodium adsorption ratio [(Na)/(sq root of 1/2 Ca + Mg)]", + "Spectral slope ratio", + "Uranium-234/Uranium-238 ratio", + "Carbon-13/Carbon-12 ratio", + "Deuterium/Hydrogen ratio", + "Nitrogen-15/Nitrogen-14 ratio", + "Oxygen-18/Oxygen-16 ratio", + "Strontium-87/Strontium-86, ratio", + "Sulfur-34/Sulfur-32 ratio" + ] + }, + "ResultValue": true + }, + "required": ["CharacteristicName", "ResultValue"] + }, + "then": { + "type": "object", + "unevaluatedProperties": true, + "properties": { + "ResultUnit": { + "enum": ["None"] + } + }, + "required": ["ResultUnit"] + } +} diff --git a/schemas/data/src/quality-control/ResultAnalyticalMethodContext-YSI-ActivityType.json b/schemas/data/src/quality-control/ResultAnalyticalMethodContext-YSI-ActivityType.json index bc26744..ed093f5 100644 --- a/schemas/data/src/quality-control/ResultAnalyticalMethodContext-YSI-ActivityType.json +++ b/schemas/data/src/quality-control/ResultAnalyticalMethodContext-YSI-ActivityType.json @@ -8,7 +8,20 @@ "unevaluatedProperties": true, "properties": { "ResultAnalyticalMethodContext": { - "enum": ["YSI"] + "enum": [ + "HACH", + "HANNA", + "HOBO", + "Hydrolab", + "LaMOTTE", + "METER Group", + "Oakton", + "RBR", + "REED", + "Solinst", + "Turner Designs", + "YSI" + ] } }, "required": ["ResultAnalyticalMethodContext"] @@ -21,6 +34,7 @@ "enum": [ "Field Msr/Obs", "Field Msr/Obs-Portable Data Logger", + "Field Msr/Obs-Continuous Time Series", "Quality Control Field Msr/Obs Post-Calibration", "Quality Control Field Msr/Obs Pre-Calibration", "Quality Control Field Replicate Msr/Obs", diff --git a/schemas/data/src/subset/CharacteristicName.json b/schemas/data/src/subset/CharacteristicName.json index d2c9142..ad09c33 100644 --- a/schemas/data/src/subset/CharacteristicName.json +++ b/schemas/data/src/subset/CharacteristicName.json @@ -240,6 +240,7 @@ "Arsenic-75", "Arsenic", "Arsenite", + "Arsenite and Arsenate (Inorganic arsenic)", "Arsonium, (carboxymethyl)trimethyl-, inner salt", "Aspartame", "Aspirin", @@ -504,6 +505,7 @@ "Copper-63", "Copper-65", "Copper", + "Corrosion & scaling control, Ryznar Stability Index", "Cotinine", "Crufomate", "Cryptosporidium", @@ -533,6 +535,7 @@ "Decanoic acid, 4,4,5,5,6,6,7,7,8,8,9,9,10,10,10-pentadecafluoro-", "Dehydroabietic acid", "delta carbon-13/carbon-12", + "Delta boron-11/boron-10", "Delta nitrogen-15/nitrogen-14", "Delta oxygen-17/oxygen-16", "Delta oxygen-18/oxygen-16", @@ -642,6 +645,7 @@ "Etrimfos", "Europium", "Extractable hydrocarbons", + "Extractable hydrocarbons, C8 and up", "Famoxadone", "Fecal Coliform", "Fecal Streptococcus Group Bacteria", @@ -1276,6 +1280,7 @@ "Thiocyanate", "Thiophanate Methyl", "Thiram", + "Thorium-230", "Thorium-232", "Thorium", "Tin-118", diff --git a/schemas/data/src/subset/MeasurementUnit.json b/schemas/data/src/subset/MeasurementUnit.json index d2ab219..0ab3be6 100644 --- a/schemas/data/src/subset/MeasurementUnit.json +++ b/schemas/data/src/subset/MeasurementUnit.json @@ -83,6 +83,7 @@ "PCU", "per mil", "per mil AIR", + "per mil NIST SRM 951a", "per mil VCDT", "per mil VPDB", "per mil VSMOW", diff --git a/schemas/data/src/subset/MethodSpeciation.json b/schemas/data/src/subset/MethodSpeciation.json index adbee26..a0813c5 100644 --- a/schemas/data/src/subset/MethodSpeciation.json +++ b/schemas/data/src/subset/MethodSpeciation.json @@ -35,6 +35,7 @@ "as SO4", "as U3O8", "as Unspecified", + "of B", "of CH4", "of CO2", "of H2O", diff --git a/schemas/data/src/subset/MonitoringLocationHorizontalCoordinateReferenceSystem.json b/schemas/data/src/subset/MonitoringLocationHorizontalCoordinateReferenceSystem.json new file mode 100644 index 0000000..941b721 --- /dev/null +++ b/schemas/data/src/subset/MonitoringLocationHorizontalCoordinateReferenceSystem.json @@ -0,0 +1,7 @@ +[ + "NAD27", + "NAD83", + "UNKWN", + "WGS72", + "WGS84" +] \ No newline at end of file diff --git a/schemas/data/src/subset/ResultAnalyticalMethodContext.json b/schemas/data/src/subset/ResultAnalyticalMethodContext.json index 2475551..a99a860 100644 --- a/schemas/data/src/subset/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/subset/ResultAnalyticalMethodContext.json @@ -27,6 +27,7 @@ "ON MECP", "PALINTEST LTD", "PROPRIETARY", + "REED", "RBR", "Seal", "Solinst",