Compare commits
14 Commits
277898f46f
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
 Davide Scaini
|
4e04b6e37e | ||
|
Davide Scaini
|
5d19ae4b67 | ||
|
Davide Scaini
|
62bb474908 | ||
|
Davide Scaini
|
3d09097eb3 | ||
|
Davide Scaini
|
15a993ecc6 | ||
|
Davide Scaini
|
fa6225d2cd | ||
|
Davide Scaini
|
f20407eecf | ||
|
Davide Scaini
|
67b721d872 | ||
|
Davide Scaini
|
89f76829b7 | ||
|
Davide Scaini
|
ed90a1830b | ||
|
Davide Scaini
|
c42e3498c2 | ||
|
Davide Scaini
|
8c60769fa6 | ||
|
Davide Scaini
|
6d095ba3ea | ||
|
Davide Scaini
|
626d145861 |
@@ -45,10 +45,31 @@ The bincio_activity server must allow CORS from `planner.bincio.org` — this is
|
||||
- [x] Auth gate with redirect to bincio login
|
||||
- [x] Deployed to `https://planner.bincio.org` with HTTPS
|
||||
|
||||
## Activity-year colour palette
|
||||
|
||||
Year-coded colours used for GPX reference tracks (and potentially other per-year data). Defined as `GPX_PALETTE` in `Planner.svelte`.
|
||||
|
||||
| Year | Color | Description |
|
||||
|------|-------|-------------|
|
||||
| 2014 | `hsl(265, 38%, 52%)` | muted purple |
|
||||
| 2015 | `hsl(248, 40%, 53%)` | slate-indigo |
|
||||
| 2016 | `hsl(232, 43%, 54%)` | slate-blue |
|
||||
| 2017 | `hsl(208, 48%, 52%)` | steel blue |
|
||||
| 2018 | `hsl(185, 52%, 50%)` | teal |
|
||||
| 2019 | `hsl(165, 50%, 49%)` | green-teal |
|
||||
| 2020 | `hsl(145, 48%, 47%)` | green |
|
||||
| 2021 | `hsl(100, 57%, 49%)` | yellow-green |
|
||||
| 2022 | `hsl(50, 72%, 52%)` | amber |
|
||||
| 2023 | `hsl(34, 75%, 53%)` | orange |
|
||||
| 2024 | `hsl(16, 77%, 56%)` | red-orange |
|
||||
| 2025 | `hsl(5, 70%, 57%)` | warm coral |
|
||||
| 2026 | `#60a5fa` | bright blue |
|
||||
| — | `#71717a` | grey (undated) |
|
||||
|
||||
## What's missing (from original plan)
|
||||
|
||||
- [ ] **Map tile switcher** — toggle between OSM and OpenCycleMap (Thunderforest, requires free API key). OpenCycleMap is significantly better for route planning.
|
||||
- [ ] **Drag-to-modify route polyline** — click and drag a point on the route line to insert a new waypoint. Deferred: requires hit-testing which segment was dragged, then inserting a waypoint at the right index. Doable but fiddly.
|
||||
- [x] **Drag-to-modify route polyline** — click and drag a point on the route line to insert a new waypoint. Deferred: requires hit-testing which segment was dragged, then inserting a waypoint at the right index. Doable but fiddly.
|
||||
- [ ] **Heatmap overlay** — nice-to-have. Our own data is too sparse (~20 users). Public options: Strava global heatmap (legally gray), Waymarked Trails (clean, OSM-based).
|
||||
- [ ] **Palette flash** — the race-calendar palette runs in `onMount`, so there's a brief flash from the default CSS vars to the correct palette. In bincio_activity this is avoided by an inline `<script>` in `<head>`. Svelte 5 makes this harder — low priority.
|
||||
- [ ] **Self-hosted Brouter** — public instance is fine for current traffic. Worth revisiting if usage grows or uptime becomes an issue.
|
||||
|
||||
@@ -0,0 +1,663 @@
|
||||
Copyright (C) 2026 Davide Scaini
|
||||
|
||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
Version 3, 19 November 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU Affero General Public License is a free, copyleft license for
|
||||
software and other kinds of works, specifically designed to ensure
|
||||
cooperation with the community in the case of network server software.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
our General Public Licenses are intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
Developers that use our General Public Licenses protect your rights
|
||||
with two steps: (1) assert copyright on the software, and (2) offer
|
||||
you this License which gives you legal permission to copy, distribute
|
||||
and/or modify the software.
|
||||
|
||||
A secondary benefit of defending all users' freedom is that
|
||||
improvements made in alternate versions of the program, if they
|
||||
receive widespread use, become available for other developers to
|
||||
incorporate. Many developers of free software are heartened and
|
||||
encouraged by the resulting cooperation. However, in the case of
|
||||
software used on network servers, this result may fail to come about.
|
||||
The GNU General Public License permits making a modified version and
|
||||
letting the public access it on a server without ever releasing its
|
||||
source code to the public.
|
||||
|
||||
The GNU Affero General Public License is designed specifically to
|
||||
ensure that, in such cases, the modified source code becomes available
|
||||
to the community. It requires the operator of a network server to
|
||||
provide the source code of the modified version running there to the
|
||||
users of that server. Therefore, public use of a modified version, on
|
||||
a publicly accessible server, gives the public access to the source
|
||||
code of the modified version.
|
||||
|
||||
An older license, called the Affero General Public License and
|
||||
published by Affero, was designed to accomplish similar goals. This is
|
||||
a different license, not a version of the Affero GPL, but Affero has
|
||||
released a new version of the Affero GPL which permits relicensing under
|
||||
this license.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, if you modify the
|
||||
Program, your modified version must prominently offer all users
|
||||
interacting with it remotely through a computer network (if your version
|
||||
supports such interaction) an opportunity to receive the Corresponding
|
||||
Source of your version by providing access to the Corresponding Source
|
||||
from a network server at no charge, through some standard or customary
|
||||
means of facilitating copying of software. This Corresponding Source
|
||||
shall include the Corresponding Source for any work covered by version 3
|
||||
of the GNU General Public License that is incorporated pursuant to the
|
||||
following paragraph.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the work with which it is combined will remain governed by version
|
||||
3 of the GNU General Public License.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU Affero General Public License from time to time. Such new versions
|
||||
will be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU Affero General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU Affero General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU Affero General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If your software can interact with users remotely through a computer
|
||||
network, you should also make sure that it provides a way for users to
|
||||
get its source. For example, if your program is a web application, its
|
||||
interface could display a "Source" link that leads users to an archive
|
||||
of the code. There are many ways you could offer source, and different
|
||||
solutions will be better for different programs; see section 13 for the
|
||||
specific requirements.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
@@ -41,3 +41,7 @@ If you have state that's important to retain within a component, consider creati
|
||||
import { writable } from 'svelte/store'
|
||||
export default writable(0)
|
||||
```
|
||||
|
||||
## License
|
||||
|
||||
[AGPL v3](LICENSE) — see the `LICENSE` file for details.
|
||||
|
||||
@@ -1,7 +1,31 @@
|
||||
#!/usr/bin/env bash
|
||||
# deploy.sh — build and deploy BincioPlanner to planner.bincio.org
|
||||
#
|
||||
# Frontend: built by Vite, rsynced to /var/www/planner/
|
||||
# Backend: server/ rsynced to the WorkingDirectory of bincio-planner.service,
|
||||
# then the service is restarted to pick up changes.
|
||||
set -e
|
||||
|
||||
VPS=root@95.216.55.151
|
||||
|
||||
VITE_ACTIVITY_URL=https://activity.bincio.org npm run build
|
||||
# ── Frontend ──────────────────────────────────────────────────────────────────
|
||||
echo "Building frontend…"
|
||||
VITE_ACTIVITY_URL=https://activity.bincio.org VITE_AUTH_URL=https://bincio.org VITE_PLANNER_API_URL= npm run build
|
||||
|
||||
echo "Deploying frontend…"
|
||||
rsync -az --delete dist/ "$VPS:/var/www/planner/"
|
||||
|
||||
# ── Backend ───────────────────────────────────────────────────────────────────
|
||||
echo "Deploying backend…"
|
||||
SERVER_DIR=$(ssh "$VPS" "systemctl show bincio-planner.service -p WorkingDirectory --value")
|
||||
if [[ -z "$SERVER_DIR" ]]; then
|
||||
echo "ERROR: could not read WorkingDirectory from bincio-planner.service" >&2
|
||||
exit 1
|
||||
fi
|
||||
rsync -az server/server.py server/pyproject.toml "$VPS:$SERVER_DIR/"
|
||||
ssh "$VPS" "cd $SERVER_DIR && uv sync -q"
|
||||
|
||||
echo "Restarting bincio-planner.service…"
|
||||
ssh "$VPS" "systemctl restart bincio-planner.service && systemctl is-active bincio-planner.service"
|
||||
|
||||
echo "Deployed to planner.bincio.org"
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
[project]
|
||||
name = "bincio-planner-server"
|
||||
version = "0.1.0"
|
||||
requires-python = ">=3.11"
|
||||
dependencies = [
|
||||
"fastapi>=0.111",
|
||||
"uvicorn[standard]>=0.29",
|
||||
"pydantic>=2.0",
|
||||
"PyJWT>=2.8",
|
||||
"cryptography>=42",
|
||||
]
|
||||
@@ -0,0 +1,445 @@
|
||||
"""BincioPlanner API — save/load route plans.
|
||||
|
||||
Auth: validates bincio_session JWT from bincio-auth.
|
||||
Accepts RS256 OIDC tokens (BINCIO_OIDC_ISSUER) and HS256 session tokens (BINCIO_AUTH_JWT_SECRET).
|
||||
Storage: JSON files at $PLANS_DIR/{handle}/{plan_id}.json
|
||||
Collections: $PLANS_DIR/{handle}/_collections.json
|
||||
Shared plans: $PLANS_DIR/_shared/{plan_id}.json (any authed user can read/write/delete)
|
||||
|
||||
Run: uvicorn server:app --host 127.0.0.1 --port 8002
|
||||
Env vars:
|
||||
BINCIO_OIDC_ISSUER OIDC issuer URL — JWKS fetched from {issuer}/.well-known/jwks.json
|
||||
BINCIO_AUTH_JWT_SECRET HS256 fallback secret
|
||||
PLANS_DIR root dir for plan JSON files (default: /var/bincio_planner)
|
||||
DEV_HANDLE bypass auth in local dev
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import secrets
|
||||
import time
|
||||
import urllib.request
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
import jwt as _jwt
|
||||
from jwt.algorithms import RSAAlgorithm as _RSAAlgorithm
|
||||
from fastapi import Cookie, Depends, FastAPI, HTTPException, Query
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.middleware.gzip import GZipMiddleware
|
||||
from fastapi.responses import JSONResponse
|
||||
from pydantic import BaseModel
|
||||
|
||||
_JWT_SECRET = os.environ.get("BINCIO_AUTH_JWT_SECRET", "")
|
||||
_OIDC_ISSUER = os.environ.get("BINCIO_OIDC_ISSUER", "")
|
||||
_PLANS_DIR = Path(os.environ.get("PLANS_DIR", "/var/bincio_planner"))
|
||||
_DEV_HANDLE = os.environ.get("DEV_HANDLE", "")
|
||||
|
||||
_SAFE_ID = re.compile(r"^[A-Za-z0-9_-]{1,32}$")
|
||||
|
||||
# Load RS256 public key from JWKS at startup.
|
||||
_rs256_key = None
|
||||
if _OIDC_ISSUER:
|
||||
try:
|
||||
with urllib.request.urlopen(f"{_OIDC_ISSUER}/.well-known/jwks.json", timeout=5) as _r:
|
||||
_jwks = json.loads(_r.read())
|
||||
for _k in _jwks.get("keys", []):
|
||||
if _k.get("kty") == "RSA":
|
||||
_rs256_key = _RSAAlgorithm.from_jwk(json.dumps(_k))
|
||||
break
|
||||
except Exception as _e:
|
||||
print(f"Warning: could not load JWKS from {_OIDC_ISSUER}: {_e}")
|
||||
|
||||
|
||||
# ── Auth ───────────────────────────────────────────────────────────────────────
|
||||
|
||||
@dataclass
|
||||
class User:
|
||||
handle: str
|
||||
display_name: str
|
||||
|
||||
|
||||
def _decode_session(token: str) -> Optional[User]:
|
||||
# Try RS256 (OIDC id_token from bincio-auth)
|
||||
if _rs256_key:
|
||||
try:
|
||||
payload = _jwt.decode(token, _rs256_key, algorithms=["RS256"],
|
||||
options={"verify_aud": False})
|
||||
handle = payload.get("sub")
|
||||
if handle and payload.get("activity_access"):
|
||||
return User(handle=handle,
|
||||
display_name=payload.get("name") or payload.get("display_name") or handle)
|
||||
except _jwt.PyJWTError:
|
||||
pass
|
||||
|
||||
# Fall back to HS256 session token
|
||||
if not _JWT_SECRET:
|
||||
return None
|
||||
try:
|
||||
payload = _jwt.decode(token, _JWT_SECRET, algorithms=["HS256"])
|
||||
except _jwt.PyJWTError:
|
||||
return None
|
||||
handle = payload.get("sub")
|
||||
if not handle or not payload.get("activity_access"):
|
||||
return None
|
||||
return User(handle=handle, display_name=payload.get("display_name", handle))
|
||||
|
||||
|
||||
async def require_auth(bincio_session: Optional[str] = Cookie(default=None)) -> User:
|
||||
if _DEV_HANDLE:
|
||||
return User(handle=_DEV_HANDLE, display_name=_DEV_HANDLE)
|
||||
if not bincio_session:
|
||||
raise HTTPException(401, "Authentication required")
|
||||
user = _decode_session(bincio_session)
|
||||
if not user:
|
||||
raise HTTPException(401, "Authentication required")
|
||||
return user
|
||||
|
||||
|
||||
# ── App ────────────────────────────────────────────────────────────────────────
|
||||
|
||||
app = FastAPI(title="BincioPlanner API", docs_url=None, redoc_url=None)
|
||||
app.add_middleware(GZipMiddleware, minimum_size=1024)
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origin_regex=r"https?://localhost(:\d+)?",
|
||||
allow_credentials=True,
|
||||
allow_methods=["GET", "POST", "PUT", "DELETE"],
|
||||
allow_headers=["Content-Type"],
|
||||
)
|
||||
|
||||
|
||||
# ── Storage helpers ────────────────────────────────────────────────────────────
|
||||
|
||||
def _user_dir(handle: str) -> Path:
|
||||
d = _PLANS_DIR / handle
|
||||
d.mkdir(parents=True, exist_ok=True)
|
||||
return d
|
||||
|
||||
|
||||
def _plan_path(handle: str, plan_id: str) -> Path:
|
||||
if not _SAFE_ID.match(plan_id):
|
||||
raise HTTPException(400, "Invalid plan id")
|
||||
return _PLANS_DIR / handle / f"{plan_id}.json"
|
||||
|
||||
|
||||
def _collections_path(handle: str) -> Path:
|
||||
return _PLANS_DIR / handle / "_collections.json"
|
||||
|
||||
|
||||
def _read_collections(handle: str) -> list[dict]:
|
||||
p = _collections_path(handle)
|
||||
if not p.exists():
|
||||
return []
|
||||
try:
|
||||
return json.loads(p.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
|
||||
def _write_collections(handle: str, cols: list[dict]) -> None:
|
||||
_user_dir(handle)
|
||||
_collections_path(handle).write_text(json.dumps(cols), encoding="utf-8")
|
||||
|
||||
|
||||
def _shared_dir() -> Path:
|
||||
d = _PLANS_DIR / "_shared"
|
||||
d.mkdir(parents=True, exist_ok=True)
|
||||
return d
|
||||
|
||||
|
||||
def _shared_plan_path(plan_id: str) -> Path:
|
||||
if not _SAFE_ID.match(plan_id):
|
||||
raise HTTPException(400, "Invalid plan id")
|
||||
return _PLANS_DIR / "_shared" / f"{plan_id}.json"
|
||||
|
||||
|
||||
# ── Endpoints ──────────────────────────────────────────────────────────────────
|
||||
|
||||
class PlanBody(BaseModel):
|
||||
name: str
|
||||
waypoints: list[dict]
|
||||
profile: str
|
||||
description: str | None = None
|
||||
geojson: dict | None = None
|
||||
gpxTrack: dict | None = None # full GeoJSON of reference track, if any GPX segments used
|
||||
gpxColorIdx: int | None = None
|
||||
gpxOpacity: float | None = None
|
||||
collection_id: str | None = None
|
||||
dist_km: float | None = None
|
||||
elevation_gain: int | None = None
|
||||
|
||||
|
||||
class CollectionBody(BaseModel):
|
||||
name: str
|
||||
|
||||
|
||||
@app.get("/api/plans")
|
||||
async def list_plans(user: User = Depends(require_auth)) -> JSONResponse:
|
||||
d = _PLANS_DIR / user.handle
|
||||
if not d.exists():
|
||||
return JSONResponse({"plans": []})
|
||||
plans = []
|
||||
_STRIP = {"geojson", "gpxTrack"}
|
||||
for p in sorted(d.glob("*.json"), key=lambda f: f.stat().st_mtime, reverse=True):
|
||||
if p.name.startswith("_"):
|
||||
continue
|
||||
try:
|
||||
data = json.loads(p.read_text(encoding="utf-8"))
|
||||
plans.append({k: v for k, v in data.items() if k not in _STRIP})
|
||||
except Exception:
|
||||
pass
|
||||
return JSONResponse({"plans": plans})
|
||||
|
||||
|
||||
@app.post("/api/plans")
|
||||
async def create_plan(body: PlanBody, user: User = Depends(require_auth)) -> JSONResponse:
|
||||
plan_id = secrets.token_urlsafe(12)
|
||||
now = int(time.time())
|
||||
data: dict = {
|
||||
"id": plan_id,
|
||||
"name": body.name.strip() or "Unnamed route",
|
||||
"waypoints": body.waypoints,
|
||||
"profile": body.profile,
|
||||
"created_at": now,
|
||||
"updated_at": now,
|
||||
}
|
||||
if body.description:
|
||||
data["description"] = body.description
|
||||
if body.collection_id:
|
||||
data["collection_id"] = body.collection_id
|
||||
if body.dist_km is not None:
|
||||
data["dist_km"] = body.dist_km
|
||||
if body.elevation_gain is not None:
|
||||
data["elevation_gain"] = body.elevation_gain
|
||||
if body.geojson is not None:
|
||||
data["geojson"] = body.geojson
|
||||
if body.gpxTrack is not None:
|
||||
data["gpxTrack"] = body.gpxTrack
|
||||
data["gpxColorIdx"] = body.gpxColorIdx
|
||||
data["gpxOpacity"] = body.gpxOpacity
|
||||
_user_dir(user.handle).joinpath(f"{plan_id}.json").write_text(
|
||||
json.dumps(data), encoding="utf-8"
|
||||
)
|
||||
return JSONResponse({"id": plan_id, "created_at": now})
|
||||
|
||||
|
||||
@app.get("/api/plans/{plan_id}")
|
||||
async def get_plan(plan_id: str, user: User = Depends(require_auth)) -> JSONResponse:
|
||||
p = _plan_path(user.handle, plan_id)
|
||||
if not p.exists():
|
||||
raise HTTPException(404, "Plan not found")
|
||||
return JSONResponse(json.loads(p.read_text(encoding="utf-8")))
|
||||
|
||||
|
||||
@app.put("/api/plans/{plan_id}")
|
||||
async def update_plan(
|
||||
plan_id: str, body: PlanBody, user: User = Depends(require_auth)
|
||||
) -> JSONResponse:
|
||||
p = _plan_path(user.handle, plan_id)
|
||||
if not p.exists():
|
||||
raise HTTPException(404, "Plan not found")
|
||||
data = json.loads(p.read_text(encoding="utf-8"))
|
||||
data.update({
|
||||
"name": body.name.strip() or data.get("name", "Unnamed route"),
|
||||
"waypoints": body.waypoints,
|
||||
"profile": body.profile,
|
||||
"updated_at": int(time.time()),
|
||||
})
|
||||
# description: non-null sets, null clears
|
||||
if body.description:
|
||||
data["description"] = body.description
|
||||
else:
|
||||
data.pop("description", None)
|
||||
# collection_id: non-null assigns, null unassigns
|
||||
if body.collection_id:
|
||||
data["collection_id"] = body.collection_id
|
||||
else:
|
||||
data.pop("collection_id", None)
|
||||
if body.dist_km is not None:
|
||||
data["dist_km"] = body.dist_km
|
||||
if body.elevation_gain is not None:
|
||||
data["elevation_gain"] = body.elevation_gain
|
||||
if body.geojson is not None:
|
||||
data["geojson"] = body.geojson
|
||||
if body.gpxTrack is not None:
|
||||
data["gpxTrack"] = body.gpxTrack
|
||||
data["gpxColorIdx"] = body.gpxColorIdx
|
||||
data["gpxOpacity"] = body.gpxOpacity
|
||||
elif "gpxTrack" in data:
|
||||
del data["gpxTrack"]
|
||||
data.pop("gpxColorIdx", None)
|
||||
data.pop("gpxOpacity", None)
|
||||
p.write_text(json.dumps(data), encoding="utf-8")
|
||||
return JSONResponse({"id": plan_id, "updated": True})
|
||||
|
||||
|
||||
@app.delete("/api/plans/{plan_id}")
|
||||
async def delete_plan(plan_id: str, user: User = Depends(require_auth)) -> JSONResponse:
|
||||
p = _plan_path(user.handle, plan_id)
|
||||
if not p.exists():
|
||||
raise HTTPException(404, "Plan not found")
|
||||
p.unlink()
|
||||
return JSONResponse({"id": plan_id, "deleted": True})
|
||||
|
||||
|
||||
# ── Collection endpoints ───────────────────────────────────────────────────────
|
||||
|
||||
@app.get("/api/collections")
|
||||
async def list_collections(user: User = Depends(require_auth)) -> JSONResponse:
|
||||
return JSONResponse({"collections": _read_collections(user.handle)})
|
||||
|
||||
|
||||
@app.post("/api/collections")
|
||||
async def create_collection(body: CollectionBody, user: User = Depends(require_auth)) -> JSONResponse:
|
||||
col_id = secrets.token_urlsafe(12)
|
||||
now = int(time.time())
|
||||
cols = _read_collections(user.handle)
|
||||
cols.append({"id": col_id, "name": body.name.strip() or "Unnamed collection", "created_at": now})
|
||||
_write_collections(user.handle, cols)
|
||||
return JSONResponse({"id": col_id, "created_at": now})
|
||||
|
||||
|
||||
@app.put("/api/collections/{col_id}")
|
||||
async def update_collection(
|
||||
col_id: str, body: CollectionBody, user: User = Depends(require_auth)
|
||||
) -> JSONResponse:
|
||||
cols = _read_collections(user.handle)
|
||||
for c in cols:
|
||||
if c["id"] == col_id:
|
||||
c["name"] = body.name.strip() or c["name"]
|
||||
_write_collections(user.handle, cols)
|
||||
return JSONResponse({"id": col_id, "updated": True})
|
||||
raise HTTPException(404, "Collection not found")
|
||||
|
||||
|
||||
@app.delete("/api/collections/{col_id}")
|
||||
async def delete_collection(
|
||||
col_id: str,
|
||||
mode: str = Query(default="unassign"),
|
||||
user: User = Depends(require_auth),
|
||||
) -> JSONResponse:
|
||||
cols = _read_collections(user.handle)
|
||||
if not any(c["id"] == col_id for c in cols):
|
||||
raise HTTPException(404, "Collection not found")
|
||||
_write_collections(user.handle, [c for c in cols if c["id"] != col_id])
|
||||
d = _PLANS_DIR / user.handle
|
||||
if d.exists():
|
||||
for p in d.glob("*.json"):
|
||||
if p.name.startswith("_"):
|
||||
continue
|
||||
try:
|
||||
data = json.loads(p.read_text(encoding="utf-8"))
|
||||
if data.get("collection_id") == col_id:
|
||||
if mode == "delete":
|
||||
p.unlink()
|
||||
else:
|
||||
data.pop("collection_id", None)
|
||||
p.write_text(json.dumps(data), encoding="utf-8")
|
||||
except Exception:
|
||||
pass
|
||||
return JSONResponse({"id": col_id, "deleted": True})
|
||||
|
||||
|
||||
# ── Shared plan endpoints ──────────────────────────────────────────────────────
|
||||
|
||||
_SHARED_STRIP = {"geojson", "gpxTrack"}
|
||||
|
||||
@app.get("/api/shared")
|
||||
async def list_shared(user: User = Depends(require_auth)) -> JSONResponse:
|
||||
d = _PLANS_DIR / "_shared"
|
||||
if not d.exists():
|
||||
return JSONResponse({"plans": []})
|
||||
plans = []
|
||||
for p in sorted(d.glob("*.json"), key=lambda f: f.stat().st_mtime, reverse=True):
|
||||
try:
|
||||
data = json.loads(p.read_text(encoding="utf-8"))
|
||||
plans.append({k: v for k, v in data.items() if k not in _SHARED_STRIP})
|
||||
except Exception:
|
||||
pass
|
||||
return JSONResponse({"plans": plans})
|
||||
|
||||
|
||||
@app.post("/api/shared")
|
||||
async def create_shared(body: PlanBody, user: User = Depends(require_auth)) -> JSONResponse:
|
||||
plan_id = secrets.token_urlsafe(12)
|
||||
now = int(time.time())
|
||||
data: dict = {
|
||||
"id": plan_id,
|
||||
"author": user.handle,
|
||||
"name": body.name.strip() or "Unnamed route",
|
||||
"waypoints": body.waypoints,
|
||||
"profile": body.profile,
|
||||
"created_at": now,
|
||||
"updated_at": now,
|
||||
}
|
||||
if body.description:
|
||||
data["description"] = body.description
|
||||
if body.dist_km is not None:
|
||||
data["dist_km"] = body.dist_km
|
||||
if body.elevation_gain is not None:
|
||||
data["elevation_gain"] = body.elevation_gain
|
||||
if body.geojson is not None:
|
||||
data["geojson"] = body.geojson
|
||||
if body.gpxTrack is not None:
|
||||
data["gpxTrack"] = body.gpxTrack
|
||||
data["gpxColorIdx"] = body.gpxColorIdx
|
||||
data["gpxOpacity"] = body.gpxOpacity
|
||||
_shared_dir().joinpath(f"{plan_id}.json").write_text(json.dumps(data), encoding="utf-8")
|
||||
return JSONResponse({"id": plan_id, "created_at": now})
|
||||
|
||||
|
||||
@app.get("/api/shared/{plan_id}")
|
||||
async def get_shared(plan_id: str, user: User = Depends(require_auth)) -> JSONResponse:
|
||||
p = _shared_plan_path(plan_id)
|
||||
if not p.exists():
|
||||
raise HTTPException(404, "Shared plan not found")
|
||||
return JSONResponse(json.loads(p.read_text(encoding="utf-8")))
|
||||
|
||||
|
||||
@app.put("/api/shared/{plan_id}")
|
||||
async def update_shared(
|
||||
plan_id: str, body: PlanBody, user: User = Depends(require_auth)
|
||||
) -> JSONResponse:
|
||||
p = _shared_plan_path(plan_id)
|
||||
if not p.exists():
|
||||
raise HTTPException(404, "Shared plan not found")
|
||||
data = json.loads(p.read_text(encoding="utf-8"))
|
||||
data.update({
|
||||
"name": body.name.strip() or data.get("name", "Unnamed route"),
|
||||
"waypoints": body.waypoints,
|
||||
"profile": body.profile,
|
||||
"updated_at": int(time.time()),
|
||||
})
|
||||
if body.description:
|
||||
data["description"] = body.description
|
||||
else:
|
||||
data.pop("description", None)
|
||||
if body.dist_km is not None:
|
||||
data["dist_km"] = body.dist_km
|
||||
if body.elevation_gain is not None:
|
||||
data["elevation_gain"] = body.elevation_gain
|
||||
if body.geojson is not None:
|
||||
data["geojson"] = body.geojson
|
||||
if body.gpxTrack is not None:
|
||||
data["gpxTrack"] = body.gpxTrack
|
||||
data["gpxColorIdx"] = body.gpxColorIdx
|
||||
data["gpxOpacity"] = body.gpxOpacity
|
||||
elif "gpxTrack" in data:
|
||||
del data["gpxTrack"]
|
||||
data.pop("gpxColorIdx", None)
|
||||
data.pop("gpxOpacity", None)
|
||||
p.write_text(json.dumps(data), encoding="utf-8")
|
||||
return JSONResponse({"id": plan_id, "updated": True})
|
||||
|
||||
|
||||
@app.delete("/api/shared/{plan_id}")
|
||||
async def delete_shared(plan_id: str, user: User = Depends(require_auth)) -> JSONResponse:
|
||||
p = _shared_plan_path(plan_id)
|
||||
if not p.exists():
|
||||
raise HTTPException(404, "Shared plan not found")
|
||||
p.unlink()
|
||||
return JSONResponse({"id": plan_id, "deleted": True})
|
||||
+6
-2
@@ -3,6 +3,7 @@
|
||||
import Planner from './Planner.svelte';
|
||||
|
||||
const ACTIVITY_URL = import.meta.env.VITE_ACTIVITY_URL ?? 'https://activity.bincio.org';
|
||||
const AUTH_URL = import.meta.env.VITE_AUTH_URL ?? 'https://bincio.org';
|
||||
|
||||
const PALETTES = {
|
||||
default: { accent: '#60a5fa', dim: 'rgba(96,165,250,0.15)' },
|
||||
@@ -27,6 +28,7 @@
|
||||
}
|
||||
|
||||
let authed = $state(false);
|
||||
let activityAccess = $state(false);
|
||||
let checking = $state(true);
|
||||
|
||||
onMount(async () => {
|
||||
@@ -34,9 +36,11 @@
|
||||
try {
|
||||
const r = await fetch(`${ACTIVITY_URL}/api/me`, { credentials: 'include' });
|
||||
if (r.ok) {
|
||||
const me = await r.json();
|
||||
authed = true;
|
||||
activityAccess = me.activity_access ?? false;
|
||||
} else {
|
||||
window.location.href = `${ACTIVITY_URL}/login/?next=${encodeURIComponent(window.location.href)}`;
|
||||
window.location.href = `${AUTH_URL}/login/?next=${encodeURIComponent(window.location.href)}`;
|
||||
}
|
||||
} catch {
|
||||
window.location.href = `${ACTIVITY_URL}/login/?next=${encodeURIComponent(window.location.href)}`;
|
||||
@@ -53,7 +57,7 @@
|
||||
{#if checking}
|
||||
<div class="splash">Checking login…</div>
|
||||
{:else if authed}
|
||||
<Planner activityUrl={ACTIVITY_URL} />
|
||||
<Planner activityUrl={ACTIVITY_URL} {activityAccess} />
|
||||
{/if}
|
||||
|
||||
<style>
|
||||
|
||||
+207
-19
@@ -1,12 +1,17 @@
|
||||
<script>
|
||||
// Renders a simple SVG elevation profile from a Brouter GeoJSON route feature.
|
||||
let { route } = $props();
|
||||
// Renders an SVG elevation profile.
|
||||
// gpxTrack: optional GeoJSON Feature — drawn in grey behind the route.
|
||||
// route: optional GeoJSON Feature — drawn in pink in front.
|
||||
// hoverFrac: 0-1 dist frac from map hover → vertical bar + dot on route profile.
|
||||
// onhover: callback(0-1 | null) when user hovers the chart.
|
||||
let { route = null, gpxTrack = null, gpxColor = '#71717a', gpxOpacity = 0.8, hoverFrac = null, onhover = null } = $props();
|
||||
|
||||
const PAD = { top: 8, right: 8, bottom: 20, left: 36 };
|
||||
const H = 140;
|
||||
|
||||
let svgEl;
|
||||
let W = $state(400);
|
||||
let cursorFrac = $state(null);
|
||||
|
||||
$effect(() => {
|
||||
if (!svgEl) return;
|
||||
@@ -15,23 +20,100 @@
|
||||
return () => ro.disconnect();
|
||||
});
|
||||
|
||||
let profile = $derived.by(() => {
|
||||
if (!route) return null;
|
||||
const coords = route.geometry?.coordinates ?? [];
|
||||
// ── Slope helpers ──────────────────────────────────────────────────────────
|
||||
|
||||
function slopeColor(pct) {
|
||||
if (pct < -1) return '#60a5fa'; // descent — blue
|
||||
if (pct < 2) return '#4ade80'; // flat — green
|
||||
if (pct < 5) return '#facc15'; // easy — yellow
|
||||
if (pct < 8) return '#f97316'; // moderate — orange
|
||||
if (pct < 12) return '#ef4444'; // steep — red
|
||||
return '#a855f7'; // wall — purple
|
||||
}
|
||||
|
||||
// Distance-weighted sliding-window slope smoothing (O(n) with advancing pointers).
|
||||
function computeSmoothedSlopes(pts, windowM = 400) {
|
||||
if (pts.length < 2) return pts.map(() => 0);
|
||||
const half = windowM / 2;
|
||||
|
||||
// Raw slope for each segment, stored at the segment midpoint.
|
||||
const segs = [];
|
||||
for (let i = 0; i < pts.length - 1; i++) {
|
||||
const len = pts[i + 1].d - pts[i].d;
|
||||
segs.push({
|
||||
d: (pts[i].d + pts[i + 1].d) / 2,
|
||||
slope: len > 0.5 ? (pts[i + 1].e - pts[i].e) / len * 100 : 0,
|
||||
len,
|
||||
});
|
||||
}
|
||||
|
||||
// Sliding window with two advancing pointers.
|
||||
const slopes = new Array(pts.length);
|
||||
let lo = 0, hi = 0;
|
||||
let sumW = 0, sumS = 0;
|
||||
|
||||
for (let i = 0; i < pts.length; i++) {
|
||||
const center = pts[i].d;
|
||||
// Expand right
|
||||
while (hi < segs.length && segs[hi].d <= center + half) {
|
||||
sumW += segs[hi].len; sumS += segs[hi].slope * segs[hi].len; hi++;
|
||||
}
|
||||
// Shrink left
|
||||
while (lo < hi && segs[lo].d < center - half) {
|
||||
sumW -= segs[lo].len; sumS -= segs[lo].slope * segs[lo].len; lo++;
|
||||
}
|
||||
slopes[i] = sumW > 0.5 ? sumS / sumW : 0;
|
||||
}
|
||||
return slopes;
|
||||
}
|
||||
|
||||
// Interpolate slope at a given cumulative distance.
|
||||
function slopeAtDist(pts, dist) {
|
||||
let lo = pts.length - 2;
|
||||
for (let i = 0; i < pts.length - 1; i++) {
|
||||
if (pts[i + 1].d >= dist) { lo = i; break; }
|
||||
}
|
||||
const seg = pts[lo + 1].d - pts[lo].d;
|
||||
const t = seg > 0 ? Math.min(1, (dist - pts[lo].d) / seg) : 0;
|
||||
return pts[lo].slope + t * (pts[lo + 1].slope - pts[lo].slope);
|
||||
}
|
||||
|
||||
// Build sub-sampled gradient stops (≤ 80 stops regardless of track length).
|
||||
function buildGradientStops(pts) {
|
||||
const total = pts[pts.length - 1].d;
|
||||
const N = Math.min(pts.length - 1, 80);
|
||||
const stops = [];
|
||||
for (let s = 0; s <= N; s++) {
|
||||
const d = (s / N) * total;
|
||||
stops.push({
|
||||
offset: ((s / N) * 100).toFixed(2) + '%',
|
||||
color: slopeColor(slopeAtDist(pts, d)),
|
||||
});
|
||||
}
|
||||
return stops;
|
||||
}
|
||||
|
||||
// ── Profile builder ────────────────────────────────────────────────────────
|
||||
|
||||
function buildProfile(track) {
|
||||
if (!track) return null;
|
||||
const coords = track.geometry?.coordinates ?? [];
|
||||
if (coords.length < 2) return null;
|
||||
|
||||
// Build cumulative distance + elevation arrays
|
||||
const pts = [];
|
||||
let dist = 0;
|
||||
for (let i = 0; i < coords.length; i++) {
|
||||
if (i > 0) {
|
||||
const dx = coords[i][0] - coords[i - 1][0];
|
||||
const dy = coords[i][1] - coords[i - 1][1];
|
||||
dist += Math.sqrt(dx*dx + dy*dy) * 111320; // rough metres
|
||||
dist += Math.sqrt(dx * dx + dy * dy) * 111320;
|
||||
}
|
||||
pts.push({ d: dist, e: coords[i][2] ?? 0 });
|
||||
pts.push({ d: dist, e: coords[i][2] ?? 0, slope: 0 });
|
||||
}
|
||||
|
||||
const smoothed = computeSmoothedSlopes(pts);
|
||||
pts.forEach((p, i) => { p.slope = smoothed[i]; });
|
||||
|
||||
const totalDist = pts[pts.length - 1].d;
|
||||
const eles = pts.map(p => p.e);
|
||||
const minE = Math.min(...eles);
|
||||
@@ -47,20 +129,126 @@
|
||||
const polyline = pts.map(p => `${toX(p.d).toFixed(1)},${toY(p.e).toFixed(1)}`).join(' ');
|
||||
const area = `${toX(0)},${(PAD.top + iH).toFixed(1)} ` + polyline + ` ${toX(totalDist)},${(PAD.top + iH).toFixed(1)}`;
|
||||
|
||||
return { polyline, area, minE, maxE, totalDist, iW, iH };
|
||||
});
|
||||
const slopeStops = buildGradientStops(pts);
|
||||
|
||||
return { polyline, area, minE, maxE, totalDist, iW, iH, pts, toX, toY, slopeStops };
|
||||
}
|
||||
|
||||
let profile = $derived(buildProfile(route));
|
||||
let gpxProfile = $derived(buildProfile(gpxTrack));
|
||||
|
||||
// Interpolate elevation at a given cumulative distance within a pts array.
|
||||
function elevAtDist(pts, dist) {
|
||||
let lo = pts.length - 2;
|
||||
for (let i = 0; i < pts.length - 1; i++) {
|
||||
if (pts[i + 1].d >= dist) { lo = i; break; }
|
||||
}
|
||||
const seg = pts[lo + 1].d - pts[lo].d;
|
||||
const t = seg > 0 ? Math.min(1, (dist - pts[lo].d) / seg) : 0;
|
||||
return pts[lo].e + t * (pts[lo + 1].e - pts[lo].e);
|
||||
}
|
||||
|
||||
function handleMouseMove(e) {
|
||||
if (!profile && !gpxProfile) return;
|
||||
const rect = svgEl.getBoundingClientRect();
|
||||
const iW = W - PAD.left - PAD.right;
|
||||
const f = Math.max(0, Math.min(1, (e.clientX - rect.left - PAD.left) / iW));
|
||||
cursorFrac = f;
|
||||
if (onhover) onhover(f);
|
||||
}
|
||||
|
||||
function handleMouseLeave() {
|
||||
cursorFrac = null;
|
||||
if (onhover) onhover(null);
|
||||
}
|
||||
|
||||
// iW is the same for both profiles since PAD and W are shared.
|
||||
let iW = $derived(W - PAD.left - PAD.right);
|
||||
let iH = $derived(H - PAD.top - PAD.bottom);
|
||||
|
||||
// Axis labels come from route profile if it exists, otherwise gpx.
|
||||
let labelProfile = $derived(profile ?? gpxProfile);
|
||||
</script>
|
||||
|
||||
<svg bind:this={svgEl} width="100%" height={H} style="display:block">
|
||||
<svg
|
||||
bind:this={svgEl}
|
||||
role="img"
|
||||
aria-label="Elevation profile"
|
||||
width="100%"
|
||||
height={H}
|
||||
style="display:block;cursor:{labelProfile ? 'crosshair' : 'default'}"
|
||||
onmousemove={handleMouseMove}
|
||||
onmouseleave={handleMouseLeave}
|
||||
>
|
||||
<defs>
|
||||
{#if profile}
|
||||
<!-- area fill -->
|
||||
<polygon points={profile.area} fill="#e879a022" />
|
||||
<!-- line -->
|
||||
<linearGradient id="slope-grad" gradientUnits="userSpaceOnUse"
|
||||
x1="{PAD.left}" y1="0" x2="{PAD.left + iW}" y2="0">
|
||||
{#each profile.slopeStops as stop}
|
||||
<stop offset={stop.offset} stop-color={stop.color} />
|
||||
{/each}
|
||||
</linearGradient>
|
||||
{/if}
|
||||
</defs>
|
||||
|
||||
{#if labelProfile}
|
||||
<!-- GPX reference profile — behind, user-chosen colour/opacity -->
|
||||
{#if gpxProfile}
|
||||
<polygon points={gpxProfile.area} fill={gpxColor} fill-opacity="0.12" />
|
||||
<polyline points={gpxProfile.polyline} fill="none" stroke={gpxColor} stroke-width="1.5" opacity={gpxOpacity} />
|
||||
{/if}
|
||||
|
||||
<!-- Route profile — slope-coloured fill + pink stroke -->
|
||||
{#if profile}
|
||||
<polygon points={profile.area} fill="url(#slope-grad)" fill-opacity="0.45" />
|
||||
<polyline points={profile.polyline} fill="none" stroke="#e879a0" stroke-width="1.5" />
|
||||
<!-- y labels -->
|
||||
<text x={PAD.left - 4} y={PAD.top + 4} text-anchor="end" font-size="9" fill="#71717a">{profile.maxE.toFixed(0)}m</text>
|
||||
<text x={PAD.left - 4} y={PAD.top + profile.iH} text-anchor="end" font-size="9" fill="#71717a">{profile.minE.toFixed(0)}m</text>
|
||||
<!-- x label -->
|
||||
<text x={PAD.left + profile.iW / 2} y={H - 4} text-anchor="middle" font-size="9" fill="#71717a">{(profile.totalDist / 1000).toFixed(1)} km</text>
|
||||
{/if}
|
||||
|
||||
<!-- y-axis labels -->
|
||||
<text x={PAD.left - 4} y={PAD.top + 4} text-anchor="end" font-size="9" fill="#71717a">{labelProfile.maxE.toFixed(0)}m</text>
|
||||
<text x={PAD.left - 4} y={PAD.top + iH} text-anchor="end" font-size="9" fill="#71717a">{labelProfile.minE.toFixed(0)}m</text>
|
||||
|
||||
<!-- x-axis distance label(s) -->
|
||||
{#if profile}
|
||||
<text x={PAD.left + iW / 2} y={H - 4} text-anchor="middle" font-size="9" fill="#71717a">{(profile.totalDist / 1000).toFixed(1)} km</text>
|
||||
{/if}
|
||||
{#if gpxProfile && !profile}
|
||||
<text x={PAD.left + iW / 2} y={H - 4} text-anchor="middle" font-size="9" fill="#71717a">{(gpxProfile.totalDist / 1000).toFixed(1)} km</text>
|
||||
{/if}
|
||||
{#if gpxProfile && profile}
|
||||
<text x={PAD.left + iW - 2} y={PAD.top + 12} text-anchor="end" font-size="8" fill="#71717a" opacity="0.65">gpx {(gpxProfile.totalDist / 1000).toFixed(1)} km</text>
|
||||
{/if}
|
||||
|
||||
<!-- Cursor bar + dot + tooltip while hovering chart -->
|
||||
{#if cursorFrac !== null}
|
||||
{@const cX = PAD.left + cursorFrac * iW}
|
||||
{@const cDist = cursorFrac * (profile ?? gpxProfile).totalDist}
|
||||
<line x1={cX} y1={PAD.top} x2={cX} y2={PAD.top + iH} stroke="#e879a0" stroke-width="1" opacity="0.7" />
|
||||
{#if profile}
|
||||
{@const cEle = elevAtDist(profile.pts, cDist)}
|
||||
{@const cSlope = slopeAtDist(profile.pts, cDist)}
|
||||
{@const cY = profile.toY(cEle)}
|
||||
{@const tipLeft = cursorFrac > 0.72}
|
||||
{@const tipX = tipLeft ? cX - 62 : cX + 6}
|
||||
<circle cx={cX} cy={cY} r="4" fill="#e879a0" stroke="#18181b" stroke-width="1.5" />
|
||||
<rect x={tipX} y={PAD.top + 2} width="56" height="30" rx="3" fill="#09090b" opacity="0.88" />
|
||||
<text x={tipX + 28} y={PAD.top + 14} text-anchor="middle" font-size="10" font-weight="700" fill={slopeColor(cSlope)}>
|
||||
{cSlope > 0.05 ? '+' : ''}{cSlope.toFixed(1)}%
|
||||
</text>
|
||||
<text x={tipX + 28} y={PAD.top + 26} text-anchor="middle" font-size="9" fill="#71717a">{cEle.toFixed(0)} m</text>
|
||||
{:else if gpxProfile}
|
||||
{@const cY = gpxProfile.toY(elevAtDist(gpxProfile.pts, cDist))}
|
||||
<circle cx={cX} cy={cY} r="4" fill={gpxColor} stroke="#18181b" stroke-width="1.5" />
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
<!-- Map-hover indicator: bar + dot on route profile -->
|
||||
{#if hoverFrac !== null && profile}
|
||||
{@const hDist = hoverFrac * profile.totalDist}
|
||||
{@const hX = profile.toX(hDist)}
|
||||
{@const hY = profile.toY(elevAtDist(profile.pts, hDist))}
|
||||
<line x1={hX} y1={PAD.top} x2={hX} y2={PAD.top + iH} stroke="#e879a0" stroke-width="1" opacity="0.55" />
|
||||
<circle cx={hX} cy={hY} r="4" fill="#e879a0" stroke="#18181b" stroke-width="1.5" />
|
||||
{/if}
|
||||
{/if}
|
||||
</svg>
|
||||
|
||||
+1523
-42
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user