msg

womeimingzi11 · May 24, 2017 · 46a5d19 · 46a5d19
1 parent 9878742
commit 46a5d19
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 19 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: baidumap
 Title: A package for spatial visualization with Baidu
-Version: 0.2.1
+Version: 0.2.2
 Encoding: UTF-8
 Author: yalei Du <[email protected]>
 Maintainer: yalei Du <[email protected]>

diff --git a/R/geoconv.R b/R/geoconv.R
@@ -9,7 +9,7 @@
 #' @export geoconv
 geoconv = function(geocode, from=3, to=5, map_ak=''){
     if (map_ak == '' && is.null(getOption('baidumap.key'))){
-        stop('Please register AK by ')
+        stop(Notification)
     }else{
         map_ak = ifelse(map_ak == '', getOption('baidumap.key'), map_ak)
     }

diff --git a/R/getBaiduMap.R b/R/getBaiduMap.R
@@ -32,7 +32,14 @@
 #' ## do not print messages
 #' p <- getBaiduMap(messaging = F)
 #' }
-getBaiduMap = function(location, width=400, height = 400, zoom=10, scale=2, color = "color", messaging = TRUE){
+getBaiduMap = function(location, width=400, height = 400, zoom=10, 
+                       scale=2, color = "color", messaging = TRUE,
+                       map_ak = ''){
+    if (map_ak == '' && is.null(getOption('baidumap.key'))){
+        stop(Notification)
+    }else{
+        map_ak = ifelse(map_ak == '', getOption('baidumap.key'), map_ak)
+    }
     ## location
     if (is.character(location) && length(location) == 1){
         location_cor = getCoordinate(location, formatted=T)

diff --git a/R/getCoordinate.R b/R/getCoordinate.R
@@ -1,11 +1,6 @@
 getCoordinate.core = function(address, city=NULL, 
                               output='json', formatted = F,
                               map_ak = ''){
-    if (map_ak == '' && is.null(getOption('baidumap.key'))){
-        stop('Please register AK by ')
-    }else{
-        map_ak = ifelse(map_ak == '', getOption('baidumap.key'), map_ak)
-    }
     ### address
     if (any(grepl(' |#', address))) warning('address should not have blank character!')
     address = gsub(' |#', '', address)
@@ -65,19 +60,24 @@ getCoordinate.core = function(address, city=NULL,
 #' ## vectorization, return a matrix
 #' getCoordinate(c('北京大学', '清华大学'), formatted = T)
 #' }
-getCoordinate=function(address, city=NULL, output='json', formatted = F,limit=600){
+getCoordinate=function(address, city=NULL, output='json', formatted = F,limit=600, map_ak=''){
+    if (map_ak == '' && is.null(getOption('baidumap.key'))){
+        stop(Notification)
+    }else{
+        map_ak = ifelse(map_ak == '', getOption('baidumap.key'), map_ak)
+    }
     if(length(address)<limit){
-        res<-getCoordinate.core(address, city, output , formatted)
+        res<-getCoordinate.core(address, city, output , formatted, map_ak)
     }else if(require(parallel)){
         cl <- makeCluster(getOption("cl.cores", detectCores()*0.8))
         res<-parLapply(cl,X = address,fun = function(x){
-            getCoordinate.core(x, city, output , formatted)
+            getCoordinate.core(x, city, output , formatted, map_ak)
         })
         res<-do.call('rbind',res)
         stopCluster(cl)
     }else{
         warning('can not run in parallel mode without package parallel')
-        res<-getCoordinate.core(address, city, output , formatted)
+        res<-getCoordinate.core(address, city, output , formatted, map_ak)
     }
     res
 }
diff --git a/R/getLocation.R b/R/getLocation.R
@@ -64,7 +64,7 @@ getLocation.core = function(location, output='json', formatted = F,
 getLocation = function (location, output = "json", formatted = F, 
                         pois = 0, limit=600, map_ak = '') {
         if (map_ak == '' && is.null(getOption('baidumap.key'))){
-            stop('Please register AK by ')
+            stop(Notification)
         }else{
             map_ak = ifelse(map_ak == '', getOption('baidumap.key'), map_ak)
         }
@@ -81,4 +81,4 @@ getLocation = function (location, output = "json", formatted = F,
             res<-getLocation.core(location, output, formatted , pois)
         }
         res
-    }
+}
diff --git a/R/getPlace.R b/R/getPlace.R
@@ -31,7 +31,7 @@ url_character = function(x){
 getPlace = function(place=NULL, city='北京', page_size=20, 
                     pages=Inf, scope=1, verbose=TRUE, map_ak=''){
     if (map_ak == '' && is.null(getOption('baidumap.key'))){
-        stop('Please register AK by ')
+        stop(Notification)
     }else{
         map_ak = ifelse(map_ak == '', getOption('baidumap.key'), map_ak)
     }

diff --git a/R/getRoute.R b/R/getRoute.R
@@ -36,7 +36,7 @@ getRouteXML = function(origin, destination, mode='driving',
                        output = 'xml',
                        map_ak=''){
     if (map_ak == '' && is.null(getOption('baidumap.key'))){
-        stop('Please register AK by ')
+        stop(Notification)
     }else{
         map_ak = ifelse(map_ak == '', getOption('baidumap.key'), map_ak)
     }

diff --git a/R/onLoad.R b/R/onLoad.R
@@ -3,7 +3,11 @@
     if (interactive()) {
         v = packageVersion("baidumap")
         message('baidumap ', v)
-        message('Apply an application from here: http://lbsyun.baidu.com/apiconsole/key')
-        message("Then register you key by running `options(baidumap.key = 'xxx')`")
+        message(Notification)
     }
-}
+}
+
+Notification <- paste('Apply an application from here: http://lbsyun.baidu.com/apiconsole/key',
+                       "Then register you key by running `options(baidumap.key = 'xxx')`",
+                      sep = '\n')
+