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

YAML batch_1 update #100

Merged
merged 6 commits into from
Feb 23, 2024
Merged

YAML batch_1 update #100

merged 6 commits into from
Feb 23, 2024

Conversation

FedericoRondoni
Copy link
Contributor

@FedericoRondoni FedericoRondoni commented Feb 22, 2024

CDS1_temperature CDS2_relative_humidity

@FedericoRondoni
Copy link
Contributor Author

Hi @santilland, I have added here a possible proprietary license. I added the license file as a "more information" link.
Can you please confirm that it will work in this way?

@santilland
Copy link
Collaborator

santilland commented Feb 22, 2024

hi @FedericoRondoni, interesting idea, but i think we will have to handle this differently.
Going over the STAC definition i now better understand, if we set proprietary (or various) as lincense type it is possible to add links to the license document. So we could.... add a CustomLicense field that could be an array for linking to any potential license documents, i think that should cover all needs.
What do you think?
The license could be described (as done in STAC by:

      "href": "https://example.com/license.html", # your license url
      "type": "text/html", #  or whatever media type applies
      "rel": "license",
      "title": "My cool license" # Title/Name of the license

@santilland
Copy link
Collaborator

Hello @FedericoRondoni , I have been thinking about it and adding an additional field for this seems a bit unnecessary and complicates understanding for someone providing the information, so i would propose following, the license can be either a string, with an identifier that matches one of the spdx license identifiers or it can be a list of license objects.
If only one license object is passed, then in stac it will be set to proprietary and the license added as link, if it is multiple in stac it will be set to various and all links to the licenses will be added.

So in examples the options would be:

License: MIT

or

License:
  - Url: exampleurl.com/license
    Type: text/html
    Title: Name of license
License:
  - Url: exampleurl.com/license1.pdf
    Type: application/pdf
    Title: Name of license 1
  - Url: exampleurl.com/license2
    Type: text/html
    Title: Name of license 2

@santilland
Copy link
Collaborator

I updated the license parsing approach to mirror the proposed changes and updated also the yaml config, from my side this would be ok to be merged

Copy link
Collaborator

@santilland santilland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed approach looks good to me, implementation done, ok to be merged

@FedericoRondoni
Copy link
Contributor Author

Hi @santilland that's perfect.
I agree with this approach. I will update all the other CDS YAMLs with the same elements.
Thanks 😄

@FedericoRondoni
Copy link
Contributor Author

However, before merging, I will probably add more YAML files to this branch, so I think we need to run a check again.
I'll let you know.

@santilland
Copy link
Collaborator

Ok, let me know when it is ok to merge. As an alternative we can merge this one and you can open a new branch that already has the implemented feature.
I updated the license information in the the wiki now:
https://github.com/eurodatacube/eodash-catalog/wiki#collection
https://github.com/eurodatacube/eodash-catalog/wiki#license

@FedericoRondoni
Copy link
Contributor Author

OK, I agree. Let me just add the CDS2 yaml so we have all of them, and then we can merge.

@FedericoRondoni
Copy link
Contributor Author

Ok, I think we can merge. Should I do that?

@santilland santilland merged commit a8ce8bb into main Feb 23, 2024
1 check passed
@santilland santilland deleted the YAML-batch_1 branch February 23, 2024 13:27
@santilland
Copy link
Collaborator

I merged and I will integrate these changes in to the other branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants