Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Json property additions #716

Merged
merged 2 commits into from
Jan 25, 2024
Merged

Json property additions #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
410c651
feat: add function to pretty print JsonProperty
hellkite500 Jan 24, 2024
174cb1f
feat: add copy constructor with new key value
hellkite500 Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 70 additions & 1 deletion include/geojson/JSONProperty.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <map>
#include <vector>
#include <iostream>

#include <iomanip>
#include <boost/property_tree/ptree.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/variant.hpp>
Expand Down Expand Up @@ -388,6 +388,16 @@ namespace geojson {
}
}

/**
* @brief Copy construct a JSONProperty, but use a new key value for the property
*
* @param value_key
* @param original
*/
JSONProperty(const std::string& value_key, const JSONProperty&original):JSONProperty(original){
key = value_key;
}

/**
* A basic destructor
*/
Expand Down Expand Up @@ -419,6 +429,65 @@ namespace geojson {
data = Object( &values );
}

/**
* @brief Pretty print the property to standard out stream.
*
* Recurses through the property to tab/print nested objects/lists.
*
* @param p Property to print
* @param tab (optional) Additional starting tab to indent (default 0)
* @param newline (optional) Add a new line to the end of the print (default true)
*/
static void print_property(const geojson::JSONProperty& p, int tab=0, bool newline = true){
char end = '\0';
if(newline) end = '\n';
std::cout<<std::setw(tab);
switch( p.get_type() ){
case geojson::PropertyType::String:
std::cout<<p.as_string()<<end;
break;
case geojson::PropertyType::Real:
std::cout<<p.as_real_number()<<end;
break;
case geojson::PropertyType::Natural:
std::cout<<p.as_natural_number()<<end;
break;
case geojson::PropertyType::Boolean:
if(p.as_boolean())
std::cout<<"true"<<end;
else
std::cout<<"false"<<end;
break;
case geojson::PropertyType::List:
std::cout<<std::setw(tab)<<"[";
tab += 5;
for( const auto& lp : p.as_list() ){
//This is a little harder to align nicely without knowing
//the length of the property as a string first...so for now,
//just try to get a little bit in to make it easier to read
std::cout<<std::setw(tab);
print_property(lp, tab, false);
std::cout<<","<<end;
}
tab -= 5;
std::cout<<std::setw(tab)<<" ]"<<end;

break;
case geojson::PropertyType::Object:
//tab += 5;
std::cout<<std::setw(tab)<<"{\n";
tab += 5;
for( auto pair : p.get_values() ){
std::cout<<std::setw(tab + pair.first.length())<<pair.first<<" : ";
print_property(pair.second, tab, false);
std::cout<<",\n";
}
tab -= 5;
std::cout<<std::setw(tab)<<"}"<<end;
tab -= 5;
};
}

/**
* Get the type of the property (Natural, Real, String, etc)
*
Expand Down
42 changes: 42 additions & 0 deletions test/geojson/JSONProperty_Test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,48 @@ class JSONProperty_Test : public ::testing::Test {

};

TEST_F(JSONProperty_Test, print_property_test) {
geojson::JSONProperty string_property("string", "test_string");
geojson::JSONProperty::print_property(string_property);
geojson::JSONProperty natural_property("natural", 4);
geojson::JSONProperty::print_property(natural_property);
geojson::JSONProperty real_property("real", 3.0);
geojson::JSONProperty::print_property(real_property);
geojson::JSONProperty boolean_property("boolean", true);
geojson::JSONProperty::print_property(boolean_property);

geojson::PropertyMap object;

object.emplace("natural", geojson::JSONProperty("natural", 4));
object.emplace("real", geojson::JSONProperty("real", 3.0));
object.emplace("string", geojson::JSONProperty("string", "test_string"));
object.emplace("boolean", geojson::JSONProperty("boolean", true));

geojson::JSONProperty object_property("object", object);
geojson::JSONProperty::print_property(object_property);

std::vector<geojson::JSONProperty> properties;

properties.push_back(geojson::JSONProperty("natural", 4));
properties.push_back(geojson::JSONProperty("real", 3.0));
properties.push_back(geojson::JSONProperty("string", "test_string"));
properties.push_back(geojson::JSONProperty("boolean", true));
properties.push_back(object_property);

geojson::JSONProperty list_property("list_property", properties);

geojson::JSONProperty::print_property(list_property);

}

TEST_F(JSONProperty_Test, copy_new_key_test) {
geojson::JSONProperty string_property("string", "test_string");
geojson::JSONProperty new_key_property("new_string", string_property);
ASSERT_EQ(new_key_property.get_type(), geojson::PropertyType::String);
ASSERT_EQ(new_key_property.as_string(), string_property.as_string());
ASSERT_EQ(new_key_property.get_key(), "new_string");
}

TEST_F(JSONProperty_Test, natural_property_test) {
geojson::JSONProperty natural_property("natural", 4);
ASSERT_EQ(natural_property.get_type(), geojson::PropertyType::Natural);
Expand Down
Loading