Skip to content

feat: map sharing #1693

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

Open
cimigree wants to merge 82 commits into
base: develop
Choose a base branch
from
Open

feat: map sharing #1693

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
2d5c2ee
Add map sharing integration to backend (WIP)
gmaclennan Feb 12, 2026
9dcffb0
First pass attempt to incorporate map server api. Not working so far.
cimigree Feb 12, 2026
1609596
patch and fix
gmaclennan Feb 12, 2026
a12372f
roll back changes for testing
gmaclennan Feb 12, 2026
afd321d
remove debug statement
gmaclennan Feb 12, 2026
f27cfa2
Incorporates backend work and dependency fixes.
cimigree Feb 12, 2026
bceae52
Tweaks to code to get it to load a custom map.
cimigree Feb 12, 2026
79930d4
Deletes extra tarball
cimigree Feb 12, 2026
c33f08b
Merge branch 'develop' into feat/waiting-map-accept
cimigree Feb 12, 2026
a2da778
Mock for tests for map server.
cimigree Feb 12, 2026
a7d9446
Updates core version. Updates package json test.
cimigree Feb 12, 2026
4ef301b
Uses different fetch for tests. Fixes use of file in backend and fron…
cimigree Feb 12, 2026
f1b67f2
Eslint fixes
cimigree Feb 12, 2026
8f3c0c5
Attempts to use custom map hooks from core react.
cimigree Feb 13, 2026
a4cbc27
fix up map sharing hooks
gmaclennan Feb 16, 2026
3e2eb58
Prevents showing of errors in unneeded situations.
cimigree Feb 16, 2026
68dc8e9
Ts expect error for file for now.
cimigree Feb 16, 2026
9835f00
Removes unneeded imports.
cimigree Feb 16, 2026
6f94e05
cast return type of File.pickFileAsync() to correct type
gmaclennan Feb 17, 2026
14f5aa0
Refactor mapServer getBaseUrl
gmaclennan Feb 17, 2026
4e34b55
update mapServer.listen() types
gmaclennan Feb 17, 2026
ef4a70c
update map-server@pre7
gmaclennan Feb 17, 2026
63b28e0
Updates test to match change in map server usage.
cimigree Feb 17, 2026
86c2022
fix core-react tarball install
gmaclennan Feb 17, 2026
1b8dd47
Update package lock
cimigree Feb 17, 2026
83477c8
add patch for large map uploads
gmaclennan Feb 23, 2026
4431252
Merge branch 'feat/waiting-map-accept' of https://github.com/digidem/…
cimigree Feb 23, 2026
24d371e
Adds loading indicator to replace button while map uploads.
cimigree Feb 23, 2026
6177cb8
Merge branch 'develop' into feat/waiting-map-accept
cimigree Feb 23, 2026
c0073c3
Fixes linting errors.
cimigree Feb 23, 2026
1c5c17f
Merges with develop
cimigree Feb 23, 2026
91d8c25
Updates to the core react tarball correctly
cimigree Feb 23, 2026
1473e1e
Updates to do comments to reflect lack of navigation.
cimigree Feb 24, 2026
d05a589
Merges with develop
cimigree Feb 25, 2026
5db0178
Updates the tarball
cimigree Feb 25, 2026
5af5a52
Updates to new provider.
cimigree Feb 25, 2026
68b06eb
Updates comapeo packages
cimigree Mar 2, 2026
4ebb986
Removes unneeded tarballs
cimigree Mar 2, 2026
28c7087
Change back test
cimigree Mar 2, 2026
38f2020
Updates to non prerelease map server.
cimigree Mar 3, 2026
a5b2ca3
Updates comapeo dependencies.
cimigree Mar 4, 2026
f227cef
Adds logic for only showing devices for map sharing that have the sam…
cimigree Mar 4, 2026
ab1f074
Updates tests for selectable devices.
cimigree Mar 4, 2026
4b806cb
Updates comapeo-core-react. Uses new type. Uses time ago hook.
cimigree Mar 5, 2026
23d4747
Separates get select device into two screens.
cimigree Mar 5, 2026
10a2aba
Divides messages between two screens.
cimigree Mar 5, 2026
a180aea
Makes loader for map file bigger
cimigree Mar 5, 2026
942a2dd
Merges with develop
cimigree Mar 16, 2026
49097a1
Update map server
cimigree Mar 16, 2026
4e9af53
Updates patches read me.
cimigree Mar 16, 2026
efbafcf
Renames icon. Updates its usage. Updates button. Fixes messages ids.
cimigree Mar 16, 2026
262c6e5
Updates messages ids
cimigree Mar 16, 2026
b7c4d9e
feat: decline map (#1697)
cimigree Mar 17, 2026
b435b1e
feat: sending maps (#1699)
cimigree Mar 17, 2026
57b27c5
feat: receive map bottom sheet (#1700)
cimigree Mar 18, 2026
c0e998d
feat: replace background map (#1704)
cimigree Mar 30, 2026
b43fc97
feat: replace background map (#1704)
cimigree Mar 30, 2026
5c3044a
Merges with develop
cimigree Apr 2, 2026
028291f
Updates no more project id.
cimigree Apr 2, 2026
f713afc
Upgrades comapeo dependencies.
cimigree Apr 2, 2026
946e31a
Adds needed elements package. Fixes duplicate code from merge from de…
cimigree Apr 6, 2026
c44c864
Updates pattern for finding devices for map sharing to same project e…
cimigree Apr 6, 2026
39e046a
Updates messages.
cimigree Apr 6, 2026
d47367c
Tries to fix ci error. Updates typebox version to fix patch package w…
cimigree Apr 6, 2026
581b2da
Override for sodium native
cimigree Apr 6, 2026
7af89a6
Tries to override problem in tests
cimigree Apr 6, 2026
fbc98ff
Trying to undo messed up package lock.
cimigree Apr 6, 2026
fe7b35d
Removes attempted fix for sodium native.
cimigree Apr 6, 2026
9911616
Updates type for custom map info.
cimigree Apr 6, 2026
2f5341b
Combines screens so as not to rely on use effects and keep state chan…
cimigree Apr 7, 2026
34448ba
Catches additional errors.
cimigree Apr 7, 2026
3e903df
Updates to latest comape-core-react. Uses new status. Uses pending st…
cimigree Apr 7, 2026
73db938
Uses pending status and idle status correctly.
cimigree Apr 7, 2026
dd5a6b6
SHould not have used idle
cimigree Apr 7, 2026
19a72dd
Some cleanup.
cimigree Apr 8, 2026
7a33818
Merge branch 'develop' into feat/waiting-map-accept
cimigree Apr 8, 2026
343679f
Merge branch 'develop' into feat/waiting-map-accept
cimigree Apr 9, 2026
e62e39c
Updates comapeo-core-react because of invite bug.
cimigree Apr 9, 2026
9c92093
fix: update to map-server@1.1.3
gmaclennan Apr 15, 2026
35e80a3
chore: pin @comapeo/map-server version
gmaclennan Apr 16, 2026
b9cc628
Limits selectable devices for map sharing to just mobile.
cimigree Apr 16, 2026
2bc3beb
Updates test
cimigree Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added comapeo-core-react-7.3.0-pre.2-MAP-SHARING.tgz
View file
Open in desktop
Binary file not shown.
Binary file added comapeo-ipc-6.1.0-pre.0.tgz
View file
Open in desktop
Binary file not shown.
9 changes: 9 additions & 0 deletions messages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1953,6 +1953,15 @@
"screens.Settings.MapManagement.BackgroundMaps.sendMap": {
"message": "Send Map"
},
"screens.Settings.MapManagement.WaitingForMapToAccept.cancel": {
"message": "Cancel"
},
"screens.Settings.MapManagement.WaitingForMapToAccept.timerMessage": {
"message": "Map sent {time}s ago"
},
"screens.Settings.MapManagement.WaitingForMapToAccept.waitingMessage": {
"message": "Waiting for Device to Accept Map"
},
"screens.Settings.NameDefaultProjectIntro.description": {
"message": "Invite devices to a new project with all your observations."
},
Expand Down
Loading
Loading