Skip to content
This repository has been archived by the owner on Apr 24, 2024. It is now read-only.

Grid layer. #524

Merged
merged 48 commits into from
Jul 21, 2023
Merged

Grid layer. #524

merged 48 commits into from
Jul 21, 2023

Conversation

badnames
Copy link
Member

@badnames badnames commented Jun 28, 2023

Basics

  • I added a line to /doc/CHANGELOG.md
  • The PR is rebased with current master.
  • Details of what you changed are in commit messages.
  • References to issues, e.g. close #X, are in the commit messages.
  • The buildserver is happy.

Checklist

  • I fully described what my PR does in the documentation
    (not in the PR description)
  • I fixed all affected documentation
  • I fixed all affected decisions
  • I added unit tests for my code
  • I added code comments, logging, and assertions as appropriate
  • I translated all strings visible to the user
  • I mentioned every code or binary not directly written or done by me in reuse syntax
  • I created left-over issues for things that are still to be done
  • Code is conforming to our Architecture
  • Code is conforming to our Guidelines
    (exceptions are documented)
  • Code is consistent to our Design Decisions

Review

  • I've tested the code
  • I've read through the whole code
  • Examples are well chosen and understandable

@badnames badnames linked an issue Jun 28, 2023 that may be closed by this pull request
@badnames badnames changed the title usecases: add grid layer. Grid layer. Jun 29, 2023
Copy link
Contributor

@markus2330 markus2330 left a comment

Choose a reason for hiding this comment

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

Please always rebase to latest master, it is very annoying to see old bugs again and again (in this case especially the flickering is terrible).

doc/usecases/done/gridlayer.md Outdated Show resolved Hide resolved
doc/usecases/done/gridlayer.md Outdated Show resolved Hide resolved
doc/usecases/done/gridlayer.md Outdated Show resolved Hide resolved
doc/usecases/done/gridlayer.md Outdated Show resolved Hide resolved
badnames and others added 11 commits July 5, 2023 21:50
# Conflicts:
#	frontend/src/features/map_planning/components/Map.tsx
#	frontend/src/features/map_planning/store/MapStoreTypes.ts
#	frontend/src/features/map_planning/store/UntrackedMapStore.ts
@badnames badnames self-assigned this Jul 12, 2023
Moritz Schalk added 9 commits July 12, 2023 14:28
# Conflicts:
#	frontend/src/config/i18n/de/common.json
#	frontend/src/config/i18n/en/common.json
#	frontend/src/features/map_planning/components/Map.tsx
#	frontend/src/features/map_planning/store/MapStoreTypes.ts
#	frontend/src/features/map_planning/store/UntrackedMapStore.ts
@badnames
Copy link
Member Author

jenkins build please

@markus2330
Copy link
Contributor

@4ydan job failed here with

#7 0.498     Updating git repository `[https://github.com/ElektraInitiative/mdbook-generate-summary`](https://github.com/ElektraInitiative/mdbook-generate-summary%60)
#7 1.872   Installing mdbook-generate-summary v0.1.1 (https://github.com/ElektraInitiative/mdbook-generate-summary#39d7f777)
#7 2.014     Updating crates.io index
#7 2.731 warning: package `crossbeam-channel v0.5.7` in Cargo.lock is yanked in registry `crates-io`, consider running without --locked
#7 2.731 warning: package `hermit-abi v0.3.1` in Cargo.lock is yanked in registry `crates-io`, consider running without --locked
#7 3.002  Downloading crates ...
#7 11.35   Downloaded notify v5.1.0
#7 11.36   Downloaded quote v1.0.26
#7 11.39   Downloaded regex-automata v0.1.10
#7 11.41 warning: spurious network error (2 tries remaining): failed to get successful HTTP response from `[https://crates.io/api/v1/crates/toml/0.5.11/download`](https://crates.io/api/v1/crates/toml/0.5.11/download%60), got 503

#7 11.41 body:

https://build.libelektra.org/blue/organizations/jenkins/PermaplanT/detail/PR-524/34/pipeline

Which node is it? Should we maybe print the node for every stage?

Let us see if it happens again.

@markus2330
Copy link
Contributor

jenkins build please

@4ydan
Copy link
Contributor

4ydan commented Jul 21, 2023

Hm, I have seen this once I think, should really add all missing node_infos, yea

@badnames badnames requested a review from Bushuo July 21, 2023 09:58
@markus2330
Copy link
Contributor

It succeeded now but some other PR already overwrote pr.permaplant.net.

@markus2330
Copy link
Contributor

jenkins build please

Copy link
Contributor

@markus2330 markus2330 left a comment

Choose a reason for hiding this comment

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

Looks much better ❤️ but we are not there yet 🚀

doc/tests/manual/protocol.md Outdated Show resolved Hide resolved
doc/usecases/done/gridlayer.md Outdated Show resolved Hide resolved
doc/usecases/done/gridlayer.md Outdated Show resolved Hide resolved
doc/usecases/done/gridlayer.md Show resolved Hide resolved
frontend/src/config/i18n/de/grid.json Outdated Show resolved Hide resolved
frontend/src/config/i18n/en/grid.json Outdated Show resolved Hide resolved
frontend/src/config/i18n/en/index.ts Outdated Show resolved Hide resolved
frontend/src/icons/grid.svg Outdated Show resolved Hide resolved
doc/CHANGELOG.md Outdated Show resolved Hide resolved
@markus2330
Copy link
Contributor

A frontend test fails now:


    Expected: "1m"
    Received: "10m"

      13 |   it('finds the correct yard stick label given the screen size', () => {
      14 |     expect(yardStickLabel(136, 'm', 'cm')).toEqual('10cm');
    > 15 |     expect(yardStickLabel(6362, 'm', 'cm')).toEqual('1m');
         |                                             ^
      16 |     expect(yardStickLabel(199462, 'm', 'cm')).toEqual('10m');
      17 |   });
      18 | });

      at Object.toEqual (src/features/map_planning/layers/_frontend_only/grid/util/Calculations.test.tsx:15:45)

@badnames
Copy link
Member Author

I just added this as an additional test.
It should now be fixed.

@badnames badnames requested a review from markus2330 July 21, 2023 15:22
@markus2330 markus2330 merged commit 90c4626 into master Jul 21, 2023
@markus2330 markus2330 mentioned this pull request Jul 21, 2023
5 tasks
@markus2330
Copy link
Contributor

There are a few little left-overs #680 but I merge now so that we can get ready for the user study (lets do cleanups+minor fixes later). 🦋

https://github.com/ElektraInitiative/PermaplanT/milestone/4 still has 3 issues assigned to you, all 3 very important (seeds a bit less important, though as we won't include it in the user study too much and it is better to have missing features as broken features). I see you are already working, great! 🚀 ❤️

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

Successfully merging this pull request may close these issues.

Map Grid
3 participants