From 17f0b0b3bc65ffba39bf6f22a12b2cc7fcb9bafd Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 6 Jul 2019 02:03:50 +0200 Subject: Proof-of-concept of JSON export limited to PrimeMeridian (refs #1545) --- scripts/reference_exported_symbols.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'scripts') diff --git a/scripts/reference_exported_symbols.txt b/scripts/reference_exported_symbols.txt index f3d13bd7..51ef425a 100644 --- a/scripts/reference_exported_symbols.txt +++ b/scripts/reference_exported_symbols.txt @@ -331,10 +331,17 @@ osgeo::proj::io::FactoryException::FactoryException(osgeo::proj::io::FactoryExce osgeo::proj::io::FactoryException::FactoryException(std::string const&) osgeo::proj::io::FormattingException::~FormattingException() osgeo::proj::io::FormattingException::FormattingException(osgeo::proj::io::FormattingException const&) +osgeo::proj::io::IJSONExportable::exportToJSON(osgeo::proj::io::JSONFormatter*) const +osgeo::proj::io::IJSONExportable::~IJSONExportable() osgeo::proj::io::IPROJStringExportable::exportToPROJString(osgeo::proj::io::PROJStringFormatter*) const osgeo::proj::io::IPROJStringExportable::~IPROJStringExportable() osgeo::proj::io::IWKTExportable::exportToWKT(osgeo::proj::io::WKTFormatter*) const osgeo::proj::io::IWKTExportable::~IWKTExportable() +osgeo::proj::io::JSONFormatter::create(std::shared_ptr) +osgeo::proj::io::JSONFormatter::~JSONFormatter() +osgeo::proj::io::JSONFormatter::setIndentationWidth(int) +osgeo::proj::io::JSONFormatter::setMultiLine(bool) +osgeo::proj::io::JSONFormatter::toString() const osgeo::proj::io::NoSuchAuthorityCodeException::getAuthorityCode() const osgeo::proj::io::NoSuchAuthorityCodeException::getAuthority() const osgeo::proj::io::NoSuchAuthorityCodeException::~NoSuchAuthorityCodeException() -- cgit v1.2.3 From ece151aed1b4bf2634de5759f37fd7bc005e8313 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 6 Jul 2019 17:06:23 +0200 Subject: CRS JSON: export GeographicCRS and Projected CRS --- scripts/reference_exported_symbols.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts') diff --git a/scripts/reference_exported_symbols.txt b/scripts/reference_exported_symbols.txt index 51ef425a..dc1e1efd 100644 --- a/scripts/reference_exported_symbols.txt +++ b/scripts/reference_exported_symbols.txt @@ -67,6 +67,7 @@ osgeo::proj::common::ObjectDomain::~ObjectDomain() osgeo::proj::common::ObjectDomain::ObjectDomain(osgeo::proj::common::ObjectDomain const&) osgeo::proj::common::ObjectDomain::ObjectDomain(osgeo::proj::util::optional const&, std::shared_ptr const&) osgeo::proj::common::ObjectDomain::scope() const +osgeo::proj::common::ObjectUsage::baseExportToJSON(osgeo::proj::io::JSONFormatter*) const osgeo::proj::common::ObjectUsage::baseExportToWKT(osgeo::proj::io::WKTFormatter*) const osgeo::proj::common::ObjectUsage::domains() const osgeo::proj::common::ObjectUsage::_isEquivalentTo(osgeo::proj::util::IComparable const*, osgeo::proj::util::IComparable::Criterion) const @@ -339,6 +340,8 @@ osgeo::proj::io::IWKTExportable::exportToWKT(osgeo::proj::io::WKTFormatter*) con osgeo::proj::io::IWKTExportable::~IWKTExportable() osgeo::proj::io::JSONFormatter::create(std::shared_ptr) osgeo::proj::io::JSONFormatter::~JSONFormatter() +osgeo::proj::io::JSONFormatter::ObjectContext::~ObjectContext() +osgeo::proj::io::JSONFormatter::ObjectContext::ObjectContext(osgeo::proj::io::JSONFormatter&, char const*, bool) osgeo::proj::io::JSONFormatter::setIndentationWidth(int) osgeo::proj::io::JSONFormatter::setMultiLine(bool) osgeo::proj::io::JSONFormatter::toString() const -- cgit v1.2.3 From 81bd57dfd8cfae609288643d1b09a4805f1bcded Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 9 Aug 2019 12:59:49 +0200 Subject: createFromUserInput(): add capability to import PROJJSON --- scripts/cppcheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh index f21c74e7..244fac41 100755 --- a/scripts/cppcheck.sh +++ b/scripts/cppcheck.sh @@ -34,7 +34,7 @@ done ret_code=0 -grep -v "unmatchedSuppression" ${LOG_FILE} | grep -v "nn.hpp" | grep -v "wkt1_generated_parser" | grep -v "wkt2_generated_parser" > ${LOG_FILE}.tmp +grep -v "unmatchedSuppression" ${LOG_FILE} | grep -v "nn.hpp" | grep -v "nlohmann/json.hpp" | grep -v "wkt1_generated_parser" | grep -v "wkt2_generated_parser" > ${LOG_FILE}.tmp mv ${LOG_FILE}.tmp ${LOG_FILE} if grep "null pointer" ${LOG_FILE} ; then -- cgit v1.2.3 From 99b25fcf9009a6cc098cf2e0703f994d74968985 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 9 Aug 2019 17:50:35 +0200 Subject: C API: add proj_as_projjson() --- scripts/reference_exported_symbols.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/reference_exported_symbols.txt b/scripts/reference_exported_symbols.txt index dc1e1efd..a372d163 100644 --- a/scripts/reference_exported_symbols.txt +++ b/scripts/reference_exported_symbols.txt @@ -768,6 +768,7 @@ proj_angular_output proj_area_create proj_area_destroy proj_area_set_bbox +proj_as_projjson proj_as_proj_string proj_assign_context proj_as_wkt -- cgit v1.2.3 From cad1c5cf61fc00759bf4ad17b0b34f57f4945de6 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 17 Aug 2019 10:58:08 +0200 Subject: PROJJSON: rename file as projjson.schema.json, and add versionning to it and to exported PROJJSON strings --- scripts/reference_exported_symbols.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/reference_exported_symbols.txt b/scripts/reference_exported_symbols.txt index a372d163..a453bb2d 100644 --- a/scripts/reference_exported_symbols.txt +++ b/scripts/reference_exported_symbols.txt @@ -344,6 +344,7 @@ osgeo::proj::io::JSONFormatter::ObjectContext::~ObjectContext() osgeo::proj::io::JSONFormatter::ObjectContext::ObjectContext(osgeo::proj::io::JSONFormatter&, char const*, bool) osgeo::proj::io::JSONFormatter::setIndentationWidth(int) osgeo::proj::io::JSONFormatter::setMultiLine(bool) +osgeo::proj::io::JSONFormatter::setSchema(std::string const&) osgeo::proj::io::JSONFormatter::toString() const osgeo::proj::io::NoSuchAuthorityCodeException::getAuthorityCode() const osgeo::proj::io::NoSuchAuthorityCodeException::getAuthority() const -- cgit v1.2.3