Merge pull request #490 from StoXProject/develop

Develop

Author: arnejohannesholmin

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: RstoxData
-Version: 2.2.0-9011
-Date: 2026-01-23
+Version: 2.2.0
+Date: 2026-01-29
 Title: Tools to Read and Manipulate Fisheries Data
 Authors@R: c(
   person(given = "Arne Johannes", 

R/DefineAndUpdateVariables.R

@@ -312,6 +312,8 @@ translateVariables <- function(
 
 
 	# Do the translations:
+	
+	# For lists of lists use two loops (one for and one lapply):
 	if(!data.table::is.data.table(data[[1]])) {
 		for(ind in seq_along(data)) {
 

R/RstoxData-package.R

@@ -11,43 +11,41 @@
 # Global variables
 utils::globalVariables(c(
 	 ".", "..Country", "..Organisation", "..SurveyName", "..atResolution", "..attribsNames",
-	 "..colList", "..columns", "..groupingVariables", "..keep", "..keys", "..parameterNames",
-	 "..relevantColumns", "..replacement", "..simpletags", "..sourceColumns",
-	 "..targetAndSourceVariables", "..toKeep", "..valueVariablesInTranslation", "..varToExtract",
-	 "..variableKeys", "..variablesInTable", "..x", "AcousticCategory", "Addition",
+	 "..colList", "..columns", "..groupingVariables", "..keep", "..keys", "..relevantColumns",
+	 "..simpletags", "..sourceColumns", "..toKeep", "..valueVariablesInTranslation",
+	 "..varToExtract", "..variableKeys", "..variablesInTable", "..x", "AcousticCategory",
 	 "AphiaIDPredator", "AphiaIDPrey", "BeamKey", "Channel", "ChannelDepthLower",
-	 "ChannelDepthUpper", "ChannelReferenceKey", "ChannelReferenceType", "Constant", "Count",
-	 "Country", "Cruise", "CruiseKey", "DataValue", "DateTime", "Day", "DigestionStage", "DoorType",
-	 "EDSU", "EchoType", "EffectiveTowDistance", "FishID", "Frequency", "Gear", "GearExceptions",
+	 "ChannelDepthUpper", "ChannelReferenceKey", "ChannelReferenceType", "Count", "Country",
+	 "Cruise", "CruiseKey", "DataValue", "DateTime", "Day", "DigestionStage", "DoorType", "EDSU",
+	 "EchoType", "EffectiveTowDistance", "FishID", "Frequency", "Gear", "GearExceptions",
 	 "GravMethod", "HaulNo", "HaulNumber", "ID", "IdentMet", "LengthClass", "LengthCode", "LocalID",
 	 "LogKey", "Month", "N", "NewValue", "Notes", "Number", "NumberAtLength",
 	 "NumberOfIndividualsToGenerate", "NumberOfSampledIndividuals", "Platform", "PreySequence",
-	 "Quarter", "ResolutionCode", "SaCategory", "Scaling", "Ship", "SpeciesCategoryNumber",
-	 "SpeciesCategoryWeight", "SpeciesCode", "SpeciesValidity", "StationNumber",
-	 "StatisticalRectangle", "StomachFullness", "SubFactor", "SubsampleWeight", "SubsampledNumber",
-	 "Survey", "SweepLength", "Time", "TotalCount", "TransducerOrientation", "Value",
-	 "VariableName", "Weight", "WeightMeasurement", "Year", "acocat", "age", "agingstructure",
-	 "aphia", "bottomdepthstart", "catchsampleid", "bottomdepthstop", "catCatchWgt", "catchcount",
-	 "catchpartnumber", "catchproducttype", "catchweight", "ch", "cruise", "currentReportingUnit",
-	 "direction", "distance", "fishingdepthcount", "fishingdepthmax", "fishingdepthmin", "freq",
-	 "gear", "gearflow", "i.replace_number", "inapplicableFormats", "individualweight",
-	 "integrator_dist", "interval", "iskey", "lat_start", "lat_stop", "latitudeend",
-	 "latitudestart", "lengthCode", "lengthintervalcount", "lengthintervalstart",
-	 "lengthmeasurement", "lengthresolution", "lengthsamplecount", "lengthsampleweight", "level",
-	 "liverweight", "lngtClass", "lngtCode", "log_start", "logstart", "lon_start", "lon_stop",
-	 "longitudeend", "longitudestart", "lsCountTot", "maturity", "maxFishID", "max_bot_depth",
-	 "meanW", "missionstartdate", "missionstopdate", "nInd", "nation", "newClass", "newLngtCode",
-	 "newLngtCodeNumeric", "newReportingUnit", "noMeas", "parasite", "pel_ch_thickness", "platform",
-	 "platformname", "preferredagereading", "preycategory", "preydigestion", "preyforeignobject",
-	 "preylengthid", "preysampleid", "readability", "reportingUnit", "res", "sa", "sampleFac",
-	 "serialnumber", "sex", "shortname", "specialstage", "specimenid", "start_time", "startyear",
-	 "station", "stationstartdate", "stationstarttime", "stationstopdate", "stationstoptime",
-	 "stomach", "stomachfillfield", "stomachweight", "stoxBioticObject", "subFactor", "subWeight",
-	 "suffixes", "sum_sa.x", "sum_sa.y", "sweeplength", "tagid", "tagtype", "target", "threshold",
-	 "tissuesample", "totalNo", "totalweight", "transceiver", "translationListOne", "trawldoorarea",
-	 "trawldoorspread", "trawldoortype", "trawldoorweight", "variableToTranslate",
-	 "verticaltrawlopening", "vesselspeed", "weightresolution", "winddirection", "windspeed",
-	 "wingspread", "wiredensity", "wirediameter", "wirelength", "xsdObjects"))
+	 "Quarter", "ResolutionCode", "SaCategory", "Ship", "SpeciesCategoryNumber",
+	 "SpeciesCategoryWeight", "SpeciesValidity", "StationNumber", "StatisticalRectangle",
+	 "StomachFullness", "SubFactor", "SubsampleWeight", "SubsampledNumber", "SweepLength", "Time",
+	 "TotalCount", "TransducerOrientation", "Value", "VariableName", "WeightMeasurement", "Year",
+	 "acocat", "age", "agingstructure", "aphia", "bottomdepthstart", "bottomdepthstop",
+	 "catCatchWgt", "catchcount", "catchpartnumber", "catchproducttype", "catchsampleid",
+	 "catchweight", "ch", "cruise", "currentReportingUnit", "direction", "distance",
+	 "fishingdepthcount", "fishingdepthmax", "fishingdepthmin", "freq", "gear", "gearflow",
+	 "i.replace_number", "inapplicableFormats", "individualweight", "integrator_dist", "iskey",
+	 "lat_start", "lat_stop", "latitudeend", "latitudestart", "lengthCode", "lengthintervalcount",
+	 "lengthintervalstart", "lengthmeasurement", "lengthresolution", "lengthsamplecount",
+	 "lengthsampleweight", "level", "liverweight", "lngtClass", "lngtCode", "log_start", "logstart",
+	 "lon_start", "lon_stop", "longitudeend", "longitudestart", "lsCountTot", "maturity",
+	 "maxFishID", "max_bot_depth", "meanW", "missionstartdate", "missionstopdate", "nInd", "nation",
+	 "newClass", "newLngtCode", "newLngtCodeNumeric", "newReportingUnit", "noMeas", "parasite",
+	 "pel_ch_thickness", "platform", "platformname", "preferredagereading", "preycategory",
+	 "preydigestion", "preyforeignobject", "preylengthid", "preysampleid", "readability",
+	 "reportingUnit", "res", "sa", "sampleFac", "serialnumber", "sex", "shortname", "specialstage",
+	 "specimenid", "start_time", "startyear", "station", "stationstartdate", "stationstarttime",
+	 "stationstopdate", "stationstoptime", "stomach", "stomachfillfield", "stomachweight",
+	 "stoxBioticObject", "subFactor", "subWeight", "sum_sa.x", "sum_sa.y", "sweeplength", "tagid",
+	 "tagtype", "target", "threshold", "tissuesample", "totalNo", "totalweight", "transceiver",
+	 "trawldoorarea", "trawldoorspread", "trawldoortype", "trawldoorweight", "verticaltrawlopening",
+	 "vesselspeed", "winddirection", "windspeed", "wingspread", "wiredensity", "wirediameter",
+	 "wirelength", "xsdObjects"))
 
 .onLoad <- function(libname, pkgname) {
 	# Initiate the RstoxData environment: