diff --git a/DESCRIPTION b/DESCRIPTION index 9a1387a..027f74e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: geojsonsf Type: Package Title: GeoJSON to Simple Feature Converter Version: 2.0.4 -Date: 2023-06-24 +Date: 2024-05-21 Authors@R: c( person("David", "Cooley", ,"dcooley@symbolix.com.au", role = c("aut", "cre")) ) @@ -12,12 +12,11 @@ URL: https://github.com/SymbolixAU/geojsonsf BugReports: https://github.com/SymbolixAU/geojsonsf/issues Encoding: UTF-8 LazyData: true -Depends: R (>= 3.3.0) -SystemRequirements: C++11 +Depends: R (>= 4.0.0) LinkingTo: geometries, - jsonify (>= 1.1.1), - rapidjsonr (>= 1.2.0), + jsonify (>= 1.2.3), + rapidjsonr (>= 1.2.1), Rcpp, sfheaders (>= 0.2.2) Imports: @@ -30,3 +29,7 @@ Suggests: rmarkdown, tinytest VignetteBuilder: knitr +remotes: + https://github.com/SymbolixAU/jsonify + https://github.com/SymbolixAU/rapidjsonr + diff --git a/inst/include/geojsonsf/geojson/geojson_properties.hpp b/inst/include/geojsonsf/geojson/geojson_properties.hpp index f6f0780..54add4d 100644 --- a/inst/include/geojsonsf/geojson/geojson_properties.hpp +++ b/inst/include/geojsonsf/geojson/geojson_properties.hpp @@ -272,12 +272,12 @@ namespace geojson_properties { // don't do anything... } else if (value_type == "Object") { - Value v = p.value.GetObject(); + Value& v = p.value.GetObject(); nested_json_to_string(v, type, properties, row_index, key); } else if (value_type == "Array") { - Value v = p.value.GetArray(); + Value& v = p.value.GetArray(); nested_json_to_string(v, type, properties, row_index, key); } else { diff --git a/src/Makevars b/src/Makevars index e932cb1..64adefd 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,4 +1,2 @@ -CXX_STD = CXX11 - PKG_CXXFLAGS = -I../inst/include/ PKG_CPPFLAGS=-DSTRICT_R_HEADERS diff --git a/src/Makevars.win b/src/Makevars.win index e932cb1..64adefd 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,4 +1,2 @@ -CXX_STD = CXX11 - PKG_CXXFLAGS = -I../inst/include/ PKG_CPPFLAGS=-DSTRICT_R_HEADERS