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

Add CRS JSON export (refs #1545) #1547

Merged
merged 16 commits into from
Aug 20, 2019
Merged

Add CRS JSON export (refs #1545) #1547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
17f0b0b
Proof-of-concept of JSON export limited to PrimeMeridian (refs #1545)
rouault Jul 6, 2019
ece151a
CRS JSON: export GeographicCRS and Projected CRS
rouault Jul 6, 2019
076e62a
Add data/crsjson.schema.json
rouault Jul 6, 2019
d44e1e2
Travis: add testing of JSON output against schema and upgrade everyth…
rouault Jul 6, 2019
ec49c9c
projinfo: rename JSON to PROJJSON
rouault Aug 8, 2019
89f2cc7
PROJJSON export: use more compact form
rouault Aug 8, 2019
81bd57d
createFromUserInput(): add capability to import PROJJSON
rouault Aug 9, 2019
f0d766e
PROJSJON: add import/export of VerticalCRS, CompoundCRS, BoundCRS, Tr…
rouault Aug 9, 2019
124eb22
projinfo: document PROJJSON output, and add single-line output capabi…
rouault Aug 9, 2019
99b25fc
C API: add proj_as_projjson()
rouault Aug 9, 2019
5e8a44e
Doxyfile: Remove obsolete options that Mac doesn't like
rouault Aug 9, 2019
17dc5eb
Exclude include/proj/internal/nlohmann from coveralls analysis
rouault Aug 9, 2019
63981af
PROJJSON: add support for DatumEnsemble and Dynamic[Geodetic|Vertical…
rouault Aug 10, 2019
0a12617
PROJJSON: a few fixes, and add import of DerivedCRS, EngineeringCRS, …
rouault Aug 10, 2019
8d0500b
PROJJSON: add support for importing 'ids'
rouault Aug 12, 2019
cad1c5c
PROJJSON: rename file as projjson.schema.json, and add versionning to…
rouault Aug 17, 2019
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
6 changes: 4 additions & 2 deletions Doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2122,7 +2122,8 @@ EXTERNAL_PAGES = YES
# interpreter (i.e. the result of 'which perl').
# The default file (with absolute path) is: /usr/bin/perl.

PERL_PATH = /usr/bin/perl
# Commented by E. Rouault
# PERL_PATH = /usr/bin/perl

#---------------------------------------------------------------------------
# Configuration options related to the dot tool
Expand All @@ -2144,7 +2145,8 @@ CLASS_DIAGRAMS = YES
# the mscgen tool resides. If left empty the tool is assumed to be found in the
# default search path.

MSCGEN_PATH =
# Commented by E. Rouault
# MSCGEN_PATH =

# You can include diagrams made with dia in doxygen documentation. Doxygen will
# then run dia to produce the diagram and insert it in the documentation. The
Expand Down
4 changes: 1 addition & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,6 @@ AX_CHECK_COMPILE_FLAG([-Wdeprecated], [CXX_WFLAGS="$CXX_WFLAGS -Wdeprecated"],,[
AX_CHECK_COMPILE_FLAG([-Wabstract-vbase-init], [CXX_WFLAGS="$CXX_WFLAGS -Wabstract-vbase-init"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Winconsistent-missing-destructor-override], [CXX_WFLAGS="$CXX_WFLAGS -Winconsistent-missing-destructor-override"],,[$ERROR_ON_UNKNOWN_OPTIONS])

dnl Forbid use of 'or', 'and', ... alias operators
AX_CHECK_COMPILE_FLAG([-fno-operator-names], [CXX_WFLAGS="$CXX_WFLAGS -fno-operator-names"],,[$ERROR_ON_UNKNOWN_OPTIONS])

HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT=no
AX_CHECK_COMPILE_FLAG([-Wzero-as-null-pointer-constant], [CXX_WFLAGS="$CXX_WFLAGS -Wzero-as-null-pointer-constant" HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT=yes NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG="-Wno-zero-as-null-pointer-constant"],,[$ERROR_ON_UNKNOWN_OPTIONS])
if test "$HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT" = "yes"; then
Expand Down Expand Up @@ -344,6 +341,7 @@ dnl Generate files
dnl ---------------------------------------------------------------------------

AC_CONFIG_FILES([Makefile cmake/Makefile src/Makefile include/Makefile include/proj/Makefile include/proj/internal/Makefile
include/proj/internal/nlohmann/Makefile
test/Makefile test/cli/Makefile test/gie/Makefile test/gigs/Makefile test/unit/Makefile
man/Makefile man/man1/Makefile man/man3/Makefile data/Makefile
jniwrap/Makefile jniwrap/org.osgeo.proj/Makefile jniwrap/org.osgeo.proj/org/Makefile jniwrap/org.osgeo.proj/org/proj4/Makefile])
Expand Down
4 changes: 3 additions & 1 deletion data/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ DATAPATH = $(top_srcdir)/data

pkgdata_DATA = GL27 nad.lst nad27 nad83 world other.extra \
CH null \
ITRF2000 ITRF2008 ITRF2014 proj.db
ITRF2000 ITRF2008 ITRF2014 proj.db \
projjson.schema.json

SQL_ORDERED_LIST = sql/begin.sql \
sql/proj_db_table_defs.sql \
Expand Down Expand Up @@ -40,6 +41,7 @@ EXTRA_DIST = GL27 nad.lst nad27 nad83 \
world other.extra \
CH \
ITRF2000 ITRF2008 ITRF2014 \
projjson.schema.json \
CMakeLists.txt tests/test_nodata.gtx null \
generate_all_sql_in.cmake sql_filelist.cmake \
$(SQL_ORDERED_LIST)
Expand Down
Loading