tm

Author: rhijmans

NEWS.md

@@ -19,6 +19,7 @@
 - `unique<SpatVector>` gained arguments "geom=TRUE" and "atts=TRUE" to allow uniqueness to be based on geometry or attributes only [#1928](https://github.com/rspatial/terra/issues/1928) by Andrea Titolo
 - `buffer<SpatRaster>` gains argument "include=TRUE" to allow exclusion of the cells that are not `NA` from the buffer  [#1929](https://github.com/rspatial/terra/issues/1929) by Márcia Barbosa
 - argument "names" to `distance<SpatVector,missing>` [#1942](https://github.com/rspatial/terra/issues/1942) by Márcia Barbosa
+- `subset<SpatVector>` now works without a value for argument "subset", to allow subsetting variables only [#1953](https://github.com/rspatial/terra/issues/1953) by Márcia Barbosa
 
 
 ## new
@@ -27,6 +28,7 @@
 - `cartogram<SpatRaster>` can now return a "circles" (dorling) cartogram [#1911](https://github.com/rspatial/terra/issues/1911) by Márcia Barbosa 
 - `subset<SpatVector>` can now use a Spat object to spatially subset [#1937](https://github.com/rspatial/terra/issues/1937) by Márcia Barbosa
 
+
 # version 1.8-70
 
 Released 2025-09-27

R/time.R

@@ -113,8 +113,10 @@ setMethod("time", signature(x="SpatRaster"),
 		tstep <- x@pntr$timestep
 
 		if (format != "") {
-			steps <- c("seconds", "days", "months", "years", "yearmonths")
+			steps <- c("seconds", "days", "months", "years", "yearmonths", "raw")
 			format <- match.arg(tolower(format), steps)
+			if (format == "raw") return(d)
+			
 			if ((format == "months") && (tstep == "years")) {
 				error("time", "cannot extract months from years-time")
 			} else if ((format == "years") && (tstep %in% c("months"))) {
@@ -133,22 +135,19 @@ setMethod("time", signature(x="SpatRaster"),
 		}
 
 
+		tz <- x@pntr$timezone
+		tz[tz == ""] <- "UTC"
 		d <- strptime("1970-01-01", "%Y-%m-%d", tz="UTC") + d
-		if (tstep == "seconds") {
-			tz <- x@pntr$timezone
-			if (!(tz %in% c("", "UTC"))) {
-				attr(d, "tzone") = tz
-			}
-			if (format == "seconds") {
-				return(d)
-			} 
+		attr(d, "tzone") = tz
+		if (format == "seconds") {
+			return(d)
 		}
 
 		if (format == "days") {
 		# first use format to avoid time zone trouble #1896
 		#	as.Date(format(d, "%Y-%m-%d"))
 		# above does not work with negative years. #1951	
-			as.Date(d, tz="")
+			as.Date(d, tz=tz)
 		} else if (format == "yearmonths") {
 			y <- as.integer(format(d, "%Y"))
 			y + (as.integer(format(d, "%m"))-1)/12

src/spatTime.cpp

@@ -241,16 +241,15 @@ SpatTime_t time_from_day(int syear, int smonth, int sday, double ndays) {
 }
 
 
+#include "Rcpp.h"
 
 SpatTime_t get_time_noleap(int syear, int smonth, int sday, int shour, int smin, int ssec, double n, std::string step) {
 
 	static const int md[13] =  {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 };
 
 	// set start to beginning of year 
-	double s = ssec + smin * 60 + shour * 3600 + (sday-1) * 24 * 3600;
-	for (int i=0; i < smonth; i++) {
-		s += (md[i] * 24 * 3600);
-	}
+	double s = ssec + smin * 60 + shour * 3600 + (sday-1) * 86400;
+	s += md[smonth-1] * 86400;
 
 	double ndays;
 	if (step == "hours") {
@@ -274,6 +273,8 @@ SpatTime_t get_time_noleap(int syear, int smonth, int sday, int shour, int smin,
 			break;
 		}
 	}
+	Rcpp::Rcout << ndays << " " << year << " " << month << " " << rem << std::endl;
+
 	rem -= md[month-1];
 	int day = rem;
 	rem -= day;
@@ -284,6 +285,11 @@ SpatTime_t get_time_noleap(int syear, int smonth, int sday, int shour, int smin,
 	int mn = rem * 60;
 	rem -= mn;
 	int sc = rem * 60;
+
+	SpatTime_t tmp = get_time(year+syear, month, day, hr, mn, sc);
+
+	Rcpp::Rcout << syear << " " << smonth << " " << sday << " " << shour << " " << smin << " " << ssec << " " << n <<  " " << step << std::endl;
+	Rcpp::Rcout << year << " " << month << " " << day << " " << tmp << std::endl << std::endl;
 
 	return get_time(year+syear, month, day, hr, mn, sc);
 }
@@ -293,7 +299,8 @@ SpatTime_t get_time_noleap(int syear, int smonth, int sday, int shour, int smin,
 SpatTime_t get_time_360(int syear, int smonth, int sday, int shour, int smin, int ssec, double n, std::string step) {
 
 	// set start to beginning of year 
-	double s = ssec + smin * 60 + shour * 3600 + (sday-1) * 24 * 3600 + (smonth-1) * 30;
+	int sdays = (smonth-1) * 30 + (sday-1);
+	double s = ssec + smin * 60 + shour * 3600 + sdays * 86400;
 
 	double ndays;
 	if (step == "hours") {