Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
e052fa8
add testing against json schema
Omar-Elrefaei Apr 24, 2025
24b4323
half-complete implementation for processing GEOGCRS
Omar-Elrefaei Apr 24, 2025
5626679
use DeepDiffs.jl for semantic comparison between nested Dicts
Omar-Elrefaei Apr 24, 2025
5e63081
add processing for GEOGCRS(Variant 1: ENSEMBLE)
Omar-Elrefaei Apr 25, 2025
7d55128
add processing for GEOGCRS(Variant 2: DATUM)
Omar-Elrefaei Apr 30, 2025
65f6d2b
handle UNIT optionally occurring in coordinate_system or each axis
Omar-Elrefaei Apr 30, 2025
27af91c
testing utils
Omar-Elrefaei Apr 30, 2025
39814a3
testing
Omar-Elrefaei Apr 30, 2025
1a5e749
add processing for GEODCRS
Omar-Elrefaei Apr 30, 2025
4bac566
add processing for DYNAMIC entries is GEOG and GEOD.
Omar-Elrefaei Apr 30, 2025
02e91a1
uncommitted changes
Omar-Elrefaei Apr 30, 2025
bf44043
add processing for PROJCRS
Omar-Elrefaei May 1, 2025
016f543
replace the actual projjsonstring function
Omar-Elrefaei May 1, 2025
33fac70
remove ArchGDAL dependency
Omar-Elrefaei May 5, 2025
d0a3eba
Revert "remove ArchGDAL dependency"
Omar-Elrefaei May 6, 2025
65ef7e0
solid cleanup round
Omar-Elrefaei May 6, 2025
65a49f1
refactor testing utils
Omar-Elrefaei May 6, 2025
822213f
side step EPSGs unsupported by the WKT dataset
Omar-Elrefaei May 7, 2025
844f960
Fix 8% of cases where axis.direction should not start with uppercase
Omar-Elrefaei May 7, 2025
8975ebb
add support for meridian and prime_meridian optional nodes
Omar-Elrefaei May 7, 2025
d02bc48
support custom units for measurments (Clarke's foot??)
Omar-Elrefaei May 7, 2025
4770623
full unit support
Omar-Elrefaei May 7, 2025
b225174
ellipsoid cleanup
Omar-Elrefaei May 7, 2025
54fc3ec
git revert hot fix
Omar-Elrefaei May 7, 2025
f661c7e
finalize testsuite
Omar-Elrefaei May 7, 2025
07604f8
testset fix
Omar-Elrefaei May 7, 2025
2c1212b
reorganize wkt2json.jl
Omar-Elrefaei May 7, 2025
142641f
rename wktdict2jsondict to wkt2json
Omar-Elrefaei May 7, 2025
5a1e97c
simple test to make sure our main callsite is tested
Omar-Elrefaei May 8, 2025
69ba497
cleanup test/jsonutils.jl
Omar-Elrefaei May 8, 2025
fc5a9fc
remove test dependency on DeepDiffs as it still had few false-negatives
Omar-Elrefaei May 8, 2025
a751dd3
remove import DeepDiffs
Omar-Elrefaei May 9, 2025
a939fdb
Merge branch 'master' into wkt2expr2json
Omar-Elrefaei May 9, 2025
3428203
reintroduce changes after merging with master
Omar-Elrefaei May 9, 2025
1c4c7cb
turns out spatialref is still needed for extra/gdal.jl
Omar-Elrefaei May 10, 2025
0809dca
change file locations
Omar-Elrefaei May 10, 2025
951975b
rename vars and helper functions to be more inline with style
Omar-Elrefaei May 10, 2025
e39e93f
adjust and rename itembykey (to finditem)
Omar-Elrefaei May 10, 2025
d8d7f31
various improvements to comments
Omar-Elrefaei May 16, 2025
b46ecb6
delete commented code
Omar-Elrefaei May 16, 2025
3d8b421
run JuliaFormatter
Omar-Elrefaei May 16, 2025
7cf6f6d
various comments, error msgs, and code cleanups
Omar-Elrefaei May 16, 2025
4c99cd0
one round of cleanups for test/jsonutils.jl
Omar-Elrefaei May 16, 2025
1731b64
cleanup debug_json (now check_projjson) test/jsonutils.jl
Omar-Elrefaei May 16, 2025
3abed26
test/jsonutils.jl renames
Omar-Elrefaei May 16, 2025
31bcfaa
style renames
Omar-Elrefaei May 16, 2025
f1b7c03
refactor wkt2json_datum and change it's encapsulation
Omar-Elrefaei May 16, 2025
0cef41c
mass consistency renames
Omar-Elrefaei May 16, 2025
3f6b291
error msg improvements
Omar-Elrefaei May 16, 2025
89e01c9
remove 80% of remaining underscores to fit project style
Omar-Elrefaei May 20, 2025
55ac020
Move test/jsonutils.jl to outside testfiles
juliohm May 22, 2025
cdb4e30
Rename test/jsonutils.jl to test/testutils.jl
juliohm May 22, 2025
4cd9990
Move all test utilities to test/testutils.jl
juliohm May 22, 2025
6fc6324
Miscellaneous cleanup
juliohm May 22, 2025
04a4c83
More refactoring
juliohm May 22, 2025
c483974
Fix typo
juliohm May 22, 2025
3d62eea
Rename src/projjson.jl to src/crsstrings.jl
juliohm May 22, 2025
3506b5b
Refactor src/conversion.jl
juliohm May 22, 2025
7915318
Refactor tests
juliohm May 22, 2025
28bf0c9
Refactor tests
juliohm May 22, 2025
348bc2e
Minor adjustments
juliohm May 22, 2025
61fe728
follow style, remove function return type
Omar-Elrefaei May 22, 2025
b86df1a
minor adjustments as per PR review
Omar-Elrefaei May 23, 2025
d1024b6
organize and elaborate on testing edge cases
Omar-Elrefaei May 23, 2025
34ef409
remove helper debugging functions
Omar-Elrefaei May 23, 2025
54ed56f
Final cleanup
juliohm May 24, 2025
1cac3ed
Final code style fixes
juliohm May 26, 2025
5eb7466
Move functions around
juliohm May 26, 2025
9931b58
Additional cleanup
juliohm May 26, 2025
26e980f
jsonroundtrip is not needed anymore. Do not leave any SubStrings in t…
Omar-Elrefaei May 26, 2025
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
9 changes: 6 additions & 3 deletions src/GeoIO.jl
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import GeoInterface as GI
import GeoFormatTypes as GFT
import ArchGDAL.GDAL

# ProjJSON CRS
# PROJJSON CRS
import JSON3

# VTK extensions
Expand Down Expand Up @@ -112,10 +112,13 @@ function formats(io=stdout; sortby=:extension)
pretty_table(io, sorted, alignment=:c, crop=:none, show_subheader=false)
end

# utilities
# basic utilities
include("utils.jl")

# conversions
# utilities for CRS strings
include("crsstrings.jl")

# utilities for geometry conversion
include("conversion.jl")

# extra code for backends
Expand Down
6 changes: 3 additions & 3 deletions src/conversion.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# Licensed under the MIT License. See LICENSE in the project root.
# ------------------------------------------------------------------

raw(coords::CRS) = coords.x, coords.y
raw(coords::LatLon) = coords.lon, coords.lat

# --------------------------------------
# Minimum GeoInterface.jl to perform IO
# --------------------------------------
Expand All @@ -23,9 +26,6 @@ GI.ncoord(::GI.PointTrait, p::Point) = CoordRefSystems.ncoords(crs(p))
GI.getcoord(::GI.PointTrait, p::Point) = ustrip.(raw(coords(p)))
GI.getcoord(trait::GI.PointTrait, p::Point, i) = GI.getcoord(trait, p)[i]

raw(coords::CRS) = coords.x, coords.y
raw(coords::LatLon) = coords.lon, coords.lat

GI.ncoord(::GI.LineTrait, s::Segment) = CoordRefSystems.ncoords(crs(s))
GI.ngeom(::GI.LineTrait, s::Segment) = nvertices(s)
GI.getgeom(::GI.LineTrait, s::Segment, i) = vertex(s, i)
Expand Down
Loading
Loading