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.

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

netCDF CF-1.8 Driver Updates - Writing Support, Bug Fix, Streaming etc. #1680

Merged
merged 182 commits into from
Jul 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
182 commits
Select commit Hold shift + click to select a range
a71ed08
Some preliminary work- add defines for new special simple geometry at…
wchen329 Feb 16, 2019
e6892ee
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 Apr 1, 2019
8c056d9
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 Apr 4, 2019
6088a59
Merge branch 'master' of https://github.com/wchen329/gdal
wchen329 Apr 4, 2019
6d720d4
minor change in perm
wchen329 Apr 4, 2019
70bef01
Add some stubs for cf-1.8, add to gmake file
wchen329 Apr 4, 2019
9a6a0ec
implemented Cf attribute retrieval, untested
wchen329 Apr 4, 2019
eababe8
implemented Cf Conventions attribute retrieval, untested
wchen329 Apr 4, 2019
cebc442
Merge branch 'master' of https://github.com/wchen329/gdal
wchen329 Apr 4, 2019
6980fff
Added most of impl for getGeometryType
wchen329 Apr 4, 2019
65c6b36
more on implementation, stubs, and members of SGeometry
wchen329 Apr 4, 2019
181cf94
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 Apr 4, 2019
952d5c2
more work on SGeometry
wchen329 Apr 5, 2019
be185bb
SGeometry constructor finished
wchen329 Apr 5, 2019
0351134
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 Apr 5, 2019
3a92af1
next pt feature [strinng needs testing]
wchen329 Apr 5, 2019
013eac8
Fixed issue with CF minor version detection
wchen329 Apr 5, 2019
dfd7d70
Fixed a few leaks, also some general func fixes
wchen329 Apr 5, 2019
26f4041
Fixed non-init issue for sgeometry ncid
wchen329 Apr 5, 2019
b361484
Add multiple geometry support
wchen329 Apr 5, 2019
d6efb4f
misc. fixes, small interfa cce addt
wchen329 Apr 5, 2019
d478962
Fixed swapping part node count and node count "whoops"
wchen329 Apr 5, 2019
b87c7fb
Further support for multipart geometry
wchen329 Apr 5, 2019
8dd25bc
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 Apr 26, 2019
ed739f4
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 Apr 26, 2019
bf34ff8
Some more preliminary work towards tying up simple geometry reading
wchen329 Apr 28, 2019
67d5b4c
Primitive support for open netCDF dataset with CF-1.8 geometries, no …
wchen329 Apr 28, 2019
a903621
CF 1.8 single polygon detection working
wchen329 May 9, 2019
7f5bb19
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 May 9, 2019
dc24114
Re-enabled multiple features per layer
wchen329 May 10, 2019
d3708f9
Genericized layer addition for sg
wchen329 May 10, 2019
6ddcfe1
Refactored SGeometry polygon wkb, linestrings working
wchen329 May 14, 2019
66b801a
Multipolygon implementation (mainly) done
wchen329 May 14, 2019
511e438
Fixed broken polygon detection, holeless Multipolygons now readable
wchen329 May 15, 2019
6f14178
Multiline reading support
wchen329 May 15, 2019
67df5a2
Fix multipoints
wchen329 May 15, 2019
78d0acc
Points working now
wchen329 May 15, 2019
f9f0f7f
Slight refactoring
wchen329 May 15, 2019
c8dfdaf
Fix seeking bug in multipoint
wchen329 May 15, 2019
b0537d3
Add property reader, not yet integrated
wchen329 May 16, 2019
3853e00
Added mostly working interior ring polygon support
wchen329 May 16, 2019
5ca2cbf
Refactor, dependence only on geometry containers
wchen329 May 17, 2019
bd165f0
Fix small potential initialization issue
wchen329 May 17, 2019
5b1c250
Add initialization, allow for more than one Layer
wchen329 May 17, 2019
e6ded56
Interior ringed polygons (finally) working
wchen329 May 17, 2019
d844b1c
Some basic field support...
wchen329 May 17, 2019
f25bbd6
Worked in property tracking for simple geometries
wchen329 May 17, 2019
62cde13
Add to vc makefile, help with MSVC linker error
wchen329 May 19, 2019
02c9dc9
Cleaned up compiler warnings, added exception handling for several ex…
wchen329 May 19, 2019
f6afe64
Refactor, fixed another init issue
wchen329 May 20, 2019
83b3bca
Refactor mempcpy and reallocarray out
wchen329 May 20, 2019
ce1d806
Added little oom check
wchen329 May 20, 2019
b5dd276
Further "refactoring"
wchen329 May 20, 2019
9b22c9b
Add test cases, small refactoring, SRS detection (not working)
wchen329 May 20, 2019
0686795
Refactoring mentioned that was intended for previous commit
wchen329 May 20, 2019
aab1d72
Remove erroneous SRS setting
wchen329 May 21, 2019
e54dbc9
Same as last commit
wchen329 May 21, 2019
19df30e
Address compiler warnings on other platforms
wchen329 May 21, 2019
e13774e
Optimize, property scanning, small refactor
wchen329 May 21, 2019
10433c6
Further resilience against bad input updated test case
wchen329 May 22, 2019
14c2378
Missing geometry type detection
wchen329 May 22, 2019
7188525
Moved around test data, basic tests, fixed buffer overflow (still yet…
wchen329 May 23, 2019
0fc9d6f
Forgot to uncomment something
wchen329 May 23, 2019
627cea3
Add a couple of more tests
wchen329 May 23, 2019
920c0e1
Refactor according to good feedback (not done yet) primarily "safety"…
wchen329 May 23, 2019
1e05a90
Also, address buffer overflow (still not done)
wchen329 May 23, 2019
78c4d97
oops clean up, get feature count passing, fix test
wchen329 May 23, 2019
9f59507
add forgotten test itself
wchen329 May 23, 2019
bc90572
Further elaboration on tests, tests features directly using WKT repre…
wchen329 May 23, 2019
f19652d
Change exception handling to be done by reference, rather than explic…
wchen329 May 23, 2019
ab5678e
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 May 24, 2019
cb6753a
Add flipped axes test, fixed flipped axis issue, addressed more conce…
wchen329 May 24, 2019
9bdcbd5
Implementation of reset reading for simple geometries (with test)
wchen329 May 24, 2019
4715e18
Revised bad feature test (and some exceptions)
wchen329 May 24, 2019
9845edd
Add multiple geometry container / layer test
wchen329 May 25, 2019
863df6a
Added explicit support for new "geometry dimension", added copyrights…
wchen329 May 25, 2019
649435b
Fix broken test
wchen329 May 28, 2019
a9c5dab
Fix one of the casting issues presented in review, remove comments
wchen329 May 28, 2019
6843972
Attempt to address appveyor warnings
wchen329 May 28, 2019
467d7ae
Switched from expression matching to simple scanning for CF version
wchen329 May 28, 2019
7cd06a2
Switched from manual expression matching to scanning for CF version, …
wchen329 May 28, 2019
6e32835
Merge branch 'master' of https://github.com/wchen329/gdal
wchen329 May 28, 2019
9f0f314
Addressed several casting issues
wchen329 May 28, 2019
ae3440f
Minor spacing changing
wchen329 May 28, 2019
3889e3b
Remove redundant test, address another spacing concern
wchen329 May 28, 2019
156ee2b
Enforce geometry_dimension, upgrade test-cases to include geometry_di…
wchen329 May 29, 2019
6b8c3f0
Fix one last inconsistent indent
wchen329 May 29, 2019
cffdbc5
Attempt to address issues in appveyor build
wchen329 May 29, 2019
7e29b12
Address MSVC issues- in appVeyor
wchen329 May 31, 2019
cf8f7ad
Clean up test
wchen329 May 31, 2019
7513eb5
Fix delete operator mismatch from valgrind, address CI warnings
wchen329 May 31, 2019
a8f8374
Remove tabulations...
wchen329 May 31, 2019
f274fa8
Revise instance dimension scanning, remove geometry_dimension from te…
wchen329 May 31, 2019
23ed0d6
3D feature update, one basic 3d point test, more to arrive soon...
wchen329 May 31, 2019
3ea9f1b
Fix bugs in 3d feature update, add test cases for each feature type
wchen329 Jun 1, 2019
4f141c5
Small refactors, according to CI failures- 3D axis ordering test
wchen329 Jun 1, 2019
24c790b
try to make CI a little happy, light doc update
wchen329 Jun 2, 2019
35d99fa
Another attempt to make CI happy, also non-working CF-1.8 CRS setting…
wchen329 Jun 3, 2019
6959442
Doc update
wchen329 Jun 3, 2019
e0c8bd1
Again, attempt to pass last CI build
wchen329 Jun 3, 2019
0738ced
Quick fix of misplaced explicit
wchen329 Jun 3, 2019
bbdd277
Retrigger CI due to network outage, also comment out SRS setting for …
wchen329 Jun 3, 2019
4441c01
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 Jun 3, 2019
d09095c
\Clean comment
wchen329 Jun 4, 2019
ee93221
Small declaration change, doc rewording and correction per review
wchen329 Jun 4, 2019
f9e17b8
Fixes for test_ogrsf
wchen329 Jun 4, 2019
dda0ff3
Remove hanging space...
wchen329 Jun 4, 2019
ea0c7d2
Fix blank layer issue
wchen329 Jun 4, 2019
3e56847
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 Jun 5, 2019
90f7ab4
Merge branch 'master' of https://github.com/wchen329/gdal
wchen329 Jun 11, 2019
62470f5
Modifications to produce very basic CF-1.8 point data (probably broke…
wchen329 Jun 14, 2019
2de317d
Add utilities that ease writing to nc files
wchen329 Jun 15, 2019
3381693
General geometry container writing
wchen329 Jun 18, 2019
6da3c04
Working CF-1.8 point writing
wchen329 Jun 19, 2019
11bc7e3
Update GNUmakefile dependency
wchen329 Jun 19, 2019
a8951df
More scaffolding for writing simplecurve based geometries
wchen329 Jun 19, 2019
88f3948
Node coordinate additions
wchen329 Jun 19, 2019
9b38e20
Remove execute bits
wchen329 Jun 19, 2019
41788b5
Ability to write standard line strings
wchen329 Jun 19, 2019
6a38bdf
Multipoint writing capabilities
wchen329 Jun 20, 2019
85849bd
single ring Polygon writing
wchen329 Jun 20, 2019
1b32541
Further progress on interior rings
wchen329 Jun 20, 2019
cf2bc86
General multi-ringed Polygon writing support
wchen329 Jun 20, 2019
66c8942
Multiline support
wchen329 Jun 20, 2019
a1661de
single ringed Multipolygon writing, most of multiple ringed Multipoly…
wchen329 Jun 20, 2019
e321d42
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 Jun 20, 2019
b971017
Fix memory corruption issues with Multipolygons with holes
wchen329 Jun 20, 2019
e3c3c0f
General Multipolygons (with and without interior rings) writing support
wchen329 Jun 20, 2019
1a5a43b
writing 3D support
wchen329 Jun 20, 2019
86b331f
Fixes for point, point25D layer creation
wchen329 Jun 21, 2019
0e7279e
Add exception classes
wchen329 Jun 21, 2019
09510d3
Added error handling, improving resilence to failures
wchen329 Jun 21, 2019
720104f
Modify LEGACY=WKT flag, upgrade some test cases
wchen329 Jun 22, 2019
016e190
Upgrade more test cases (to use LEGACY=WKT)
wchen329 Jun 22, 2019
08bec46
Add test procedure stubs (not yet implemented)
wchen329 Jun 22, 2019
62ab55d
Test cases for writing point and point 3D, passing
wchen329 Jun 22, 2019
fa20ddd
Small test case tweak
wchen329 Jun 22, 2019
0d1d718
Adjust layer heuristic, allow group datasets that are heterogenous be…
wchen329 Jun 22, 2019
28f0005
Somewhat fix issue of false positive on dimension check (by disabling…
wchen329 Jun 23, 2019
829886c
Multipoint and multipoint 3D tests, both passing
wchen329 Jun 23, 2019
b48d2f2
Added polygon (one with interior rings) write test, fixed issue with …
wchen329 Jun 23, 2019
bf5b134
Multiline test case, passing
wchen329 Jun 23, 2019
cd26cbb
Exterior ring only polygon test cases
wchen329 Jun 24, 2019
2797cbe
Multiline 3D test
wchen329 Jun 24, 2019
9031123
Multipolygon no interior rings, 2D and 3D tests, passing
wchen329 Jun 24, 2019
a1c70e1
Mixed multipolygon test holes and with no holes (failing)
wchen329 Jun 24, 2019
031d58b
First steps toward optimization, non-legacy tests failing
wchen329 Jun 24, 2019
434cc22
Re-implementation of interior ring support (currently bugged for non-…
wchen329 Jun 25, 2019
e65eaf7
Fix polygon test cases
wchen329 Jun 25, 2019
b4e691d
Fix multiline tests
wchen329 Jun 25, 2019
0ca7525
Fix specific glitch in reader concerning interior ring less polygon f…
wchen329 Jun 25, 2019
94b134a
Multipolygon 3D test, passing
wchen329 Jun 25, 2019
46283df
Remove multiple layer test
wchen329 Jun 26, 2019
b6aa9df
New layer creation option: BUFFER_SIZE, allows for manual setting of …
wchen329 Jun 26, 2019
c83d722
New test case on correctness of geometries written with explicit limi…
wchen329 Jun 26, 2019
e44723a
Switched netCDF CF-1.8 reader to fetch features on-demand rather than…
wchen329 Jun 26, 2019
019be5f
Projection setting capabilities... kind of
wchen329 Jun 26, 2019
d3fb770
Addded SRS testing testing script, modify bad CF 1.8 test case
wchen329 Jun 26, 2019
4f2d629
Address CI concerns, refactor, remove unused code
wchen329 Jun 27, 2019
27db975
Fix corruption issue that could happen when reading netCDF datasets
wchen329 Jun 27, 2019
4896475
Remove tabulation characters
wchen329 Jun 27, 2019
336160c
Remove random character inputted when refactoring
wchen329 Jun 27, 2019
941988c
Merge branch 'master' of https://github.com/OSGeo/gdal
wchen329 Jun 28, 2019
fecc9bb
Resolve issue with aborting when writing from another netCDF source file
wchen329 Jun 28, 2019
4585353
netCDF file replication test
wchen329 Jun 28, 2019
c79d519
Small changes. Write lat and lon cf attrib, retab
wchen329 Jun 28, 2019
77ae0e1
First wave of changes, based on feedback
wchen329 Jun 29, 2019
186df92
Wave two: nullptr checks and other misc changes
wchen329 Jun 29, 2019
07b336f
Remove some more poor memsets
wchen329 Jun 29, 2019
5976484
Wave 3: refactoring based off of feedback
wchen329 Jun 29, 2019
f3a9925
Refactor tokenizer- use CSL/CPL instead
wchen329 Jun 29, 2019
27723ca
Changes made based on CI
wchen329 Jun 29, 2019
5f1b001
Fix axis ordering on LAT/LON projections
wchen329 Jun 29, 2019
1379752
address test_ogrsf issue of feature SRS not being set
wchen329 Jun 30, 2019
abf112f
Prevent possible corruption that can caused by AddProjectionVars
wchen329 Jun 30, 2019
bf8cc68
Address some more feedback, deal with case of LAYER and FEATURE type …
wchen329 Jul 1, 2019
ad1d9ba
Document update. ALSO: Further enforce no multiple layers for CF-1.8 …
wchen329 Jul 1, 2019
ed20c7f
Doc hotfixes
wchen329 Jul 1, 2019
9a7cd19
[burning] hot fix
wchen329 Jul 1, 2019
60f3451
remove disclaimers about XML config for CF-1.8, document any deficien…
wchen329 Jul 1, 2019
c3d6cd5
Attempt to fix multiple layer restriction
wchen329 Jul 2, 2019
6e12f3e
Fix netcdf_57, proper enforcement of MULTIPLE_LAYERS defined implies …
wchen329 Jul 2, 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
77 changes: 77 additions & 0 deletions autotest/gdrivers/data/netcdf-sg/write-tests/Yahara_alb.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "FeatureCollection",
"name": "path",
"features": [
{ "type": "Feature", "properties": { "NAMES": "path1" }, "geometry": { "type": "LineString", "coordinates": [ [ 0.1, 0.2, 0.3 ], [99.0, -99.0, 0.0 ] ] } },
{ "type": "Feature", "properties": { "NAMES": "path2" }, "geometry": { "type": "LineString", "coordinates": [ [ 100.0, 101.0, 102.0 ], [ 25.0, 27.0, 29.0 ] ] } },
{ "type": "Feature", "properties": { "NAMES": "path3" }, "geometry": { "type": "LineString", "coordinates": [ [ 7.0, -11.0, -7.0 ], [ -11.0, 7, 11.0 ], [ -6.0, 1945.0, 1918.0] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "FeatureCollection",
"name": "segv",
"features": [
{ "type": "Feature", "properties": { "NAMES": "seg1" }, "geometry": { "type": "LineString", "coordinates": [ [ 1.5, -1.5 ] ] } },
{ "type": "Feature", "properties": { "NAMES": "seg2" }, "geometry": { "type": "LineString", "coordinates": [ [ 30.5, 30.5 ], [ 5.0, 5.0 ] ] } },
{ "type": "Feature", "properties": { "NAMES": "seg3" }, "geometry": { "type": "LineString", "coordinates": [ [ 9.0, -9.0 ], [ 10.0, -10.0 ], [ -1.0, 1.0 ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "FeatureCollection",
"name": "streams",
"features": [
{ "type": "Feature", "properties": { "NAMES": "fresh_river" }, "geometry": { "type": "MultiLineString", "coordinates": [ [ [ 1.0, -5.0, 10.0] ], [ [ 2.0, -4.0, 9.0 ], [ 3.0, -3.0, 8.0 ], [ 4.0, -2.0, 7.0 ], [ 5.0 , -1.0, 8.0 ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "not_fresh_river" }, "geometry": { "type": "MultiLineString", "coordinates": [ [ [ 0.0, 1.0, 1.0], [ 1.0, 0.0, 2.0 ] ], [ [ 2.0, 0.0, 1.0 ], [ -2.0, 0.0, 1.0 ] ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "FeatureCollection",
"name": "streams",
"features": [
{ "type": "Feature", "properties": { "NAMES": "fresh_river" }, "geometry": { "type": "MultiLineString", "coordinates": [ [ [ 1.0, -5.0 ] ], [ [ 2.0, -4.0 ], [ 3.0, -3.0 ], [ 4.0, -2.0 ], [ 5.0 , -1.0 ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "not_so_fresh_river" }, "geometry": { "type": "MultiLineString", "coordinates": [ [ [ -2.0, 5.0 ], [ -3.0, 4.0 ], [ -4.0, 3.0 ], [ -5.0, 2.0 ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "not_fresh_river" }, "geometry": { "type": "MultiLineString", "coordinates": [ [ [ 0.0, 1.0 ], [ 1.0, 0.0 ] ], [ [ 2.0, 0.0 ], [ -2.0, 0.0 ] ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "FeatureCollection",
"name": "drilling_sites",
"features": [
{ "type": "Feature", "properties": { "NAMES": "site1" }, "geometry": { "type": "MultiPoint", "coordinates": [ [ 0.0, -1.0, -5.0 ], [ 2.0, -2.0, 2.0 ] ] } },
{ "type": "Feature", "properties": { "NAMES": "site2" }, "geometry": { "type": "MultiPoint", "coordinates": [ [ 7.0, -2.0, 1.0 ], [ 4.0, 3.0, 2.0 ], [ 8.0, -8.0, 3.0 ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "FeatureCollection",
"name": "peak_list",
"features": [
{ "type": "Feature", "properties": { "NAMES": "Peaks1" }, "geometry": { "type": "MultiPoint", "coordinates": [ [ 1.0, -1.0 ], [ 2.0, -2.0 ], [ 4.0, -4.0 ] ] } },
{ "type": "Feature", "properties": { "NAMES": "Peaks2" }, "geometry": { "type": "MultiPoint", "coordinates": [ [ 5.0, -5.0 ], [ 6.0, -6.0 ], [ 8.0, -8.0 ] ] } },
{ "type": "Feature", "properties": { "NAMES": "Peaks3" }, "geometry": { "type": "MultiPoint", "coordinates": [ [ 9.0, -9.0 ], [ 10.0, -10.0 ], [ -2.0, 2.0 ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "FeatureCollection",
"name": "mpoly_shape",
"features": [
{ "type": "Feature", "properties": { "NAMES": "Triangle" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 0.0, 0.0, 0.0 ], [ 1.0, 0.0, 1.0 ], [ 1.0, 1.0, 2.0 ], [ 0.0, 0.0, 3.0 ] ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "DoubleTriangle" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 3.0, 0.0, 0.0 ], [ 4.0, 0.0, 1.0 ], [ 4.0, 1.0, 2.0 ], [ 3.0, 0.0, 3.0 ] ] ], [ [ [ 3.0, 0.0, -1.0 ], [ 4.0, 1.0, -2.0 ], [ 3.0, 1.0, -3.0 ], [ 3.0, 0.0, -4.0 ] ] ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "FeatureCollection",
"name": "shapes",
"features": [
{ "type": "Feature", "properties": { "NAMES": "Trianglies" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 0.0, 0.0, 0.0 ], [ 1.0, 0.0, 1.0 ], [ 1.0, 1.0, 1.0 ], [ 0.0, 0.0, 0.0 ] ] ], [ [ [ 0.0, 0.0, 0.0 ], [ -1.0, 0.0, -1.0 ], [ -1.0, -1.0, -1.0 ], [ 0.0, 0.0, 0.0 ] ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "Prismy_and_Triangly" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 3.0, 0.0, 0.0], [ 4.0, 0.0, 0.0 ], [ 4.0, 1.0, 1.0 ], [ 3.0, 1.0, 1.0 ], [ 3.0, 0.0, 0.0 ] ], [ [3.5, 0.25, 0.0], [3.75, 0.25, 0.0], [3.75, 0.5, 0.1], [3.5, 0.5, 0.1], [3.5, 0.25, 0.0] ] ], [ [ [ 4.0, 4.0, 100.0 ], [ 4.0, 5.0, 101.0 ], [ 5.0, 4.0, 101.0 ], [ 4.0, 4.0, 100.0 ] ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "Single_Triangly" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -2.0, 0.0, -5.0 ], [ -2.0, 1.0, -6.0 ], [ -1.0, 1.0, -6.0 ], [ -2.0, 0.0, -5.0 ] ] ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "FeatureCollection",
"name": "mpoly_shape",
"features": [
{ "type": "Feature", "properties": { "NAMES": "Triangle" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 0.0, 0.0 ], [ 1.0, 0.0 ], [ 1.0, 1.0 ], [ 0.0, 0.0 ] ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "DoubleTriangle" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 3.0, 0.0 ], [ 4.0, 0.0 ], [ 4.0, 1.0 ], [ 3.0, 0.0 ] ] ], [ [ [ 3.0, 0.0 ], [ 4.0, 1.0 ], [ 3.0, 1.0 ], [ 3.0, 0.0 ] ] ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "FeatureCollection",
"name": "shapes",
"features": [
{ "type": "Feature", "properties": { "NAMES": "Triangles" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 0.0, 0.0 ], [ 1.0, 0.0 ], [ 1.0, 1.0 ], [ 0.0, 0.0 ] ] ], [ [ [ 0.0, 0.0 ], [ -1.0, 0.0 ], [ -1.0, -1.0 ], [ 0.0, 0.0 ] ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "Square_in_Square_and_Triangle" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 3.0, 0.0 ], [ 4.0, 0.0 ], [ 4.0, 1.0 ], [ 3.0, 1.0 ], [ 3.0, 0.0 ] ], [ [3.5, 0.25], [3.75, 0.25], [3.75, 0.5], [3.5, 0.5], [3.5, 0.25] ] ], [ [ [ 4.0, 4.0 ], [ 4.0, 5.0 ], [ 5.0, 4.0 ], [ 4.0, 4.0 ] ] ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "FeatureCollection",
"name": "point_collection",
"features": [
{ "type": "Feature", "properties": { "NAMES": "FishingSpot1" }, "geometry": { "type": "Point", "coordinates": [ 0.5, -0.5, -1.5 ] } },
{ "type": "Feature", "properties": { "NAMES": "FishingSpot2" }, "geometry": { "type": "Point", "coordinates": [ 1.0, -1.0, -0.5 ] } },
{ "type": "Feature", "properties": { "NAMES": "FishingSpot3" }, "geometry": { "type": "Point", "coordinates": [ 1.5, -1.5, 0.5 ] } },
{ "type": "Feature", "properties": { "NAMES": "FishingSpot4" }, "geometry": { "type": "Point", "coordinates": [ 2.0, -2.0, 1.5 ] } }
]
}
10 changes: 10 additions & 0 deletions autotest/gdrivers/data/netcdf-sg/write-tests/point_write_test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "FeatureCollection",
"name": "point_collection",
"features": [
{ "type": "Feature", "properties": { "NAMES": "FishingSpot1" }, "geometry": { "type": "Point", "coordinates": [ 0.5, -0.5 ] } },
{ "type": "Feature", "properties": { "NAMES": "FishingSpot2" }, "geometry": { "type": "Point", "coordinates": [ 1.0, -1.0 ] } },
{ "type": "Feature", "properties": { "NAMES": "FishingSpot3" }, "geometry": { "type": "Point", "coordinates": [ 1.5, -1.5 ] } },
{ "type": "Feature", "properties": { "NAMES": "FishingSpot4" }, "geometry": { "type": "Point", "coordinates": [ 2.0, -2.0 ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "FeatureCollection",
"name": "noir_write",
"features": [
{ "type": "Feature", "properties": { "ID": 0 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.0, 0.0, 0.0 ], [ 1.0, 0.0, 2.0 ], [ 1.0, 1.0, 0.0 ], [ 0.0, 0.0, 2.0 ] ] ] } },
{ "type": "Feature", "properties": { "ID": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 3.0, 0.0, -1.0 ], [ 4.0, 0.0, -2.0 ], [ 4.0, 1.0, 0.0 ], [ 3.0, 1.0, -2.0 ], [ 3.0, 0.0, -1.0 ] ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "FeatureCollection",
"name": "shapes",
"features": [
{ "type": "Feature", "properties": { "NAMES": "Trianglything" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.0, 0.0, 0.0 ], [ 1.0, 0.0, -1.0 ], [ 1.0, 1.0, -2.0 ], [ 0.0, 0.0, -3.0 ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "Prismthing" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 3.0, 0.0, 0.0 ], [ 4.0, 0.0, 0.0 ], [ 4.0, 1.0, 1.0 ], [ 3.0, 1.0, 1.0 ], [ 3.0, 0.0, 0.0] ], [ [3.5, 0.25, 1.0], [3.75, 0.25, 1.0], [3.75, 0.5, 1.0], [3.5, 0.5, 1.0], [3.5, 0.25, 1.0] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "Trianglyflipped" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.0, 0.0, 0.0 ], [ -1.0, 0.0, 1.0 ], [ -1.0, -1.0, 2.0 ], [ 0.0, 0.0, 3.0 ] ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "FeatureCollection",
"name": "noir_write",
"features": [
{ "type": "Feature", "properties": { "NAMES": "Triangle" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.0, 0.0 ], [ 1.0, 0.0 ], [ 1.0, 1.0 ], [ 0.0, 0.0 ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "Square" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 3.0, 0.0 ], [ 4.0, 0.0 ], [ 4.0, 1.0 ], [ 3.0, 1.0 ], [ 3.0, 0.0 ] ] ] } }
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "FeatureCollection",
"name": "shapes",
"features": [
{ "type": "Feature", "properties": { "NAMES": "Triangle" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.0, 0.0 ], [ 1.0, 0.0 ], [ 1.0, 1.0 ], [ 0.0, 0.0 ] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "Square_in_Square" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 3.0, 0.0 ], [ 4.0, 0.0 ], [ 4.0, 1.0 ], [ 3.0, 1.0 ], [ 3.0, 0.0 ] ], [ [3.5, 0.25], [3.75, 0.25], [3.75, 0.5], [3.5, 0.5], [3.5, 0.25] ] ] } },
{ "type": "Feature", "properties": { "NAMES": "Triangle_Flipped" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.0, 0.0 ], [ -1.0, 0.0 ], [ -1.0, -1.0 ], [ 0.0, 0.0 ] ] ] } }
]
}
Loading