Merge pull request #22 from EvolEcolGroup/extractFromLayer_test

New tests for extractfromLayer

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: geoGraph
 Type: Package
-Title: Walking through the geographic space using graphs
+Title: Walking Through the Geographic Space Using Graphs
 Version: 1.1.1.9003
 Authors@R: c(
     person("Thibaut", "Jombart", role = "aut"),
@@ -34,7 +34,7 @@ Suggests:
     rmarkdown,
     rnaturalearthdata,
     spelling
-RoxygenNote: 7.3.0
+RoxygenNote: 7.3.1
 Collate: 
     'classes.R'
     'accessors.R'
@@ -49,7 +49,7 @@ Collate:
     'extractFromLayer.R'
     'findLand.R'
     'geo.segments.R'
-    'geograph.R'
+    'geograph-package.R'
     'globals.R'
     'hasCosts.R'
     'interact.R'

R/extractFromLayer.R

@@ -155,7 +155,20 @@ setMethod("extractFromLayer", "data.frame", function(x, layer = "world", attr =
 
 
 
-
+################
+## for numeric vector (of long/lat)
+################
+#' @rdname extractFromLayer
+#' @export
+setMethod("extractFromLayer","numeric",function(x, layer = "world", attr = "all", ...) {
+   if(isTRUE(length(x) %% 2 == 0)){
+     x <- matrix(x, ncol = 2, byrow = TRUE)
+     return(extractFromLayer(x, layer = layer, attr = attr, ...))
+   } else {
+     stop ("Vector must have even number of longitude and latitude entries")
+   }
+
+})
 
 
 ################

R/geograph-package.R

@@ -0,0 +1,6 @@
+#' @keywords internal
+"_PACKAGE"
+
+## usethis namespace: start
+## usethis namespace: end
+NULL

inst/WORDLIST

@@ -9,7 +9,7 @@ Malaga
 RBGL
 RBGL's
 Ringler
-attr
+antimeridian
 closestNode
 codecov
 coords
@@ -23,7 +23,6 @@ gPath
 geo
 geoGraphEnv
 georeferenced
-goto
 graphNEL
 hgdp
 img
@@ -35,7 +34,6 @@ nb
 rawgraph
 rawgraph's
 rawgraphs
-replot
 replotting
 rnaturalearth
 roxygen