Merge pull request #94 from ateucher/issue90

Parse UTF-8 strings on Windows
SymbolixAU · Mar 3, 2022 · 0550dbe · 0550dbe
2 parents fc8359b + 52ef035
commit 0550dbe
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/inst/include/geojsonsf/geojson/geojson_properties.hpp b/inst/include/geojsonsf/geojson/geojson_properties.hpp
@@ -74,14 +74,14 @@ namespace geojson_properties {
 		properties.names() = property_keys;
 		std::vector< std::string > n = properties.names();
 		std::reverse( n.begin(), n.end() );
-		std::vector< std::string > sv( n.size() );
+		Rcpp::StringVector sv( n.size() );
 		R_xlen_t i;
 
 		for( i = 0; i < n.size(); ++i ) {
-			sv[i] = n[i];
+			std::string s = n[i];
+			sv[i] = Rcpp::String( s );
 		}
 		properties.names() = sv;
-
 	}
 
 	inline void get_property_keys(
@@ -108,7 +108,7 @@ namespace geojson_properties {
 			const R_xlen_t& row_index
 		) {
 		Rcpp::StringVector sv = sf[key];
-		sv[row_index] = value;
+		sv[row_index] = Rcpp::String( value );
 		sf[key] = sv;
 	}
 

diff --git a/inst/tinytest/test-geojson_sf.R b/inst/tinytest/test-geojson_sf.R
@@ -71,3 +71,9 @@
 	expect_true( is.logical( sf$b ) )
 	expect_true( is.character( sf$c ) )
 
+	## Issue 90
+	## UTF8-encoded strings
+	geojson <- enc2utf8('{"type":"Feature","geometry":{"type":"Point","coordinates":[7.624747,51.954044]},"properties":{"örtchen":"Münster"}}')
+	out <- geojson_sf( geojson )
+	expect_equal(out[1][[1]], "Münster")
+	expect_equal(names(out)[1], "örtchen")
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -5,6 +5,11 @@
 
 using namespace Rcpp;
 
+#ifdef RCPP_USE_GLOBAL_ROSTREAM
+Rcpp::Rostream<true>&  Rcpp::Rcout = Rcpp::Rcpp_cout_get();
+Rcpp::Rostream<false>& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get();
+#endif
+
 // rcpp_df_to_geojson_atomise
 Rcpp::StringVector rcpp_df_to_geojson_atomise(Rcpp::DataFrame& df, Rcpp::StringVector& geometry_columns, int& digits, bool& factors_as_string);
 RcppExport SEXP _geojsonsf_rcpp_df_to_geojson_atomise(SEXP dfSEXP, SEXP geometry_columnsSEXP, SEXP digitsSEXP, SEXP factors_as_stringSEXP) {