Rename proj attribute in geojson objects

ateucher · Mar 22, 2020 · 390880b · 390880b
1 parent 9be7c80
commit 390880b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/R/filter_fields.R b/R/filter_fields.R
@@ -103,7 +103,7 @@ ms_filter_fields_sp <- function(input, fields, sys) {
   #
   # ret <- apply_mapshaper_commands(data = geojson, command = cmd, force_FC = FALSE)
   #
-  # GeoJSON_to_sp(ret, proj = attr(geojson, "proj4"))
+  # GeoJSON_to_sp(ret, proj = attr(geojson, "proj"))
 
   if (!(all(is.element(fields, names(input@data))))) {
     stop("Not all named fields exist in input data", call. = FALSE)

diff --git a/R/utils.R b/R/utils.R
@@ -142,7 +142,7 @@ ms_sp <- function(input, call, sys = FALSE) {
          were reduced to null.", call. = FALSE)
   }
 
-  ret <- GeoJSON_to_sp(ret, proj = attr(geojson, "proj4"))
+  ret <- GeoJSON_to_sp(ret, proj = attr(geojson, "proj"))
 
   # remove data slot if input didn't have one (default out_class is the class of the input)
   if (!has_data) {
@@ -168,7 +168,7 @@ sp_to_GeoJSON <- function(sp, file = FALSE){
     js <- readr::read_file(js_tmp, locale = readr::locale())
     on.exit(unlink(js_tmp))
   }
-  structure(js, proj4 = proj)
+  structure(js, proj = proj)
 }
 
 ## Utilties for sf
@@ -192,7 +192,7 @@ ms_sf <- function(input, call, sys = FALSE) {
          were reduced to null.", call. = FALSE)
   }
 
-  ret <- GeoJSON_to_sf(ret, proj = attr(geojson, "proj4"))
+  ret <- GeoJSON_to_sf(ret, proj = attr(geojson, "proj"))
 
   ## Only return sfc if that's all that was input
   if (!has_data) {
@@ -219,7 +219,7 @@ GeoJSON_to_sf <- function(geojson, proj = NULL) {
   curly_brace_na(sf)
 }
 
-sf_to_GeoJSON <- function(sf, file = FALSE){
+sf_to_GeoJSON <- function(sf, file = FALSE) {
   proj <- sf::st_crs(sf)
   if (file) {
     js <- sf_sp_to_tempfile(sf)
@@ -228,7 +228,7 @@ sf_to_GeoJSON <- function(sf, file = FALSE){
     ## the geo_json classing that goes on there
     js <- geo_list_to_json(sf)
   }
-  structure(js, proj4 = proj)
+  structure(js, proj = proj)
 }
 
 geo_list_to_json <- function(x) {

diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
@@ -57,12 +57,12 @@ test_that("NA values dealt with in sf_to_GeoJSON", {
   geojson <- sf_to_GeoJSON(sf_obj)
   expect_equal(geojson,
     structure("{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"properties\":{\"a\":1},\"geometry\":{\"type\":\"Point\",\"coordinates\":[0,0]}},{\"type\":\"Feature\",\"properties\":{\"a\":null},\"geometry\":{\"type\":\"Point\",\"coordinates\":[1,1]}}]}",
-      class = "json", proj4 = structure(list(
+      class = "json", proj = structure(list(
         epsg = NA_integer_, proj4string = NA_character_
       ), class = "crs")
     )
   )
-  back_to_sf <- GeoJSON_to_sf(geojson, proj = attr(geojson, "proj4"))
+  back_to_sf <- GeoJSON_to_sf(geojson, proj = attr(geojson, "proj"))
   expect_equivalent(sf_obj, back_to_sf)
 })