version 1.5

DESCRIPTION

@@ -1,18 +1,18 @@
 Package: birdring
 Type: Package
 Title: Methods to Analyse Ring Re-Encounter Data
-Version: 1.4
-Date: 2019-08-20
+Version: 1.5
+Date: 2023-09-29
 Author: Fraenzi Korner-Nievergelt, Rob Robinson
 Maintainer: Fraenzi Korner-Nievergelt <fraenzi.korner@vogelwarte.ch>
-Depends: R (>= 2.10.1), stats
-Imports: geosphere, ks, lazyData, raster, rgdal, rgeos, rworldmap,
-        rworldxtra, sp, methods, graphics
-Description: R functions to read EURING data and analyse re-encounter data of birds marked by metal rings. For a tutorial, go to <http://www.tandfonline.com/doi/full/10.1080/03078698.2014.933053>.
+Depends: R (>= 2.10.1), stats, basemaps, maps, sfheaders
+Imports: geosphere, ks, lazyData, raster, rworldmap, rworldxtra, sf,
+        methods, graphics, sp
+Description: R functions to read EURING data and analyse re-encounter data of birds marked by metal rings. For a tutorial, go to <doi:10.1080/03078698.2014.933053>.
 License: GPL-2
 LazyLoad: yes
 LazyData: TRUE
 NeedsCompilation: no
-Packaged: 2019-08-20 07:53:57 UTC; fk
+Packaged: 2023-09-30 08:27:42 UTC; fk
 Repository: CRAN
-Date/Publication: 2019-08-20 09:00:02 UTC
+Date/Publication: 2023-09-30 08:52:38 UTC

MD5

@@ -1,26 +1,23 @@
-e105cc2d762fafe807d02e2e80038a25 *DESCRIPTION
-33048a51e528fa51d074753294c74dc5 *NAMESPACE
+e7643fce02953b43fa54e0d97fbb10c3 *DESCRIPTION
+b43ef4c6fe60370bffdb0b4f48194a6b *NAMESPACE
 931a853d6e3755c0fe219409753a4755 *R/birdstate.R
 416d5e2b2ba05e9d2bc0ab0802f2c31d *R/bootci.dc.r
 d85d0d2eed5e5bfa92892c65bbc6f9b1 *R/codes2names.r
 5aa3185b08b0edfc8e98de7f6004ae42 *R/critical.check.ringing.event.r
 36b4b0f95f749f6e33c230800bca375a *R/dayofyear.R
 bfef7d09c18bfa385d4ae6f8b4155800 *R/dc.r
-54b05dc5a1dba38236fe79494099e0fc *R/decimal.coord.r
+ce1e54669832d90b107e380c456fe740 *R/decimal.coord.r
 61a0617ea8bcba25efec80a33958a9e9 *R/dmvnorm.r
 fe4d5fd57ac251e6bd17fccfddaeb3bc *R/draw.map.r
-50ba01780500fa11e8ac560511c0515d *R/draw.recmap.R
 8749e35256b963e7eda2fe4c61b09b38 *R/loxodrom.dir.r
 83fd1c8307301ede5aa9976dd904dc3c *R/loxodrom.dist.r
-856a410361c6bcab7329b4f59df1f420 *R/map.density2.R
-4305d0eaf5b39b731e6ae0b45a258018 *R/map.legend.R
 bf24206a6a1289fa7b25df6007463d4b *R/mdy.date.r
 773762f0f36c221f52676e8ea77c6532 *R/mercatorlat.R
 6fb247b3a223dd73729f95425e205a8f *R/orthodrom.dist.r
 ecadac0602f99ffb72342baee854bec5 *R/overlap.r
 ccd02f9c3a8c76dda7e4538b40e93a45 *R/place2name.R
-7a90e9edb826e2159d003519fe125630 *R/read.euring2000.r
-2166158961cd6ca86e99979d289dd7d0 *R/read.euring2000plus.r
+991cd8ae51d64a7c1ae71e967c9d5f5b *R/read.euring2000.r
+0358384245e5f6a4fb84bb7dd479b567 *R/read.euring2000plus.r
 ee7834e8a04c0877157faf2898513eea *R/scheme2country.r
 ab95c82496cb139052e070efddd2d472 *R/sysdata.rda
 ca13c1d62cdc044062c7e23db9486abd *data/circumstances.rda
