Add more maps #2038
Open
Add more maps #2038
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hudson-newey
added
bug
atruskie
requested changes
Feb 27, 2023
There was a problem hiding this comment.
Ok my main feedback is in this comment: #2027 (comment)
I think we can vastly simplify the site-map component. Change the query to a GET /sites which by default shows all sites. Then add projects and regions filter inputs (possibly even just ids) which filter the fetch all for the sites. This would satisfy every use case:
- show one site
<baw-site-map [sites]=[sites] ></baw-site-map> - show sites in a region
<baw-site-map [regions]=[regions] ></baw-site-map> - show sites in a project
<baw-site-map [projects]=[projects] ></baw-site-map> - show all sites
<baw-site-map ></baw-site-map>
Comment on lines
+239
to
+240
| it("should handle taking both projects and regions", async () => { | ||
| }); |
Comment on lines
+138
to
+140
| const sites: Observable<Region[] | Project[]> = settings.hideProjects | ||
| ? this.regionApi.filter(filter) | ||
| : this.projectApi.filter(filter); |
There was a problem hiding this comment.
why don't we just query for all sites?
Comment on lines
+128
to
+163
| public fetchAllSiteLocations(): Observable<List<Project | Region>> { | ||
| const settings = this.config.settings; | ||
|
|
||
| let pageNumber = 1; | ||
| // Get the first page of points. This will also provide information on the max page length to search through | ||
| let maxPageNumber = 1; | ||
|
|
||
| while (pageNumber <= maxPageNumber) { | ||
| const filter = { paging: { page: pageNumber } }; | ||
|
|
||
| const sites: Observable<Region[] | Project[]> = settings.hideProjects | ||
| ? this.regionApi.filter(filter) | ||
| : this.projectApi.filter(filter); | ||
|
|
||
| this.allSites$ = sites.pipe( | ||
| map((models) => List<Project | Region>(models)), | ||
| takeUntil(this.unsubscribe) | ||
| ); | ||
|
|
||
| // find the max page number from the metadata | ||
| this.allSites$ | ||
| .pipe(takeUntil(this.unsubscribe)) | ||
| .subscribe((site) => maxPageNumber = site.toArray()?.shift()?.getMetadata()?.paging?.maxPage); | ||
| pageNumber++; | ||
| } | ||
|
|
||
| return this.allSites$; | ||
| } | ||
|
|
||
| public projects(sites: List<Project | Region>): List<Project> { | ||
| return sites?.filter((location) => location.kind === "Project") as List<Project>; | ||
| } | ||
|
|
||
| public regions(sites: List<Project | Region>): List<Region> { | ||
| return sites?.filter((location) => location.kind === "Region") as List<Region>; | ||
| } |
There was a problem hiding this comment.
some notes:
- just select all sites
- you can disable paging on the request using the
disable_pagingoption https://github.com/QutEcoacoustics/baw-server/wiki/API:-Spec#specialized-patterns - you must not pull back full sized site objects. Use the projection API filters to only pull back the values you need (id, name, lat/long).
- you'll need a custom service method
There was a problem hiding this comment.
Also, I think we can strip all this logic and my suggestions out and move it into the component
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add more maps
Users have expressed a lack of geographical information from the list and home pages. Therefore, to show more geographical information, I have added a map to the home page and list pages.
Changes
baw-site-mapto the home pagebaw-site-mapto the project and list pages that displays all sites in the filter (if the filter is updated, the sites update)Problems
Pending design review
Issues
Fixes: #2027
Visual Changes
Project and list site pages:
Home Page:
Final Checklist
npm run lint)npm run test:all)