unused variables

SymbolixAU · Apr 17, 2018 · 5b3d3f5 · 5b3d3f5
1 parent 2ac615e
commit 5b3d3f5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/inst/include/geojsonsf.h b/inst/include/geojsonsf.h
@@ -12,9 +12,6 @@ namespace geojsonsf {
   const std::string PROJ4STRING = "+proj=longlat +datum=WGS84 +no_defs";
 }
 
-static const char* ARRAY_TYPES[] =
-	{ "Null", "False", "True", "Object", "Array", "String", "Number" };
-
 #define UNKNOWN            0
 #define POINT              1
 #define MULTIPOINT         2

diff --git a/src/geojson_properties.cpp b/src/geojson_properties.cpp
@@ -19,6 +19,11 @@ void vector_to_string(Rcpp::List& lst, std::string& key) {
 
 
 void get_property_types(const Value& v, std::map< std::string, std::string>& property_types) {
+
+	// TODO: move to a header??
+	static const char* ARRAY_TYPES[] =
+		{ "Null", "False", "True", "Object", "Array", "String", "Number" };
+
   for (Value::ConstMemberIterator iter = v.MemberBegin(); iter != v.MemberEnd(); ++iter){
     std::string property = iter->name.GetString();
 

diff --git a/src/geojson_to_sf.cpp b/src/geojson_to_sf.cpp
@@ -291,13 +291,17 @@ void fill_property_vectors(Document& doc_properties,
                            Rcpp::List& properties,
                            int& row_index) {
 
+	static const char* ARRAY_TYPES[] =
+		{ "Null", "False", "True", "Object", "Array", "String", "Number" };
+
   for (auto& m : doc_properties.GetObject()) {
     row_index = std::stoi(m.name.GetString());
 
     for (auto& p : m.value.GetObject() ) {
 
       std::string key = p.name.GetString();
       std::string type = property_types[key];
+
       std::string value_type = ARRAY_TYPES[p.value.GetType()];
 
       if (value_type == "String") {