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

Closed Handle multiple different time and altitude axes for GridAsPoint writer #1241

Closed
wants to merge 65 commits into from
Closed

Closed Handle multiple different time and altitude axes for GridAsPoint writer #1241

wants to merge 65 commits into from

Conversation

mnlerman
Copy link
Contributor

@mnlerman mnlerman commented Sep 27, 2023 •
edited
Loading

Closing so that I can make a new one with the commits squashed

This is a good breaking point to submit changes associated with Unidata/tds#269

Tasks completed in this pull request:

  • Add timeName attribute to DsgFeatureCollection
  • And altName attribute to DsgFeatureCollection
  • Add constructors to pass timeName and altName up through the inheritance tree
  • Assign timeName and altName attributes for
  • Tests to confirm that altName and timeName are assigned correctly for CoverageAsPoint and CoverageAsProfile
  • Rework Point writer and StationCollection writer to write the actual axis names rather than generic names

Work still to be completed:

  • Rework StationProfileCollectionWriter to write the actual axis names rather than generic names
  • Rework ProfileCollectionWriter to write the actual axis names rather than generic names

PR Checklist

  • Link to any issues that the PR addresses
  • Add labels
  • Open as a draft PR
    until ready for review
  • Make sure GitHub tests pass
  • Mark PR as "Ready for Review"

mnlerman and others added 30 commits June 30, 2023 10:02
@mnlerman
add timeName property with getter for DSG feature collection
6f452f7
@mnlerman
add timeName to DSG feature collection constructors
db4eab5
@mnlerman
rework writeHeader include all variables in the subset and use the co…
6dbe983 
…rrect names for the time dimension
@mnlerman
write the record with the true name of the time coordinate if we can …
579d250 
…get it from the station rather than the generic name
@mnlerman
remove unused argument from writeHeader. The StationPointFeature argu…
dab3a40 
…ment was only ever used for writing NetCDF files but it's no longer needed after reworking the method
@mnlerman
Merge branch 'Unidata:maint-5.x' into ncj-cf-point-writer
74b1489
@mnlerman
add coordinates outside of loop
98001a9
@mnlerman
set timeName
72bd77b
@mnlerman
always add default time coordinate. add conditional to prevent duplic…
d998199 
…ating default time coordinate
@mnlerman
add constructors with timeName argument
672ef82
@mnlerman
move everything I can to outside of the inner for loop
698c260
@mnlerman
Merge branch 'Unidata:maint-5.x' into ncj-cf-point-writer
b295e5f
@mnlerman
Merge remote-tracking branch 'origin/ncj-cf-point-writer' into ncj-cf…
df60461 
…-point-writer
@mnlerman
rework header and record writing
34989c0
@mnlerman
apply spotless
f1bdd82
@mnlerman
return the number of records written plus small cleanups
86a7793
@mnlerman
get correct variable name for matching
3e7da13
@mnlerman
Merge branch 'Unidata:maint-5.x' into ncj-cf-point-writer
5ecde7d
@mnlerman
Merge branch 'Unidata:maint-5.x' into ncj-cf-point-writer
e4b4475
@mnlerman
loop over the station and break after one loop
7cb43fb
@mnlerman
Merge branch 'Unidata:maint-5.x' into ncj-cf-point-writer
4966c05
@mnlerman
remove unused method, change argument type and use peeking iterator i…
991c873 
…nstead of breaking the loop
@mnlerman
Merge remote-tracking branch 'origin/ncj-cf-point-writer' into ncj-cf…
25f9485 
…-point-writer
@mnlerman
Merge branch 'Unidata:maint-5.x' into ncj-cf-point-writer
600dc75
@mnlerman
add station index to test a collection of variables and stations at once
7889139
@mnlerman
add test for multiple time series
38a4f9e
@mnlerman
add check for time name
845369d
@mnlerman
add check for time name
a16f773
@mnlerman
Merge remote-tracking branch 'origin/ncj-cf-point-writer' into ncj-cf…
a2ab0f7 
…-point-writer

# Conflicts:
#	cdm/core/src/test/java/ucar/nc2/ft2/coverage/writer/TestCoverageAsPoint.java
@mnlerman
add the beginings of tests for coverage as a profile with more than o…
b2951f3 
…ne z-axis and/or time axis
@mnlerman mnlerman added the bug Something isn't working label Sep 27, 2023
mnlerman and others added 20 commits October 9, 2023 10:09
@mnlerman
change condition and altName to be specific to the points in the station
d684334
@mnlerman
don't need to add station altitude variable for every station (just n…
ad8b8bf 
…eed one)
@mnlerman
move writeHeader outside of loop and loop over PointFeatureCollection…
c66b052 
…s instead of flattening
@mnlerman
add constructors and getters for altName and timeName
d55fe01
@mnlerman
fix conditionals, use right timeName and altCoodName, loop over all s…
e093678 
…tations in StationTimeSeriesFeatureCollection
@mnlerman
write header by looping over all stations in the StationTimeSeriesFea…
c044d90 
…tureCollection and write the correct timeName and altName
@mnlerman
Merge branch 'Unidata:maint-5.x' into ncj-cf-point-writer
bcd8403
@mnlerman
use alt coord name instead of station alt name
0d82bd4
@mnlerman
write altitude coordinate if it's not null
ffddf23
@mnlerman
write altitude if the point has an altitude, not the station
915f783
@mnlerman
Merge remote-tracking branch 'origin/ncj-cf-point-writer' into ncj-cf…
a53f2c3 
…-point-writer
@mnlerman
don't add varaibles that are already there
60696f9
@mnlerman
spotless
3fa6d3c
@mnlerman
swap method ordering so that the PR dif is more clear
9e5ab33
@mnlerman
dereference and remove old writeRecord method
e046a4a
@mnlerman
constructors inside of private classes are private
1cb89cc
@mnlerman
use new constructor
96ac0b9
@mnlerman
move timename write into conditional so it doesn't get written twice
0a822f4
@mnlerman
use new constructor
a8c3fb1
@mnlerman
Merge branch 'Unidata:maint-5.x' into ncj-cf-point-writer
8697d6c
@mnlerman mnlerman closed this Oct 19, 2023
@mnlerman mnlerman changed the title Intermediate PR: Handle multiple different time and altitude axes for GridAsPoint writer Closed Handle multiple different time and altitude axes for GridAsPoint writer Oct 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lesserwhirls lesserwhirls Awaiting requested review from lesserwhirls lesserwhirls will be requested when the pull request is marked ready for review lesserwhirls is a code owner

Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@mnlerman