Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Commit

Permalink
get rid of commented out code, addressing #33
Browse files Browse the repository at this point in the history
  • Loading branch information
@hettling
hettling committed Dec 11, 2018
1 parent 56e8dae commit 272383a
Show file tree
Hide file tree
Showing 55 changed files with 4 additions and 1,267 deletions.
2 changes: 0 additions & 2 deletions R/Agent.r
View file
Expand Up @@ -94,8 +94,6 @@ Agent <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(AgentList)
# self[["agentText"]] <-
# AgentList[["agentText"]]
invisible(self)
}
)
Expand Down
4 changes: 0 additions & 4 deletions R/AssociatedTaxon.r
View file
Expand Up @@ -110,10 +110,6 @@ AssociatedTaxon <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(AssociatedTaxonList)
# self[["name"]] <-
# AssociatedTaxonList[["name"]]
# self[["relationType"]] <-
# AssociatedTaxonList[["relationType"]]
invisible(self)
}
)
Expand Down
30 changes: 0 additions & 30 deletions R/BioStratigraphy.r
View file
Expand Up @@ -314,36 +314,6 @@ BioStratigraphy <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(BioStratigraphyList)
# self[["youngBioDatingQualifier"]] <-
# BioStratigraphyList[["youngBioDatingQualifier"]]
# self[["youngBioName"]] <-
# BioStratigraphyList[["youngBioName"]]
# self[["youngFossilZone"]] <-
# BioStratigraphyList[["youngFossilZone"]]
# self[["youngFossilSubZone"]] <-
# BioStratigraphyList[["youngFossilSubZone"]]
# self[["youngBioCertainty"]] <-
# BioStratigraphyList[["youngBioCertainty"]]
# self[["youngStratType"]] <-
# BioStratigraphyList[["youngStratType"]]
# self[["bioDatingQualifier"]] <-
# BioStratigraphyList[["bioDatingQualifier"]]
# self[["bioPreferredFlag"]] <-
# BioStratigraphyList[["bioPreferredFlag"]]
# self[["rangePosition"]] <-
# BioStratigraphyList[["rangePosition"]]
# self[["oldBioName"]] <-
# BioStratigraphyList[["oldBioName"]]
# self[["bioIdentifier"]] <-
# BioStratigraphyList[["bioIdentifier"]]
# self[["oldFossilzone"]] <-
# BioStratigraphyList[["oldFossilzone"]]
# self[["oldFossilSubzone"]] <-
# BioStratigraphyList[["oldFossilSubzone"]]
# self[["oldBioCertainty"]] <-
# BioStratigraphyList[["oldBioCertainty"]]
# self[["oldBioStratType"]] <-
# BioStratigraphyList[["oldBioStratType"]]
invisible(self)
}
)
Expand Down
52 changes: 0 additions & 52 deletions R/ChronoStratigraphy.r
View file
Expand Up @@ -490,58 +490,6 @@ ChronoStratigraphy <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(ChronoStratigraphyList)
# self[["youngRegionalSubstage"]] <-
# ChronoStratigraphyList[["youngRegionalSubstage"]]
# self[["youngRegionalStage"]] <-
# ChronoStratigraphyList[["youngRegionalStage"]]
# self[["youngRegionalSeries"]] <-
# ChronoStratigraphyList[["youngRegionalSeries"]]
# self[["youngDatingQualifier"]] <-
# ChronoStratigraphyList[["youngDatingQualifier"]]
# self[["youngInternSystem"]] <-
# ChronoStratigraphyList[["youngInternSystem"]]
# self[["youngInternSubstage"]] <-
# ChronoStratigraphyList[["youngInternSubstage"]]
# self[["youngInternStage"]] <-
# ChronoStratigraphyList[["youngInternStage"]]
# self[["youngInternSeries"]] <-
# ChronoStratigraphyList[["youngInternSeries"]]
# self[["youngInternErathem"]] <-
# ChronoStratigraphyList[["youngInternErathem"]]
# self[["youngInternEonothem"]] <-
# ChronoStratigraphyList[["youngInternEonothem"]]
# self[["youngChronoName"]] <-
# ChronoStratigraphyList[["youngChronoName"]]
# self[["youngCertainty"]] <-
# ChronoStratigraphyList[["youngCertainty"]]
# self[["oldDatingQualifier"]] <-
# ChronoStratigraphyList[["oldDatingQualifier"]]
# self[["chronoPreferredFlag"]] <-
# ChronoStratigraphyList[["chronoPreferredFlag"]]
# self[["oldRegionalSubstage"]] <-
# ChronoStratigraphyList[["oldRegionalSubstage"]]
# self[["oldRegionalStage"]] <-
# ChronoStratigraphyList[["oldRegionalStage"]]
# self[["oldRegionalSeries"]] <-
# ChronoStratigraphyList[["oldRegionalSeries"]]
# self[["oldInternSystem"]] <-
# ChronoStratigraphyList[["oldInternSystem"]]
# self[["oldInternSubstage"]] <-
# ChronoStratigraphyList[["oldInternSubstage"]]
# self[["oldInternStage"]] <-
# ChronoStratigraphyList[["oldInternStage"]]
# self[["oldInternSeries"]] <-
# ChronoStratigraphyList[["oldInternSeries"]]
# self[["oldInternErathem"]] <-
# ChronoStratigraphyList[["oldInternErathem"]]
# self[["oldInternEonothem"]] <-
# ChronoStratigraphyList[["oldInternEonothem"]]
# self[["oldChronoName"]] <-
# ChronoStratigraphyList[["oldChronoName"]]
# self[["chronoIdentifier"]] <-
# ChronoStratigraphyList[["chronoIdentifier"]]
# self[["oldCertainty"]] <-
# ChronoStratigraphyList[["oldCertainty"]]
invisible(self)
}
)
Expand Down
4 changes: 0 additions & 4 deletions R/Crs.r
View file
Expand Up @@ -106,10 +106,6 @@ Crs <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(CrsList)
# self[["type"]] <-
# CrsList[["type"]]
# self[["properties"]] <-
# CrsList[["properties"]]
invisible(self)
}
)
Expand Down
22 changes: 0 additions & 22 deletions R/DefaultClassification.r
View file
Expand Up @@ -254,28 +254,6 @@ DefaultClassification <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(DefaultClassificationList)
# self[["kingdom"]] <-
# DefaultClassificationList[["kingdom"]]
# self[["phylum"]] <-
# DefaultClassificationList[["phylum"]]
# self[["className"]] <-
# DefaultClassificationList[["className"]]
# self[["order"]] <-
# DefaultClassificationList[["order"]]
# self[["superFamily"]] <-
# DefaultClassificationList[["superFamily"]]
# self[["family"]] <-
# DefaultClassificationList[["family"]]
# self[["genus"]] <-
# DefaultClassificationList[["genus"]]
# self[["subgenus"]] <-
# DefaultClassificationList[["subgenus"]]
# self[["specificEpithet"]] <-
# DefaultClassificationList[["specificEpithet"]]
# self[["infraspecificEpithet"]] <-
# DefaultClassificationList[["infraspecificEpithet"]]
# self[["infraspecificRank"]] <-
# DefaultClassificationList[["infraspecificRank"]]
invisible(self)
}
)
Expand Down
10 changes: 0 additions & 10 deletions R/Expert.r
View file
Expand Up @@ -125,16 +125,6 @@ Expert <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(ExpertList)
# self[["agentText"]] <-
# ExpertList[["agentText"]]
# self[["fullName"]] <-
# ExpertList[["fullName"]]
# self[["organization"]] <-
# Organization$new()$fromJSONString(
# jsonlite::toJSON(
# ExpertList[["organization"]],
# auto_unbox = TRUE),
# typeMapping = typeMapping)
invisible(self)
}
)
Expand Down
14 changes: 0 additions & 14 deletions R/Feature.r
View file
Expand Up @@ -153,20 +153,6 @@ Feature <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(FeatureList)
# self[["crs"]] <-
# Crs$new()$fromJSONString(
# jsonlite::toJSON(
# FeatureList[["crs"]],
# auto_unbox = TRUE),
# typeMapping = typeMapping)
# self[["bbox"]] <-
# FeatureList[["bbox"]]
# self[["properties"]] <-
# FeatureList[["properties"]]
# self[["geometry"]] <-
# FeatureList[["geometry"]]
# self[["id"]] <-
# FeatureList[["id"]]
invisible(self)
}
)
Expand Down
15 changes: 0 additions & 15 deletions R/FeatureCollection.r
View file
Expand Up @@ -139,21 +139,6 @@ FeatureCollection <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(FeatureCollectionList)
# self[["crs"]] <-
# Crs$new()$fromJSONString(
# jsonlite::toJSON(
# FeatureCollectionList[["crs"]],
# auto_unbox = TRUE),
# typeMapping = typeMapping)
# self[["bbox"]] <-
# FeatureCollectionList[["bbox"]]
# self[["features"]] <- lapply(FeatureCollectionList[["features"]],
# function(x) {
# Feature$new()$fromJSONString(
# jsonlite::toJSON(
# x,
# auto_unbox = TRUE),
# typeMapping = typeMapping)})
invisible(self)
}
)
Expand Down
8 changes: 0 additions & 8 deletions R/Filter.r
View file
Expand Up @@ -150,14 +150,6 @@ Filter <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(FilterList)
# self[["acceptRegexp"]] <-
# FilterList[["acceptRegexp"]]
# self[["rejectRegexp"]] <-
# FilterList[["rejectRegexp"]]
# self[["acceptValues"]] <-
# FilterList[["acceptValues"]]
# self[["rejectValues"]] <-
# FilterList[["rejectValues"]]
invisible(self)
}
)
Expand Down
94 changes: 0 additions & 94 deletions R/GatheringEvent.r
View file
Expand Up @@ -590,100 +590,6 @@ GatheringEvent <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(GatheringEventList)
# self[["projectTitle"]] <-
# GatheringEventList[["projectTitle"]]
# self[["worldRegion"]] <-
# GatheringEventList[["worldRegion"]]
# self[["continent"]] <-
# GatheringEventList[["continent"]]
# self[["country"]] <-
# GatheringEventList[["country"]]
# self[["iso3166Code"]] <-
# GatheringEventList[["iso3166Code"]]
# self[["provinceState"]] <-
# GatheringEventList[["provinceState"]]
# self[["island"]] <-
# GatheringEventList[["island"]]
# self[["locality"]] <-
# GatheringEventList[["locality"]]
# self[["city"]] <-
# GatheringEventList[["city"]]
# self[["sublocality"]] <-
# GatheringEventList[["sublocality"]]
# self[["localityText"]] <-
# GatheringEventList[["localityText"]]
# self[["dateTimeBegin"]] <-
# GatheringEventList[["dateTimeBegin"]]
# self[["dateTimeEnd"]] <-
# GatheringEventList[["dateTimeEnd"]]
# self[["method"]] <-
# GatheringEventList[["method"]]
# self[["altitude"]] <-
# GatheringEventList[["altitude"]]
# self[["altitudeUnifOfMeasurement"]] <-
# GatheringEventList[["altitudeUnifOfMeasurement"]]
# self[["biotopeText"]] <-
# GatheringEventList[["biotopeText"]]
# self[["depth"]] <-
# GatheringEventList[["depth"]]
# self[["depthUnitOfMeasurement"]] <-
# GatheringEventList[["depthUnitOfMeasurement"]]
# self[["gatheringPersons"]] <- lapply(GatheringEventList[["gatheringPersons"]],
# function(x) {
# Person$new()$fromJSONString(
# jsonlite::toJSON(
# x,
# auto_unbox = TRUE),
# typeMapping = typeMapping)})
# self[["gatheringOrganizations"]] <- lapply(GatheringEventList[["gatheringOrganizations"]],
# function(x) {
# Organization$new()$fromJSONString(
# jsonlite::toJSON(
# x,
# auto_unbox = TRUE),
# typeMapping = typeMapping)})
# self[["siteCoordinates"]] <- lapply(GatheringEventList[["siteCoordinates"]],
# function(x) {
# GatheringSiteCoordinates$new()$fromJSONString(
# jsonlite::toJSON(
# x,
# auto_unbox = TRUE),
# typeMapping = typeMapping)})
# self[["namedAreas"]] <- lapply(GatheringEventList[["namedAreas"]],
# function(x) {
# NamedArea$new()$fromJSONString(
# jsonlite::toJSON(
# x,
# auto_unbox = TRUE),
# typeMapping = typeMapping)})
# self[["associatedTaxa"]] <- lapply(GatheringEventList[["associatedTaxa"]],
# function(x) {
# AssociatedTaxon$new()$fromJSONString(
# jsonlite::toJSON(
# x,
# auto_unbox = TRUE),
# typeMapping = typeMapping)})
# self[["chronoStratigraphy"]] <- lapply(GatheringEventList[["chronoStratigraphy"]],
# function(x) {
# ChronoStratigraphy$new()$fromJSONString(
# jsonlite::toJSON(
# x,
# auto_unbox = TRUE),
# typeMapping = typeMapping)})
# self[["lithoStratigraphy"]] <- lapply(GatheringEventList[["lithoStratigraphy"]],
# function(x) {
# LithoStratigraphy$new()$fromJSONString(
# jsonlite::toJSON(
# x,
# auto_unbox = TRUE),
# typeMapping = typeMapping)})
# self[["bioStratigraphic"]] <- lapply(GatheringEventList[["bioStratigraphic"]],
# function(x) {
# BioStratigraphy$new()$fromJSONString(
# jsonlite::toJSON(
# x,
# auto_unbox = TRUE),
# typeMapping = typeMapping)})
invisible(self)
}
)
Expand Down
20 changes: 0 additions & 20 deletions R/GatheringSiteCoordinates.r
View file
Expand Up @@ -205,26 +205,6 @@ GatheringSiteCoordinates <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(GatheringSiteCoordinatesList)
# self[["longitudeDecimal"]] <-
# GatheringSiteCoordinatesList[["longitudeDecimal"]]
# self[["latitudeDecimal"]] <-
# GatheringSiteCoordinatesList[["latitudeDecimal"]]
# self[["gridCellSystem"]] <-
# GatheringSiteCoordinatesList[["gridCellSystem"]]
# self[["gridLatitudeDecimal"]] <-
# GatheringSiteCoordinatesList[["gridLatitudeDecimal"]]
# self[["gridLongitudeDecimal"]] <-
# GatheringSiteCoordinatesList[["gridLongitudeDecimal"]]
# self[["gridCellCode"]] <-
# GatheringSiteCoordinatesList[["gridCellCode"]]
# self[["gridQualifier"]] <-
# GatheringSiteCoordinatesList[["gridQualifier"]]
# self[["geoShape"]] <-
# Point$new()$fromJSONString(
# jsonlite::toJSON(
# GatheringSiteCoordinatesList[["geoShape"]],
# auto_unbox = TRUE),
# typeMapping = typeMapping)
invisible(self)
}
)
Expand Down
24 changes: 0 additions & 24 deletions R/GeoArea.r
View file
Expand Up @@ -233,30 +233,6 @@ GeoArea <- R6::R6Class(
simplifyVector = FALSE
)
self <- self$fromList(GeoAreaList)
# self[["sourceSystem"]] <-
# SourceSystem$new()$fromJSONString(
# jsonlite::toJSON(
# GeoAreaList[["sourceSystem"]],
# auto_unbox = TRUE),
# typeMapping = typeMapping)
# self[["sourceSystemId"]] <-
# GeoAreaList[["sourceSystemId"]]
# self[["recordURI"]] <-
# GeoAreaList[["recordURI"]]
# self[["id"]] <-
# GeoAreaList[["id"]]
# self[["areaType"]] <-
# GeoAreaList[["areaType"]]
# self[["locality"]] <-
# GeoAreaList[["locality"]]
# self[["shape"]] <-
# GeoAreaList[["shape"]]
# self[["source"]] <-
# GeoAreaList[["source"]]
# self[["isoCode"]] <-
# GeoAreaList[["isoCode"]]
# self[["countryNL"]] <-
# GeoAreaList[["countryNL"]]
invisible(self)
}
)
Expand Down

0 comments on commit 272383a

Please sign in to comment.