Merge branch 'master' of https://github.com/vwmaus/dtwSat

DESCRIPTION

@@ -48,6 +48,8 @@ Suggests:
     xtable,
     tikzDevice
 License: GPL (>= 2) | file LICENSE
+URL: https://github.com/vwmaus/dtwSat/
+BugReports: https://github.com/vwmaus/dtwSat/issues
 Author: Victor Maus [aut, cre]
 Maintainer: Victor Maus <[email protected]>
 LazyData: true

R/getTimeSeries.R

@@ -28,20 +28,19 @@ setGeneric("getPatterns", function(object, ...) standardGeneric("getPatterns"))
 #' latitude, the start ''from'' and the end ''to'' of the time interval 
 #' for each sample. This can also be a \code{\link[sp]{SpatialPointsDataFrame}} 
 #' whose attributes are the start ''from'' and the end ''to'' of the time interval.
-#' If missing ''from'' and/or ''to'', their are set to the time range of the object
-#' \code{object}. As additional attribute of \code{samples} can be used as labels 
-#' for each sample. See \code{id.labels}. 
+#' If missing ''from'' and/or ''to'', they are set to the time range of the 
+#' \code{object}. 
 #' 
-#' @param id.labels a numeric or character with an attribute of \code{samples} to 
-#' be used as labels of the samples. Optional.
+#' @param id.labels a numeric or character with an column name from \code{y} to 
+#' be used as samples labels. Optional.
 #' 
 #' @param labels character vector with time series labels. For signature 
 #' \code{\link[dtwSat]{twdtwRaster}} this argument can be used to set the 
-#' labels for each \code{sample}, or it can be combined with \code{id.labels} 
+#' labels for each sample in \code{y}, or it can be combined with \code{id.labels} 
 #' to select samples with a specific label.
 #' 
 #' @param proj4string projection string, see \code{\link[sp]{CRS-class}}. Used 
-#' if \code{samples} is a \code{\link[base]{data.frame}}.
+#' if \code{y} is a \code{\link[base]{data.frame}}.
 #' 
 #' @return An object of class \code{\link[dtwSat]{twdtwTimeSeries}}.
 #'