increase units version dep; units init stuff

Author: edzer

DESCRIPTION

@@ -25,7 +25,7 @@ Imports:
 	grid,
 	Rcpp,
 	DBI (>= 0.8),
-	units (>= 0.5-1),
+	units (>= 0.6-0),
 	classInt,
 	magrittr
 Suggests:

R/crs.R

@@ -210,32 +210,9 @@ st_is_longlat = function(x) {
 }
 
 # a = "b" => a is the proj.4 unit (try: cs2cs -lu); "b" is the udunits2 unit
-udunits_from_proj = if (utils::packageVersion("units") < "0.5-2") {
+udunits_from_proj = list(
 #   PROJ.4     UDUNITS
-c(  `km` =     "km",
-	`m` =      "m",
-	`dm` =     "dm",
-	`cm` =     "cm",
-	`mm` =     "mm",
-	`kmi` =    "nautical_mile",
-	`in` =     "in",
-	`ft` =     "ft",
-	`yd` =     "yd",
-	`mi` =     "mi",
-	`fath` =   "fathom",
-	`ch` =     "chain",
-#	`link` =   "0.201168 m",
-#	`us-in` =  "1./39.37 m",
-	`us-ft` =  "US_survey_foot",
-	`us-yd` =  "US_survey_yard",
-	`us-ch` =  "chain",
-	`us-mi` =  "US_survey_mile"
-#	`ind-yd` = "0.91439523 m",
-#	`ind-ft` = "0.30479841 m",
-#	`ind-ch` = "20.11669506 m"
-)
-} else {
-list(`km` =    as_units("km"),
+	`km` =    as_units("km"),
 	`m` =      as_units("m"),
 	`dm` =     as_units("dm"),
 	`cm` =     as_units("cm"),
@@ -247,17 +224,16 @@ list(`km` =    as_units("km"),
 	`mi` =     as_units("mi"),
 	`fath` =   as_units("fathom"),
 	`ch` =     as_units("chain"),
-#	`link` =   as_units("link"),
-#	`us-in` =  as_units("us_in"),
+	`link` =   as_units("link", check_is_valid = FALSE), # not (yet) existing; set in .onLoad()
+ 	`us-in` =  as_units("us_in", check_is_valid = FALSE),
 	`us-ft` =  as_units("US_survey_foot"),
 	`us-yd` =  as_units("US_survey_yard"),
 	`us-ch` =  as_units("chain"),
-	`us-mi` =  as_units("US_survey_mile")
-#	`ind-yd` = as_units("ind_yd"),
-#	`ind-ft` = as_units("ind_ft"),
-#	`ind-ch` = as_units("ind_ch")
+	`us-mi` =  as_units("US_survey_mile"),
+	`ind-yd` = as_units("ind_yd", check_is_valid = FALSE),
+	`ind-ft` = as_units("ind_ft", check_is_valid = FALSE),
+	`ind-ch` = as_units("ind_ch", check_is_valid = FALSE)
 )
-}
 
 crs_parameters = function(x) {
 	stopifnot(!is.na(x))

R/init.R

@@ -41,7 +41,7 @@ setOldClass("sfg")
 	}
 	CPL_gdal_init()
 	register_all_s3_methods() # dynamically registers non-imported pkgs (tidyverse)
-	#units::install_conversion_constant("m", "link", 0.201168)
+	units::install_conversion_constant("m", "link", 0.201168)
 	#units::install_conversion_constant("m", "us_in", 1./39.37)
 	#units::install_conversion_constant("m", "ind_yd", 0.91439523)
 	#units::install_conversion_constant("m", "ind_ft", 0.30479841)
@@ -56,7 +56,7 @@ setOldClass("sfg")
 		Sys.setenv("GDAL_DATA"=get(".sf.GDAL_DATA", envir=.sf_cache))
 		# nocov end
 	}
-	#units::remove_symbolic_unit("link")
+	units::remove_symbolic_unit("link")
 	#units::remove_symbolic_unit("us_in")
 	#units::remove_symbolic_unit("ind_yd")
 	#units::remove_symbolic_unit("ind_ft")

tests/testthat/test_gdal.R

@@ -34,7 +34,6 @@ test_that("st_transform works", {
 
 test_that("gdal can be loaded, unloaded, and loaded", {
   expect_silent({
-  sf:::.onLoad()
   sf:::.onUnload()
   sf:::.onLoad()
   }