@@ -46,7 +43,6 @@ b8b961f17c16f4672a25730cdcfe88c9 *man/codes2names.Rd
 169296e9b42b2421f082c5308259e72c *man/decimal.coord.Rd
 092b8948baa59f33c9be99122536f915 *man/dmvnorm.Rd
 9b8c63821dffe7d8f8bf75930ccc1632 *man/draw.map.Rd
-9a7a02525568138afae5d7d6abb7f5fc *man/draw.recmap.Rd
 a59f377aee0aa351619e2e70e89726ea *man/lancol.Rd
 9f9e68562cd19eb1a7bba46a3faf874f *man/loxodrom.dir.Rd
 083cc94f6f5c49cf1db07c9f53c17afe *man/mdy.date.Rd
@@ -55,8 +51,8 @@ a59f377aee0aa351619e2e70e89726ea *man/lancol.Rd
 fd13b010dd4016bac5210a971507f1f3 *man/overlap.Rd
 b50d0878568906ef12299ec7e20fc33e *man/place2name.Rd
 225134c3abc9ad0c9616bf7a484c4fab *man/places.Rd
-c0fc2984f8d9877e610f0e3a730c09cc *man/read.euring2000.Rd
-b631003fe7dfb202ca2ca882f98e2b72 *man/read.euring2000plus.rd
+335eab1fd35ba3a63da5e12c2336a97f *man/read.euring2000.Rd
+7d8a497f764940365d64096cb9515900 *man/read.euring2000plus.rd
 f92567deada1e7e2e926d83b2140ebbe *man/scheme2country.Rd
 95db4d8fc039f75f573dcc3e15c46210 *man/schemes.Rd
 3ef268c53ad5851022ffbe1b93c07be8 *man/species.Rd

NAMESPACE

@@ -1,5 +1,6 @@
 export(
-	birdstate
+  #add.geometry
+	     birdstate
        ,bootci.dc
        ,codes2names
        ,critical.check.ringing.event
@@ -8,11 +9,10 @@ export(
        ,decimal.coord
        ,dmvnorm
        ,draw.map
-       ,draw.recmap
+ #      ,draw.recmap
        ,loxodrom.dir
        ,loxodrom.dist
        ,mdy.date
- #     ,mercatorbreite
        ,mercatorlat
        ,orthodrom.dist
        ,overlap
@@ -27,7 +27,7 @@ export(
 	)
 importFrom(lazyData, requireData)
 importFrom(raster, extent)
-importFrom(rgeos, gIntersects, gIntersection, gDifference, gUnionCascaded)
+#importFrom(rgeos, gIntersects, gIntersection, gDifference, gUnionCascaded)
 importFrom(geosphere,gcIntermediate, distRhumb, distMeeus)
 #importFrom(ks, kde, Hpi)
 #importFrom(reshape, melt, cast)
@@ -39,10 +39,14 @@ importFrom(geosphere,gcIntermediate, distRhumb, distMeeus)
   importFrom("stats", "density", "mahalanobis", "optim", "quantile", "runif", "median")
   importFrom("utils", "data", "read.table")
 
-import(rgdal)
+#import(rgdal)
 import(rworldmap)
 import(rworldxtra)
 import(sp)
+import(sf)
 import(ks)
+import(basemaps)
+import(maps)
+import(sfheaders)
 #import(reshape)
 

R/decimal.coord.r

@@ -2,12 +2,16 @@
 # Computes decimal coordinates from degrees and minutes
 # x: vector containing degrees and minutes
 # Author: Fraenzi Korner, 9.9.2004, www.oikostat.ch and www.vogelwarte.ch
+#         updated 14.10.2022 to include seconds
 ###################################################################################
 decimal.coord<-function(x){
-t.sign<-sign(x)
-t.minuten<-abs(x)-abs(trunc(x))
-t.dezimalstellen<-t.minuten*(5/3)
-t.dec<-t.sign*(abs(trunc(x))+t.dezimalstellen)
-t.dec
+  # x is a numeric vector of the following format dd.mmss, e.g. 55.3215 for 
+  # 55degree 32' 15''
+  t.sign<-sign(x)
+  t.min <-floor(100*(abs(x)-abs(trunc(x))))
+  t.sec <- 100*(abs(100*x)-abs(trunc(100*x)))
+  t.decimals <- t.min/60 + t.sec/3600
+  t.dec<-t.sign*(abs(trunc(x))+t.decimals)
+  t.dec
 }
-###################################################################################
+###################################################################################