Skip to content

Change announcements for collections ch.blw* and ch.bafu*#126

Merged
asteiner-swisstopo merged 4 commits intomasterfrom
Change-announcements-for-collections-ch.blw-and-ch.bafu
Mar 2, 2026
Merged

Change announcements for collections ch.blw* and ch.bafu*#126
asteiner-swisstopo merged 4 commits intomasterfrom
Change-announcements-for-collections-ch.blw-and-ch.bafu

Conversation

@mariokeusen
Copy link
Contributor

@mariokeusen mariokeusen commented Feb 26, 2026

Copy link
Contributor

@faselm faselm left a comment

Choose a reason for hiding this comment

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

👍

Copy link
Contributor

@asteiner-swisstopo asteiner-swisstopo left a comment

Choose a reason for hiding this comment

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

Nice, has the right amount of detail. I would put in a bit more structure to make it easier to read than one long sentence.

Comment on lines +12 to +13
- The existing 5 collections on service STAC _ch.blw.ursprungsbezeichnungen-fleisch_, _ch.blw.ursprungsbezeichnungen-kaese_, _ch.blw.ursprungsbezeichnungen-konditoreiwaren_, _ch.blw.ursprungsbezeichnungen-pflanzen_ and _ch.blw.ursprungsbezeichnungen-spirituosen_ on service STAC have been replaced by a new single collection with the same content _ch.blw.ursprungsbezeichnungen_ and will be decommissioned from service STAC soon.
- The collection _ch.bafu.gewaesserschutz-nawa_ currently has one item _gewaesserschutz-nawa_. Today's item will be replaced by two new items _gewaesserschutz-nawa_biologie_ and _gewaesserschutz-nawa_chemie_ for content and timestand related reasons with the release of March 18th 2026.
Copy link
Contributor

Choose a reason for hiding this comment

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

I have the following concerns:

  1. I find these long sentences a bit difficult to read.
  2. There is a typo: "timestand"
  3. Don't we have to write that it is a "STAC collection" instead of just "collection" to make it clear what the context is?
  4. It's not clear if only ch.bafu.gewaesserschutz-nawa is going to be released on March 18th - what about ch.blw.ursprungsbezeichnungen?

How about this simpler version?

[2026-02-26] Migration of STAC collections ch.blw.ursprungsbezeichnungen* and update to ch.bafu.gewaesserschutz-nawa

The upcoming release on March 18th 2026 will introduce the following changes:

  • New collection ch.blw.ursprungsbezeichnungen. This collection replaces the five previous collections:

    • ch.blw.ursprungsbezeichnungen-fleisch
    • ch.blw.ursprungsbezeichnungen-kaese
    • ch.blw.ursprungsbezeichnungen-konditoreiwaren
    • ch.blw.ursprungsbezeichnungen-pflanzen
    • ch.blw.ursprungsbezeichnungen-spirituosen
  • Updated items in ch.bafu.gewaesserschutz-nawa. The existing STAC item gewaesserschutz-nawa will be replaced by two new items with updated content and timestamps:

    • gewaesserschutz-nawa_biologie
    • gewaesserschutz-nawa_chemie

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Tried to bring this in an updated proposal while considering the facts about the changes. Merci fürs re-review...

Copy link
Contributor

@asteiner-swisstopo asteiner-swisstopo left a comment

Choose a reason for hiding this comment

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

Cool thanks. Very long title but I can live with that 🙃

For your info @mariokeusen, our guidelines state that we should rebase, not merge in case of a merge conflict (as you did):

When merging a personal branch into a shared branch (e.g. feat-my-feature into develop), we should never have conflict as the head branch should be always rebased on top of the base branch. Due to this conflict always happens during the rebase and needs to be fixed during the rebase step on the personal branch.

You can do this in GitHub easily:

Image

@mariokeusen
Copy link
Contributor Author

@asteiner-swisstopo thanks for that hint, this is due to the fact, I only very rarely merge pr's myself. In this case, anyways currently nothing can be merged, because of some aws code build test failing (and I am totally lost there). Therefore glad if you or someone who can handle that, could take over the merging here (from the content side, for me this can be published)

@asteiner-swisstopo asteiner-swisstopo merged commit 8ea6a79 into master Mar 2, 2026
2 checks passed
@asteiner-swisstopo asteiner-swisstopo deleted the Change-announcements-for-collections-ch.blw-and-ch.bafu branch March 2, 2026 10:13
@asteiner-swisstopo
Copy link
Contributor

@asteiner-swisstopo thanks for that hint, this is due to the fact, I only very rarely merge pr's myself. In this case, anyways currently nothing can be merged, because of some aws code build test failing (and I am totally lost there). Therefore glad if you or someone who can handle that, could take over the merging here (from the content side, for me this can be published)

@mariokeusen When building the website for the test link, AWS CodeBuild runs a program to check for inconsistencies in the Markdown documents (prettier). In this case, there were several small issues, so the corresponding pipeline in AWS CodeBuild failed. For example, there was no blank line after the list.

For this time, I fixed the issue, merged the branch to master and released to https://docs.geo.admin.ch.

I can show you how to do that yourself for another time, feel free to reach out.

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.

3 participants