#172, remove JS stuff, using wicket now

Author: sckott

.travis.yml

@@ -5,7 +5,7 @@ script: ./travis-tool.sh run_tests
 
 before_script:
   - sudo apt-get --yes --force-yes update -qq
-  - sudo apt-get install -y libproj-dev libv8-dev libproj-dev libgeos++-dev
+  - sudo apt-get install -y libproj-dev libproj-dev libgeos++-dev
   - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
   - chmod 755 ./travis-tool.sh
   - ./travis-tool.sh bootstrap

DESCRIPTION

@@ -29,7 +29,6 @@ Imports:
     lubridate (>= 1.5.0),
     httr (>= 1.1.0),
     whisker (>= 0.3-2),
-    V8 (>= 1.1),
     jsonlite (>= 1.1),
     data.table (>= 1.9.6),
     tibble (>= 1.2),

NAMESPACE

@@ -86,10 +86,7 @@ export(occ_names_options)
 export(occ_options)
 export(spocc_capwords)
 export(wkt2bbox)
-export(wkt_read)
 export(wkt_vis)
-export(wkt_write)
-importFrom(V8,new_context)
 importFrom(data.table,rbindlist)
 importFrom(data.table,setDF)
 importFrom(httr,GET)

R/handle_sp.R

@@ -32,19 +32,6 @@
 # handle_sp(sppoly_df)
 # handle_sp(sppoly_df, group = FALSE)[[1]]
 
-handle_sp <- function(spobj, group = TRUE) wicket::sp_convert(spobj, group = group)
-  # wkt <- make_wkt(spobj)
-  # stopifnot(is.numeric(length(wkt)))
-  # stopifnot(length(wkt) > 0)
-  # return( wkt )
-# }
-
-# make_wkt <- function(x){
-#   coords <- lapply(x@polygons, function(z) {
-#     z@Polygons[[1]]@coords
-#   })
-#   lapply(coords, function(z) {
-#     geojson <- jsonlite::toJSON(list(type = "Polygon", coordinates =  list(z)), auto_unbox = TRUE)
-#     wkt_write(geojson)
-#   })
-# }
+handle_sp <- function(spobj, group = TRUE) {
+  wicket::sp_convert(spobj, group = group)
+}

R/on_load.R

@@ -24,26 +24,14 @@
 #' wkt <- "POLYGON((-125 38.4,-125 40.9,-121.8 40.9,-121.8 38.4,-125 38.4))"
 #' wkt2bbox(wkt)
 #' }
-
 bbox2wkt <- function(minx=NA, miny=NA, maxx=NA, maxy=NA, bbox=NULL) {
   if (is.null(bbox)) bbox <- list(c(minx, miny, maxx, maxy))
   wicket::bounding_wkt(values = bbox)
-  # stopifnot(length(bbox) == 4) #check for 4 digits
-  # stopifnot(!any(is.na(bbox))) #check for NAs
-  # stopifnot(is.numeric(as.numeric(bbox))) #check for numeric-ness
-  # paste('POLYGON((',
-  #       sprintf('%s %s',bbox[1],bbox[2]), ',', sprintf(' %s %s',bbox[3],bbox[2]), ',',
-  #       sprintf(' %s %s',bbox[3],bbox[4]), ',', sprintf(' %s %s',bbox[1],bbox[4]), ',',
-  #       sprintf(' %s %s',bbox[1],bbox[2]),
-  #       '))', sep = "")
 }
 
 #' @param wkt A Well Known Text object.
 #' @export
 #' @rdname bbox2wkt
 wkt2bbox <- function(wkt){
-  # stopifnot(!is.null(wkt))
-  # tmp <- wkt_read(wkt)$bbox
-  # as.vector(tmp)
   wicket::wkt_bounding(wkt)
 }

R/read_wkt.R

@@ -34,46 +34,57 @@
 
 wkt_vis <- function(x, zoom = 6, maptype = "terrain", browse = TRUE) {
   long = lat = group = NULL
+  
   stopifnot(!is.null(x))
   stopifnot(is.character(x))
-
-  out <- wkt_read(gsub("\n|\n\\s+", "", strtrim(x)))
-  
-  if (inherits(out$coordinates[,,1], "matrix")) {
-    longs <- data.frame(out$coordinates[,,1])
-    lats <- data.frame(out$coordinates[,,2])
-  } else {
-    longs <- t(data.frame(out$coordinates[,,1]))
-    lats <- t(data.frame(out$coordinates[,,2]) )
-  }
-  tocentroid <- list()
-  dfs <- list()
-  for (i in 1:NROW(longs)) {
-    tocentroid[[i]] <- tmp <- data.frame(long = as.numeric(longs[i,]), lat = as.numeric(lats[i,]))
-    dfs[[i]] <- apply(tmp, 1, function(x) as.list(x[c('long','lat')]))
-  }
-  centroid <- get_centroid(do.call("rbind", tocentroid))
+  x <- gsub("\n|\n\\s+", "", strtrim(x))
+  out <- wicket::wkt_coords(x)
+  centroid <- wicket::get_centroid(x)
+  dfs <- unname(lapply(split(out, out$ring), function(z) {
+    unname(
+      apply(z, 1, function(x) {
+        as.list(stats::setNames(x[c('lng','lat')], c('long', 'lat')))
+      })
+    )
+  }))
 
   whiskout <- list()
   for (i in seq_along(dfs)) {
     dats <- dfs[[i]]
     whiskout[[i]] <- whisker.render(features)
   }
   rend <- paste0(map_header, paste(whiskout, sep = "", collapse = ","), map_end)
-  
-  foot <- sprintf(footer, centroid[2], centroid[1], zoom)
+  foot <- sprintf(footer, centroid$lat, centroid$lng, zoom)
   res <- paste(rend, foot)
   tmpfile <- tempfile(pattern = 'spocc', fileext = ".html")
   write(res, file = tmpfile)
   if (browse) browseURL(tmpfile) else tmpfile
 }
 
-get_centroid <- function(x) {
-  x <- unname(as.matrix(x))
-  geojson <- jsonlite::toJSON(list(type = "Polygon", coordinates =  list(x)), auto_unbox = TRUE)
-  cent$eval(sprintf("var out = centroid(%s);", geojson))
-  cent$get("out.geometry.coordinates")
-}
+
+# out <- wkt_read(gsub("\n|\n\\s+", "", strtrim(x)))
+# if (inherits(out$coordinates[,,1], "matrix")) {
+#   longs <- data.frame(out$coordinates[,,1])
+#   lats <- data.frame(out$coordinates[,,2])
+# } else {
+#   longs <- t(data.frame(out$coordinates[,,1]))
+#   lats <- t(data.frame(out$coordinates[,,2]) )
+# }
+# tocentroid <- list()
+# dfs <- list()
+# for (i in 1:NROW(longs)) {
+#   tocentroid[[i]] <- tmp <- data.frame(long = as.numeric(longs[i,]), 
+#                                        lat = as.numeric(lats[i,]))
+#   dfs[[i]] <- apply(tmp, 1, function(x) as.list(x[c('long','lat')]))
+# }
+# centroid <- get_centroid(do.call("rbind", tocentroid))
+
+# get_centroid <- function(x) {
+#   x <- unname(as.matrix(x))
+#   geojson <- jsonlite::toJSON(list(type = "Polygon", coordinates =  list(x)), auto_unbox = TRUE)
+#   cent$eval(sprintf("var out = centroid(%s);", geojson))
+#   cent$get("out.geometry.coordinates")
+# }
 
 map_header <- '
 <!DOCTYPE html>
@@ -82,8 +93,8 @@ map_header <- '
 <meta charset=utf-8 />
 <title>spocc WKT Viewer</title>
 <meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no" />
-<script src="https://api.tiles.mapbox.com/mapbox.js/v2.2.2/mapbox.js"></script>
-<link href="https://api.tiles.mapbox.com/mapbox.js/v2.2.2/mapbox.css" rel="stylesheet" />
+<script src="https://api.tiles.mapbox.com/mapbox.js/v3.0.1/mapbox.js"></script>
+<link href="https://api.tiles.mapbox.com/mapbox.js/v3.0.1/mapbox.css" rel="stylesheet" />
 <style>
   body { margin:0; padding:0; }
   #map { position:absolute; top:0; bottom:0; width:100%; }