diff --git a/DESCRIPTION b/DESCRIPTION index 159925f2..2874b4e9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: RstoxBase -Version: 2.2.0-9009 -Date: 2026-01-24 +Version: 2.2.0 +Date: 2026-01-29 Title: Base StoX Functions Authors@R: c( person(given = "Arne Johannes", @@ -47,7 +47,7 @@ Imports: jsonlite (>= 1.6), lwgeom (>= 0.2-0), maps (>= 0.2-0), - RstoxData (>= 2.2.0-9011), + RstoxData (>= 2.2.0), sf (>= 0.9.0), stringi (>= 1.4.0), units (>= 0.7), diff --git a/R/RstoxBase-package.R b/R/RstoxBase-package.R index dd1bfda4..72edf8af 100644 --- a/R/RstoxBase-package.R +++ b/R/RstoxBase-package.R @@ -10,15 +10,15 @@ # Global variables utils::globalVariables(c( - ".", ".data", "..Cruise", "..DateTime", "..DensityType", "..FileGroupingVariables", - "..TrackGroupingVariables", "..Hauls", "..LengthDistributionType", - "..SpeciesCategoryCatchType", "..VerticalResolutionMax", "..VerticalResolutionMin", - "..WeightingFactors", "..acceptedColumns", "..atMissingLengthGroup", "..by", "..cols", - "..columnNames", "..columnsToKeep", "..endNames", "..extract", "..extractFromDataCopy", - "..haulGrouping", "..idCol", "..keys", "..keysSansSample", "..lengthInterval", - "..lengthIntervalWidths", "..lengthVar", "..locatedStratum", "..meanBy", "..paddingVariables", + ".", "..Cruise", "..DateTime", "..DensityType", "..FileGroupingVariables", "..Hauls", + "..LengthDistributionType", "..SpeciesCategoryCatchType", "..TrackGroupingVariables", + "..VerticalResolutionMax", "..VerticalResolutionMin", "..WeightingFactors", + "..acceptedColumns", "..atMissingLengthGroup", "..by", "..cols", "..columnNames", + "..columnsToKeep", "..endNames", "..extract", "..extractFromDataCopy", "..haulGrouping", + "..idCol", "..keys", "..keysSansSample", "..lengthInterval", "..lengthIntervalWidths", + "..lengthVar", "..locatedStratum", "..meanBy", "..paddingVariables", "..presentResolutionVariables", "..refvar", "..resolutionVar", "..startNames", "..sumBy", - "..tomerge", "..variablesToGetFromQuantityData", "..vars", "..x1y1x2y2", "Abundance", + "..tomerge", "..variablesToGetFromQuantityData", "..vars", "..x1y1x2y2", ".data", "Abundance", "AcousticCategory", "AcousticCategoryKey", "Area", "Beam", "BeamKey", "Biomass", "CatchFractionNumber", "CatchFractionWeight", "Channel", "ChannelReferenceDepth", "ChannelReferenceKey", "ChannelReferenceTilt", "ChannelReferenceType", "Coverage", "Cruise", @@ -32,20 +32,20 @@ utils::globalVariables(c( "LongitudeEnd", "LongitudeStart", "MaxChannelDepth", "MaxChannelRange", "MeanNASCWeight", "MiddleDateTime", "MinChannelDepth", "MinChannelRange", "NASCKey", "NASCWeight", "PSU", "PreySpeciesCategoryCatchWeightingFactor", "ReplaceIndividual", "ReplaceIndividualIndex", - "ReplaceLevel", "ReplaceStratumLayerIndividual", "ReplaceStratumLayerIndividualIndex", - "RuterNavn", "SSU", "SSUIndex", "Sample", "SampleNumber", "SampleWeight", "SegmentType", - "SpeciesCategory", "SpeciesCategoryCatchWeight", "Speed", "SplitAcousticCategory", - "StartDateTime", "Station", "StationLevel", "StopDateTime", "Stratum", - "StratumLayerIndividual", "StratumLayerIndividualIndex", "StratumName", "StratumPolygon", - "SummedWeights", "Survey", "SweepWidth", "TargetStrength", "TargetStrength0", - "TargetStrengthFunction", "TempLengthGroupUsedInSuperIndividuals", "TotalLength", "Transect", - "V1", "WeightedNumber", "WeightingFactor", "X", "Y", "approx", "area", "area_hole", - "assignmentID", "assignmentPasted", "backscatteringCrossSection", "cov", "crossSection", - "distance", "haulWeightFactor", "head", "imputeSeed", "includeintotal", "individualNumber", - "individualWeightFactor", "inside", "insideRadius", "intervalIndex", "km", - "midIndividualTotalLength", "minDistance", "missingAssignment", "missingSpecies", - "numberOfBeams", "numberOfIndividuals", "numberOfSubSamples", "polygonAreaSP_simple", - "raisingFactor", "representativeBackscatteringCrossSection", + "ReplaceLevel", "ReplaceStratumLayerIndividual", "ReplaceStratumLayerIndividualIndex", "SSU", + "SSUIndex", "Sample", "SampleNumber", "SampleWeight", "SegmentType", "SpeciesCategory", + "SpeciesCategoryCatchWeight", "Speed", "SplitAcousticCategory", "StartDateTime", "Station", + "StationLevel", "StopDateTime", "Stratum", "StratumLayerIndividual", + "StratumLayerIndividualIndex", "StratumName", "StratumPolygon", "SummedWeights", "Survey", + "SweepWidth", "TargetStrength", "TargetStrength0", "TargetStrengthFunction", + "TempLengthGroupUsedInSuperIndividuals", "TotalLength", "Transect", "V1", "WeightedNumber", + "WeightingFactor", "X", "Y", "approx", "area", "area_hole", "assignmentID", "assignmentPasted", + "backscatteringCrossSection", "cov", "crossSection", "distance", "haulWeightFactor", "head", + "imputeSeed", "includeintotal", "individualNumber", "individualWeightFactor", "inside", + "insideRadius", "intervalIndex", "km", "midIndividualTotalLength", "minDistance", + "missingAssignment", "missingSpecies", "numberOfBeams", "numberOfIndividuals", + "numberOfSubSamples", "polygonAreaSP_simple", "raisingFactor", + "representativeBackscatteringCrossSection", "representativeBackscatteringCrossSectionNormalized", "runif", "setUnit", "sumArea", "sumIndividualWeightFactor", "sumWeightedNumber", "temporary_denominator_column_name", "temporary_numerator_column_name", "x", "y")) diff --git a/inst/extdata/functionArguments.rds b/inst/extdata/functionArguments.rds index e85af504..6fb6679a 100644 Binary files a/inst/extdata/functionArguments.rds and b/inst/extdata/functionArguments.rds differ