Merge branch 'master' of https://github.com/SymbolixAU/geojsonsf

q# especially if it merges an updated upstream into a topic branch.
SymbolixAU · Mar 15, 2020 · 559d52b · 559d52b
2 parents 13593a7 + 48e7bac
commit 559d52b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 180 deletions.
diff --git a/R/scratch.R b/R/scratch.R
diff --git a/inst/include/geojsonsf/geojson/api/df_api.hpp b/inst/include/geojsonsf/geojson/api/df_api.hpp
@@ -133,7 +133,7 @@ namespace api {
   	for ( i = 0; i < df.length(); ++i) {
 
   		Rcpp::String this_column = column_names[i];
-  		int idx = sfheaders::utils::where_is( this_column, geometry_columns );
+  	  R_xlen_t idx = sfheaders::utils::where_is( this_column, geometry_columns );
 
   		if ( idx == -1 ) {  // i.e. it's not in the vector
 

diff --git a/inst/include/geojsonsf/geojson/geojson_properties.hpp b/inst/include/geojsonsf/geojson/geojson_properties.hpp
@@ -74,7 +74,7 @@ namespace geojson_properties {
 		std::vector< std::string > n = properties.names();
 		std::reverse( n.begin(), n.end() );
 		std::vector< std::string > sv( n.size() );
-		unsigned int i;
+		R_xlen_t i;
 
 		for( i = 0; i < n.size(); ++i ) {
 			sv[i] = n[i];

diff --git a/inst/include/geojsonsf/geojson/parse.hpp b/inst/include/geojsonsf/geojson/parse.hpp
@@ -67,8 +67,8 @@ namespace parse {
 		std::string geom_type;
 		geojsonsf::validate::validate_geometries(val, sfg_objects);
 		auto geometries = val["geometries"].GetArray();
-		unsigned int n = geometries.Size();
-		unsigned int i;
+		R_xlen_t n = geometries.Size();
+		R_xlen_t i;
 		Rcpp::List geom_collection(n);
 
 		for (i = 0; i < n; ++i) {
@@ -137,8 +137,8 @@ namespace parse {
 		geojsonsf::geojson_properties::get_property_keys(p, property_keys);
 		geojsonsf::geojson_properties::get_property_types(p, property_types);
 
-		unsigned int geomsize = 1;
-		unsigned int i;
+		R_xlen_t geomsize = 1;
+		R_xlen_t i;
 
 		if (expand_geometries && type == "GeometryCollection") {
 			geojsonsf::validate::validate_geometries( geometry, sfg_objects );
@@ -185,8 +185,8 @@ namespace parse {
 
 		auto features = fc["features"].GetArray();
 
-		unsigned int n = features.Size(); // number of features
-		unsigned int i;
+		R_xlen_t n = features.Size(); // number of features
+		R_xlen_t i;
 
 		Rcpp::List feature_collection(n);
 

diff --git a/inst/include/geojsonsf/geojson/writers/writers.hpp b/inst/include/geojsonsf/geojson/writers/writers.hpp
@@ -116,8 +116,8 @@ namespace writers {
 
   template< typename Writer >
   inline void points_to_geojson( Writer& writer, Rcpp::IntegerVector& point, int digits ) {
-    int n = point.size();
-    int i;
+  	R_xlen_t n = point.size();
+  	R_xlen_t i;
     int value;
     writer.StartArray();
     for ( i = 0; i < n; ++i ) {
@@ -138,8 +138,8 @@ namespace writers {
 
   template< typename Writer >
   inline void points_to_geojson( Writer& writer, Rcpp::NumericVector& point, int digits ) {
-    int n = point.size();
-    int i;
+  	R_xlen_t n = point.size();
+  	R_xlen_t i;
     double value;
     writer.StartArray();
     for ( i = 0; i < n; ++i ) {
@@ -187,8 +187,8 @@ namespace writers {
 
   template< typename Writer >
   inline void linestring_to_geojson( Writer& writer, Rcpp::IntegerMatrix& line, int digits ) {
-    int i;
-    int nrow = line.nrow();
+  	R_xlen_t i;
+  	R_xlen_t nrow = line.nrow();
     for ( i = 0; i < nrow; ++i ) {
       Rcpp::IntegerVector this_row = line(i, Rcpp::_ );
       points_to_geojson( writer, this_row, digits );
@@ -202,8 +202,8 @@ namespace writers {
 
   template< typename Writer >
   inline void linestring_to_geojson( Writer& writer, Rcpp::NumericMatrix& line, int digits ) {
-    int i;
-    int nrow = line.nrow();
+  	R_xlen_t i;
+  	R_xlen_t nrow = line.nrow();
     for ( i = 0; i < nrow; ++i ) {
       Rcpp::NumericVector this_row = line(i, Rcpp::_ );
       points_to_geojson( writer, this_row, digits );
@@ -238,8 +238,8 @@ namespace writers {
 
   template< typename Writer >
   inline void polygon_to_geojson( Writer& writer, Rcpp::List& sfg, int digits ) {
-    int i;
-    int n = sfg.size();
+  	R_xlen_t i;
+  	R_xlen_t n = sfg.size();
     for ( i = 0; i < n; ++i ) {
       Rcpp::NumericMatrix sfgi = sfg[i];
       linestring_to_geojson( writer, sfgi, digits );
@@ -254,8 +254,8 @@ namespace writers {
 
   template< typename Writer >
   inline void multi_polygon_to_geojson( Writer& writer, Rcpp::List& sfg, int digits ) {
-    int i;
-    int n = sfg.size();
+  	R_xlen_t i;
+  	R_xlen_t n = sfg.size();
     for ( i = 0; i < n; ++i ) {
       Rcpp::List sfgi = sfg[i];
       polygon_to_geojson( writer, sfgi, digits );