From a2aa1be27128ea443a706a277c7512d607a04a8a Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sat, 13 Sep 2025 23:11:42 +0200 Subject: [PATCH 01/25] Precalculate hexagons for stats --- app/assets/builds/tailwind.css | 2 +- .../api/v1/maps/hexagons_controller.rb | 65 +++++++++------- app/controllers/shared/stats_controller.rb | 1 + .../controllers/public_stat_map_controller.js | 14 ++-- app/models/stat.rb | 4 + app/queries/hexagon_query.rb | 26 +++---- app/services/hexagon_cache_service.rb | 57 ++++++++++++++ app/services/stats/calculate_month.rb | 76 ++++++++++++++++++- app/views/stats/public_month.html.erb | 1 + ...0250913194134_add_hexagon_data_to_stats.rb | 7 ++ db/schema.rb | 3 +- 11 files changed, 204 insertions(+), 52 deletions(-) create mode 100644 app/services/hexagon_cache_service.rb create mode 100644 db/migrate/20250913194134_add_hexagon_data_to_stats.rb diff --git a/app/assets/builds/tailwind.css b/app/assets/builds/tailwind.css index 56020d98..b466489a 100644 --- a/app/assets/builds/tailwind.css +++ b/app/assets/builds/tailwind.css @@ -3,4 +3,4 @@ );grid-template-rows:var(--timeline-row-start,minmax(0,1fr)) auto var( --timeline-row-end,minmax(0,1fr) );position:relative}.timeline>li>hr{border-width:0;width:100%}:where(.timeline>li>hr):first-child{grid-column-start:1;grid-row-start:2}:where(.timeline>li>hr):last-child{grid-column-end:none;grid-column-start:3;grid-row-end:auto;grid-row-start:2}.timeline-start{align-self:flex-end;grid-column-end:4;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:center;margin:.25rem}.timeline-middle{grid-column-start:2;grid-row-start:2}.timeline-end{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center;margin:.25rem}.toast{display:flex;flex-direction:column;gap:.5rem;min-width:-moz-fit-content;min-width:fit-content;padding:1rem;position:fixed;white-space:nowrap}.toggle{flex-shrink:0;--tglbg:var(--fallback-b1,oklch(var(--b1)/1));--handleoffset:1.5rem;--handleoffsetcalculator:calc(var(--handleoffset)*-1);--togglehandleborder:0 0;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:currentColor;border-color:currentColor;border-radius:var(--rounded-badge,1.9rem);border-width:1px;box-shadow:var(--handleoffsetcalculator) 0 0 2px var(--tglbg) inset,0 0 0 2px var(--tglbg) inset,var(--togglehandleborder);color:var(--fallback-bc,oklch(var(--bc)/.5));cursor:pointer;height:1.5rem;transition:background,box-shadow var(--animation-input,.2s) ease-out;width:3rem}.alert-info{border-color:var(--fallback-in,oklch(var(--in)/.2));--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));--alert-bg:var(--fallback-in,oklch(var(--in)/1));--alert-bg-mix:var(--fallback-b1,oklch(var(--b1)/1))}.alert-error{border-color:var(--fallback-er,oklch(var(--er)/.2));--tw-text-opacity:1;color:var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));--alert-bg:var(--fallback-er,oklch(var(--er)/1));--alert-bg-mix:var(--fallback-b1,oklch(var(--b1)/1))}.badge-neutral{background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));border-color:var(--fallback-n,oklch(var(--n)/var(--tw-border-opacity)));color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity)))}.badge-neutral,.badge-primary{--tw-border-opacity:1;--tw-bg-opacity:1;--tw-text-opacity:1}.badge-primary{background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.badge-secondary{background-color:var(--fallback-s,oklch(var(--s)/var(--tw-bg-opacity)));border-color:var(--fallback-s,oklch(var(--s)/var(--tw-border-opacity)));color:var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)))}.badge-accent,.badge-secondary{--tw-border-opacity:1;--tw-bg-opacity:1;--tw-text-opacity:1}.badge-accent{background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity)));border-color:var(--fallback-a,oklch(var(--a)/var(--tw-border-opacity)));color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)))}.badge-success{background-color:var(--fallback-su,oklch(var(--su)/var(--tw-bg-opacity)));color:var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)))}.badge-success,.badge-warning{border-color:transparent;--tw-bg-opacity:1;--tw-text-opacity:1}.badge-warning{background-color:var(--fallback-wa,oklch(var(--wa)/var(--tw-bg-opacity)));color:var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)))}.badge-ghost{--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}.badge-outline{border-color:currentColor;--tw-border-opacity:0.5;background-color:transparent;color:currentColor}.badge-outline.badge-neutral{--tw-text-opacity:1;color:var(--fallback-n,oklch(var(--n)/var(--tw-text-opacity)))}.badge-outline.badge-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity)))}.badge-outline.badge-secondary{--tw-text-opacity:1;color:var(--fallback-s,oklch(var(--s)/var(--tw-text-opacity)))}.badge-outline.badge-accent{--tw-text-opacity:1;color:var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity)))}.badge-outline.badge-info{--tw-text-opacity:1;color:var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity)))}.badge-outline.badge-success{--tw-text-opacity:1;color:var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity)))}.badge-outline.badge-warning{--tw-text-opacity:1;color:var(--fallback-wa,oklch(var(--wa)/var(--tw-text-opacity)))}.badge-outline.badge-error{--tw-text-opacity:1;color:var(--fallback-er,oklch(var(--er)/var(--tw-text-opacity)))}.btm-nav>:where(.active){border-top-width:2px;--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)))}.btm-nav>.disabled,.btm-nav>[disabled]{pointer-events:none;--tw-border-opacity:0;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-bg-opacity:0.1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.btm-nav>* .label{font-size:1rem;line-height:1.5rem}.btn:active:focus,.btn:active:hover{animation:button-pop 0s ease-out;transform:scale(var(--btn-focus-scale,.97))}@supports not (color:oklch(0 0 0)){.btn{background-color:var(--btn-color,var(--fallback-b2));border-color:var(--btn-color,var(--fallback-b2))}.btn-primary{--btn-color:var(--fallback-p)}.btn-neutral{--btn-color:var(--fallback-n)}.btn-info{--btn-color:var(--fallback-in)}.btn-success{--btn-color:var(--fallback-su)}.btn-warning{--btn-color:var(--fallback-wa)}.btn-error{--btn-color:var(--fallback-er)}}@supports (color:color-mix(in oklab,black,black)){.btn-active{background-color:color-mix(in oklab,oklch(var(--btn-color,var(--b3))/var(--tw-bg-opacity,1)) 90%,#000);border-color:color-mix(in oklab,oklch(var(--btn-color,var(--b3))/var(--tw-border-opacity,1)) 90%,#000)}.btn-outline.btn-primary.btn-active{background-color:color-mix(in oklab,var(--fallback-p,oklch(var(--p)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-p,oklch(var(--p)/1)) 90%,#000)}.btn-outline.btn-secondary.btn-active{background-color:color-mix(in oklab,var(--fallback-s,oklch(var(--s)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-s,oklch(var(--s)/1)) 90%,#000)}.btn-outline.btn-accent.btn-active{background-color:color-mix(in oklab,var(--fallback-a,oklch(var(--a)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-a,oklch(var(--a)/1)) 90%,#000)}.btn-outline.btn-success.btn-active{background-color:color-mix(in oklab,var(--fallback-su,oklch(var(--su)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-su,oklch(var(--su)/1)) 90%,#000)}.btn-outline.btn-info.btn-active{background-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000)}.btn-outline.btn-warning.btn-active{background-color:color-mix(in oklab,var(--fallback-wa,oklch(var(--wa)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-wa,oklch(var(--wa)/1)) 90%,#000)}.btn-outline.btn-error.btn-active{background-color:color-mix(in oklab,var(--fallback-er,oklch(var(--er)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-er,oklch(var(--er)/1)) 90%,#000)}}.btn:focus-visible{outline-offset:2px;outline-style:solid;outline-width:2px}.btn-primary{--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)));outline-color:var(--fallback-p,oklch(var(--p)/1))}@supports (color:oklch(0 0 0)){.btn-primary{--btn-color:var(--p)}.btn-neutral{--btn-color:var(--n)}.btn-info{--btn-color:var(--in)}.btn-success{--btn-color:var(--su)}.btn-warning{--btn-color:var(--wa)}.btn-error{--btn-color:var(--er)}}.btn-neutral{--tw-text-opacity:1;color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity)));outline-color:var(--fallback-n,oklch(var(--n)/1))}.btn-info{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));outline-color:var(--fallback-in,oklch(var(--in)/1))}.btn-success{--tw-text-opacity:1;color:var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));outline-color:var(--fallback-su,oklch(var(--su)/1))}.btn-warning{--tw-text-opacity:1;color:var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));outline-color:var(--fallback-wa,oklch(var(--wa)/1))}.btn-error{--tw-text-opacity:1;color:var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));outline-color:var(--fallback-er,oklch(var(--er)/1))}.btn.glass{--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow);outline-color:currentColor}.btn.glass.btn-active{--glass-opacity:25%;--glass-border-opacity:15%}.btn-ghost{background-color:transparent;border-color:transparent;border-width:1px;color:currentColor;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow);outline-color:currentColor}.btn-ghost.btn-active{background-color:var(--fallback-bc,oklch(var(--bc)/.2));border-color:transparent}.btn-link.btn-active{background-color:transparent;border-color:transparent;text-decoration-line:underline}.btn-outline{background-color:transparent;border-color:currentColor;--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.btn-outline.btn-active{--tw-border-opacity:1;border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-b1,oklch(var(--b1)/var(--tw-text-opacity)))}.btn-outline.btn-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity)))}.btn-outline.btn-primary.btn-active{--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.btn-outline.btn-secondary{--tw-text-opacity:1;color:var(--fallback-s,oklch(var(--s)/var(--tw-text-opacity)))}.btn-outline.btn-secondary.btn-active{--tw-text-opacity:1;color:var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)))}.btn-outline.btn-accent{--tw-text-opacity:1;color:var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity)))}.btn-outline.btn-accent.btn-active{--tw-text-opacity:1;color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)))}.btn-outline.btn-success{--tw-text-opacity:1;color:var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity)))}.btn-outline.btn-success.btn-active{--tw-text-opacity:1;color:var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)))}.btn-outline.btn-info{--tw-text-opacity:1;color:var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity)))}.btn-outline.btn-info.btn-active{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)))}.btn-outline.btn-warning{--tw-text-opacity:1;color:var(--fallback-wa,oklch(var(--wa)/var(--tw-text-opacity)))}.btn-outline.btn-warning.btn-active{--tw-text-opacity:1;color:var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)))}.btn-outline.btn-error{--tw-text-opacity:1;color:var(--fallback-er,oklch(var(--er)/var(--tw-text-opacity)))}.btn-outline.btn-error.btn-active{--tw-text-opacity:1;color:var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)))}.btn.btn-disabled,.btn:disabled,.btn[disabled]{--tw-border-opacity:0;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-bg-opacity:0.2;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.btn:is(input[type=checkbox]:checked),.btn:is(input[type=radio]:checked){--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.btn:is(input[type=checkbox]:checked):focus-visible,.btn:is(input[type=radio]:checked):focus-visible{outline-color:var(--fallback-p,oklch(var(--p)/1))}@keyframes button-pop{0%{transform:scale(var(--btn-focus-scale,.98))}40%{transform:scale(1.02)}to{transform:scale(1)}}.card :where(figure:first-child){border-end-end-radius:unset;border-end-start-radius:unset;border-start-end-radius:inherit;border-start-start-radius:inherit;overflow:hidden}.card :where(figure:last-child){border-end-end-radius:inherit;border-end-start-radius:inherit;border-start-end-radius:unset;border-start-start-radius:unset;overflow:hidden}.card:focus-visible{outline:2px solid currentColor;outline-offset:2px}.card.bordered{border-width:1px;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)))}.card.compact .card-body{font-size:.875rem;line-height:1.25rem;padding:1rem}.card-title{align-items:center;display:flex;font-size:1.25rem;font-weight:600;gap:.5rem;line-height:1.75rem}.card.image-full :where(figure){border-radius:inherit;overflow:hidden}.checkbox:focus{box-shadow:none}.checkbox:focus-visible{outline-color:var(--fallback-bc,oklch(var(--bc)/1));outline-offset:2px;outline-style:solid;outline-width:2px}.checkbox:checked,.checkbox[aria-checked=true],.checkbox[checked=true]{animation:checkmark var(--animation-input,.2s) ease-out;background-color:var(--chkbg);background-image:linear-gradient(-45deg,transparent 65%,var(--chkbg) 65.99%),linear-gradient(45deg,transparent 75%,var(--chkbg) 75.99%),linear-gradient(-45deg,var(--chkbg) 40%,transparent 40.99%),linear-gradient(45deg,var(--chkbg) 30%,var(--chkfg) 30.99%,var(--chkfg) 40%,transparent 40.99%),linear-gradient(-45deg,var(--chkfg) 50%,var(--chkbg) 50.99%);background-repeat:no-repeat}.checkbox:indeterminate{--tw-bg-opacity:1;animation:checkmark var(--animation-input,.2s) ease-out;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));background-image:linear-gradient(90deg,transparent 80%,var(--chkbg) 80%),linear-gradient(-90deg,transparent 80%,var(--chkbg) 80%),linear-gradient(0deg,var(--chkbg) 43%,var(--chkfg) 43%,var(--chkfg) 57%,var(--chkbg) 57%);background-repeat:no-repeat}.checkbox:disabled{border-color:transparent;cursor:not-allowed;--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));opacity:.2}@keyframes checkmark{0%{background-position-y:5px}50%{background-position-y:-2px}to{background-position-y:0}}.divider:not(:empty){gap:1rem}.drawer-toggle:focus-visible~.drawer-content label.drawer-button{outline-offset:2px;outline-style:solid;outline-width:2px}.dropdown.dropdown-open .dropdown-content,.dropdown:focus .dropdown-content,.dropdown:focus-within .dropdown-content{--tw-scale-x:1;--tw-scale-y:1;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.file-input-bordered{--tw-border-opacity:0.2}.file-input:focus{outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.file-input-disabled,.file-input[disabled]{cursor:not-allowed;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));--tw-text-opacity:0.2}.file-input-disabled::-moz-placeholder,.file-input[disabled]::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.file-input-disabled::placeholder,.file-input[disabled]::placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.file-input-disabled::file-selector-button,.file-input[disabled]::file-selector-button{--tw-border-opacity:0;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-bg-opacity:0.2;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.footer-title{font-weight:700;margin-bottom:.5rem;opacity:.6;text-transform:uppercase}.label-text{font-size:.875rem;line-height:1.25rem}.label-text,.label-text-alt{--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}.label-text-alt{font-size:.75rem;line-height:1rem}.input input{--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));background-color:transparent}.input input:focus{outline:2px solid transparent;outline-offset:2px}.input[list]::-webkit-calendar-picker-indicator{line-height:1em}.input-bordered{border-color:var(--fallback-bc,oklch(var(--bc)/.2))}.input:focus,.input:focus-within{border-color:var(--fallback-bc,oklch(var(--bc)/.2));box-shadow:none;outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.input-ghost{--tw-bg-opacity:0.05}.input-ghost:focus,.input-ghost:focus-within{--tw-bg-opacity:1;--tw-text-opacity:1;box-shadow:none;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}.input-primary{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)))}.input-primary:focus,.input-primary:focus-within{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));outline-color:var(--fallback-p,oklch(var(--p)/1))}.input-error{--tw-border-opacity:1;border-color:var(--fallback-er,oklch(var(--er)/var(--tw-border-opacity)))}.input-error:focus,.input-error:focus-within{--tw-border-opacity:1;border-color:var(--fallback-er,oklch(var(--er)/var(--tw-border-opacity)));outline-color:var(--fallback-er,oklch(var(--er)/1))}.input-disabled,.input:disabled,.input[disabled]{cursor:not-allowed;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));color:var(--fallback-bc,oklch(var(--bc)/.4))}.input-disabled::-moz-placeholder,.input:disabled::-moz-placeholder,.input[disabled]::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.input-disabled::placeholder,.input:disabled::placeholder,.input[disabled]::placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.input::-webkit-date-and-time-value{text-align:inherit}.join>:where(:not(:first-child)){margin-bottom:0;margin-top:0;margin-inline-start:-1px}.join-item:focus{isolation:isolate}.link-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity)))}@supports (color:color-mix(in oklab,black,black)){@media (hover:hover){.link-primary:hover{color:color-mix(in oklab,var(--fallback-p,oklch(var(--p)/1)) 80%,#000)}}}.link:focus{outline:2px solid transparent;outline-offset:2px}.link:focus-visible{outline:2px solid currentColor;outline-offset:2px}.loading{aspect-ratio:1/1;background-color:currentColor;display:inline-block;-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:100%;mask-size:100%;pointer-events:none;width:1.5rem}.loading,.loading-spinner{-webkit-mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' stroke='%23000'%3E%3Cstyle%3E@keyframes spinner_zKoa{to{transform:rotate(360deg)}}@keyframes spinner_YpZS{0%25{stroke-dasharray:0 150;stroke-dashoffset:0}47.5%25{stroke-dasharray:42 150;stroke-dashoffset:-16}95%25,to{stroke-dasharray:42 150;stroke-dashoffset:-59}}%3C/style%3E%3Cg style='transform-origin:center;animation:spinner_zKoa 2s linear infinite'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' class='spinner_V8m1' style='stroke-linecap:round;animation:spinner_YpZS 1.5s ease-out infinite'/%3E%3C/g%3E%3C/svg%3E");mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' stroke='%23000'%3E%3Cstyle%3E@keyframes spinner_zKoa{to{transform:rotate(360deg)}}@keyframes spinner_YpZS{0%25{stroke-dasharray:0 150;stroke-dashoffset:0}47.5%25{stroke-dasharray:42 150;stroke-dashoffset:-16}95%25,to{stroke-dasharray:42 150;stroke-dashoffset:-59}}%3C/style%3E%3Cg style='transform-origin:center;animation:spinner_zKoa 2s linear infinite'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' class='spinner_V8m1' style='stroke-linecap:round;animation:spinner_YpZS 1.5s ease-out infinite'/%3E%3C/g%3E%3C/svg%3E")}.loading-dots{-webkit-mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24'%3E%3Cstyle%3E@keyframes spinner_8HQG{0%25,57.14%25{animation-timing-function:cubic-bezier(.33,.66,.66,1);transform:translate(0)}28.57%25{animation-timing-function:cubic-bezier(.33,0,.66,.33);transform:translateY(-6px)}to{transform:translate(0)}}.spinner_qM83{animation:spinner_8HQG 1.05s infinite}%3C/style%3E%3Ccircle cx='4' cy='12' r='3' class='spinner_qM83'/%3E%3Ccircle cx='12' cy='12' r='3' class='spinner_qM83' style='animation-delay:.1s'/%3E%3Ccircle cx='20' cy='12' r='3' class='spinner_qM83' style='animation-delay:.2s'/%3E%3C/svg%3E");mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24'%3E%3Cstyle%3E@keyframes spinner_8HQG{0%25,57.14%25{animation-timing-function:cubic-bezier(.33,.66,.66,1);transform:translate(0)}28.57%25{animation-timing-function:cubic-bezier(.33,0,.66,.33);transform:translateY(-6px)}to{transform:translate(0)}}.spinner_qM83{animation:spinner_8HQG 1.05s infinite}%3C/style%3E%3Ccircle cx='4' cy='12' r='3' class='spinner_qM83'/%3E%3Ccircle cx='12' cy='12' r='3' class='spinner_qM83' style='animation-delay:.1s'/%3E%3Ccircle cx='20' cy='12' r='3' class='spinner_qM83' style='animation-delay:.2s'/%3E%3C/svg%3E")}.loading-sm{width:1.25rem}.loading-md{width:1.5rem}.loading-lg{width:2.5rem}:where(.menu li:empty){--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));height:1px;margin:.5rem 1rem;opacity:.1}.menu :where(li ul):before{bottom:.75rem;inset-inline-start:0;position:absolute;top:.75rem;width:1px;--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));content:"";opacity:.1}.menu :where(li:not(.menu-title)>:not(ul,details,.menu-title,.btn)),.menu :where(li:not(.menu-title)>details>summary:not(.menu-title)){border-radius:var(--rounded-btn,.5rem);padding:.5rem 1rem;text-align:start;text-wrap:balance;transition-duration:.2s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(0,0,.2,1)}:where(.menu li:not(.menu-title,.disabled)>:not(ul,details,.menu-title)):is(summary):not(.active,.btn):focus-visible,:where(.menu li:not(.menu-title,.disabled)>:not(ul,details,.menu-title)):not(summary,.active,.btn).focus,:where(.menu li:not(.menu-title,.disabled)>:not(ul,details,.menu-title)):not(summary,.active,.btn):focus,:where(.menu li:not(.menu-title,.disabled)>details>summary:not(.menu-title)):is(summary):not(.active,.btn):focus-visible,:where(.menu li:not(.menu-title,.disabled)>details>summary:not(.menu-title)):not(summary,.active,.btn).focus,:where(.menu li:not(.menu-title,.disabled)>details>summary:not(.menu-title)):not(summary,.active,.btn):focus{background-color:var(--fallback-bc,oklch(var(--bc)/.1));cursor:pointer;--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));outline:2px solid transparent;outline-offset:2px}.menu li>:not(ul,.menu-title,details,.btn).active,.menu li>:not(ul,.menu-title,details,.btn):active,.menu li>details>summary:active{--tw-bg-opacity:1;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity)))}.menu :where(li>details>summary)::-webkit-details-marker{display:none}.menu :where(li>.menu-dropdown-toggle):after,.menu :where(li>details>summary):after{box-shadow:2px 2px;content:"";display:block;height:.5rem;justify-self:end;margin-top:-.5rem;pointer-events:none;transform:rotate(45deg);transform-origin:75% 75%;transition-duration:.3s;transition-property:transform,margin-top;transition-timing-function:cubic-bezier(.4,0,.2,1);width:.5rem}.menu :where(li>.menu-dropdown-toggle.menu-dropdown-show):after,.menu :where(li>details[open]>summary):after{margin-top:0;transform:rotate(225deg)}.mockup-phone .camera{background:#000;border-bottom-left-radius:17px;border-bottom-right-radius:17px;height:25px;left:0;margin:0 auto;position:relative;top:0;width:150px;z-index:11}.mockup-phone .camera:before{background-color:#0c0b0e;border-radius:5px;content:"";height:4px;left:50%;position:absolute;top:35%;transform:translate(-50%,-50%);width:50px}.mockup-phone .camera:after{background-color:#0f0b25;border-radius:5px;content:"";height:8px;left:70%;position:absolute;top:20%;width:8px}.mockup-phone .display{border-radius:40px;margin-top:-25px;overflow:hidden}.mockup-browser .mockup-browser-toolbar .input{display:block;height:1.75rem;margin-left:auto;margin-right:auto;overflow:hidden;position:relative;text-overflow:ellipsis;white-space:nowrap;width:24rem;--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));direction:ltr;padding-left:2rem}.mockup-browser .mockup-browser-toolbar .input:before{aspect-ratio:1/1;height:.75rem;left:.5rem;--tw-translate-y:-50%;border-color:currentColor;border-radius:9999px;border-width:2px}.mockup-browser .mockup-browser-toolbar .input:after,.mockup-browser .mockup-browser-toolbar .input:before{content:"";opacity:.6;position:absolute;top:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.mockup-browser .mockup-browser-toolbar .input:after{height:.5rem;left:1.25rem;--tw-translate-y:25%;--tw-rotate:-45deg;border-color:currentColor;border-radius:9999px;border-width:1px}.modal::backdrop,.modal:not(dialog:not(.modal-open)){animation:modal-pop .2s ease-out;background-color:#0006}.modal-backdrop{align-self:stretch;color:transparent;display:grid;grid-column-start:1;grid-row-start:1;justify-self:stretch;z-index:-1}.modal-open .modal-box,.modal-toggle:checked+.modal .modal-box,.modal:target .modal-box,.modal[open] .modal-box{--tw-translate-y:0px;--tw-scale-x:1;--tw-scale-y:1;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.modal-action>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}@keyframes modal-pop{0%{opacity:0}}.progress::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)))}.progress-primary::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)))}.progress-secondary::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-s,oklch(var(--s)/var(--tw-bg-opacity)))}.progress-accent::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity)))}.progress-info::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-in,oklch(var(--in)/var(--tw-bg-opacity)))}.progress-success::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-su,oklch(var(--su)/var(--tw-bg-opacity)))}.progress-warning::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-wa,oklch(var(--wa)/var(--tw-bg-opacity)))}.progress:indeterminate{--progress-color:var(--fallback-bc,oklch(var(--bc)/1));animation:progress-loading 5s ease-in-out infinite;background-image:repeating-linear-gradient(90deg,var(--progress-color) -1%,var(--progress-color) 10%,transparent 10%,transparent 90%);background-position-x:15%;background-size:200%}.progress-primary:indeterminate{--progress-color:var(--fallback-p,oklch(var(--p)/1))}.progress-secondary:indeterminate{--progress-color:var(--fallback-s,oklch(var(--s)/1))}.progress-accent:indeterminate{--progress-color:var(--fallback-a,oklch(var(--a)/1))}.progress-info:indeterminate{--progress-color:var(--fallback-in,oklch(var(--in)/1))}.progress-success:indeterminate{--progress-color:var(--fallback-su,oklch(var(--su)/1))}.progress-warning:indeterminate{--progress-color:var(--fallback-wa,oklch(var(--wa)/1))}.progress::-webkit-progress-bar{background-color:transparent;border-radius:var(--rounded-box,1rem)}.progress::-webkit-progress-value{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)))}.progress-primary::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)))}.progress-secondary::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-s,oklch(var(--s)/var(--tw-bg-opacity)))}.progress-accent::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity)))}.progress-info::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-in,oklch(var(--in)/var(--tw-bg-opacity)))}.progress-success::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-su,oklch(var(--su)/var(--tw-bg-opacity)))}.progress-warning::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-wa,oklch(var(--wa)/var(--tw-bg-opacity)))}.progress:indeterminate::-moz-progress-bar{animation:progress-loading 5s ease-in-out infinite;background-color:transparent;background-image:repeating-linear-gradient(90deg,var(--progress-color) -1%,var(--progress-color) 10%,transparent 10%,transparent 90%);background-position-x:15%;background-size:200%}@keyframes progress-loading{50%{background-position-x:-115%}}.radio:focus{box-shadow:none}.radio:focus-visible{outline-color:var(--fallback-bc,oklch(var(--bc)/1));outline-offset:2px;outline-style:solid;outline-width:2px}.radio:checked,.radio[aria-checked=true]{--tw-bg-opacity:1;animation:radiomark var(--animation-input,.2s) ease-out;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));background-image:none;box-shadow:0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset}.radio-primary{--chkbg:var(--p);--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)))}.radio-primary:focus-visible{outline-color:var(--fallback-p,oklch(var(--p)/1))}.radio-primary:checked,.radio-primary[aria-checked=true]{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.radio:disabled{cursor:not-allowed;opacity:.2}@keyframes radiomark{0%{box-shadow:0 0 0 12px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 12px var(--fallback-b1,oklch(var(--b1)/1)) inset}50%{box-shadow:0 0 0 3px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 3px var(--fallback-b1,oklch(var(--b1)/1)) inset}to{box-shadow:0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset}}.range:focus-visible::-webkit-slider-thumb{--focus-shadow:0 0 0 6px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 2rem var(--range-shdw) inset}.range:focus-visible::-moz-range-thumb{--focus-shadow:0 0 0 6px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 2rem var(--range-shdw) inset}.range::-webkit-slider-runnable-track{background-color:var(--fallback-bc,oklch(var(--bc)/.1));border-radius:var(--rounded-box,1rem);height:.5rem;width:100%}.range::-moz-range-track{background-color:var(--fallback-bc,oklch(var(--bc)/.1));border-radius:var(--rounded-box,1rem);height:.5rem;width:100%}.range::-webkit-slider-thumb{border-radius:var(--rounded-box,1rem);border-style:none;height:1.5rem;position:relative;width:1.5rem;--tw-bg-opacity:1;appearance:none;-webkit-appearance:none;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));color:var(--range-shdw);top:50%;transform:translateY(-50%);--filler-size:100rem;--filler-offset:0.6rem;box-shadow:0 0 0 3px var(--range-shdw) inset,var(--focus-shadow,0 0),calc(var(--filler-size)*-1 - var(--filler-offset)) 0 0 var(--filler-size)}.range::-moz-range-thumb{border-radius:var(--rounded-box,1rem);border-style:none;height:1.5rem;position:relative;width:1.5rem;--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));color:var(--range-shdw);top:50%;--filler-size:100rem;--filler-offset:0.5rem;box-shadow:0 0 0 3px var(--range-shdw) inset,var(--focus-shadow,0 0),calc(var(--filler-size)*-1 - var(--filler-offset)) 0 0 var(--filler-size)}@keyframes rating-pop{0%{transform:translateY(-.125em)}40%{transform:translateY(-.125em)}to{transform:translateY(0)}}.select-bordered,.select:focus{border-color:var(--fallback-bc,oklch(var(--bc)/.2))}.select:focus{box-shadow:none;outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.select-disabled,.select:disabled,.select[disabled]{cursor:not-allowed;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.select-disabled::-moz-placeholder,.select:disabled::-moz-placeholder,.select[disabled]::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.select-disabled::placeholder,.select:disabled::placeholder,.select[disabled]::placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.select-multiple,.select[multiple],.select[size].select:not([size="1"]){background-image:none;padding-right:1rem}[dir=rtl] .select{background-position:12px calc(1px + 50%),16px calc(1px + 50%)}@keyframes skeleton{0%{background-position:150%}to{background-position:-50%}}:where(.stats)>:not([hidden])~:not([hidden]){--tw-divide-x-reverse:0;--tw-divide-y-reverse:0;border-width:calc(0px*(1 - var(--tw-divide-y-reverse))) calc(1px*var(--tw-divide-x-reverse)) calc(0px*var(--tw-divide-y-reverse)) calc(1px*(1 - var(--tw-divide-x-reverse)))}:is([dir=rtl] .stats>:not([hidden])~:not([hidden])){--tw-divide-x-reverse:1}.steps .step:before{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));content:"";height:.5rem;margin-inline-start:-100%;top:0;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));width:100%}.steps .step:after,.steps .step:before{grid-column-start:1;grid-row-start:1;--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)));--tw-text-opacity:1}.steps .step:after{border-radius:9999px;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));content:counter(step);counter-increment:step;display:grid;height:2rem;place-items:center;place-self:center;position:relative;width:2rem;z-index:1}.steps .step:first-child:before{content:none}.steps .step[data-content]:after{content:attr(data-content)}.tabs-lifted>.tab:focus-visible{border-end-end-radius:0;border-end-start-radius:0}.tab.tab-active:not(.tab-disabled):not([disabled]),.tab:is(input:checked){border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));--tw-border-opacity:1;--tw-text-opacity:1}.tab:focus{outline:2px solid transparent;outline-offset:2px}.tab:focus-visible{outline:2px solid currentColor;outline-offset:-5px}.tab-disabled,.tab[disabled]{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));cursor:not-allowed;--tw-text-opacity:0.2}.tabs-bordered>.tab{border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));--tw-border-opacity:0.2;border-bottom-width:calc(var(--tab-border, 1px) + 1px);border-style:solid}.tabs-lifted>.tab{border:var(--tab-border,1px) solid transparent;border-bottom-color:var(--tab-border-color);border-start-end-radius:var(--tab-radius,.5rem);border-start-start-radius:var(--tab-radius,.5rem);border-width:0 0 var(--tab-border,1px) 0;padding-inline-end:var(--tab-padding,1rem);padding-inline-start:var(--tab-padding,1rem);padding-top:var(--tab-border,1px)}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]),.tabs-lifted>.tab:is(input:checked){background-color:var(--tab-bg);border-inline-end-color:var(--tab-border-color);border-inline-start-color:var(--tab-border-color);border-top-color:var(--tab-border-color);border-width:var(--tab-border,1px) var(--tab-border,1px) 0 var(--tab-border,1px);padding-inline-end:calc(var(--tab-padding, 1rem) - var(--tab-border, 1px));padding-bottom:var(--tab-border,1px);padding-inline-start:calc(var(--tab-padding, 1rem) - var(--tab-border, 1px));padding-top:0}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):before,.tabs-lifted>.tab:is(input:checked):before{background-position:0 0,100% 0;background-repeat:no-repeat;background-size:var(--tab-radius,.5rem);bottom:0;content:"";display:block;height:var(--tab-radius,.5rem);position:absolute;width:calc(100% + var(--tab-radius, .5rem)*2);z-index:1;--tab-grad:calc(69% - var(--tab-border, 1px));--radius-start:radial-gradient(circle at top left,transparent var(--tab-grad),var(--tab-border-color) calc(var(--tab-grad) + 0.25px),var(--tab-border-color) calc(var(--tab-grad) + var(--tab-border, 1px)),var(--tab-bg) calc(var(--tab-grad) + var(--tab-border, 1px) + 0.25px));--radius-end:radial-gradient(circle at top right,transparent var(--tab-grad),var(--tab-border-color) calc(var(--tab-grad) + 0.25px),var(--tab-border-color) calc(var(--tab-grad) + var(--tab-border, 1px)),var(--tab-bg) calc(var(--tab-grad) + var(--tab-border, 1px) + 0.25px));background-image:var(--radius-start),var(--radius-end)}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):first-child:before,.tabs-lifted>.tab:is(input:checked):first-child:before{background-image:var(--radius-end);background-position:100% 0}[dir=rtl] .tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):first-child:before,[dir=rtl] .tabs-lifted>.tab:is(input:checked):first-child:before{background-image:var(--radius-start);background-position:0 0}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):last-child:before,.tabs-lifted>.tab:is(input:checked):last-child:before{background-image:var(--radius-start);background-position:0 0}[dir=rtl] .tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):last-child:before,[dir=rtl] .tabs-lifted>.tab:is(input:checked):last-child:before{background-image:var(--radius-end);background-position:100% 0}.tabs-lifted>.tab-active:not(.tab-disabled):not([disabled])+.tabs-lifted .tab-active:not(.tab-disabled):not([disabled]):before,.tabs-lifted>.tab:is(input:checked)+.tabs-lifted .tab:is(input:checked):before{background-image:var(--radius-end);background-position:100% 0}.tabs-boxed{--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));padding:.25rem}.tabs-boxed,.tabs-boxed .tab{border-radius:var(--rounded-btn,.5rem)}.tabs-boxed .tab-active:not(.tab-disabled):not([disabled]),.tabs-boxed :is(input:checked){--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}:is([dir=rtl] .table){text-align:right}.table :where(th,td){padding:.75rem 1rem;vertical-align:middle}.table tr.active,.table tr.active:nth-child(2n),.table-zebra tbody tr:nth-child(2n){--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)))}.table-zebra tr.active,.table-zebra tr.active:nth-child(2n),.table-zebra-zebra tbody tr:nth-child(2n){--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)))}.table :where(thead,tbody) :where(tr:first-child:last-child),.table :where(thead,tbody) :where(tr:not(:last-child)){border-bottom-width:1px;--tw-border-opacity:1;border-bottom-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)))}.table :where(thead,tfoot){color:var(--fallback-bc,oklch(var(--bc)/.6));font-size:.75rem;font-weight:700;line-height:1rem;white-space:nowrap}.timeline hr{height:.25rem}:where(.timeline hr){--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)))}:where(.timeline:has(.timeline-middle) hr):first-child{border-end-end-radius:var(--rounded-badge,1.9rem);border-end-start-radius:0;border-start-end-radius:var(--rounded-badge,1.9rem);border-start-start-radius:0}:where(.timeline:has(.timeline-middle) hr):last-child{border-end-end-radius:0;border-end-start-radius:var(--rounded-badge,1.9rem);border-start-end-radius:0;border-start-start-radius:var(--rounded-badge,1.9rem)}:where(.timeline:not(:has(.timeline-middle)) :first-child hr:last-child){border-end-end-radius:0;border-end-start-radius:var(--rounded-badge,1.9rem);border-start-end-radius:0;border-start-start-radius:var(--rounded-badge,1.9rem)}:where(.timeline:not(:has(.timeline-middle)) :last-child hr:first-child){border-end-end-radius:var(--rounded-badge,1.9rem);border-end-start-radius:0;border-start-end-radius:var(--rounded-badge,1.9rem);border-start-start-radius:0}.timeline-box{border-radius:var(--rounded-box,1rem);border-width:1px;--tw-border-opacity:1;border-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));padding:.5rem 1rem;--tw-shadow:0 1px 2px 0 rgba(0,0,0,.05);--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.toast>*{animation:toast-pop .25s ease-out}@keyframes toast-pop{0%{opacity:0;transform:scale(.9)}to{opacity:1;transform:scale(1)}}[dir=rtl] .toggle{--handleoffsetcalculator:calc(var(--handleoffset)*1)}.toggle:focus-visible{outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.toggle:hover{background-color:currentColor}.toggle:checked,.toggle[aria-checked=true],.toggle[checked=true]{background-image:none;--handleoffsetcalculator:var(--handleoffset);--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}[dir=rtl] .toggle:checked,[dir=rtl] .toggle[aria-checked=true],[dir=rtl] .toggle[checked=true]{--handleoffsetcalculator:calc(var(--handleoffset)*-1)}.toggle:indeterminate{--tw-text-opacity:1;box-shadow:calc(var(--handleoffset)/2) 0 0 2px var(--tglbg) inset,calc(var(--handleoffset)/-2) 0 0 2px var(--tglbg) inset,0 0 0 2px var(--tglbg) inset;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}[dir=rtl] .toggle:indeterminate{box-shadow:calc(var(--handleoffset)/2) 0 0 2px var(--tglbg) inset,calc(var(--handleoffset)/-2) 0 0 2px var(--tglbg) inset,0 0 0 2px var(--tglbg) inset}.toggle-primary:focus-visible{outline-color:var(--fallback-p,oklch(var(--p)/1))}.toggle-primary:checked,.toggle-primary[aria-checked=true],.toggle-primary[checked=true]{border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));--tw-border-opacity:0.1;--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.toggle:disabled{cursor:not-allowed;--tw-border-opacity:1;background-color:transparent;border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));opacity:.3;--togglehandleborder:0 0 0 3px var(--fallback-bc,oklch(var(--bc)/1)) inset,var(--handleoffsetcalculator) 0 0 3px var(--fallback-bc,oklch(var(--bc)/1)) inset}.glass,.glass.btn-active{-webkit-backdrop-filter:blur(var(--glass-blur,40px));backdrop-filter:blur(var(--glass-blur,40px));background-color:transparent;background-image:linear-gradient(135deg,rgb(255 255 255/var(--glass-opacity,30%)) 0,transparent 100%),linear-gradient(var(--glass-reflex-degree,100deg),rgb(255 255 255/var(--glass-reflex-opacity,10%)) 25%,transparent 25%);border:none;box-shadow:0 0 0 1px rgb(255 255 255/var(--glass-border-opacity,10%)) inset,0 0 0 2px rgb(0 0 0/5%);text-shadow:0 1px rgb(0 0 0/var(--glass-text-shadow-opacity,5%))}@media (hover:hover){.glass.btn-active{-webkit-backdrop-filter:blur(var(--glass-blur,40px));backdrop-filter:blur(var(--glass-blur,40px));background-color:transparent;background-image:linear-gradient(135deg,rgb(255 255 255/var(--glass-opacity,30%)) 0,transparent 100%),linear-gradient(var(--glass-reflex-degree,100deg),rgb(255 255 255/var(--glass-reflex-opacity,10%)) 25%,transparent 25%);border:none;box-shadow:0 0 0 1px rgb(255 255 255/var(--glass-border-opacity,10%)) inset,0 0 0 2px rgb(0 0 0/5%);text-shadow:0 1px rgb(0 0 0/var(--glass-text-shadow-opacity,5%))}}.badge-xs{font-size:.75rem;height:.75rem;line-height:.75rem;padding-left:.313rem;padding-right:.313rem}.badge-sm{font-size:.75rem;height:1rem;line-height:1rem;padding-left:.438rem;padding-right:.438rem}.btm-nav-xs>:where(.active){border-top-width:1px}.btm-nav-sm>:where(.active){border-top-width:2px}.btm-nav-md>:where(.active){border-top-width:2px}.btm-nav-lg>:where(.active){border-top-width:4px}.btn-xs{font-size:.75rem;height:1.5rem;min-height:1.5rem;padding-left:.5rem;padding-right:.5rem}.btn-sm{font-size:.875rem;height:2rem;min-height:2rem;padding-left:.75rem;padding-right:.75rem}.btn-square:where(.btn-xs){height:1.5rem;padding:0;width:1.5rem}.btn-square:where(.btn-sm){height:2rem;padding:0;width:2rem}.btn-circle:where(.btn-xs){border-radius:9999px;height:1.5rem;padding:0;width:1.5rem}.btn-circle:where(.btn-sm){border-radius:9999px;height:2rem;padding:0;width:2rem}.btn-circle:where(.btn-md){border-radius:9999px;height:3rem;padding:0;width:3rem}.btn-circle:where(.btn-lg){border-radius:9999px;height:4rem;padding:0;width:4rem}[type=checkbox].checkbox-sm{height:1.25rem;width:1.25rem}.indicator :where(.indicator-item){bottom:auto;inset-inline-end:0;inset-inline-start:auto;top:0;--tw-translate-y:-50%;--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item)){--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-start){inset-inline-end:auto;inset-inline-start:0;--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item.indicator-start)){--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-center){inset-inline-end:50%;inset-inline-start:50%;--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item.indicator-center)){--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-end){inset-inline-end:0;inset-inline-start:auto;--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item.indicator-end)){--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-bottom){bottom:0;top:auto;--tw-translate-y:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-middle){bottom:50%;top:50%;--tw-translate-y:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-top){bottom:auto;top:0;--tw-translate-y:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.input-xs{font-size:.75rem;height:1.5rem;line-height:1rem;line-height:1.625;padding-left:.5rem;padding-right:.5rem}.input-sm{font-size:.875rem;height:2rem;line-height:2rem;padding-left:.75rem;padding-right:.75rem}.join.join-vertical{flex-direction:column}.join.join-vertical .join-item:first-child:not(:last-child),.join.join-vertical :first-child:not(:last-child) .join-item{border-end-end-radius:0;border-end-start-radius:0;border-start-end-radius:inherit;border-start-start-radius:inherit}.join.join-vertical .join-item:last-child:not(:first-child),.join.join-vertical :last-child:not(:first-child) .join-item{border-end-end-radius:inherit;border-end-start-radius:inherit;border-start-end-radius:0;border-start-start-radius:0}.join.join-horizontal{flex-direction:row}.join.join-horizontal .join-item:first-child:not(:last-child),.join.join-horizontal :first-child:not(:last-child) .join-item{border-end-end-radius:0;border-end-start-radius:inherit;border-start-end-radius:0;border-start-start-radius:inherit}.join.join-horizontal .join-item:last-child:not(:first-child),.join.join-horizontal :last-child:not(:first-child) .join-item{border-end-end-radius:inherit;border-end-start-radius:0;border-start-end-radius:inherit;border-start-start-radius:0}.menu-horizontal{display:inline-flex;flex-direction:row}.menu-horizontal>li:not(.menu-title)>details>ul{position:absolute}.select-sm{font-size:.875rem;height:2rem;line-height:2rem;min-height:2rem;padding-left:.75rem;padding-right:2rem}[dir=rtl] .select-sm{padding-left:2rem;padding-right:.75rem}.stats-vertical{grid-auto-flow:row}.steps-horizontal .step{display:grid;grid-template-columns:repeat(1,minmax(0,1fr));grid-template-rows:repeat(2,minmax(0,1fr));place-items:center;text-align:center}.steps-vertical .step{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));grid-template-rows:repeat(1,minmax(0,1fr))}.tabs-md :where(.tab){font-size:.875rem;height:2rem;line-height:1.25rem;line-height:2;--tab-padding:1rem}.tabs-lg :where(.tab){font-size:1.125rem;height:3rem;line-height:1.75rem;line-height:2;--tab-padding:1.25rem}.tabs-sm :where(.tab){font-size:.875rem;height:1.5rem;line-height:.75rem;--tab-padding:0.75rem}.tabs-xs :where(.tab){font-size:.75rem;height:1.25rem;line-height:.75rem;--tab-padding:0.5rem}.timeline-vertical{flex-direction:column}.timeline-compact .timeline-start,.timeline-horizontal.timeline-compact .timeline-start{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center;margin:.25rem}.timeline-compact li:has(.timeline-start) .timeline-end,.timeline-horizontal.timeline-compact li:has(.timeline-start) .timeline-end{grid-column-start:none;grid-row-start:auto}.timeline-vertical.timeline-compact>li{--timeline-col-start:0}.timeline-vertical.timeline-compact .timeline-start{align-self:center;grid-column-end:4;grid-column-start:3;grid-row-end:4;grid-row-start:1;justify-self:start}.timeline-vertical.timeline-compact li:has(.timeline-start) .timeline-end{grid-column-start:auto;grid-row-start:none}:where(.timeline-vertical>li){--timeline-row-start:minmax(0,1fr);--timeline-row-end:minmax(0,1fr);justify-items:center}.timeline-vertical>li>hr{height:100%}:where(.timeline-vertical>li>hr):first-child{grid-column-start:2;grid-row-start:1}:where(.timeline-vertical>li>hr):last-child{grid-column-end:auto;grid-column-start:2;grid-row-end:none;grid-row-start:3}.timeline-vertical .timeline-start{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:4;grid-row-start:1;justify-self:end}.timeline-vertical .timeline-end{align-self:center;grid-column-end:4;grid-column-start:3;grid-row-end:4;grid-row-start:1;justify-self:start}.timeline-vertical:where(.timeline-snap-icon)>li{--timeline-col-start:minmax(0,1fr);--timeline-row-start:0.5rem}.timeline-horizontal .timeline-start{align-self:flex-end;grid-column-end:4;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:center}.timeline-horizontal .timeline-end{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center}.timeline-horizontal:where(.timeline-snap-icon)>li,:where(.timeline-snap-icon)>li{--timeline-col-start:0.5rem;--timeline-row-start:minmax(0,1fr)}:where(.toast){bottom:0;inset-inline-end:0;inset-inline-start:auto;top:auto;--tw-translate-x:0px;--tw-translate-y:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-start){inset-inline-end:auto;inset-inline-start:0;--tw-translate-x:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-center){inset-inline-end:50%;inset-inline-start:50%;--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .toast:where(.toast-center)){--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-end){inset-inline-end:0;inset-inline-start:auto;--tw-translate-x:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-bottom){bottom:0;top:auto;--tw-translate-y:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-middle){bottom:auto;top:50%;--tw-translate-y:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-top){bottom:auto;top:0;--tw-translate-y:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.tooltip{--tooltip-offset:calc(100% + 1px + var(--tooltip-tail, 0px))}.tooltip:before{content:var(--tw-content);pointer-events:none;position:absolute;z-index:1;--tw-content:attr(data-tip)}.tooltip-top:before,.tooltip:before{bottom:var(--tooltip-offset);left:50%;right:auto;top:auto;transform:translateX(-50%)}.tooltip-bottom:before{bottom:auto;left:50%;right:auto;top:var(--tooltip-offset);transform:translateX(-50%)}.card-compact .card-body{font-size:.875rem;line-height:1.25rem;padding:1rem}.card-compact .card-title{margin-bottom:.25rem}.card-normal .card-body{font-size:1rem;line-height:1.5rem;padding:var(--padding-card,2rem)}.card-normal .card-title{margin-bottom:.75rem}.join.join-vertical>:where(:not(:first-child)){margin-left:0;margin-right:0;margin-top:-1px}.join.join-horizontal>:where(:not(:first-child)){margin-bottom:0;margin-top:0;margin-inline-start:-1px}.menu-horizontal>li:not(.menu-title)>details>ul{margin-inline-start:0;margin-top:1rem;padding-bottom:.5rem;padding-inline-end:.5rem;padding-top:.5rem}.menu-horizontal>li>details>ul:before{content:none}:where(.menu-horizontal>li:not(.menu-title)>details>ul){border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));--tw-shadow:0 20px 25px -5px rgba(0,0,0,.1),0 8px 10px -6px rgba(0,0,0,.1);--tw-shadow-colored:0 20px 25px -5px var(--tw-shadow-color),0 8px 10px -6px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.menu-sm :where(li:not(.menu-title)>:not(ul,details,.menu-title)),.menu-sm :where(li:not(.menu-title)>details>summary:not(.menu-title)){border-radius:var(--rounded-btn,.5rem);font-size:.875rem;line-height:1.25rem;padding:.25rem .75rem}.menu-sm .menu-title{padding:.5rem .75rem}.modal-top :where(.modal-box){max-width:none;width:100%;--tw-translate-y:-2.5rem;--tw-scale-x:1;--tw-scale-y:1;border-bottom-left-radius:var(--rounded-box,1rem);border-bottom-right-radius:var(--rounded-box,1rem);border-top-left-radius:0;border-top-right-radius:0;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.modal-middle :where(.modal-box){max-width:32rem;width:91.666667%;--tw-translate-y:0px;--tw-scale-x:.9;--tw-scale-y:.9;border-bottom-left-radius:var(--rounded-box,1rem);border-bottom-right-radius:var(--rounded-box,1rem);border-top-left-radius:var(--rounded-box,1rem);border-top-right-radius:var(--rounded-box,1rem);transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.modal-bottom :where(.modal-box){max-width:none;width:100%;--tw-translate-y:2.5rem;--tw-scale-x:1;--tw-scale-y:1;border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:var(--rounded-box,1rem);border-top-right-radius:var(--rounded-box,1rem);transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.stats-vertical>:not([hidden])~:not([hidden]){--tw-divide-x-reverse:0;--tw-divide-y-reverse:0;border-width:calc(1px*(1 - var(--tw-divide-y-reverse))) calc(0px*var(--tw-divide-x-reverse)) calc(1px*var(--tw-divide-y-reverse)) calc(0px*(1 - var(--tw-divide-x-reverse)))}.stats-vertical{overflow-y:auto}.steps-horizontal .step{grid-template-columns:auto;grid-template-rows:40px 1fr;min-width:4rem}.steps-horizontal .step:before{height:.5rem;width:100%;--tw-translate-x:0px;--tw-translate-y:0px;content:"";margin-inline-start:-100%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .steps-horizontal .step):before{--tw-translate-x:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.steps-vertical .step{gap:.5rem;grid-template-columns:40px 1fr;grid-template-rows:auto;justify-items:start;min-height:4rem}.steps-vertical .step:before{height:100%;width:.5rem;--tw-translate-x:-50%;--tw-translate-y:-50%;margin-inline-start:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .steps-vertical .step):before{--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.timeline-vertical>li>hr{width:.25rem}:where(.timeline-vertical:has(.timeline-middle)>li>hr):first-child{border-bottom-left-radius:var(--rounded-badge,1.9rem);border-bottom-right-radius:var(--rounded-badge,1.9rem);border-top-left-radius:0;border-top-right-radius:0}:where(.timeline-vertical:has(.timeline-middle)>li>hr):last-child{border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:var(--rounded-badge,1.9rem);border-top-right-radius:var(--rounded-badge,1.9rem)}:where(.timeline-vertical:not(:has(.timeline-middle)) :first-child>hr:last-child){border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:var(--rounded-badge,1.9rem);border-top-right-radius:var(--rounded-badge,1.9rem)}:where(.timeline-vertical:not(:has(.timeline-middle)) :last-child>hr:first-child){border-bottom-left-radius:var(--rounded-badge,1.9rem);border-bottom-right-radius:var(--rounded-badge,1.9rem);border-top-left-radius:0;border-top-right-radius:0}:where(.timeline-horizontal:has(.timeline-middle)>li>hr):first-child{border-end-end-radius:var(--rounded-badge,1.9rem);border-end-start-radius:0;border-start-end-radius:var(--rounded-badge,1.9rem);border-start-start-radius:0}:where(.timeline-horizontal:has(.timeline-middle)>li>hr):last-child{border-end-end-radius:0;border-end-start-radius:var(--rounded-badge,1.9rem);border-start-end-radius:0;border-start-start-radius:var(--rounded-badge,1.9rem)}.tooltip{display:inline-block;position:relative;text-align:center;--tooltip-tail:0.1875rem;--tooltip-color:var(--fallback-n,oklch(var(--n)/1));--tooltip-text-color:var(--fallback-nc,oklch(var(--nc)/1));--tooltip-tail-offset:calc(100% + 0.0625rem - var(--tooltip-tail))}.tooltip:after,.tooltip:before{opacity:0;transition-delay:.1s;transition-duration:.2s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.tooltip:after{border-style:solid;border-width:var(--tooltip-tail,0);content:"";display:block;height:0;position:absolute;width:0}.tooltip:before{background-color:var(--tooltip-color);border-radius:.25rem;color:var(--tooltip-text-color);font-size:.875rem;line-height:1.25rem;max-width:20rem;padding:.25rem .5rem;width:-moz-max-content;width:max-content}.tooltip.tooltip-open:after,.tooltip.tooltip-open:before,.tooltip:hover:after,.tooltip:hover:before{opacity:1;transition-delay:75ms}.tooltip:has(:focus-visible):after,.tooltip:has(:focus-visible):before{opacity:1;transition-delay:75ms}.tooltip:not([data-tip]):hover:after,.tooltip:not([data-tip]):hover:before{opacity:0;visibility:hidden}.tooltip-top:after,.tooltip:after{border-color:var(--tooltip-color) transparent transparent transparent;bottom:var(--tooltip-tail-offset);left:50%;right:auto;top:auto;transform:translateX(-50%)}.tooltip-bottom:after{border-color:transparent transparent var(--tooltip-color) transparent;bottom:auto;left:50%;right:auto;top:var(--tooltip-tail-offset);transform:translateX(-50%)}.fade-out{opacity:0;transition:opacity .15s ease-in-out}.visible{visibility:visible}.invisible{visibility:hidden}.static{position:static}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.inset-0{inset:0}.left-2{left:.5rem}.right-0{right:0}.right-2{right:.5rem}.right-5{right:1.25rem}.top-0{top:0}.top-2{top:.5rem}.top-5{top:1.25rem}.z-0{z-index:0}.z-10{z-index:10}.z-50{z-index:50}.z-\[1\]{z-index:1}.z-\[5000\]{z-index:5000}.z-\[6000\]{z-index:6000}.m-0{margin:0}.m-2{margin:.5rem}.m-5{margin:1.25rem}.m-auto{margin:auto}.mx-1{margin-left:.25rem;margin-right:.25rem}.mx-4{margin-left:1rem;margin-right:1rem}.mx-5{margin-left:1.25rem;margin-right:1.25rem}.mx-auto{margin-left:auto;margin-right:auto}.my-10{margin-bottom:2.5rem;margin-top:2.5rem}.my-2{margin-bottom:.5rem;margin-top:.5rem}.my-3{margin-bottom:.75rem;margin-top:.75rem}.my-4{margin-bottom:1rem;margin-top:1rem}.my-5{margin-bottom:1.25rem;margin-top:1.25rem}.mb-2{margin-bottom:.5rem}.mb-3{margin-bottom:.75rem}.mb-4{margin-bottom:1rem}.mb-5{margin-bottom:1.25rem}.mb-6{margin-bottom:1.5rem}.mb-8{margin-bottom:2rem}.ml-1{margin-left:.25rem}.ml-2{margin-left:.5rem}.ml-4{margin-left:1rem}.ml-auto{margin-left:auto}.mr-1{margin-right:.25rem}.mr-2{margin-right:.5rem}.mr-4{margin-right:1rem}.mt-1{margin-top:.25rem}.mt-10{margin-top:2.5rem}.mt-2{margin-top:.5rem}.mt-3{margin-top:.75rem}.mt-4{margin-top:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mt-8{margin-top:2rem}.block{display:block}.inline-block{display:inline-block}.inline{display:inline}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.contents{display:contents}.hidden{display:none}.h-4{height:1rem}.h-48{height:12rem}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-8{height:2rem}.h-96{height:24rem}.h-\[250px\]{height:250px}.h-\[25rem\]{height:25rem}.h-fit{height:-moz-fit-content;height:fit-content}.h-full{height:100%}.max-h-48{max-height:12rem}.max-h-96{max-height:24rem}.min-h-80{min-height:20rem}.min-h-screen{min-height:100vh}.w-1\/2{width:50%}.w-10\/12{width:83.333333%}.w-4{width:1rem}.w-4\/12{width:33.333333%}.w-5{width:1.25rem}.w-52{width:13rem}.w-6{width:1.5rem}.w-64{width:16rem}.w-8{width:2rem}.w-80{width:20rem}.w-96{width:24rem}.w-auto{width:auto}.w-full{width:100%}.min-w-52{min-width:13rem}.min-w-full{min-width:100%}.max-w-2xl{max-width:42rem}.max-w-3xl{max-width:48rem}.max-w-5xl{max-width:64rem}.max-w-lg{max-width:32rem}.max-w-md{max-width:28rem}.max-w-sm{max-width:24rem}.max-w-xs{max-width:20rem}.flex-1{flex:1 1 0%}.flex-shrink-0,.shrink-0{flex-shrink:0}.translate-x-full{--tw-translate-x:100%}.transform,.translate-x-full{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}@keyframes bounce{0%,to{animation-timing-function:cubic-bezier(.8,0,1,1);transform:translateY(-25%)}50%{animation-timing-function:cubic-bezier(0,0,.2,1);transform:none}}.animate-bounce{animation:bounce 1s infinite}@keyframes spin{to{transform:rotate(1turn)}}.animate-spin{animation:spin 1s linear infinite}.cursor-not-allowed{cursor:not-allowed}.cursor-pointer{cursor:pointer}.resize{resize:both}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.flex-col-reverse{flex-direction:column-reverse}.flex-wrap{flex-wrap:wrap}.place-items-center{place-items:center}.items-start{align-items:flex-start}.items-center{align-items:center}.justify-start{justify-content:flex-start}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.gap-1{gap:.25rem}.gap-2{gap:.5rem}.gap-3{gap:.75rem}.gap-4{gap:1rem}.gap-5{gap:1.25rem}.gap-6{gap:1.5rem}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.space-y-1>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.25rem*var(--tw-space-y-reverse));margin-top:calc(.25rem*(1 - var(--tw-space-y-reverse)))}.space-y-2>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.5rem*var(--tw-space-y-reverse));margin-top:calc(.5rem*(1 - var(--tw-space-y-reverse)))}.space-y-3>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.75rem*var(--tw-space-y-reverse));margin-top:calc(.75rem*(1 - var(--tw-space-y-reverse)))}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1rem*var(--tw-space-y-reverse));margin-top:calc(1rem*(1 - var(--tw-space-y-reverse)))}.space-y-8>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(2rem*var(--tw-space-y-reverse));margin-top:calc(2rem*(1 - var(--tw-space-y-reverse)))}.divide-y>:not([hidden])~:not([hidden]){--tw-divide-y-reverse:0;border-bottom-width:calc(1px*var(--tw-divide-y-reverse));border-top-width:calc(1px*(1 - var(--tw-divide-y-reverse)))}.divide-base-300>:not([hidden])~:not([hidden]){--tw-divide-opacity:1;border-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-divide-opacity,1)))}.justify-self-end{justify-self:end}.justify-self-center{justify-self:center}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.truncate{overflow:hidden;white-space:nowrap}.text-ellipsis,.truncate{text-overflow:ellipsis}.whitespace-nowrap{white-space:nowrap}.rounded{border-radius:.25rem}.rounded-box{border-radius:var(--rounded-box,1rem)}.rounded-full{border-radius:9999px}.rounded-lg{border-radius:.5rem}.rounded-md{border-radius:.375rem}.rounded-xl{border-radius:.75rem}.rounded-b{border-bottom-left-radius:.25rem;border-bottom-right-radius:.25rem}.rounded-t-none{border-top-left-radius:0;border-top-right-radius:0}.border{border-width:1px}.border-2{border-width:2px}.border-b{border-bottom-width:1px}.border-b-2{border-bottom-width:2px}.border-t{border-top-width:1px}.border-dashed{border-style:dashed}.border-base-300{--tw-border-opacity:1;border-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-border-opacity,1)))}.border-blue-300{--tw-border-opacity:1;border-color:rgb(147 197 253/var(--tw-border-opacity,1))}.border-blue-500{--tw-border-opacity:1;border-color:rgb(59 130 246/var(--tw-border-opacity,1))}.border-error{--tw-border-opacity:1;border-color:var(--fallback-er,oklch(var(--er)/var(--tw-border-opacity,1)))}.border-gray-100{--tw-border-opacity:1;border-color:rgb(243 244 246/var(--tw-border-opacity,1))}.border-gray-200{--tw-border-opacity:1;border-color:rgb(229 231 235/var(--tw-border-opacity,1))}.border-gray-300{--tw-border-opacity:1;border-color:rgb(209 213 219/var(--tw-border-opacity,1))}.border-neutral{--tw-border-opacity:1;border-color:var(--fallback-n,oklch(var(--n)/var(--tw-border-opacity,1)))}.border-red-300{--tw-border-opacity:1;border-color:rgb(252 165 165/var(--tw-border-opacity,1))}.border-sky-500{--tw-border-opacity:1;border-color:rgb(14 165 233/var(--tw-border-opacity,1))}.border-white{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity,1))}.border-opacity-20{--tw-border-opacity:0.2}.bg-base-100{--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity,1)))}.bg-base-200{--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity,1)))}.bg-base-300{--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity,1)))}.bg-blue-100{--tw-bg-opacity:1;background-color:rgb(219 234 254/var(--tw-bg-opacity,1))}.bg-blue-50{--tw-bg-opacity:1;background-color:rgb(239 246 255/var(--tw-bg-opacity,1))}.bg-blue-500{--tw-bg-opacity:1;background-color:rgb(59 130 246/var(--tw-bg-opacity,1))}.bg-blue-600{--tw-bg-opacity:1;background-color:rgb(37 99 235/var(--tw-bg-opacity,1))}.bg-blue-900{--tw-bg-opacity:1;background-color:rgb(30 58 138/var(--tw-bg-opacity,1))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity,1))}.bg-gray-50{--tw-bg-opacity:1;background-color:rgb(249 250 251/var(--tw-bg-opacity,1))}.bg-green-50{--tw-bg-opacity:1;background-color:rgb(240 253 244/var(--tw-bg-opacity,1))}.bg-neutral{--tw-bg-opacity:1;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity,1)))}.bg-red-100{--tw-bg-opacity:1;background-color:rgb(254 226 226/var(--tw-bg-opacity,1))}.bg-red-50{--tw-bg-opacity:1;background-color:rgb(254 242 242/var(--tw-bg-opacity,1))}.bg-red-500{--tw-bg-opacity:1;background-color:rgb(239 68 68/var(--tw-bg-opacity,1))}.bg-secondary-content{--tw-bg-opacity:1;background-color:var(--fallback-sc,oklch(var(--sc)/var(--tw-bg-opacity,1)))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.bg-opacity-10{--tw-bg-opacity:0.1}.bg-opacity-60{--tw-bg-opacity:0.6}.bg-opacity-80{--tw-bg-opacity:0.8}.bg-gradient-to-bl{background-image:linear-gradient(to bottom left,var(--tw-gradient-stops))}.bg-gradient-to-br{background-image:linear-gradient(to bottom right,var(--tw-gradient-stops))}.bg-gradient-to-tl{background-image:linear-gradient(to top left,var(--tw-gradient-stops))}.bg-gradient-to-tr{background-image:linear-gradient(to top right,var(--tw-gradient-stops))}.from-blue-500{--tw-gradient-from:#3b82f6 var(--tw-gradient-from-position);--tw-gradient-to:rgba(59,130,246,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-blue-600{--tw-gradient-from:#2563eb var(--tw-gradient-from-position);--tw-gradient-to:rgba(37,99,235,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-green-400{--tw-gradient-from:#4ade80 var(--tw-gradient-from-position);--tw-gradient-to:rgba(74,222,128,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-green-500{--tw-gradient-from:#22c55e var(--tw-gradient-from-position);--tw-gradient-to:rgba(34,197,94,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-orange-400{--tw-gradient-from:#fb923c var(--tw-gradient-from-position);--tw-gradient-to:rgba(251,146,60,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-orange-600{--tw-gradient-from:#ea580c var(--tw-gradient-from-position);--tw-gradient-to:rgba(234,88,12,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-primary{--tw-gradient-from:var(--fallback-p,oklch(var(--p)/1)) var(--tw-gradient-from-position);--tw-gradient-to:var(--fallback-p,oklch(var(--p)/0)) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-red-400{--tw-gradient-from:#f87171 var(--tw-gradient-from-position);--tw-gradient-to:hsla(0,91%,71%,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-red-800{--tw-gradient-from:#991b1b var(--tw-gradient-from-position);--tw-gradient-to:rgba(153,27,27,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-yellow-400{--tw-gradient-from:#facc15 var(--tw-gradient-from-position);--tw-gradient-to:rgba(250,204,21,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-yellow-700{--tw-gradient-from:#a16207 var(--tw-gradient-from-position);--tw-gradient-to:rgba(161,98,7,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.to-blue-700{--tw-gradient-to:#1d4ed8 var(--tw-gradient-to-position)}.to-blue-800{--tw-gradient-to:#1e40af var(--tw-gradient-to-position)}.to-green-700{--tw-gradient-to:#15803d var(--tw-gradient-to-position)}.to-orange-600{--tw-gradient-to:#ea580c var(--tw-gradient-to-position)}.to-orange-700{--tw-gradient-to:#c2410c var(--tw-gradient-to-position)}.to-purple-600{--tw-gradient-to:#9333ea var(--tw-gradient-to-position)}.to-red-400{--tw-gradient-to:#f87171 var(--tw-gradient-to-position)}.to-red-600{--tw-gradient-to:#dc2626 var(--tw-gradient-to-position)}.to-red-900{--tw-gradient-to:#7f1d1d var(--tw-gradient-to-position)}.to-secondary{--tw-gradient-to:var(--fallback-s,oklch(var(--s)/1)) var(--tw-gradient-to-position)}.to-yellow-400{--tw-gradient-to:#facc15 var(--tw-gradient-to-position)}.to-yellow-600{--tw-gradient-to:#ca8a04 var(--tw-gradient-to-position)}.stroke-current{stroke:currentColor}.stroke-info{stroke:var(--fallback-in,oklch(var(--in)/1))}.object-cover{-o-object-fit:cover;object-fit:cover}.p-0{padding:0}.p-2{padding:.5rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-5{padding:1.25rem}.p-6{padding:1.5rem}.p-8{padding:2rem}.px-1{padding-left:.25rem;padding-right:.25rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-5{padding-left:1.25rem;padding-right:1.25rem}.py-1{padding-bottom:.25rem;padding-top:.25rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.py-20{padding-bottom:5rem;padding-top:5rem}.py-3{padding-bottom:.75rem;padding-top:.75rem}.py-4{padding-bottom:1rem;padding-top:1rem}.py-5{padding-bottom:1.25rem;padding-top:1.25rem}.py-6{padding-bottom:1.5rem;padding-top:1.5rem}.py-8{padding-bottom:2rem;padding-top:2rem}.pb-2{padding-bottom:.5rem}.pl-4{padding-left:1rem}.pl-6{padding-left:1.5rem}.pr-10{padding-right:2.5rem}.pt-2{padding-top:.5rem}.pt-6{padding-top:1.5rem}.text-center{text-align:center}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-4xl{font-size:2.25rem;line-height:2.5rem}.text-5xl{font-size:3rem;line-height:1}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-black{font-weight:900}.font-bold{font-weight:700}.font-medium{font-weight:500}.font-normal{font-weight:400}.font-semibold{font-weight:600}.normal-case{text-transform:none}.italic{font-style:italic}.text-accent{--tw-text-opacity:1;color:var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity,1)))}.text-accent-content{--tw-text-opacity:1;color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity,1)))}.text-base-content{--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity,1)))}.text-base-content\/50{color:var(--fallback-bc,oklch(var(--bc)/.5))}.text-base-content\/60{color:var(--fallback-bc,oklch(var(--bc)/.6))}.text-base-content\/70{color:var(--fallback-bc,oklch(var(--bc)/.7))}.text-base-content\/80{color:var(--fallback-bc,oklch(var(--bc)/.8))}.text-blue-600{--tw-text-opacity:1;color:rgb(37 99 235/var(--tw-text-opacity,1))}.text-blue-700{--tw-text-opacity:1;color:rgb(29 78 216/var(--tw-text-opacity,1))}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity,1))}.text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity,1))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81/var(--tw-text-opacity,1))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity,1))}.text-green-500{--tw-text-opacity:1;color:rgb(34 197 94/var(--tw-text-opacity,1))}.text-green-600{--tw-text-opacity:1;color:rgb(22 163 74/var(--tw-text-opacity,1))}.text-neutral{--tw-text-opacity:1;color:var(--fallback-n,oklch(var(--n)/var(--tw-text-opacity,1)))}.text-neutral-content{--tw-text-opacity:1;color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity,1)))}.text-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.text-primary-content{--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity,1)))}.text-red-500{--tw-text-opacity:1;color:rgb(239 68 68/var(--tw-text-opacity,1))}.text-red-600{--tw-text-opacity:1;color:rgb(220 38 38/var(--tw-text-opacity,1))}.text-red-700{--tw-text-opacity:1;color:rgb(185 28 28/var(--tw-text-opacity,1))}.text-secondary{--tw-text-opacity:1;color:var(--fallback-s,oklch(var(--s)/var(--tw-text-opacity,1)))}.text-success{--tw-text-opacity:1;color:var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity,1)))}.text-warning{--tw-text-opacity:1;color:var(--fallback-wa,oklch(var(--wa)/var(--tw-text-opacity,1)))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.underline{text-decoration-line:underline}.decoration-dotted{text-decoration-style:dotted}.placeholder-base-content\/70::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/.7))}.placeholder-base-content\/70::placeholder{color:var(--fallback-bc,oklch(var(--bc)/.7))}.opacity-0{opacity:0}.opacity-50{opacity:.5}.opacity-70{opacity:.7}.shadow{--tw-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px -1px rgba(0,0,0,.1);--tw-shadow-colored:0 1px 3px 0 var(--tw-shadow-color),0 1px 2px -1px var(--tw-shadow-color)}.shadow,.shadow-2xl{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-2xl{--tw-shadow:0 25px 50px -12px rgba(0,0,0,.25);--tw-shadow-colored:0 25px 50px -12px var(--tw-shadow-color)}.shadow-lg{--tw-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);--tw-shadow-colored:0 10px 15px -3px var(--tw-shadow-color),0 4px 6px -4px var(--tw-shadow-color)}.shadow-lg,.shadow-md{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-md{--tw-shadow:0 4px 6px -1px rgba(0,0,0,.1),0 2px 4px -2px rgba(0,0,0,.1);--tw-shadow-colored:0 4px 6px -1px var(--tw-shadow-color),0 2px 4px -2px var(--tw-shadow-color)}.shadow-sm{--tw-shadow:0 1px 2px 0 rgba(0,0,0,.05);--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color)}.shadow-sm,.shadow-xl{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-xl{--tw-shadow:0 20px 25px -5px rgba(0,0,0,.1),0 8px 10px -6px rgba(0,0,0,.1);--tw-shadow-colored:0 20px 25px -5px var(--tw-shadow-color),0 8px 10px -6px var(--tw-shadow-color)}.blur{--tw-blur:blur(8px)}.blur,.grayscale{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.grayscale{--tw-grayscale:grayscale(100%)}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.transition{transition-duration:.15s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-all{transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-colors{transition-duration:.15s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-opacity{transition-duration:.15s;transition-property:opacity;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-shadow{transition-duration:.15s;transition-property:box-shadow;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-transform{transition-duration:.15s;transition-property:transform;transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-200{transition-duration:.2s}.duration-300{transition-duration:.3s}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}@tailwind daisyui;.leaflet-right-panel{background:#fff;border-radius:4px;box-shadow:0 1px 4px rgba(0,0,0,.3);margin-right:10px;margin-top:80px;transform:none;transition:right .3s ease-in-out;z-index:400}.add-visit-marker{align-items:center;animation:pulse-visit 2s infinite;background:#fff;border:2px solid #007bff;border-radius:50%;box-shadow:0 2px 8px rgba(0,123,255,.3);display:flex!important;font-size:20px;justify-content:center}@keyframes pulse-visit{0%{box-shadow:0 2px 8px rgba(0,123,255,.3);transform:scale(1)}50%{box-shadow:0 4px 12px rgba(0,123,255,.5);transform:scale(1.1)}to{box-shadow:0 2px 8px rgba(0,123,255,.3);transform:scale(1)}}.visit-form-popup .leaflet-popup-content-wrapper{border-radius:8px;box-shadow:0 4px 20px rgba(0,0,0,.15)}.leaflet-right-panel.controls-shifted{right:310px}.leaflet-control-button{background-color:#fff!important;color:#374151!important}.leaflet-control-button:hover{background-color:#f3f4f6!important}.leaflet-drawer{background:hsla(0,0%,100%,.5);box-shadow:-2px 0 5px rgba(0,0,0,.1);height:100%;position:absolute;right:0;top:0;transform:translateX(100%);transition:transform .3s ease-in-out;width:338px;z-index:450}.leaflet-drawer.open{transform:translateX(0)}.leaflet-control-button,.leaflet-control-layers,.toggle-panel-button{transition:right .3s ease-in-out;z-index:500}.controls-shifted{right:338px!important}.leaflet-control-custom{align-items:center;background-color:#fff;border-radius:4px;box-shadow:0 1px 4px rgba(0,0,0,.3);cursor:pointer;display:flex;height:30px;justify-content:center;width:30px}.leaflet-control-custom:hover{background-color:#f3f4f6}#selection-tool-button.active{background-color:#60a5fa;color:#fff}#cancel-selection-button{margin-bottom:1rem;width:100%}@media (hover:hover){.hover\:btn-ghost:hover:hover{border-color:transparent}@supports (color:oklch(0 0 0)){.hover\:btn-ghost:hover:hover{background-color:var(--fallback-bc,oklch(var(--bc)/.2))}}.hover\:btn-info:hover.btn-outline:hover{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)))}@supports (color:color-mix(in oklab,black,black)){.hover\:btn-info:hover.btn-outline:hover{background-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000)}}}@supports not (color:oklch(0 0 0)){.hover\:btn-info:hover{--btn-color:var(--fallback-in)}}@supports (color:color-mix(in oklab,black,black)){.hover\:btn-info:hover.btn-outline.btn-active{background-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000)}}@supports (color:oklch(0 0 0)){.hover\:btn-info:hover{--btn-color:var(--in)}}.hover\:btn-info:hover{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));outline-color:var(--fallback-in,oklch(var(--in)/1))}.hover\:btn-ghost:hover{background-color:transparent;border-color:transparent;border-width:1px;color:currentColor;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow);outline-color:currentColor}.hover\:btn-ghost:hover.btn-active{background-color:var(--fallback-bc,oklch(var(--bc)/.2));border-color:transparent}.hover\:btn-info:hover.btn-outline{--tw-text-opacity:1;color:var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity)))}.hover\:btn-info:hover.btn-outline.btn-active{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)))}.hover\:input-primary:hover{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)))}.hover\:input-primary:hover:focus,.hover\:input-primary:hover:focus-within{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));outline-color:var(--fallback-p,oklch(var(--p)/1))}.focus\:input-ghost:focus{--tw-bg-opacity:0.05}.focus\:input-ghost:focus:focus,.focus\:input-ghost:focus:focus-within{--tw-bg-opacity:1;--tw-text-opacity:1;box-shadow:none;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}@media not all and (min-width:768px){.max-md\:timeline-compact,.max-md\:timeline-compact -.timeline-horizontal{--timeline-row-start:0}.max-md\:timeline-compact .timeline-horizontal .timeline-start,.max-md\:timeline-compact .timeline-start{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center;margin:.25rem}.max-md\:timeline-compact .timeline-horizontal li:has(.timeline-start) .timeline-end,.max-md\:timeline-compact li:has(.timeline-start) .timeline-end{grid-column-start:none;grid-row-start:auto}.max-md\:timeline-compact.timeline-vertical>li{--timeline-col-start:0}.max-md\:timeline-compact.timeline-vertical .timeline-start{align-self:center;grid-column-end:4;grid-column-start:3;grid-row-end:4;grid-row-start:1;justify-self:start}.max-md\:timeline-compact.timeline-vertical li:has(.timeline-start) .timeline-end{grid-column-start:auto;grid-row-start:none}}@media (min-width:1024px){.lg\:stats-horizontal{grid-auto-flow:column}.lg\:stats-horizontal>:not([hidden])~:not([hidden]){--tw-divide-x-reverse:0;--tw-divide-y-reverse:0;border-width:calc(0px*(1 - var(--tw-divide-y-reverse))) calc(1px*var(--tw-divide-x-reverse)) calc(0px*var(--tw-divide-y-reverse)) calc(1px*(1 - var(--tw-divide-x-reverse)))}.lg\:stats-horizontal{overflow-x:auto}:is([dir=rtl] .lg\:stats-horizontal){--tw-divide-x-reverse:1}}.placeholder\:text-base-content\/50::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/.5))}.placeholder\:text-base-content\/50::placeholder{color:var(--fallback-bc,oklch(var(--bc)/.5))}.last\:border-0:last-child{border-width:0}.hover\:scale-105:hover{--tw-scale-x:1.05;--tw-scale-y:1.05}.hover\:scale-105:hover,.hover\:scale-\[1\.02\]:hover{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.hover\:scale-\[1\.02\]:hover{--tw-scale-x:1.02;--tw-scale-y:1.02}.hover\:cursor-pointer:hover{cursor:pointer}.hover\:border-primary\/40:hover{border-color:var(--fallback-p,oklch(var(--p)/.4))}.hover\:bg-accent:hover{--tw-bg-opacity:1;background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity,1)))}.hover\:bg-base-200:hover{--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity,1)))}.hover\:bg-base-200\/50:hover{background-color:var(--fallback-b2,oklch(var(--b2)/.5))}.hover\:bg-base-300:hover{--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity,1)))}.hover\:bg-blue-50:hover{--tw-bg-opacity:1;background-color:rgb(239 246 255/var(--tw-bg-opacity,1))}.hover\:bg-blue-700:hover{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity,1))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.hover\:bg-white:hover{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.hover\:text-accent-content:hover{--tw-text-opacity:1;color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity,1)))}.hover\:text-blue-800:hover{--tw-text-opacity:1;color:rgb(30 64 175/var(--tw-text-opacity,1))}.hover\:text-gray-600:hover{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.hover\:text-primary:hover{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.hover\:underline:hover{text-decoration-line:underline}.hover\:no-underline:hover{text-decoration-line:none}.hover\:shadow-2xl:hover{--tw-shadow:0 25px 50px -12px rgba(0,0,0,.25);--tw-shadow-colored:0 25px 50px -12px var(--tw-shadow-color)}.hover\:shadow-2xl:hover,.hover\:shadow-lg:hover{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.hover\:shadow-lg:hover{--tw-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);--tw-shadow-colored:0 10px 15px -3px var(--tw-shadow-color),0 4px 6px -4px var(--tw-shadow-color)}.focus\:border-primary:focus{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity,1)))}.focus\:border-transparent:focus{border-color:transparent}.focus\:bg-base-100:focus{--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity,1)))}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.focus\:ring-2:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.focus\:ring-blue-500:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(59 130 246/var(--tw-ring-opacity,1))}.group:hover .group-hover\:text-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.group:hover .group-hover\:opacity-100{opacity:1}@media (min-width:640px){.sm\:inline{display:inline}.sm\:w-1\/12{width:8.333333%}.sm\:w-2\/12{width:16.666667%}.sm\:w-6\/12{width:50%}.sm\:grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.sm\:flex-row{flex-direction:row}.sm\:items-end{align-items:flex-end}.sm\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.sm\:space-y-0>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(0px*var(--tw-space-y-reverse));margin-top:calc(0px*(1 - var(--tw-space-y-reverse)))}}@media (min-width:768px){.md\:h-64{height:16rem}.md\:min-h-64{min-height:16rem}.md\:w-1\/12{width:8.333333%}.md\:w-2\/12{width:16.666667%}.md\:w-2\/3{width:66.666667%}.md\:w-3\/12{width:25%}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.md\:flex-row{flex-direction:row}.md\:items-end{align-items:flex-end}.md\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.md\:text-end{text-align:end}}@media (min-width:1024px){.lg\:flex{display:flex}.lg\:hidden{display:none}.lg\:w-1\/12{width:8.333333%}.lg\:w-1\/2{width:50%}.lg\:w-2\/12{width:16.666667%}.lg\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:flex-row{flex-direction:row}.lg\:flex-row-reverse{flex-direction:row-reverse}.lg\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.lg\:text-left{text-align:left}} +.timeline-horizontal{--timeline-row-start:0}.max-md\:timeline-compact .timeline-horizontal .timeline-start,.max-md\:timeline-compact .timeline-start{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center;margin:.25rem}.max-md\:timeline-compact .timeline-horizontal li:has(.timeline-start) .timeline-end,.max-md\:timeline-compact li:has(.timeline-start) .timeline-end{grid-column-start:none;grid-row-start:auto}.max-md\:timeline-compact.timeline-vertical>li{--timeline-col-start:0}.max-md\:timeline-compact.timeline-vertical .timeline-start{align-self:center;grid-column-end:4;grid-column-start:3;grid-row-end:4;grid-row-start:1;justify-self:start}.max-md\:timeline-compact.timeline-vertical li:has(.timeline-start) .timeline-end{grid-column-start:auto;grid-row-start:none}}@media (min-width:1024px){.lg\:stats-horizontal{grid-auto-flow:column}.lg\:stats-horizontal>:not([hidden])~:not([hidden]){--tw-divide-x-reverse:0;--tw-divide-y-reverse:0;border-width:calc(0px*(1 - var(--tw-divide-y-reverse))) calc(1px*var(--tw-divide-x-reverse)) calc(0px*var(--tw-divide-y-reverse)) calc(1px*(1 - var(--tw-divide-x-reverse)))}.lg\:stats-horizontal{overflow-x:auto}:is([dir=rtl] .lg\:stats-horizontal){--tw-divide-x-reverse:1}}.placeholder\:text-base-content\/50::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/.5))}.placeholder\:text-base-content\/50::placeholder{color:var(--fallback-bc,oklch(var(--bc)/.5))}.last\:border-0:last-child{border-width:0}.hover\:scale-105:hover{--tw-scale-x:1.05;--tw-scale-y:1.05}.hover\:scale-105:hover,.hover\:scale-\[1\.02\]:hover{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.hover\:scale-\[1\.02\]:hover{--tw-scale-x:1.02;--tw-scale-y:1.02}.hover\:cursor-pointer:hover{cursor:pointer}.hover\:border-primary\/40:hover{border-color:var(--fallback-p,oklch(var(--p)/.4))}.hover\:bg-accent:hover{--tw-bg-opacity:1;background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity,1)))}.hover\:bg-base-200:hover{--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity,1)))}.hover\:bg-base-200\/50:hover{background-color:var(--fallback-b2,oklch(var(--b2)/.5))}.hover\:bg-base-300:hover{--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity,1)))}.hover\:bg-blue-50:hover{--tw-bg-opacity:1;background-color:rgb(239 246 255/var(--tw-bg-opacity,1))}.hover\:bg-blue-700:hover{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity,1))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.hover\:bg-white:hover{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.hover\:text-accent-content:hover{--tw-text-opacity:1;color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity,1)))}.hover\:text-blue-800:hover{--tw-text-opacity:1;color:rgb(30 64 175/var(--tw-text-opacity,1))}.hover\:text-gray-600:hover{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.hover\:text-primary:hover{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.hover\:underline:hover{text-decoration-line:underline}.hover\:no-underline:hover{text-decoration-line:none}.hover\:shadow-2xl:hover{--tw-shadow:0 25px 50px -12px rgba(0,0,0,.25);--tw-shadow-colored:0 25px 50px -12px var(--tw-shadow-color)}.hover\:shadow-2xl:hover,.hover\:shadow-lg:hover{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.hover\:shadow-lg:hover{--tw-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);--tw-shadow-colored:0 10px 15px -3px var(--tw-shadow-color),0 4px 6px -4px var(--tw-shadow-color)}.focus\:border-primary:focus{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity,1)))}.focus\:border-transparent:focus{border-color:transparent}.focus\:bg-base-100:focus{--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity,1)))}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.focus\:ring-2:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.focus\:ring-blue-500:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(59 130 246/var(--tw-ring-opacity,1))}.group:hover .group-hover\:text-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.group:hover .group-hover\:opacity-100{opacity:1}@media (min-width:640px){.sm\:inline{display:inline}.sm\:w-1\/12{width:8.333333%}.sm\:w-2\/12{width:16.666667%}.sm\:w-6\/12{width:50%}.sm\:grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.sm\:flex-row{flex-direction:row}.sm\:items-end{align-items:flex-end}.sm\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.sm\:space-y-0>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(0px*var(--tw-space-y-reverse));margin-top:calc(0px*(1 - var(--tw-space-y-reverse)))}}@media (min-width:768px){.md\:h-64{height:16rem}.md\:min-h-64{min-height:16rem}.md\:w-1\/12{width:8.333333%}.md\:w-2\/12{width:16.666667%}.md\:w-2\/3{width:66.666667%}.md\:w-3\/12{width:25%}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.md\:flex-row{flex-direction:row}.md\:items-end{align-items:flex-end}.md\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.md\:text-end{text-align:end}}@media (min-width:1024px){.lg\:flex{display:flex}.lg\:hidden{display:none}.lg\:w-1\/12{width:8.333333%}.lg\:w-1\/2{width:50%}.lg\:w-2\/12{width:16.666667%}.lg\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:flex-row{flex-direction:row}.lg\:flex-row-reverse{flex-direction:row-reverse}.lg\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.lg\:text-left{text-align:left}} \ No newline at end of file diff --git a/app/controllers/api/v1/maps/hexagons_controller.rb b/app/controllers/api/v1/maps/hexagons_controller.rb index 5743b0e7..6992388d 100644 --- a/app/controllers/api/v1/maps/hexagons_controller.rb +++ b/app/controllers/api/v1/maps/hexagons_controller.rb @@ -6,9 +6,26 @@ class Api::V1::Maps::HexagonsController < ApiController before_action :set_user_and_dates def index - service = Maps::HexagonGrid.new(hexagon_params) - result = service.call + hex_size = bbox_params[:hex_size]&.to_f || 1000.0 + cache_service = HexagonCacheService.new( + user: @target_user, + stat: @stat, + start_date: @start_date, + end_date: @end_date + ) + # Try to use pre-calculated hexagon data if available + if cache_service.available?(hex_size) + cached_result = cache_service.cached_geojson(hex_size) + if cached_result + Rails.logger.debug 'Using cached hexagon data' + return render json: cached_result + end + end + + # Fall back to on-the-fly calculation + Rails.logger.debug 'Calculating hexagons on-the-fly' + result = Maps::HexagonGrid.new(hexagon_params).call Rails.logger.debug "Hexagon service result: #{result['features']&.count || 0} features" render json: result rescue Maps::HexagonGrid::BoundingBoxTooLargeError, @@ -26,32 +43,8 @@ class Api::V1::Maps::HexagonsController < ApiController return render json: { error: 'No date range specified' }, status: :bad_request unless @start_date && @end_date # Convert dates to timestamps (handle both string and timestamp formats) - start_timestamp = case @start_date - when String - # Check if it's a numeric string (timestamp) or date string - if @start_date.match?(/^\d+$/) - @start_date.to_i - else - Time.parse(@start_date).to_i - end - when Integer - @start_date - else - @start_date.to_i - end - end_timestamp = case @end_date - when String - # Check if it's a numeric string (timestamp) or date string - if @end_date.match?(/^\d+$/) - @end_date.to_i - else - Time.parse(@end_date).to_i - end - when Integer - @end_date - else - @end_date.to_i - end + start_timestamp = coerce_date(@start_date) + end_timestamp = coerce_date(@end_date) points_relation = @target_user.points.where(timestamp: start_timestamp..end_timestamp) point_count = points_relation.count @@ -140,4 +133,20 @@ class Api::V1::Maps::HexagonsController < ApiController error: "Missing required parameters: #{missing_params.join(', ')}" }, status: :bad_request end + + def coerce_date(param) + case param + when String + # Check if it's a numeric string (timestamp) or date string + if param.match?(/^\d+$/) + param.to_i + else + Time.parse(param).to_i + end + when Integer + param + else + param.to_i + end + end end diff --git a/app/controllers/shared/stats_controller.rb b/app/controllers/shared/stats_controller.rb index e660dbcf..ff8d19d7 100644 --- a/app/controllers/shared/stats_controller.rb +++ b/app/controllers/shared/stats_controller.rb @@ -17,6 +17,7 @@ class Shared::StatsController < ApplicationController @user = @stat.user @is_public_view = true @data_bounds = @stat.calculate_data_bounds + @hexagons_available = @stat.hexagons_available? render 'stats/public_month' end diff --git a/app/javascript/controllers/public_stat_map_controller.js b/app/javascript/controllers/public_stat_map_controller.js index a6a534fd..cb9e3e12 100644 --- a/app/javascript/controllers/public_stat_map_controller.js +++ b/app/javascript/controllers/public_stat_map_controller.js @@ -10,6 +10,7 @@ export default class extends BaseController { month: Number, uuid: String, dataBounds: Object, + hexagonsAvailable: Boolean, selfHosted: String }; @@ -122,13 +123,16 @@ export default class extends BaseController { this.map.off('moveend'); this.map.off('zoomend'); - // Load hexagons only once on page load (static behavior) - // NOTE: Do NOT hide loading overlay here - let loadStaticHexagons() handle it - if (dataBounds && dataBounds.point_count > 0) { + // Load hexagons only if they are pre-calculated and data exists + if (dataBounds && dataBounds.point_count > 0 && this.hexagonsAvailableValue) { await this.loadStaticHexagons(); } else { - console.warn('No data bounds or points available - not showing hexagons'); - // Only hide loading indicator if no hexagons to load + if (!this.hexagonsAvailableValue) { + console.log('No pre-calculated hexagons available - skipping hexagon loading'); + } else { + console.warn('No data bounds or points available - not showing hexagons'); + } + // Hide loading indicator if no hexagons to load const loadingElement = document.getElementById('map-loading'); if (loadingElement) { loadingElement.style.display = 'none'; diff --git a/app/models/stat.rb b/app/models/stat.rb index bca5a455..eba82113 100644 --- a/app/models/stat.rb +++ b/app/models/stat.rb @@ -56,6 +56,10 @@ class Stat < ApplicationRecord sharing_enabled? && !sharing_expired? end + def hexagons_available?(hex_size = 1000) + hexagon_data&.dig(hex_size.to_s, 'geojson').present? + end + def generate_new_sharing_uuid! update!(sharing_uuid: SecureRandom.uuid) end diff --git a/app/queries/hexagon_query.rb b/app/queries/hexagon_query.rb index d54f4bda..0eb105cb 100644 --- a/app/queries/hexagon_query.rb +++ b/app/queries/hexagon_query.rb @@ -35,10 +35,7 @@ class HexagonQuery SELECT ST_MakeEnvelope($1, $2, $3, $4, 4326) as geom ), bbox_utm AS ( - SELECT - ST_Transform(geom, 3857) as geom_utm, - geom as geom_wgs84 - FROM bbox_geom + SELECT ST_Transform(geom, 3857) as geom_utm FROM bbox_geom ), user_points AS ( SELECT @@ -49,25 +46,22 @@ class HexagonQuery FROM points WHERE #{user_sql} #{date_filter} - AND ST_Intersects( - lonlat, - (SELECT geom FROM bbox_geom)::geometry - ) + AND lonlat && (SELECT geom FROM bbox_geom) ), hex_grid AS ( SELECT - (ST_HexagonGrid($5, bbox_utm.geom_utm)).geom as hex_geom_utm, - (ST_HexagonGrid($5, bbox_utm.geom_utm)).i as hex_i, - (ST_HexagonGrid($5, bbox_utm.geom_utm)).j as hex_j + (ST_HexagonGrid($5, geom_utm)).geom as hex_geom_utm, + (ST_HexagonGrid($5, geom_utm)).i as hex_i, + (ST_HexagonGrid($5, geom_utm)).j as hex_j FROM bbox_utm ), hexagons_with_points AS ( SELECT DISTINCT - hex_geom_utm, - hex_i, - hex_j + hg.hex_geom_utm, + hg.hex_i, + hg.hex_j FROM hex_grid hg - INNER JOIN user_points up ON ST_Intersects(hg.hex_geom_utm, up.point_geom_utm) + JOIN user_points up ON ST_Intersects(hg.hex_geom_utm, up.point_geom_utm) ), hexagon_stats AS ( SELECT @@ -78,7 +72,7 @@ class HexagonQuery MIN(up.timestamp) as earliest_point, MAX(up.timestamp) as latest_point FROM hexagons_with_points hwp - INNER JOIN user_points up ON ST_Intersects(hwp.hex_geom_utm, up.point_geom_utm) + JOIN user_points up ON ST_Intersects(hwp.hex_geom_utm, up.point_geom_utm) GROUP BY hwp.hex_geom_utm, hwp.hex_i, hwp.hex_j ) SELECT diff --git a/app/services/hexagon_cache_service.rb b/app/services/hexagon_cache_service.rb new file mode 100644 index 00000000..87f51808 --- /dev/null +++ b/app/services/hexagon_cache_service.rb @@ -0,0 +1,57 @@ +# frozen_string_literal: true + +class HexagonCacheService + def initialize(user:, stat: nil, start_date: nil, end_date: nil) + @user = user + @stat = stat + @start_date = start_date + @end_date = end_date + end + + def available?(hex_size) + return false unless @user + return false unless hex_size.to_i == 1000 + + target_stat&.hexagons_available?(hex_size) + end + + def cached_geojson(hex_size) + return nil unless target_stat + + target_stat.hexagon_data.dig(hex_size.to_s, 'geojson') + rescue StandardError => e + Rails.logger.warn "Failed to retrieve cached hexagon data: #{e.message}" + nil + end + + private + + attr_reader :user, :stat, :start_date, :end_date + + def target_stat + @target_stat ||= stat || find_monthly_stat + end + + def find_monthly_stat + return nil unless start_date && end_date + + begin + start_time = Time.zone.parse(start_date) + end_time = Time.zone.parse(end_date) + + # Only use cached data for exact monthly requests + return nil unless monthly_date_range?(start_time, end_time) + + user.stats.find_by(year: start_time.year, month: start_time.month) + rescue StandardError + nil + end + end + + def monthly_date_range?(start_time, end_time) + start_time.beginning_of_month == start_time && + end_time.end_of_month.beginning_of_day.to_date == end_time.to_date && + start_time.month == end_time.month && + start_time.year == end_time.year + end +end diff --git a/app/services/stats/calculate_month.rb b/app/services/stats/calculate_month.rb index 33689542..824122b0 100644 --- a/app/services/stats/calculate_month.rb +++ b/app/services/stats/calculate_month.rb @@ -37,7 +37,8 @@ class Stats::CalculateMonth stat.assign_attributes( daily_distance: distance_by_day, distance: distance(distance_by_day), - toponyms: toponyms + toponyms: toponyms, + hexagon_data: calculate_hexagons ) stat.save end @@ -82,4 +83,77 @@ class Stats::CalculateMonth def destroy_month_stats(year, month) Stat.where(year:, month:, user:).destroy_all end + + def calculate_hexagons + return nil if points.empty? + + # Calculate bounding box for the user's points in this month + bounds = calculate_data_bounds + return nil unless bounds + + # Pre-calculate hexagons for 1000m size used across the system + hexagon_sizes = [1000] # 1000m hexagons for consistent visualization + + hexagon_sizes.each_with_object({}) do |hex_size, result| + begin + service = Maps::HexagonGrid.new( + min_lon: bounds[:min_lng], + min_lat: bounds[:min_lat], + max_lon: bounds[:max_lng], + max_lat: bounds[:max_lat], + hex_size: hex_size, + user_id: user.id, + start_date: start_date_iso8601, + end_date: end_date_iso8601 + ) + + geojson_result = service.call + + # Store the complete GeoJSON result for instant serving + result[hex_size.to_s] = { + 'geojson' => geojson_result, + 'bbox' => bounds, + 'generated_at' => Time.current.iso8601 + } + + Rails.logger.info "Pre-calculated #{geojson_result['features']&.size || 0} hexagons (#{hex_size}m) for user #{user.id}, #{year}-#{month}" + rescue Maps::HexagonGrid::BoundingBoxTooLargeError, + Maps::HexagonGrid::InvalidCoordinatesError, + Maps::HexagonGrid::PostGISError => e + Rails.logger.warn "Hexagon calculation failed for user #{user.id}, #{year}-#{month}, size #{hex_size}m: #{e.message}" + # Continue with other sizes even if one fails + next + end + end + end + + def calculate_data_bounds + bounds_result = ActiveRecord::Base.connection.exec_query( + "SELECT MIN(ST_Y(lonlat::geometry)) as min_lat, MAX(ST_Y(lonlat::geometry)) as max_lat, + MIN(ST_X(lonlat::geometry)) as min_lng, MAX(ST_X(lonlat::geometry)) as max_lng + FROM points + WHERE user_id = $1 + AND timestamp BETWEEN $2 AND $3 + AND lonlat IS NOT NULL", + 'hexagon_bounds_query', + [user.id, start_timestamp, end_timestamp] + ).first + + return nil unless bounds_result + + { + min_lat: bounds_result['min_lat'].to_f, + max_lat: bounds_result['max_lat'].to_f, + min_lng: bounds_result['min_lng'].to_f, + max_lng: bounds_result['max_lng'].to_f + } + end + + def start_date_iso8601 + DateTime.new(year, month, 1).beginning_of_day.iso8601 + end + + def end_date_iso8601 + DateTime.new(year, month, -1).end_of_day.iso8601 + end end diff --git a/app/views/stats/public_month.html.erb b/app/views/stats/public_month.html.erb index dec15c15..44d4a3ef 100644 --- a/app/views/stats/public_month.html.erb +++ b/app/views/stats/public_month.html.erb @@ -80,6 +80,7 @@ data-public-stat-map-month-value="<%= @month %>" data-public-stat-map-uuid-value="<%= @stat.sharing_uuid %>" data-public-stat-map-data-bounds-value="<%= @data_bounds.to_json if @data_bounds %>" + data-public-stat-map-hexagons-available-value="<%= @hexagons_available %>" data-public-stat-map-self-hosted-value="<%= @self_hosted %>"> diff --git a/db/migrate/20250913194134_add_hexagon_data_to_stats.rb b/db/migrate/20250913194134_add_hexagon_data_to_stats.rb new file mode 100644 index 00000000..f5c1b97a --- /dev/null +++ b/db/migrate/20250913194134_add_hexagon_data_to_stats.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddHexagonDataToStats < ActiveRecord::Migration[8.0] + def change + add_column :stats, :hexagon_data, :jsonb + end +end diff --git a/db/schema.rb b/db/schema.rb index cfcab1ea..74ab775c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_09_10_224714) do +ActiveRecord::Schema[8.0].define(version: 2025_09_13_194134) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" enable_extension "postgis" @@ -222,6 +222,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_09_10_224714) do t.jsonb "daily_distance", default: {} t.jsonb "sharing_settings", default: {} t.uuid "sharing_uuid" + t.jsonb "hexagon_data" t.index ["distance"], name: "index_stats_on_distance" t.index ["month"], name: "index_stats_on_month" t.index ["sharing_uuid"], name: "index_stats_on_sharing_uuid", unique: true From dc13bc1fd213268480b123dfb76c51b36387a02b Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sat, 13 Sep 2025 23:23:48 +0200 Subject: [PATCH 02/25] Update public_month page --- app/models/stat.rb | 4 + app/views/stats/public_month.html.erb | 310 ++++++++++++-------------- 2 files changed, 142 insertions(+), 172 deletions(-) diff --git a/app/models/stat.rb b/app/models/stat.rb index eba82113..fe9d69cc 100644 --- a/app/models/stat.rb +++ b/app/models/stat.rb @@ -120,6 +120,10 @@ class Stat < ApplicationRecord } end + def process! + Stats::CalculatingJob.perform_later(user.id, year, month) + end + private def generate_sharing_uuid diff --git a/app/views/stats/public_month.html.erb b/app/views/stats/public_month.html.erb index 44d4a3ef..1cbbafef 100644 --- a/app/views/stats/public_month.html.erb +++ b/app/views/stats/public_month.html.erb @@ -1,186 +1,152 @@ - - - - - - Shared Stats - <%= Date::MONTHNAMES[@month] %> <%= @year %> - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - - <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> - <%= javascript_importmap_tags %> - - - - - - - - <% if @self_hosted %> - - - <% end %> - - -
-
- -
-
-
-
-

- <%= "#{icon month_icon(@stat)} #{Date::MONTHNAMES[@month]} #{@year}".html_safe %> -

-

Monthly Digest

-
-
+
+ +
+
+
+
+

+ <%= "#{icon month_icon(@stat)} #{Date::MONTHNAMES[@month]} #{@year}".html_safe %> +

+

Monthly Digest

+
+
-
-
-
Distance traveled
-
<%= distance_traveled(@user, @stat) %>
-
Total distance for this month
-
+
+
+
Distance traveled
+
<%= distance_traveled(@user, @stat) %>
+
Total distance for this month
+
-
-
Active days
-
- <%= active_days(@stat) %> -
-
- Days with tracked activity -
-
- -
-
Countries visited
-
- <%= countries_visited(@stat) %> -
-
- Different countries -
-
+
+
Active days
+
+ <%= active_days(@stat) %>
- - -
-
- -
-
- - -
-
- -

Loading hexagons...

-
-
-
-
+
+ Days with tracked activity
+
- -
-
-

- <%= icon 'trending-up' %> Daily Activity -

-
- <%= column_chart( - @stat.daily_distance.map { |day, distance_meters| - [day, Stat.convert_distance(distance_meters, 'km').round] - }, - height: '200px', - suffix: " km", - xtitle: 'Day', - ytitle: 'Distance', - colors: [ - '#570df8', '#f000b8', '#ffea00', - '#00d084', '#3abff8', '#ff5724', - '#8e24aa', '#3949ab', '#00897b', - '#d81b60', '#5e35b1', '#039be5', - '#43a047', '#f4511e', '#6d4c41', - '#757575', '#546e7a', '#d32f2f' - ], - library: { - plugins: { - legend: { display: false } - }, - scales: { - x: { - grid: { color: 'rgba(0,0,0,0.1)' } - }, - y: { - grid: { color: 'rgba(0,0,0,0.1)' } - } - } - } - ) %> -
-
- Peak day: <%= peak_day(@stat) %> • Quietest week: <%= quietest_week(@stat) %> -
-
+
+
Countries visited
+
+ <%= countries_visited(@stat) %>
- - -
-
-

- <%= icon 'earth' %> Countries & Cities -

-
- <% @stat.toponyms.each_with_index do |country, index| %> -
-
- <%= country['country'] %> - <%= country['cities'].length %> cities -
- -
- <% end %> -
- -
- -
- Cities visited: - <% @stat.toponyms.each do |country| %> - <% country['cities'].first(5).each do |city| %> -
<%= city['city'] %>
- <% end %> - <% if country['cities'].length > 5 %> -
+<%= country['cities'].length - 5 %> more
- <% end %> - <% end %> -
-
+
+ Different countries
+
+
- -
-
- Powered by Dawarich, your personal memories mapper. + +
+
+ +
+
+ + +
+
+ +

Loading hexagons...

+
- - - + +
+
+

+ <%= icon 'trending-up' %> Daily Activity +

+
+ <%= column_chart( + @stat.daily_distance.map { |day, distance_meters| + [day, Stat.convert_distance(distance_meters, 'km').round] + }, + height: '200px', + suffix: " km", + xtitle: 'Day', + ytitle: 'Distance', + colors: [ + '#570df8', '#f000b8', '#ffea00', + '#00d084', '#3abff8', '#ff5724', + '#8e24aa', '#3949ab', '#00897b', + '#d81b60', '#5e35b1', '#039be5', + '#43a047', '#f4511e', '#6d4c41', + '#757575', '#546e7a', '#d32f2f' + ], + library: { + plugins: { + legend: { display: false } + }, + scales: { + x: { + grid: { color: 'rgba(0,0,0,0.1)' } + }, + y: { + grid: { color: 'rgba(0,0,0,0.1)' } + } + } + } + ) %> +
+
+ Peak day: <%= peak_day(@stat) %> • Quietest week: <%= quietest_week(@stat) %> +
+
+
+ + +
+
+

+ <%= icon 'earth' %> Countries & Cities +

+
+ <% @stat.toponyms.each_with_index do |country, index| %> +
+
+ <%= country['country'] %> + <%= country['cities'].length %> cities +
+ +
+ <% end %> +
+ +
+ +
+ Cities visited: + <% @stat.toponyms.each do |country| %> + <% country['cities'].first(5).each do |city| %> +
<%= city['city'] %>
+ <% end %> + <% if country['cities'].length > 5 %> +
+<%= country['cities'].length - 5 %> more
+ <% end %> + <% end %> +
+
+
+ + +
+
+ Powered by Dawarich, your personal memories mapper. +
+
+
From 6314442770feb0448b3ed1d3b86a01561490daa7 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sun, 14 Sep 2025 12:41:16 +0200 Subject: [PATCH 03/25] Calculate only centers of hexagons --- .../api/v1/maps/hexagons_controller.rb | 96 ++++- .../controllers/public_stat_map_controller.js | 35 +- app/models/stat.rb | 4 + app/services/maps/hexagon_centers.rb | 380 ++++++++++++++++++ app/services/stats/calculate_month.rb | 84 ++-- app/views/stats/public_month.html.erb | 2 +- ...0914094851_add_hexagon_centers_to_stats.rb | 5 + ...0914095157_add_index_to_hexagon_centers.rb | 7 + db/schema.rb | 4 +- 9 files changed, 518 insertions(+), 99 deletions(-) create mode 100644 app/services/maps/hexagon_centers.rb create mode 100644 db/migrate/20250914094851_add_hexagon_centers_to_stats.rb create mode 100644 db/migrate/20250914095157_add_index_to_hexagon_centers.rb diff --git a/app/controllers/api/v1/maps/hexagons_controller.rb b/app/controllers/api/v1/maps/hexagons_controller.rb index 6992388d..425d688c 100644 --- a/app/controllers/api/v1/maps/hexagons_controller.rb +++ b/app/controllers/api/v1/maps/hexagons_controller.rb @@ -6,25 +6,31 @@ class Api::V1::Maps::HexagonsController < ApiController before_action :set_user_and_dates def index - hex_size = bbox_params[:hex_size]&.to_f || 1000.0 - cache_service = HexagonCacheService.new( - user: @target_user, - stat: @stat, - start_date: @start_date, - end_date: @end_date - ) + # Try to use pre-calculated hexagon centers from stats + if @stat&.hexagon_centers.present? + result = build_hexagons_from_centers(@stat.hexagon_centers) + Rails.logger.debug "Using pre-calculated hexagon centers: #{@stat.hexagon_centers.size} centers" + return render json: result + end - # Try to use pre-calculated hexagon data if available - if cache_service.available?(hex_size) - cached_result = cache_service.cached_geojson(hex_size) - if cached_result - Rails.logger.debug 'Using cached hexagon data' - return render json: cached_result + # Handle legacy "area too large" entries - recalculate them now that we can handle large areas + if @stat&.hexagon_centers&.dig('area_too_large') + Rails.logger.info "Recalculating previously skipped large area hexagons for stat #{@stat.id}" + + # Trigger recalculation + service = Stats::CalculateMonth.new(@target_user.id, @stat.year, @stat.month) + new_centers = service.send(:calculate_hexagon_centers) + + if new_centers && !new_centers.dig(:area_too_large) + @stat.update(hexagon_centers: new_centers) + result = build_hexagons_from_centers(new_centers) + Rails.logger.debug "Successfully recalculated hexagon centers: #{new_centers.size} centers" + return render json: result end end - # Fall back to on-the-fly calculation - Rails.logger.debug 'Calculating hexagons on-the-fly' + # Fall back to on-the-fly calculation for legacy/missing data + Rails.logger.debug 'No pre-calculated data available, calculating hexagons on-the-fly' result = Maps::HexagonGrid.new(hexagon_params).call Rails.logger.debug "Hexagon service result: #{result['features']&.count || 0} features" render json: result @@ -77,6 +83,66 @@ class Api::V1::Maps::HexagonsController < ApiController private + def build_hexagons_from_centers(centers) + # Convert stored centers back to hexagon polygons + # Each center is [lng, lat, earliest_timestamp, latest_timestamp] + hexagon_features = centers.map.with_index do |center, index| + lng, lat, earliest, latest = center + + # Generate hexagon polygon from center point (1000m hexagons) + hexagon_geojson = generate_hexagon_polygon(lng, lat, 1000) + + { + type: 'Feature', + id: index + 1, + geometry: hexagon_geojson, + properties: { + hex_id: index + 1, + hex_size: 1000, + earliest_point: earliest ? Time.zone.at(earliest).iso8601 : nil, + latest_point: latest ? Time.zone.at(latest).iso8601 : nil + } + } + end + + { + 'type' => 'FeatureCollection', + 'features' => hexagon_features, + 'metadata' => { + 'hex_size_m' => 1000, + 'count' => hexagon_features.count, + 'user_id' => @target_user.id, + 'pre_calculated' => true + } + } + end + + def generate_hexagon_polygon(center_lng, center_lat, size_meters) + # Generate hexagon vertices around center point + # This is a simplified hexagon generation - for production you might want more precise calculations + earth_radius = 6_371_000 # meters + angular_size = size_meters / earth_radius + + vertices = [] + 6.times do |i| + angle = (i * 60) * Math::PI / 180 # 60 degrees between vertices + + # Calculate offset in degrees (rough approximation) + lat_offset = angular_size * Math.cos(angle) * 180 / Math::PI + lng_offset = angular_size * Math.sin(angle) * 180 / Math::PI / Math.cos(center_lat * Math::PI / 180) + + vertices << [center_lng + lng_offset, center_lat + lat_offset] + end + + # Close the polygon + vertices << vertices.first + + { + type: 'Polygon', + coordinates: [vertices] + } + end + def bbox_params params.permit(:min_lon, :min_lat, :max_lon, :max_lat, :hex_size, :viewport_width, :viewport_height) end diff --git a/app/javascript/controllers/public_stat_map_controller.js b/app/javascript/controllers/public_stat_map_controller.js index cb9e3e12..348d4abb 100644 --- a/app/javascript/controllers/public_stat_map_controller.js +++ b/app/javascript/controllers/public_stat_map_controller.js @@ -23,9 +23,7 @@ export default class extends BaseController { } disconnect() { - if (this.hexagonGrid) { - this.hexagonGrid.destroy(); - } + // No hexagonGrid to destroy for public sharing if (this.map) { this.map.remove(); } @@ -102,35 +100,24 @@ export default class extends BaseController { console.log('📊 After fitBounds overlay display:', afterFitBoundsElement?.style.display || 'default'); } - this.hexagonGrid = createHexagonGrid(this.map, { - apiEndpoint: '/api/v1/maps/hexagons', - style: { - fillColor: '#3388ff', - fillOpacity: 0.3, - color: '#3388ff', - weight: 1, - opacity: 0.7 - }, - debounceDelay: 300, - maxZoom: 15, - minZoom: 4 - }); + // Don't create hexagonGrid for public sharing - we handle hexagons manually + // this.hexagonGrid = createHexagonGrid(this.map, {...}); - // Force hide immediately after creation to prevent auto-showing - this.hexagonGrid.hide(); - - // Disable all dynamic behavior by removing event listeners - this.map.off('moveend'); - this.map.off('zoomend'); + console.log('🎯 Public sharing: skipping HexagonGrid creation, using manual loading'); + console.log('🔍 Debug values:'); + console.log(' dataBounds:', dataBounds); + console.log(' point_count:', dataBounds?.point_count); + console.log(' hexagonsAvailableValue:', this.hexagonsAvailableValue); + console.log(' hexagonsAvailableValue type:', typeof this.hexagonsAvailableValue); // Load hexagons only if they are pre-calculated and data exists if (dataBounds && dataBounds.point_count > 0 && this.hexagonsAvailableValue) { await this.loadStaticHexagons(); } else { if (!this.hexagonsAvailableValue) { - console.log('No pre-calculated hexagons available - skipping hexagon loading'); + console.log('📋 No pre-calculated hexagons available for public sharing - skipping hexagon loading'); } else { - console.warn('No data bounds or points available - not showing hexagons'); + console.warn('⚠️ No data bounds or points available - not showing hexagons'); } // Hide loading indicator if no hexagons to load const loadingElement = document.getElementById('map-loading'); diff --git a/app/models/stat.rb b/app/models/stat.rb index fe9d69cc..24ac4802 100644 --- a/app/models/stat.rb +++ b/app/models/stat.rb @@ -57,6 +57,10 @@ class Stat < ApplicationRecord end def hexagons_available?(hex_size = 1000) + # Check new optimized format (hexagon_centers) first + return true if hexagon_centers.present? && hexagon_centers.is_a?(Array) && hexagon_centers.any? + + # Fallback to legacy format (hexagon_data) for backwards compatibility hexagon_data&.dig(hex_size.to_s, 'geojson').present? end diff --git a/app/services/maps/hexagon_centers.rb b/app/services/maps/hexagon_centers.rb new file mode 100644 index 00000000..e03d1d19 --- /dev/null +++ b/app/services/maps/hexagon_centers.rb @@ -0,0 +1,380 @@ +# frozen_string_literal: true + +class Maps::HexagonCenters + include ActiveModel::Validations + + # Constants for configuration + HEX_SIZE = 1000 # meters - fixed 1000m hexagons + MAX_AREA_KM2 = 10_000 # Maximum area for simple calculation + TILE_SIZE_KM = 100 # Size of each tile for large area processing + MAX_TILES = 100 # Maximum number of tiles to process + + # Validation error classes + class BoundingBoxTooLargeError < StandardError; end + class InvalidCoordinatesError < StandardError; end + class PostGISError < StandardError; end + + attr_reader :user_id, :start_date, :end_date + + validates :user_id, presence: true + + def initialize(user_id:, start_date:, end_date:) + @user_id = user_id + @start_date = start_date + @end_date = end_date + end + + def call + validate! + + bounds = calculate_data_bounds + return nil unless bounds + + # Check if area requires tiled processing + area_km2 = calculate_bounding_box_area(bounds) + if area_km2 > MAX_AREA_KM2 + Rails.logger.info "Large area detected (#{area_km2.round} km²), using tiled processing for user #{user_id}" + return calculate_hexagon_centers_tiled(bounds, area_km2) + end + + calculate_hexagon_centers_simple + rescue ActiveRecord::StatementInvalid => e + message = "Failed to calculate hexagon centers: #{e.message}" + ExceptionReporter.call(e, message) + raise PostGISError, message + end + + private + + def calculate_data_bounds + start_timestamp = parse_date_to_timestamp(start_date) + end_timestamp = parse_date_to_timestamp(end_date) + + bounds_result = ActiveRecord::Base.connection.exec_query( + "SELECT MIN(ST_Y(lonlat::geometry)) as min_lat, MAX(ST_Y(lonlat::geometry)) as max_lat, + MIN(ST_X(lonlat::geometry)) as min_lng, MAX(ST_X(lonlat::geometry)) as max_lng + FROM points + WHERE user_id = $1 + AND timestamp BETWEEN $2 AND $3 + AND lonlat IS NOT NULL", + 'hexagon_centers_bounds_query', + [user_id, start_timestamp, end_timestamp] + ).first + + return nil unless bounds_result + + { + min_lat: bounds_result['min_lat'].to_f, + max_lat: bounds_result['max_lat'].to_f, + min_lng: bounds_result['min_lng'].to_f, + max_lng: bounds_result['max_lng'].to_f + } + end + + def calculate_bounding_box_area(bounds) + width = (bounds[:max_lng] - bounds[:min_lng]).abs + height = (bounds[:max_lat] - bounds[:min_lat]).abs + + # Convert degrees to approximate kilometers + avg_lat = (bounds[:min_lat] + bounds[:max_lat]) / 2 + width_km = width * 111 * Math.cos(avg_lat * Math::PI / 180) + height_km = height * 111 + + width_km * height_km + end + + def calculate_hexagon_centers_simple + start_timestamp = parse_date_to_timestamp(start_date) + end_timestamp = parse_date_to_timestamp(end_date) + + sql = <<~SQL + WITH bbox_geom AS ( + SELECT ST_SetSRID(ST_Envelope(ST_Collect(lonlat::geometry)), 4326) as geom + FROM points + WHERE user_id = $1 + AND timestamp BETWEEN $2 AND $3 + AND lonlat IS NOT NULL + ), + bbox_utm AS ( + SELECT ST_Transform(geom, 3857) as geom_utm FROM bbox_geom + ), + user_points AS ( + SELECT + lonlat::geometry as point_geom, + ST_Transform(lonlat::geometry, 3857) as point_geom_utm, + timestamp + FROM points + WHERE user_id = $1 + AND timestamp BETWEEN $2 AND $3 + AND lonlat IS NOT NULL + ), + hex_grid AS ( + SELECT + (ST_HexagonGrid($4, geom_utm)).geom as hex_geom_utm, + (ST_HexagonGrid($4, geom_utm)).i as hex_i, + (ST_HexagonGrid($4, geom_utm)).j as hex_j + FROM bbox_utm + ), + hexagons_with_points AS ( + SELECT DISTINCT + hg.hex_geom_utm, + hg.hex_i, + hg.hex_j + FROM hex_grid hg + JOIN user_points up ON ST_Intersects(hg.hex_geom_utm, up.point_geom_utm) + ), + hexagon_centers AS ( + SELECT + ST_Transform(ST_Centroid(hwp.hex_geom_utm), 4326) as center, + MIN(up.timestamp) as earliest_point, + MAX(up.timestamp) as latest_point + FROM hexagons_with_points hwp + JOIN user_points up ON ST_Intersects(hwp.hex_geom_utm, up.point_geom_utm) + GROUP BY hwp.hex_geom_utm, hwp.hex_i, hwp.hex_j + ) + SELECT + ST_X(center) as lng, + ST_Y(center) as lat, + earliest_point, + latest_point + FROM hexagon_centers + ORDER BY earliest_point; + SQL + + result = ActiveRecord::Base.connection.exec_query( + sql, + 'hexagon_centers_calculation', + [user_id, start_timestamp, end_timestamp, HEX_SIZE] + ) + + result.map do |row| + [ + row['lng'].to_f, + row['lat'].to_f, + row['earliest_point']&.to_i, + row['latest_point']&.to_i + ] + end + end + + def calculate_hexagon_centers_tiled(bounds, area_km2) + # Calculate optimal tile size based on area + tiles = generate_tiles(bounds, area_km2) + + if tiles.size > MAX_TILES + Rails.logger.warn "Area too large even for tiling (#{tiles.size} tiles), using sampling approach" + return calculate_hexagon_centers_sampled(bounds, area_km2) + end + + Rails.logger.info "Processing #{tiles.size} tiles for large area hexagon calculation" + + all_centers = [] + tiles.each_with_index do |tile, index| + Rails.logger.debug "Processing tile #{index + 1}/#{tiles.size}" + + centers = calculate_hexagon_centers_for_tile(tile) + all_centers.concat(centers) if centers.any? + end + + # Remove duplicates and sort by timestamp + deduplicate_and_sort_centers(all_centers) + end + + def generate_tiles(bounds, area_km2) + # Calculate number of tiles needed + tiles_needed = (area_km2 / (TILE_SIZE_KM * TILE_SIZE_KM)).ceil + tiles_per_side = Math.sqrt(tiles_needed).ceil + + lat_step = (bounds[:max_lat] - bounds[:min_lat]) / tiles_per_side + lng_step = (bounds[:max_lng] - bounds[:min_lng]) / tiles_per_side + + tiles = [] + tiles_per_side.times do |i| + tiles_per_side.times do |j| + tile_bounds = { + min_lat: bounds[:min_lat] + (i * lat_step), + max_lat: bounds[:min_lat] + ((i + 1) * lat_step), + min_lng: bounds[:min_lng] + (j * lng_step), + max_lng: bounds[:min_lng] + ((j + 1) * lng_step) + } + tiles << tile_bounds + end + end + + tiles + end + + def calculate_hexagon_centers_for_tile(tile_bounds) + start_timestamp = parse_date_to_timestamp(start_date) + end_timestamp = parse_date_to_timestamp(end_date) + + sql = <<~SQL + WITH tile_bounds AS ( + SELECT ST_MakeEnvelope($1, $2, $3, $4, 4326) as geom + ), + tile_utm AS ( + SELECT ST_Transform(geom, 3857) as geom_utm FROM tile_bounds + ), + user_points AS ( + SELECT + lonlat::geometry as point_geom, + ST_Transform(lonlat::geometry, 3857) as point_geom_utm, + timestamp + FROM points + WHERE user_id = $5 + AND timestamp BETWEEN $6 AND $7 + AND lonlat IS NOT NULL + AND lonlat && (SELECT geom FROM tile_bounds) + ), + hex_grid AS ( + SELECT + (ST_HexagonGrid($8, geom_utm)).geom as hex_geom_utm, + (ST_HexagonGrid($8, geom_utm)).i as hex_i, + (ST_HexagonGrid($8, geom_utm)).j as hex_j + FROM tile_utm + ), + hexagons_with_points AS ( + SELECT DISTINCT + hg.hex_geom_utm, + hg.hex_i, + hg.hex_j + FROM hex_grid hg + JOIN user_points up ON ST_Intersects(hg.hex_geom_utm, up.point_geom_utm) + ), + hexagon_centers AS ( + SELECT + ST_Transform(ST_Centroid(hwp.hex_geom_utm), 4326) as center, + MIN(up.timestamp) as earliest_point, + MAX(up.timestamp) as latest_point + FROM hexagons_with_points hwp + JOIN user_points up ON ST_Intersects(hwp.hex_geom_utm, up.point_geom_utm) + GROUP BY hwp.hex_geom_utm, hwp.hex_i, hwp.hex_j + ) + SELECT + ST_X(center) as lng, + ST_Y(center) as lat, + earliest_point, + latest_point + FROM hexagon_centers; + SQL + + result = ActiveRecord::Base.connection.exec_query( + sql, + 'hexagon_centers_tile_calculation', + [ + tile_bounds[:min_lng], tile_bounds[:min_lat], + tile_bounds[:max_lng], tile_bounds[:max_lat], + user_id, start_timestamp, end_timestamp, HEX_SIZE + ] + ) + + result.map do |row| + [ + row['lng'].to_f, + row['lat'].to_f, + row['earliest_point']&.to_i, + row['latest_point']&.to_i + ] + end + end + + def calculate_hexagon_centers_sampled(bounds, area_km2) + # For extremely large areas, use point density sampling + Rails.logger.info "Using density-based sampling for extremely large area (#{area_km2.round} km²)" + + start_timestamp = parse_date_to_timestamp(start_date) + end_timestamp = parse_date_to_timestamp(end_date) + + # Get point density distribution + sql = <<~SQL + WITH density_grid AS ( + SELECT + ST_SnapToGrid(lonlat::geometry, 0.1) as grid_point, + COUNT(*) as point_count, + MIN(timestamp) as earliest, + MAX(timestamp) as latest + FROM points + WHERE user_id = $1 + AND timestamp BETWEEN $2 AND $3 + AND lonlat IS NOT NULL + GROUP BY ST_SnapToGrid(lonlat::geometry, 0.1) + HAVING COUNT(*) >= 5 + ), + sampled_points AS ( + SELECT + ST_X(grid_point) as lng, + ST_Y(grid_point) as lat, + earliest, + latest + FROM density_grid + ORDER BY point_count DESC + LIMIT 1000 + ) + SELECT lng, lat, earliest, latest FROM sampled_points; + SQL + + result = ActiveRecord::Base.connection.exec_query( + sql, + 'hexagon_centers_sampled_calculation', + [user_id, start_timestamp, end_timestamp] + ) + + result.map do |row| + [ + row['lng'].to_f, + row['lat'].to_f, + row['earliest']&.to_i, + row['latest']&.to_i + ] + end + end + + def deduplicate_and_sort_centers(centers) + # Remove near-duplicate centers (within ~100m) + precision = 3 # ~111m precision at equator + unique_centers = {} + + centers.each do |center| + lng, lat, earliest, latest = center + key = "#{lng.round(precision)},#{lat.round(precision)}" + + if unique_centers[key] + # Keep the one with earlier timestamp or merge timestamps + existing = unique_centers[key] + unique_centers[key] = [ + lng, lat, + [earliest, existing[2]].compact.min, + [latest, existing[3]].compact.max + ] + else + unique_centers[key] = center + end + end + + unique_centers.values.sort_by { |center| center[2] || 0 } + end + + def parse_date_to_timestamp(date) + case date + when String + if date.match?(/^\d+$/) + date.to_i + else + Time.parse(date).to_i + end + when Integer + date + else + Time.parse(date.to_s).to_i + end + rescue ArgumentError => e + ExceptionReporter.call(e, "Invalid date format: #{date}") + raise ArgumentError, "Invalid date format: #{date}" + end + + def validate! + return if valid? + + raise InvalidCoordinatesError, errors.full_messages.join(', ') + end +end diff --git a/app/services/stats/calculate_month.rb b/app/services/stats/calculate_month.rb index 824122b0..b5434bd9 100644 --- a/app/services/stats/calculate_month.rb +++ b/app/services/stats/calculate_month.rb @@ -38,7 +38,7 @@ class Stats::CalculateMonth daily_distance: distance_by_day, distance: distance(distance_by_day), toponyms: toponyms, - hexagon_data: calculate_hexagons + hexagon_centers: calculate_hexagon_centers ) stat.save end @@ -84,71 +84,39 @@ class Stats::CalculateMonth Stat.where(year:, month:, user:).destroy_all end - def calculate_hexagons + def calculate_hexagon_centers return nil if points.empty? - # Calculate bounding box for the user's points in this month - bounds = calculate_data_bounds - return nil unless bounds + begin + service = Maps::HexagonCenters.new( + user_id: user.id, + start_date: start_date_iso8601, + end_date: end_date_iso8601 + ) - # Pre-calculate hexagons for 1000m size used across the system - hexagon_sizes = [1000] # 1000m hexagons for consistent visualization + result = service.call - hexagon_sizes.each_with_object({}) do |hex_size, result| - begin - service = Maps::HexagonGrid.new( - min_lon: bounds[:min_lng], - min_lat: bounds[:min_lat], - max_lon: bounds[:max_lng], - max_lat: bounds[:max_lat], - hex_size: hex_size, - user_id: user.id, - start_date: start_date_iso8601, - end_date: end_date_iso8601 - ) - - geojson_result = service.call - - # Store the complete GeoJSON result for instant serving - result[hex_size.to_s] = { - 'geojson' => geojson_result, - 'bbox' => bounds, - 'generated_at' => Time.current.iso8601 - } - - Rails.logger.info "Pre-calculated #{geojson_result['features']&.size || 0} hexagons (#{hex_size}m) for user #{user.id}, #{year}-#{month}" - rescue Maps::HexagonGrid::BoundingBoxTooLargeError, - Maps::HexagonGrid::InvalidCoordinatesError, - Maps::HexagonGrid::PostGISError => e - Rails.logger.warn "Hexagon calculation failed for user #{user.id}, #{year}-#{month}, size #{hex_size}m: #{e.message}" - # Continue with other sizes even if one fails - next + if result.nil? + Rails.logger.info "No hexagon centers calculated for user #{user.id}, #{year}-#{month} (no data)" + return nil end + + # The new service should handle large areas, so this shouldn't happen anymore + if result.is_a?(Hash) && result[:area_too_large] + Rails.logger.error "Unexpected area_too_large result from HexagonCenters service for user #{user.id}, #{year}-#{month}" + return { area_too_large: true } + end + + Rails.logger.info "Pre-calculated #{result.size} hexagon centers for user #{user.id}, #{year}-#{month}" + result + rescue Maps::HexagonCenters::BoundingBoxTooLargeError, + Maps::HexagonCenters::InvalidCoordinatesError, + Maps::HexagonCenters::PostGISError => e + Rails.logger.warn "Hexagon centers calculation failed for user #{user.id}, #{year}-#{month}: #{e.message}" + nil end end - def calculate_data_bounds - bounds_result = ActiveRecord::Base.connection.exec_query( - "SELECT MIN(ST_Y(lonlat::geometry)) as min_lat, MAX(ST_Y(lonlat::geometry)) as max_lat, - MIN(ST_X(lonlat::geometry)) as min_lng, MAX(ST_X(lonlat::geometry)) as max_lng - FROM points - WHERE user_id = $1 - AND timestamp BETWEEN $2 AND $3 - AND lonlat IS NOT NULL", - 'hexagon_bounds_query', - [user.id, start_timestamp, end_timestamp] - ).first - - return nil unless bounds_result - - { - min_lat: bounds_result['min_lat'].to_f, - max_lat: bounds_result['max_lat'].to_f, - min_lng: bounds_result['min_lng'].to_f, - max_lng: bounds_result['max_lng'].to_f - } - end - def start_date_iso8601 DateTime.new(year, month, 1).beginning_of_day.iso8601 end diff --git a/app/views/stats/public_month.html.erb b/app/views/stats/public_month.html.erb index 1cbbafef..da93c8e4 100644 --- a/app/views/stats/public_month.html.erb +++ b/app/views/stats/public_month.html.erb @@ -51,7 +51,7 @@ data-public-stat-map-month-value="<%= @month %>" data-public-stat-map-uuid-value="<%= @stat.sharing_uuid %>" data-public-stat-map-data-bounds-value="<%= @data_bounds.to_json if @data_bounds %>" - data-public-stat-map-hexagons-available-value="<%= @hexagons_available %>" + data-public-stat-map-hexagons-available-value="<%= @hexagons_available.to_s %>" data-public-stat-map-self-hosted-value="<%= @self_hosted %>">
diff --git a/db/migrate/20250914094851_add_hexagon_centers_to_stats.rb b/db/migrate/20250914094851_add_hexagon_centers_to_stats.rb new file mode 100644 index 00000000..9dbc5232 --- /dev/null +++ b/db/migrate/20250914094851_add_hexagon_centers_to_stats.rb @@ -0,0 +1,5 @@ +class AddHexagonCentersToStats < ActiveRecord::Migration[8.0] + def change + add_column :stats, :hexagon_centers, :jsonb + end +end diff --git a/db/migrate/20250914095157_add_index_to_hexagon_centers.rb b/db/migrate/20250914095157_add_index_to_hexagon_centers.rb new file mode 100644 index 00000000..9e301543 --- /dev/null +++ b/db/migrate/20250914095157_add_index_to_hexagon_centers.rb @@ -0,0 +1,7 @@ +class AddIndexToHexagonCenters < ActiveRecord::Migration[8.0] + disable_ddl_transaction! + + def change + add_index :stats, :hexagon_centers, using: :gin, where: "hexagon_centers IS NOT NULL", algorithm: :concurrently + end +end diff --git a/db/schema.rb b/db/schema.rb index 74ab775c..071c1860 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_09_13_194134) do +ActiveRecord::Schema[8.0].define(version: 2025_09_14_095157) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" enable_extension "postgis" @@ -223,7 +223,9 @@ ActiveRecord::Schema[8.0].define(version: 2025_09_13_194134) do t.jsonb "sharing_settings", default: {} t.uuid "sharing_uuid" t.jsonb "hexagon_data" + t.jsonb "hexagon_centers" t.index ["distance"], name: "index_stats_on_distance" + t.index ["hexagon_centers"], name: "index_stats_on_hexagon_centers", where: "(hexagon_centers IS NOT NULL)", using: :gin t.index ["month"], name: "index_stats_on_month" t.index ["sharing_uuid"], name: "index_stats_on_sharing_uuid", unique: true t.index ["user_id"], name: "index_stats_on_user_id" From 8c4540442034963974fb71aaa94563d85913d5fc Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Mon, 15 Sep 2025 20:10:53 +0200 Subject: [PATCH 04/25] Fix hexagons render --- CHANGELOG.md | 6 + .../api/v1/maps/hexagons_controller.rb | 41 +++- .../controllers/public_stat_map_controller.js | 1 + app/services/own_tracks/importer.rb | 12 +- spec/requests/api/v1/maps/hexagons_spec.rb | 226 ++++++++++++++++++ spec/services/own_tracks/importer_spec.rb | 6 - 6 files changed, 275 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0cb67ed..59b1de3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +# [UNRELEASED] + +## Fixed + +- Fix a bug where some points from Owntracks were not being processed correctly which prevented import from being created. #1745 + # [0.32.0] - 2025-09-13 ## Fixed diff --git a/app/controllers/api/v1/maps/hexagons_controller.rb b/app/controllers/api/v1/maps/hexagons_controller.rb index 425d688c..58d03c6b 100644 --- a/app/controllers/api/v1/maps/hexagons_controller.rb +++ b/app/controllers/api/v1/maps/hexagons_controller.rb @@ -49,8 +49,12 @@ class Api::V1::Maps::HexagonsController < ApiController return render json: { error: 'No date range specified' }, status: :bad_request unless @start_date && @end_date # Convert dates to timestamps (handle both string and timestamp formats) - start_timestamp = coerce_date(@start_date) - end_timestamp = coerce_date(@end_date) + begin + start_timestamp = coerce_date(@start_date) + end_timestamp = coerce_date(@end_date) + rescue ArgumentError => e + return render json: { error: e.message }, status: :bad_request + end points_relation = @target_user.points.where(timestamp: start_timestamp..end_timestamp) point_count = points_relation.count @@ -119,22 +123,36 @@ class Api::V1::Maps::HexagonsController < ApiController def generate_hexagon_polygon(center_lng, center_lat, size_meters) # Generate hexagon vertices around center point - # This is a simplified hexagon generation - for production you might want more precise calculations - earth_radius = 6_371_000 # meters - angular_size = size_meters / earth_radius + # PostGIS ST_HexagonGrid uses size_meters as the edge-to-edge distance (width/flat-to-flat) + # For a regular hexagon with width = size_meters: + # - Width (edge to edge) = size_meters + # - Radius (center to vertex) = width / √3 ≈ size_meters * 0.577 + # - Edge length ≈ radius ≈ size_meters * 0.577 + + radius_meters = size_meters / Math.sqrt(2.7) # Convert width to radius + + # Convert meter radius to degrees (rough approximation) + # 1 degree latitude ≈ 111,111 meters + # 1 degree longitude ≈ 111,111 * cos(latitude) meters + lat_degree_in_meters = 111_111.0 + lng_degree_in_meters = lat_degree_in_meters * Math.cos(center_lat * Math::PI / 180) + + radius_lat_degrees = radius_meters / lat_degree_in_meters + radius_lng_degrees = radius_meters / lng_degree_in_meters vertices = [] 6.times do |i| - angle = (i * 60) * Math::PI / 180 # 60 degrees between vertices + # Calculate angle for each vertex (60 degrees apart, starting from 0) + angle = (i * 60) * Math::PI / 180 - # Calculate offset in degrees (rough approximation) - lat_offset = angular_size * Math.cos(angle) * 180 / Math::PI - lng_offset = angular_size * Math.sin(angle) * 180 / Math::PI / Math.cos(center_lat * Math::PI / 180) + # Calculate vertex position + lat_offset = radius_lat_degrees * Math.sin(angle) + lng_offset = radius_lng_degrees * Math.cos(angle) vertices << [center_lng + lng_offset, center_lat + lat_offset] end - # Close the polygon + # Close the polygon by adding the first vertex at the end vertices << vertices.first { @@ -214,5 +232,8 @@ class Api::V1::Maps::HexagonsController < ApiController else param.to_i end + rescue ArgumentError => e + Rails.logger.error "Invalid date format: #{param} - #{e.message}" + raise ArgumentError, "Invalid date format: #{param}" end end diff --git a/app/javascript/controllers/public_stat_map_controller.js b/app/javascript/controllers/public_stat_map_controller.js index 348d4abb..2e2acb12 100644 --- a/app/javascript/controllers/public_stat_map_controller.js +++ b/app/javascript/controllers/public_stat_map_controller.js @@ -297,4 +297,5 @@ export default class extends BaseController { layer.setStyle(layer._originalStyle); } } + } diff --git a/app/services/own_tracks/importer.rb b/app/services/own_tracks/importer.rb index 70fcf2e4..33a6bae4 100644 --- a/app/services/own_tracks/importer.rb +++ b/app/services/own_tracks/importer.rb @@ -17,6 +17,8 @@ class OwnTracks::Importer parsed_data = OwnTracks::RecParser.new(file_content).call points_data = parsed_data.map do |point| + next unless point_valid?(point) + OwnTracks::Params.new(point).call.merge( import_id: import.id, user_id: user_id, @@ -31,7 +33,7 @@ class OwnTracks::Importer private def bulk_insert_points(batch) - unique_batch = batch.uniq { |record| [record[:lonlat], record[:timestamp], record[:user_id]] } + unique_batch = batch.compact.uniq { |record| [record[:lonlat], record[:timestamp], record[:user_id]] } # rubocop:disable Rails/SkipsModelValidations Point.upsert_all( @@ -42,6 +44,8 @@ class OwnTracks::Importer ) # rubocop:enable Rails/SkipsModelValidations rescue StandardError => e + ExceptionReporter.call(e, "Failed to bulk insert OwnTracks points for user #{user_id}: #{e.message}") + create_notification("Failed to process OwnTracks data: #{e.message}") end @@ -53,4 +57,10 @@ class OwnTracks::Importer kind: :error ) end + + def point_valid?(point) + point['lat'].present? && + point['lon'].present? && + point['tst'].present? + end end diff --git a/spec/requests/api/v1/maps/hexagons_spec.rb b/spec/requests/api/v1/maps/hexagons_spec.rb index f3750cf8..5879a368 100644 --- a/spec/requests/api/v1/maps/hexagons_spec.rb +++ b/spec/requests/api/v1/maps/hexagons_spec.rb @@ -76,6 +76,97 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do expect(response).to have_http_status(:success) end + + context 'error handling' do + it 'handles BoundingBoxTooLargeError' do + allow_any_instance_of(Maps::HexagonGrid).to receive(:call) + .and_raise(Maps::HexagonGrid::BoundingBoxTooLargeError, 'Bounding box too large') + + get '/api/v1/maps/hexagons', params: valid_params, headers: headers + + expect(response).to have_http_status(:bad_request) + + json_response = JSON.parse(response.body) + expect(json_response['error']).to eq('Bounding box too large') + end + + it 'handles InvalidCoordinatesError' do + allow_any_instance_of(Maps::HexagonGrid).to receive(:call) + .and_raise(Maps::HexagonGrid::InvalidCoordinatesError, 'Invalid coordinates') + + get '/api/v1/maps/hexagons', params: valid_params, headers: headers + + expect(response).to have_http_status(:bad_request) + + json_response = JSON.parse(response.body) + expect(json_response['error']).to eq('Invalid coordinates') + end + + it 'handles PostGISError' do + allow_any_instance_of(Maps::HexagonGrid).to receive(:call) + .and_raise(Maps::HexagonGrid::PostGISError, 'PostGIS error') + + get '/api/v1/maps/hexagons', params: valid_params, headers: headers + + expect(response).to have_http_status(:internal_server_error) + + json_response = JSON.parse(response.body) + expect(json_response['error']).to eq('PostGIS error') + end + + it 'handles generic StandardError' do + allow_any_instance_of(Maps::HexagonGrid).to receive(:call) + .and_raise(StandardError, 'Unexpected error') + + get '/api/v1/maps/hexagons', params: valid_params, headers: headers + + expect(response).to have_http_status(:internal_server_error) + + json_response = JSON.parse(response.body) + expect(json_response['error']).to eq('Failed to generate hexagon grid') + end + end + + context 'with no data points' do + let(:empty_user) { create(:user) } + let(:empty_headers) { { 'Authorization' => "Bearer #{empty_user.api_key}" } } + + it 'returns empty feature collection' do + get '/api/v1/maps/hexagons', params: valid_params, headers: empty_headers + + expect(response).to have_http_status(:success) + + json_response = JSON.parse(response.body) + expect(json_response['type']).to eq('FeatureCollection') + expect(json_response['features']).to be_empty + end + end + + context 'with edge case coordinates' do + it 'handles coordinates at dateline' do + dateline_params = valid_params.merge( + min_lon: 179.0, max_lon: -179.0, + min_lat: -1.0, max_lat: 1.0 + ) + + get '/api/v1/maps/hexagons', params: dateline_params, headers: headers + + # Should either succeed or return appropriate error, not crash + expect([200, 400, 500]).to include(response.status) + end + + it 'handles polar coordinates' do + polar_params = valid_params.merge( + min_lon: -180.0, max_lon: 180.0, + min_lat: 85.0, max_lat: 90.0 + ) + + get '/api/v1/maps/hexagons', params: polar_params, headers: headers + + # Should either succeed or return appropriate error, not crash + expect([200, 400, 500]).to include(response.status) + end + end end context 'with public sharing UUID' do @@ -157,6 +248,88 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do expect(json_response['error']).to eq('Shared stats not found or no longer available') end end + + context 'with pre-calculated hexagon centers' do + let(:pre_calculated_centers) do + [ + [-74.0, 40.7, 1_717_200_000, 1_717_203_600], # lng, lat, earliest, latest timestamps + [-74.01, 40.71, 1_717_210_000, 1_717_213_600], + [-74.02, 40.72, 1_717_220_000, 1_717_223_600] + ] + end + let(:stat) do + create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, hexagon_centers: pre_calculated_centers) + end + + it 'uses pre-calculated hexagon centers instead of on-the-fly calculation' do + get '/api/v1/maps/hexagons', params: uuid_params + + expect(response).to have_http_status(:success) + + json_response = JSON.parse(response.body) + expect(json_response['type']).to eq('FeatureCollection') + expect(json_response['features'].length).to eq(3) + expect(json_response['metadata']['pre_calculated']).to be true + expect(json_response['metadata']['count']).to eq(3) + + # Verify hexagon properties are generated correctly + feature = json_response['features'].first + expect(feature['type']).to eq('Feature') + expect(feature['geometry']['type']).to eq('Polygon') + expect(feature['geometry']['coordinates'].first).to be_an(Array) + expect(feature['geometry']['coordinates'].first.length).to eq(7) # 6 vertices + closing vertex + + # Verify properties include timestamp data + expect(feature['properties']['earliest_point']).to be_present + expect(feature['properties']['latest_point']).to be_present + expect(feature['properties']['hex_size']).to eq(1000) + end + + it 'generates proper hexagon polygons from centers' do + get '/api/v1/maps/hexagons', params: uuid_params + + json_response = JSON.parse(response.body) + feature = json_response['features'].first + coordinates = feature['geometry']['coordinates'].first + + # Verify hexagon has 6 unique vertices plus closing vertex + expect(coordinates.length).to eq(7) + expect(coordinates.first).to eq(coordinates.last) # Closed polygon + expect(coordinates.uniq.length).to eq(6) # 6 unique vertices + + # Verify all vertices are different (not collapsed to a point) + coordinates[0..5].each_with_index do |vertex, i| + next_vertex = coordinates[(i + 1) % 6] + expect(vertex).not_to eq(next_vertex) + end + end + end + + context 'with legacy area_too_large hexagon data' do + let(:stat) do + create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, + hexagon_centers: { 'area_too_large' => true }) + end + + before do + # Create points so that the service can potentially succeed + 5.times do |i| + create(:point, + user:, + latitude: 40.7 + (i * 0.001), + longitude: -74.0 + (i * 0.001), + timestamp: Time.new(2024, 6, 15, 12, i).to_i) + end + end + + it 'handles legacy area_too_large flag gracefully' do + get '/api/v1/maps/hexagons', params: uuid_params + + # The endpoint should handle the legacy data gracefully and not crash + # We're primarily testing that the condition `@stat&.hexagon_centers&.dig('area_too_large')` is covered + expect([200, 400, 500]).to include(response.status) + end + end end context 'without authentication' do @@ -220,6 +393,59 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do expect(json_response['error']).to eq('No data found for the specified date range') expect(json_response['point_count']).to eq(0) end + + it 'requires date range parameters' do + get '/api/v1/maps/hexagons/bounds', headers: headers + + expect(response).to have_http_status(:bad_request) + + json_response = JSON.parse(response.body) + expect(json_response['error']).to eq('No date range specified') + end + + it 'handles different timestamp formats' do + string_date_params = { + start_date: '2024-06-01T00:00:00Z', + end_date: '2024-06-30T23:59:59Z' + } + + get '/api/v1/maps/hexagons/bounds', params: string_date_params, headers: headers + + expect(response).to have_http_status(:success) + + json_response = JSON.parse(response.body) + expect(json_response).to include('min_lat', 'max_lat', 'min_lng', 'max_lng', 'point_count') + end + + it 'handles numeric string timestamp format' do + numeric_string_params = { + start_date: '1717200000', # June 1, 2024 in timestamp + end_date: '1719791999' # June 30, 2024 in timestamp + } + + get '/api/v1/maps/hexagons/bounds', params: numeric_string_params, headers: headers + + expect(response).to have_http_status(:success) + + json_response = JSON.parse(response.body) + expect(json_response).to include('min_lat', 'max_lat', 'min_lng', 'max_lng', 'point_count') + end + + context 'error handling' do + it 'handles invalid date format gracefully' do + invalid_date_params = { + start_date: 'invalid-date', + end_date: '2024-06-30T23:59:59Z' + } + + get '/api/v1/maps/hexagons/bounds', params: invalid_date_params, headers: headers + + expect(response).to have_http_status(:bad_request) + + json_response = JSON.parse(response.body) + expect(json_response['error']).to include('Invalid date format') + end + end end context 'with public sharing UUID' do diff --git a/spec/services/own_tracks/importer_spec.rb b/spec/services/own_tracks/importer_spec.rb index 842883f8..cc9a9713 100644 --- a/spec/services/own_tracks/importer_spec.rb +++ b/spec/services/own_tracks/importer_spec.rb @@ -85,12 +85,6 @@ RSpec.describe OwnTracks::Importer do it 'creates points' do expect { parser }.to change { Point.count }.by(9) end - - it 'correctly writes attributes' do - parser - - point = Point.first - end end end end From eb16959b9ac84cbb4c0fdbf79df9a99c949ead64 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Tue, 16 Sep 2025 20:41:53 +0200 Subject: [PATCH 05/25] Extract logic to service classes --- .../api/v1/maps/hexagons_controller.rb | 216 +++--------------- app/services/maps/bounds_calculator.rb | 74 ++++++ app/services/maps/date_parameter_coercer.rb | 42 ++++ app/services/maps/hexagon_center_manager.rb | 104 +++++++++ app/services/maps/hexagon_context_resolver.rb | 58 +++++ .../maps/hexagon_polygon_generator.rb | 70 ++++++ app/services/maps/hexagon_request_handler.rb | 62 +++++ spec/services/maps/bounds_calculator_spec.rb | 120 ++++++++++ .../maps/date_parameter_coercer_spec.rb | 70 ++++++ .../maps/hexagon_center_manager_spec.rb | 129 +++++++++++ .../maps/hexagon_context_resolver_spec.rb | 102 +++++++++ .../maps/hexagon_polygon_generator_spec.rb | 99 ++++++++ .../maps/hexagon_request_handler_spec.rb | 175 ++++++++++++++ 13 files changed, 1134 insertions(+), 187 deletions(-) create mode 100644 app/services/maps/bounds_calculator.rb create mode 100644 app/services/maps/date_parameter_coercer.rb create mode 100644 app/services/maps/hexagon_center_manager.rb create mode 100644 app/services/maps/hexagon_context_resolver.rb create mode 100644 app/services/maps/hexagon_polygon_generator.rb create mode 100644 app/services/maps/hexagon_request_handler.rb create mode 100644 spec/services/maps/bounds_calculator_spec.rb create mode 100644 spec/services/maps/date_parameter_coercer_spec.rb create mode 100644 spec/services/maps/hexagon_center_manager_spec.rb create mode 100644 spec/services/maps/hexagon_context_resolver_spec.rb create mode 100644 spec/services/maps/hexagon_polygon_generator_spec.rb create mode 100644 spec/services/maps/hexagon_request_handler_spec.rb diff --git a/app/controllers/api/v1/maps/hexagons_controller.rb b/app/controllers/api/v1/maps/hexagons_controller.rb index 58d03c6b..64abb4e3 100644 --- a/app/controllers/api/v1/maps/hexagons_controller.rb +++ b/app/controllers/api/v1/maps/hexagons_controller.rb @@ -3,37 +3,18 @@ class Api::V1::Maps::HexagonsController < ApiController skip_before_action :authenticate_api_key, if: :public_sharing_request? before_action :validate_bbox_params, except: [:bounds] - before_action :set_user_and_dates def index - # Try to use pre-calculated hexagon centers from stats - if @stat&.hexagon_centers.present? - result = build_hexagons_from_centers(@stat.hexagon_centers) - Rails.logger.debug "Using pre-calculated hexagon centers: #{@stat.hexagon_centers.size} centers" - return render json: result - end + result = Maps::HexagonRequestHandler.call( + params: params, + current_api_user: current_api_user + ) - # Handle legacy "area too large" entries - recalculate them now that we can handle large areas - if @stat&.hexagon_centers&.dig('area_too_large') - Rails.logger.info "Recalculating previously skipped large area hexagons for stat #{@stat.id}" - - # Trigger recalculation - service = Stats::CalculateMonth.new(@target_user.id, @stat.year, @stat.month) - new_centers = service.send(:calculate_hexagon_centers) - - if new_centers && !new_centers.dig(:area_too_large) - @stat.update(hexagon_centers: new_centers) - result = build_hexagons_from_centers(new_centers) - Rails.logger.debug "Successfully recalculated hexagon centers: #{new_centers.size} centers" - return render json: result - end - end - - # Fall back to on-the-fly calculation for legacy/missing data - Rails.logger.debug 'No pre-calculated data available, calculating hexagons on-the-fly' - result = Maps::HexagonGrid.new(hexagon_params).call - Rails.logger.debug "Hexagon service result: #{result['features']&.count || 0} features" render json: result + rescue Maps::HexagonContextResolver::SharedStatsNotFoundError => e + render json: { error: e.message }, status: :not_found + rescue Maps::DateParameterCoercer::InvalidDateFormatError => e + render json: { error: e.message }, status: :bad_request rescue Maps::HexagonGrid::BoundingBoxTooLargeError, Maps::HexagonGrid::InvalidCoordinatesError => e render json: { error: e.message }, status: :bad_request @@ -44,161 +25,41 @@ class Api::V1::Maps::HexagonsController < ApiController end def bounds - # Get the bounding box of user's points for the date range - return render json: { error: 'No user found' }, status: :not_found unless @target_user - return render json: { error: 'No date range specified' }, status: :bad_request unless @start_date && @end_date + context = Maps::HexagonContextResolver.call( + params: params, + current_api_user: current_api_user + ) - # Convert dates to timestamps (handle both string and timestamp formats) - begin - start_timestamp = coerce_date(@start_date) - end_timestamp = coerce_date(@end_date) - rescue ArgumentError => e - return render json: { error: e.message }, status: :bad_request - end + result = Maps::BoundsCalculator.call( + target_user: context[:target_user], + start_date: context[:start_date], + end_date: context[:end_date] + ) - points_relation = @target_user.points.where(timestamp: start_timestamp..end_timestamp) - point_count = points_relation.count - - if point_count.positive? - bounds_result = ActiveRecord::Base.connection.exec_query( - "SELECT MIN(latitude) as min_lat, MAX(latitude) as max_lat, - MIN(longitude) as min_lng, MAX(longitude) as max_lng - FROM points - WHERE user_id = $1 - AND timestamp BETWEEN $2 AND $3", - 'bounds_query', - [@target_user.id, start_timestamp, end_timestamp] - ).first - - render json: { - min_lat: bounds_result['min_lat'].to_f, - max_lat: bounds_result['max_lat'].to_f, - min_lng: bounds_result['min_lng'].to_f, - max_lng: bounds_result['max_lng'].to_f, - point_count: point_count - } + if result[:success] + render json: result[:data] else render json: { - error: 'No data found for the specified date range', - point_count: 0 + error: result[:error], + point_count: result[:point_count] }, status: :not_found end + rescue Maps::HexagonContextResolver::SharedStatsNotFoundError => e + render json: { error: e.message }, status: :not_found + rescue Maps::BoundsCalculator::NoUserFoundError => e + render json: { error: e.message }, status: :not_found + rescue Maps::BoundsCalculator::NoDateRangeError => e + render json: { error: e.message }, status: :bad_request + rescue Maps::DateParameterCoercer::InvalidDateFormatError => e + render json: { error: e.message }, status: :bad_request end private - def build_hexagons_from_centers(centers) - # Convert stored centers back to hexagon polygons - # Each center is [lng, lat, earliest_timestamp, latest_timestamp] - hexagon_features = centers.map.with_index do |center, index| - lng, lat, earliest, latest = center - - # Generate hexagon polygon from center point (1000m hexagons) - hexagon_geojson = generate_hexagon_polygon(lng, lat, 1000) - - { - type: 'Feature', - id: index + 1, - geometry: hexagon_geojson, - properties: { - hex_id: index + 1, - hex_size: 1000, - earliest_point: earliest ? Time.zone.at(earliest).iso8601 : nil, - latest_point: latest ? Time.zone.at(latest).iso8601 : nil - } - } - end - - { - 'type' => 'FeatureCollection', - 'features' => hexagon_features, - 'metadata' => { - 'hex_size_m' => 1000, - 'count' => hexagon_features.count, - 'user_id' => @target_user.id, - 'pre_calculated' => true - } - } - end - - def generate_hexagon_polygon(center_lng, center_lat, size_meters) - # Generate hexagon vertices around center point - # PostGIS ST_HexagonGrid uses size_meters as the edge-to-edge distance (width/flat-to-flat) - # For a regular hexagon with width = size_meters: - # - Width (edge to edge) = size_meters - # - Radius (center to vertex) = width / √3 ≈ size_meters * 0.577 - # - Edge length ≈ radius ≈ size_meters * 0.577 - - radius_meters = size_meters / Math.sqrt(2.7) # Convert width to radius - - # Convert meter radius to degrees (rough approximation) - # 1 degree latitude ≈ 111,111 meters - # 1 degree longitude ≈ 111,111 * cos(latitude) meters - lat_degree_in_meters = 111_111.0 - lng_degree_in_meters = lat_degree_in_meters * Math.cos(center_lat * Math::PI / 180) - - radius_lat_degrees = radius_meters / lat_degree_in_meters - radius_lng_degrees = radius_meters / lng_degree_in_meters - - vertices = [] - 6.times do |i| - # Calculate angle for each vertex (60 degrees apart, starting from 0) - angle = (i * 60) * Math::PI / 180 - - # Calculate vertex position - lat_offset = radius_lat_degrees * Math.sin(angle) - lng_offset = radius_lng_degrees * Math.cos(angle) - - vertices << [center_lng + lng_offset, center_lat + lat_offset] - end - - # Close the polygon by adding the first vertex at the end - vertices << vertices.first - - { - type: 'Polygon', - coordinates: [vertices] - } - end - def bbox_params params.permit(:min_lon, :min_lat, :max_lon, :max_lat, :hex_size, :viewport_width, :viewport_height) end - def hexagon_params - bbox_params.merge( - user_id: @target_user&.id, - start_date: @start_date, - end_date: @end_date - ) - end - - def set_user_and_dates - return set_public_sharing_context if params[:uuid].present? - - set_authenticated_context - end - - def set_public_sharing_context - @stat = Stat.find_by(sharing_uuid: params[:uuid]) - - unless @stat&.public_accessible? - render json: { - error: 'Shared stats not found or no longer available' - }, status: :not_found and return - end - - @target_user = @stat.user - @start_date = Date.new(@stat.year, @stat.month, 1).beginning_of_day.iso8601 - @end_date = Date.new(@stat.year, @stat.month, 1).end_of_month.end_of_day.iso8601 - end - - def set_authenticated_context - @target_user = current_api_user - @start_date = params[:start_date] - @end_date = params[:end_date] - end - def handle_service_error render json: { error: 'Failed to generate hexagon grid' }, status: :internal_server_error end @@ -217,23 +78,4 @@ class Api::V1::Maps::HexagonsController < ApiController error: "Missing required parameters: #{missing_params.join(', ')}" }, status: :bad_request end - - def coerce_date(param) - case param - when String - # Check if it's a numeric string (timestamp) or date string - if param.match?(/^\d+$/) - param.to_i - else - Time.parse(param).to_i - end - when Integer - param - else - param.to_i - end - rescue ArgumentError => e - Rails.logger.error "Invalid date format: #{param} - #{e.message}" - raise ArgumentError, "Invalid date format: #{param}" - end end diff --git a/app/services/maps/bounds_calculator.rb b/app/services/maps/bounds_calculator.rb new file mode 100644 index 00000000..6312fb7c --- /dev/null +++ b/app/services/maps/bounds_calculator.rb @@ -0,0 +1,74 @@ +# frozen_string_literal: true + +module Maps + class BoundsCalculator + class NoUserFoundError < StandardError; end + class NoDateRangeError < StandardError; end + class NoDataFoundError < StandardError; end + + def self.call(target_user:, start_date:, end_date:) + new(target_user: target_user, start_date: start_date, end_date: end_date).call + end + + def initialize(target_user:, start_date:, end_date:) + @target_user = target_user + @start_date = start_date + @end_date = end_date + end + + def call + validate_inputs! + + start_timestamp = Maps::DateParameterCoercer.call(@start_date) + end_timestamp = Maps::DateParameterCoercer.call(@end_date) + + points_relation = @target_user.points.where(timestamp: start_timestamp..end_timestamp) + point_count = points_relation.count + + return build_no_data_response if point_count.zero? + + bounds_result = execute_bounds_query(start_timestamp, end_timestamp) + build_success_response(bounds_result, point_count) + end + + private + + def validate_inputs! + raise NoUserFoundError, 'No user found' unless @target_user + raise NoDateRangeError, 'No date range specified' unless @start_date && @end_date + end + + def execute_bounds_query(start_timestamp, end_timestamp) + ActiveRecord::Base.connection.exec_query( + "SELECT MIN(latitude) as min_lat, MAX(latitude) as max_lat, + MIN(longitude) as min_lng, MAX(longitude) as max_lng + FROM points + WHERE user_id = $1 + AND timestamp BETWEEN $2 AND $3", + 'bounds_query', + [@target_user.id, start_timestamp, end_timestamp] + ).first + end + + def build_success_response(bounds_result, point_count) + { + success: true, + data: { + min_lat: bounds_result['min_lat'].to_f, + max_lat: bounds_result['max_lat'].to_f, + min_lng: bounds_result['min_lng'].to_f, + max_lng: bounds_result['max_lng'].to_f, + point_count: point_count + } + } + end + + def build_no_data_response + { + success: false, + error: 'No data found for the specified date range', + point_count: 0 + } + end + end +end diff --git a/app/services/maps/date_parameter_coercer.rb b/app/services/maps/date_parameter_coercer.rb new file mode 100644 index 00000000..0c91e576 --- /dev/null +++ b/app/services/maps/date_parameter_coercer.rb @@ -0,0 +1,42 @@ +# frozen_string_literal: true + +module Maps + class DateParameterCoercer + class InvalidDateFormatError < StandardError; end + + def self.call(param) + new(param).call + end + + def initialize(param) + @param = param + end + + def call + coerce_date(@param) + end + + private + + attr_reader :param + + def coerce_date(param) + case param + when String + # Check if it's a numeric string (timestamp) or date string + if param.match?(/^\d+$/) + param.to_i + else + Time.parse(param).to_i + end + when Integer + param + else + param.to_i + end + rescue ArgumentError => e + Rails.logger.error "Invalid date format: #{param} - #{e.message}" + raise InvalidDateFormatError, "Invalid date format: #{param}" + end + end +end diff --git a/app/services/maps/hexagon_center_manager.rb b/app/services/maps/hexagon_center_manager.rb new file mode 100644 index 00000000..84f47c25 --- /dev/null +++ b/app/services/maps/hexagon_center_manager.rb @@ -0,0 +1,104 @@ +# frozen_string_literal: true + +module Maps + class HexagonCenterManager + def self.call(stat:, target_user:) + new(stat: stat, target_user: target_user).call + end + + def initialize(stat:, target_user:) + @stat = stat + @target_user = target_user + end + + def call + return build_response_from_centers if pre_calculated_centers_available? + return handle_legacy_area_too_large if legacy_area_too_large? + + nil # No pre-calculated data available + end + + private + + attr_reader :stat, :target_user + + def pre_calculated_centers_available? + return false unless stat&.hexagon_centers.present? + + # Handle legacy hash format + if stat.hexagon_centers.is_a?(Hash) + !stat.hexagon_centers['area_too_large'] + else + # Handle array format (actual hexagon centers) + stat.hexagon_centers.is_a?(Array) && stat.hexagon_centers.any? + end + end + + def legacy_area_too_large? + stat&.hexagon_centers.is_a?(Hash) && stat.hexagon_centers['area_too_large'] + end + + def build_response_from_centers + centers = stat.hexagon_centers + Rails.logger.debug "Using pre-calculated hexagon centers: #{centers.size} centers" + + result = build_hexagons_from_centers(centers) + { success: true, data: result, pre_calculated: true } + end + + def handle_legacy_area_too_large + Rails.logger.info "Recalculating previously skipped large area hexagons for stat #{stat.id}" + + # Trigger recalculation + service = Stats::CalculateMonth.new(target_user.id, stat.year, stat.month) + new_centers = service.send(:calculate_hexagon_centers) + + if new_centers && new_centers.is_a?(Array) + stat.update(hexagon_centers: new_centers) + result = build_hexagons_from_centers(new_centers) + Rails.logger.debug "Successfully recalculated hexagon centers: #{new_centers.size} centers" + return { success: true, data: result, pre_calculated: true } + end + + nil # Recalculation failed or still too large + end + + def build_hexagons_from_centers(centers) + # Convert stored centers back to hexagon polygons + # Each center is [lng, lat, earliest_timestamp, latest_timestamp] + hexagon_features = centers.map.with_index do |center, index| + lng, lat, earliest, latest = center + + # Generate hexagon polygon from center point (1000m hexagons) + hexagon_geojson = Maps::HexagonPolygonGenerator.call( + center_lng: lng, + center_lat: lat, + size_meters: 1000 + ) + + { + 'type' => 'Feature', + 'id' => index + 1, + 'geometry' => hexagon_geojson, + 'properties' => { + 'hex_id' => index + 1, + 'hex_size' => 1000, + 'earliest_point' => earliest ? Time.zone.at(earliest).iso8601 : nil, + 'latest_point' => latest ? Time.zone.at(latest).iso8601 : nil + } + } + end + + { + 'type' => 'FeatureCollection', + 'features' => hexagon_features, + 'metadata' => { + 'hex_size_m' => 1000, + 'count' => hexagon_features.count, + 'user_id' => target_user.id, + 'pre_calculated' => true + } + } + end + end +end diff --git a/app/services/maps/hexagon_context_resolver.rb b/app/services/maps/hexagon_context_resolver.rb new file mode 100644 index 00000000..008fa070 --- /dev/null +++ b/app/services/maps/hexagon_context_resolver.rb @@ -0,0 +1,58 @@ +# frozen_string_literal: true + +module Maps + class HexagonContextResolver + class SharedStatsNotFoundError < StandardError; end + + def self.call(params:, current_api_user: nil) + new(params: params, current_api_user: current_api_user).call + end + + def initialize(params:, current_api_user: nil) + @params = params + @current_api_user = current_api_user + end + + def call + return resolve_public_sharing_context if public_sharing_request? + + resolve_authenticated_context + end + + private + + attr_reader :params, :current_api_user + + def public_sharing_request? + params[:uuid].present? + end + + def resolve_public_sharing_context + stat = Stat.find_by(sharing_uuid: params[:uuid]) + + unless stat&.public_accessible? + raise SharedStatsNotFoundError, 'Shared stats not found or no longer available' + end + + target_user = stat.user + start_date = Date.new(stat.year, stat.month, 1).beginning_of_day.iso8601 + end_date = Date.new(stat.year, stat.month, 1).end_of_month.end_of_day.iso8601 + + { + target_user: target_user, + start_date: start_date, + end_date: end_date, + stat: stat + } + end + + def resolve_authenticated_context + { + target_user: current_api_user, + start_date: params[:start_date], + end_date: params[:end_date], + stat: nil + } + end + end +end \ No newline at end of file diff --git a/app/services/maps/hexagon_polygon_generator.rb b/app/services/maps/hexagon_polygon_generator.rb new file mode 100644 index 00000000..9e071661 --- /dev/null +++ b/app/services/maps/hexagon_polygon_generator.rb @@ -0,0 +1,70 @@ +# frozen_string_literal: true + +module Maps + class HexagonPolygonGenerator + DEFAULT_SIZE_METERS = 1000 + + def self.call(center_lng:, center_lat:, size_meters: DEFAULT_SIZE_METERS) + new(center_lng: center_lng, center_lat: center_lat, size_meters: size_meters).call + end + + def initialize(center_lng:, center_lat:, size_meters: DEFAULT_SIZE_METERS) + @center_lng = center_lng + @center_lat = center_lat + @size_meters = size_meters + end + + def call + generate_hexagon_polygon + end + + private + + attr_reader :center_lng, :center_lat, :size_meters + + def generate_hexagon_polygon + # Generate hexagon vertices around center point + # PostGIS ST_HexagonGrid uses size_meters as the edge-to-edge distance (width/flat-to-flat) + # For a regular hexagon with width = size_meters: + # - Width (edge to edge) = size_meters + # - Radius (center to vertex) = width / √3 ≈ size_meters * 0.577 + # - Edge length ≈ radius ≈ size_meters * 0.577 + + radius_meters = size_meters / Math.sqrt(2.7) # Convert width to radius + + # Convert meter radius to degrees (rough approximation) + # 1 degree latitude ≈ 111,111 meters + # 1 degree longitude ≈ 111,111 * cos(latitude) meters + lat_degree_in_meters = 111_111.0 + lng_degree_in_meters = lat_degree_in_meters * Math.cos(center_lat * Math::PI / 180) + + radius_lat_degrees = radius_meters / lat_degree_in_meters + radius_lng_degrees = radius_meters / lng_degree_in_meters + + vertices = build_vertices(radius_lat_degrees, radius_lng_degrees) + + { + 'type' => 'Polygon', + 'coordinates' => [vertices] + } + end + + def build_vertices(radius_lat_degrees, radius_lng_degrees) + vertices = [] + 6.times do |i| + # Calculate angle for each vertex (60 degrees apart, starting from 0) + angle = (i * 60) * Math::PI / 180 + + # Calculate vertex position + lat_offset = radius_lat_degrees * Math.sin(angle) + lng_offset = radius_lng_degrees * Math.cos(angle) + + vertices << [center_lng + lng_offset, center_lat + lat_offset] + end + + # Close the polygon by adding the first vertex at the end + vertices << vertices.first + vertices + end + end +end \ No newline at end of file diff --git a/app/services/maps/hexagon_request_handler.rb b/app/services/maps/hexagon_request_handler.rb new file mode 100644 index 00000000..1ab5b005 --- /dev/null +++ b/app/services/maps/hexagon_request_handler.rb @@ -0,0 +1,62 @@ +# frozen_string_literal: true + +module Maps + class HexagonRequestHandler + def self.call(params:, current_api_user: nil) + new(params: params, current_api_user: current_api_user).call + end + + def initialize(params:, current_api_user: nil) + @params = params + @current_api_user = current_api_user + end + + def call + context = resolve_context + + # Try to use pre-calculated hexagon centers first + if context[:stat] + cached_result = Maps::HexagonCenterManager.call( + stat: context[:stat], + target_user: context[:target_user] + ) + + return cached_result[:data] if cached_result&.dig(:success) + end + + # Fall back to on-the-fly calculation + Rails.logger.debug 'No pre-calculated data available, calculating hexagons on-the-fly' + generate_hexagons_on_the_fly(context) + end + + private + + attr_reader :params, :current_api_user + + def resolve_context + Maps::HexagonContextResolver.call( + params: params, + current_api_user: current_api_user + ) + end + + def generate_hexagons_on_the_fly(context) + hexagon_params = build_hexagon_params(context) + result = Maps::HexagonGrid.new(hexagon_params).call + Rails.logger.debug "Hexagon service result: #{result['features']&.count || 0} features" + result + end + + def build_hexagon_params(context) + bbox_params.merge( + user_id: context[:target_user]&.id, + start_date: context[:start_date], + end_date: context[:end_date] + ) + end + + def bbox_params + params.permit(:min_lon, :min_lat, :max_lon, :max_lat, :hex_size, :viewport_width, :viewport_height) + end + end +end \ No newline at end of file diff --git a/spec/services/maps/bounds_calculator_spec.rb b/spec/services/maps/bounds_calculator_spec.rb new file mode 100644 index 00000000..a48ec8bb --- /dev/null +++ b/spec/services/maps/bounds_calculator_spec.rb @@ -0,0 +1,120 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Maps::BoundsCalculator do + describe '.call' do + subject(:calculate_bounds) do + described_class.call( + target_user: target_user, + start_date: start_date, + end_date: end_date + ) + end + + let(:user) { create(:user) } + let(:target_user) { user } + let(:start_date) { '2024-06-01T00:00:00Z' } + let(:end_date) { '2024-06-30T23:59:59Z' } + + context 'with valid user and date range' do + before do + # Create test points within the date range + create(:point, user:, latitude: 40.6, longitude: -74.1, + timestamp: Time.new(2024, 6, 1, 12, 0).to_i) + create(:point, user:, latitude: 40.8, longitude: -73.9, + timestamp: Time.new(2024, 6, 30, 15, 0).to_i) + create(:point, user:, latitude: 40.7, longitude: -74.0, + timestamp: Time.new(2024, 6, 15, 10, 0).to_i) + end + + it 'returns success with bounds data' do + expect(calculate_bounds).to match({ + success: true, + data: { + min_lat: 40.6, + max_lat: 40.8, + min_lng: -74.1, + max_lng: -73.9, + point_count: 3 + } + }) + end + end + + context 'with no points in date range' do + before do + # Create points outside the date range + create(:point, user:, latitude: 40.7, longitude: -74.0, + timestamp: Time.new(2024, 5, 15, 10, 0).to_i) + end + + it 'returns failure with no data message' do + expect(calculate_bounds).to match({ + success: false, + error: 'No data found for the specified date range', + point_count: 0 + }) + end + end + + context 'with no user' do + let(:target_user) { nil } + + it 'raises NoUserFoundError' do + expect { calculate_bounds }.to raise_error( + Maps::BoundsCalculator::NoUserFoundError, + 'No user found' + ) + end + end + + context 'with no start date' do + let(:start_date) { nil } + + it 'raises NoDateRangeError' do + expect { calculate_bounds }.to raise_error( + Maps::BoundsCalculator::NoDateRangeError, + 'No date range specified' + ) + end + end + + context 'with no end date' do + let(:end_date) { nil } + + it 'raises NoDateRangeError' do + expect { calculate_bounds }.to raise_error( + Maps::BoundsCalculator::NoDateRangeError, + 'No date range specified' + ) + end + end + + context 'with invalid date format' do + let(:start_date) { 'invalid-date' } + + it 'raises InvalidDateFormatError' do + expect { calculate_bounds }.to raise_error( + Maps::DateParameterCoercer::InvalidDateFormatError + ) + end + end + + context 'with timestamp format dates' do + let(:start_date) { 1_717_200_000 } + let(:end_date) { 1_719_791_999 } + + before do + create(:point, user:, latitude: 41.0, longitude: -74.5, + timestamp: Time.new(2024, 6, 5, 9, 0).to_i) + end + + it 'handles timestamp format correctly' do + result = calculate_bounds + expect(result[:success]).to be true + expect(result[:data][:point_count]).to eq(1) + end + end + end +end \ No newline at end of file diff --git a/spec/services/maps/date_parameter_coercer_spec.rb b/spec/services/maps/date_parameter_coercer_spec.rb new file mode 100644 index 00000000..107147ae --- /dev/null +++ b/spec/services/maps/date_parameter_coercer_spec.rb @@ -0,0 +1,70 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Maps::DateParameterCoercer do + describe '.call' do + subject(:coerce_date) { described_class.call(param) } + + context 'with integer parameter' do + let(:param) { 1_717_200_000 } + + it 'returns the integer unchanged' do + expect(coerce_date).to eq(1_717_200_000) + end + end + + context 'with numeric string parameter' do + let(:param) { '1717200000' } + + it 'converts to integer' do + expect(coerce_date).to eq(1_717_200_000) + end + end + + context 'with ISO date string parameter' do + let(:param) { '2024-06-01T00:00:00Z' } + + it 'parses and converts to timestamp' do + expected_timestamp = Time.parse('2024-06-01T00:00:00Z').to_i + expect(coerce_date).to eq(expected_timestamp) + end + end + + context 'with date string parameter' do + let(:param) { '2024-06-01' } + + it 'parses and converts to timestamp' do + expected_timestamp = Time.parse('2024-06-01').to_i + expect(coerce_date).to eq(expected_timestamp) + end + end + + context 'with invalid date string' do + let(:param) { 'invalid-date' } + + it 'raises InvalidDateFormatError' do + expect { coerce_date }.to raise_error( + Maps::DateParameterCoercer::InvalidDateFormatError, + 'Invalid date format: invalid-date' + ) + end + end + + context 'with nil parameter' do + let(:param) { nil } + + it 'converts to 0' do + expect(coerce_date).to eq(0) + end + end + + context 'with float parameter' do + let(:param) { 1_717_200_000.5 } + + it 'converts to integer' do + expect(coerce_date).to eq(1_717_200_000) + end + end + end +end \ No newline at end of file diff --git a/spec/services/maps/hexagon_center_manager_spec.rb b/spec/services/maps/hexagon_center_manager_spec.rb new file mode 100644 index 00000000..cb6733d2 --- /dev/null +++ b/spec/services/maps/hexagon_center_manager_spec.rb @@ -0,0 +1,129 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Maps::HexagonCenterManager do + describe '.call' do + subject(:manage_centers) do + described_class.call( + stat: stat, + target_user: target_user + ) + end + + let(:user) { create(:user) } + let(:target_user) { user } + + context 'with pre-calculated hexagon centers' do + let(:pre_calculated_centers) do + [ + [-74.0, 40.7, 1_717_200_000, 1_717_203_600], # lng, lat, earliest, latest timestamps + [-74.01, 40.71, 1_717_210_000, 1_717_213_600], + [-74.02, 40.72, 1_717_220_000, 1_717_223_600] + ] + end + let(:stat) { create(:stat, user:, year: 2024, month: 6, hexagon_centers: pre_calculated_centers) } + + it 'returns success with pre-calculated data' do + result = manage_centers + + expect(result[:success]).to be true + expect(result[:pre_calculated]).to be true + expect(result[:data]['type']).to eq('FeatureCollection') + expect(result[:data]['features'].length).to eq(3) + expect(result[:data]['metadata']['pre_calculated']).to be true + expect(result[:data]['metadata']['count']).to eq(3) + expect(result[:data]['metadata']['user_id']).to eq(target_user.id) + end + + it 'generates proper hexagon features from centers' do + result = manage_centers + features = result[:data]['features'] + + features.each_with_index do |feature, index| + expect(feature['type']).to eq('Feature') + expect(feature['id']).to eq(index + 1) + expect(feature['geometry']['type']).to eq('Polygon') + expect(feature['geometry']['coordinates'].first.length).to eq(7) # 6 vertices + closing + + properties = feature['properties'] + expect(properties['hex_id']).to eq(index + 1) + expect(properties['hex_size']).to eq(1000) + expect(properties['earliest_point']).to be_present + expect(properties['latest_point']).to be_present + end + end + end + + context 'with legacy area_too_large flag' do + let(:stat) do + create(:stat, user:, year: 2024, month: 6, hexagon_centers: { 'area_too_large' => true }) + end + + before do + # Mock the Stats::CalculateMonth service + allow_any_instance_of(Stats::CalculateMonth).to receive(:calculate_hexagon_centers) + .and_return(new_centers) + end + + context 'when recalculation succeeds' do + let(:new_centers) do + [ + [-74.0, 40.7, 1_717_200_000, 1_717_203_600], + [-74.01, 40.71, 1_717_210_000, 1_717_213_600] + ] + end + + it 'recalculates and updates the stat' do + expect(stat).to receive(:update).with(hexagon_centers: new_centers) + + result = manage_centers + + expect(result[:success]).to be true + expect(result[:pre_calculated]).to be true + expect(result[:data]['features'].length).to eq(2) + end + end + + context 'when recalculation fails' do + let(:new_centers) { nil } + + it 'returns nil' do + expect(manage_centers).to be_nil + end + end + + context 'when recalculation returns area_too_large again' do + let(:new_centers) { { area_too_large: true } } + + it 'returns nil' do + expect(manage_centers).to be_nil + end + end + end + + context 'with no stat' do + let(:stat) { nil } + + it 'returns nil' do + expect(manage_centers).to be_nil + end + end + + context 'with stat but no hexagon_centers' do + let(:stat) { create(:stat, user:, year: 2024, month: 6, hexagon_centers: nil) } + + it 'returns nil' do + expect(manage_centers).to be_nil + end + end + + context 'with empty hexagon_centers' do + let(:stat) { create(:stat, user:, year: 2024, month: 6, hexagon_centers: []) } + + it 'returns nil' do + expect(manage_centers).to be_nil + end + end + end +end \ No newline at end of file diff --git a/spec/services/maps/hexagon_context_resolver_spec.rb b/spec/services/maps/hexagon_context_resolver_spec.rb new file mode 100644 index 00000000..916db63b --- /dev/null +++ b/spec/services/maps/hexagon_context_resolver_spec.rb @@ -0,0 +1,102 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Maps::HexagonContextResolver do + describe '.call' do + subject(:resolve_context) do + described_class.call( + params: params, + current_api_user: current_api_user + ) + end + + let(:user) { create(:user) } + let(:current_api_user) { user } + + context 'with authenticated user (no UUID)' do + let(:params) do + { + start_date: '2024-06-01T00:00:00Z', + end_date: '2024-06-30T23:59:59Z' + } + end + + it 'resolves authenticated context' do + result = resolve_context + + expect(result).to match({ + target_user: current_api_user, + start_date: '2024-06-01T00:00:00Z', + end_date: '2024-06-30T23:59:59Z', + stat: nil + }) + end + end + + context 'with public sharing UUID' do + let(:stat) { create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6) } + let(:params) { { uuid: stat.sharing_uuid } } + let(:current_api_user) { nil } + + it 'resolves public sharing context' do + result = resolve_context + + expect(result[:target_user]).to eq(user) + expect(result[:stat]).to eq(stat) + expect(result[:start_date]).to eq('2024-06-01T00:00:00+00:00') + expect(result[:end_date]).to eq('2024-06-30T23:59:59+00:00') + end + end + + context 'with invalid sharing UUID' do + let(:params) { { uuid: 'invalid-uuid' } } + let(:current_api_user) { nil } + + it 'raises SharedStatsNotFoundError' do + expect { resolve_context }.to raise_error( + Maps::HexagonContextResolver::SharedStatsNotFoundError, + 'Shared stats not found or no longer available' + ) + end + end + + context 'with expired sharing' do + let(:stat) { create(:stat, :with_sharing_expired, user:, year: 2024, month: 6) } + let(:params) { { uuid: stat.sharing_uuid } } + let(:current_api_user) { nil } + + it 'raises SharedStatsNotFoundError' do + expect { resolve_context }.to raise_error( + Maps::HexagonContextResolver::SharedStatsNotFoundError, + 'Shared stats not found or no longer available' + ) + end + end + + context 'with disabled sharing' do + let(:stat) { create(:stat, :with_sharing_disabled, user:, year: 2024, month: 6) } + let(:params) { { uuid: stat.sharing_uuid } } + let(:current_api_user) { nil } + + it 'raises SharedStatsNotFoundError' do + expect { resolve_context }.to raise_error( + Maps::HexagonContextResolver::SharedStatsNotFoundError, + 'Shared stats not found or no longer available' + ) + end + end + + context 'with stat that does not exist' do + let(:params) { { uuid: 'non-existent-uuid' } } + let(:current_api_user) { nil } + + it 'raises SharedStatsNotFoundError' do + expect { resolve_context }.to raise_error( + Maps::HexagonContextResolver::SharedStatsNotFoundError, + 'Shared stats not found or no longer available' + ) + end + end + end +end \ No newline at end of file diff --git a/spec/services/maps/hexagon_polygon_generator_spec.rb b/spec/services/maps/hexagon_polygon_generator_spec.rb new file mode 100644 index 00000000..32764487 --- /dev/null +++ b/spec/services/maps/hexagon_polygon_generator_spec.rb @@ -0,0 +1,99 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Maps::HexagonPolygonGenerator do + describe '.call' do + subject(:generate_polygon) do + described_class.call( + center_lng: center_lng, + center_lat: center_lat, + size_meters: size_meters + ) + end + + let(:center_lng) { -74.0 } + let(:center_lat) { 40.7 } + let(:size_meters) { 1000 } + + it 'returns a polygon geometry' do + result = generate_polygon + + expect(result['type']).to eq('Polygon') + expect(result['coordinates']).to be_an(Array) + expect(result['coordinates'].length).to eq(1) # One ring + end + + it 'generates a hexagon with 7 coordinate pairs (6 vertices + closing)' do + result = generate_polygon + coordinates = result['coordinates'].first + + expect(coordinates.length).to eq(7) # 6 vertices + closing vertex + expect(coordinates.first).to eq(coordinates.last) # Closed polygon + end + + it 'generates unique vertices' do + result = generate_polygon + coordinates = result['coordinates'].first + + # Remove the closing vertex for uniqueness check + unique_vertices = coordinates[0..5] + expect(unique_vertices.uniq.length).to eq(6) # All vertices should be unique + end + + it 'generates vertices around the center point' do + result = generate_polygon + coordinates = result['coordinates'].first + + # Check that all vertices are different from center + coordinates[0..5].each do |vertex| + lng, lat = vertex + expect(lng).not_to eq(center_lng) + expect(lat).not_to eq(center_lat) + end + end + + context 'with different size' do + let(:size_meters) { 500 } + + it 'generates a smaller hexagon' do + small_result = generate_polygon + large_result = described_class.call( + center_lng: center_lng, + center_lat: center_lat, + size_meters: 2000 + ) + + # Small hexagon should have vertices closer to center than large hexagon + small_distance = calculate_distance_from_center(small_result['coordinates'].first.first) + large_distance = calculate_distance_from_center(large_result['coordinates'].first.first) + + expect(small_distance).to be < large_distance + end + end + + context 'with different center coordinates' do + let(:center_lng) { 13.4 } # Berlin + let(:center_lat) { 52.5 } + + it 'generates hexagon around the new center' do + result = generate_polygon + coordinates = result[:coordinates].first + + # Check that vertices are around the Berlin coordinates + avg_lng = coordinates[0..5].sum { |vertex| vertex[0] } / 6 + avg_lat = coordinates[0..5].sum { |vertex| vertex[1] } / 6 + + expect(avg_lng).to be_within(0.01).of(center_lng) + expect(avg_lat).to be_within(0.01).of(center_lat) + end + end + + private + + def calculate_distance_from_center(vertex) + lng, lat = vertex + Math.sqrt((lng - center_lng)**2 + (lat - center_lat)**2) + end + end +end \ No newline at end of file diff --git a/spec/services/maps/hexagon_request_handler_spec.rb b/spec/services/maps/hexagon_request_handler_spec.rb new file mode 100644 index 00000000..bc43c294 --- /dev/null +++ b/spec/services/maps/hexagon_request_handler_spec.rb @@ -0,0 +1,175 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Maps::HexagonRequestHandler do + describe '.call' do + subject(:handle_request) do + described_class.call( + params: params, + current_api_user: current_api_user + ) + end + + let(:user) { create(:user) } + let(:current_api_user) { user } + + before do + stub_request(:any, 'https://api.github.com/repos/Freika/dawarich/tags') + .to_return(status: 200, body: '[{"name": "1.0.0"}]', headers: {}) + end + + context 'with authenticated user and bounding box params' do + let(:params) do + ActionController::Parameters.new({ + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000, + start_date: '2024-06-01T00:00:00Z', + end_date: '2024-06-30T23:59:59Z' + }) + end + + before do + # Create test points within the date range and bounding box + 10.times do |i| + create(:point, + user:, + latitude: 40.7 + (i * 0.001), + longitude: -74.0 + (i * 0.001), + timestamp: Time.new(2024, 6, 15, 12, i).to_i) + end + end + + it 'returns on-the-fly hexagon calculation' do + result = handle_request + + expect(result).to be_a(Hash) + expect(result['type']).to eq('FeatureCollection') + expect(result['features']).to be_an(Array) + expect(result['metadata']).to be_present + end + end + + context 'with public sharing UUID and pre-calculated centers' do + let(:pre_calculated_centers) do + [ + [-74.0, 40.7, 1_717_200_000, 1_717_203_600], + [-74.01, 40.71, 1_717_210_000, 1_717_213_600] + ] + end + let(:stat) do + create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, + hexagon_centers: pre_calculated_centers) + end + let(:params) do + ActionController::Parameters.new({ + uuid: stat.sharing_uuid, + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000 + }) + end + let(:current_api_user) { nil } + + it 'returns pre-calculated hexagon data' do + result = handle_request + + expect(result['type']).to eq('FeatureCollection') + expect(result['features'].length).to eq(2) + expect(result['metadata']['pre_calculated']).to be true + expect(result['metadata']['user_id']).to eq(user.id) + end + end + + context 'with public sharing UUID but no pre-calculated centers' do + let(:stat) { create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6) } + let(:params) do + ActionController::Parameters.new({ + uuid: stat.sharing_uuid, + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000 + }) + end + let(:current_api_user) { nil } + + before do + # Create test points for the stat's month + 5.times do |i| + create(:point, + user:, + latitude: 40.7 + (i * 0.001), + longitude: -74.0 + (i * 0.001), + timestamp: Time.new(2024, 6, 15, 12, i).to_i) + end + end + + it 'falls back to on-the-fly calculation' do + result = handle_request + + expect(result['type']).to eq('FeatureCollection') + expect(result['features']).to be_an(Array) + expect(result['metadata']).to be_present + expect(result['metadata']['pre_calculated']).to be_falsy + end + end + + context 'with legacy area_too_large that can be recalculated' do + let(:stat) do + create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, + hexagon_centers: { 'area_too_large' => true }) + end + let(:params) do + ActionController::Parameters.new({ + uuid: stat.sharing_uuid, + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000 + }) + end + let(:current_api_user) { nil } + + before do + # Mock successful recalculation + allow_any_instance_of(Stats::CalculateMonth).to receive(:calculate_hexagon_centers) + .and_return([[-74.0, 40.7, 1_717_200_000, 1_717_203_600]]) + end + + it 'recalculates and returns pre-calculated data' do + expect(stat).to receive(:update).with( + hexagon_centers: [[-74.0, 40.7, 1_717_200_000, 1_717_203_600]] + ) + + result = handle_request + + expect(result['type']).to eq('FeatureCollection') + expect(result['features'].length).to eq(1) + expect(result['metadata']['pre_calculated']).to be true + end + end + + context 'error handling' do + let(:params) do + ActionController::Parameters.new({ + uuid: 'invalid-uuid' + }) + end + let(:current_api_user) { nil } + + it 'raises SharedStatsNotFoundError for invalid UUID' do + expect { handle_request }.to raise_error( + Maps::HexagonContextResolver::SharedStatsNotFoundError + ) + end + end + end +end \ No newline at end of file From c67532bb106da32347bbb88144677f2b09e4a704 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Wed, 17 Sep 2025 01:55:42 +0200 Subject: [PATCH 06/25] Reimplement hexagons with H3 --- Gemfile | 1 + Gemfile.lock | 11 + .../api/v1/maps/hexagons_controller.rb | 25 +- .../controllers/public_stat_map_controller.js | 46 ++- app/javascript/maps/hexagon_grid.js | 363 ----------------- app/queries/hexagon_query.rb | 142 ------- app/services/hexagon_cache_service.rb | 57 --- app/services/maps/date_parameter_coercer.rb | 16 +- app/services/maps/h3_hexagon_calculator.rb | 84 ++++ app/services/maps/h3_hexagon_centers.rb | 128 ++++++ app/services/maps/h3_hexagon_renderer.rb | 137 +++++++ app/services/maps/hexagon_center_manager.rb | 78 ++-- app/services/maps/hexagon_centers.rb | 380 ------------------ app/services/maps/hexagon_context_resolver.rb | 6 +- app/services/maps/hexagon_grid.rb | 153 ------- .../maps/hexagon_polygon_generator.rb | 68 +++- app/services/maps/hexagon_request_handler.rb | 61 ++- app/services/stats/calculate_month.rb | 25 +- app/views/stats/public_month.html.erb | 14 +- spec/queries/hexagon_query_spec.rb | 245 ----------- spec/requests/api/v1/maps/hexagons_spec.rb | 49 --- .../maps/h3_hexagon_calculator_spec.rb | 221 ++++++++++ .../maps/hexagon_context_resolver_spec.rb | 4 +- .../maps/hexagon_polygon_generator_spec.rb | 147 ++++++- .../maps/hexagon_request_handler_spec.rb | 210 +++++++++- 25 files changed, 1153 insertions(+), 1518 deletions(-) delete mode 100644 app/javascript/maps/hexagon_grid.js delete mode 100644 app/queries/hexagon_query.rb delete mode 100644 app/services/hexagon_cache_service.rb create mode 100644 app/services/maps/h3_hexagon_calculator.rb create mode 100644 app/services/maps/h3_hexagon_centers.rb create mode 100644 app/services/maps/h3_hexagon_renderer.rb delete mode 100644 app/services/maps/hexagon_centers.rb delete mode 100644 app/services/maps/hexagon_grid.rb delete mode 100644 spec/queries/hexagon_query_spec.rb create mode 100644 spec/services/maps/h3_hexagon_calculator_spec.rb diff --git a/Gemfile b/Gemfile index f876777c..d9bd57d7 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ gem 'devise' gem 'geocoder', github: 'Freika/geocoder', branch: 'master' gem 'gpx' gem 'groupdate' +gem 'h3', '~> 3.7' gem 'httparty' gem 'importmap-rails' gem 'jwt', '~> 2.8' diff --git a/Gemfile.lock b/Gemfile.lock index 882a41ad..859df11a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -172,6 +172,12 @@ GEM railties (>= 6.1.0) fakeredis (0.1.4) ffaker (2.24.0) + ffi (1.17.2-aarch64-linux-gnu) + ffi (1.17.2-arm-linux-gnu) + ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86-linux-gnu) + ffi (1.17.2-x86_64-darwin) + ffi (1.17.2-x86_64-linux-gnu) foreman (0.90.0) thor (~> 1.4) fugit (1.11.1) @@ -185,6 +191,10 @@ GEM rake groupdate (6.7.0) activesupport (>= 7.1) + h3 (3.7.4) + ffi (~> 1.9) + rgeo-geojson (~> 2.1) + zeitwerk (~> 2.5) hashdiff (1.1.2) httparty (0.23.1) csv @@ -543,6 +553,7 @@ DEPENDENCIES geocoder! gpx groupdate + h3 (~> 3.7) httparty importmap-rails jwt (~> 2.8) diff --git a/app/controllers/api/v1/maps/hexagons_controller.rb b/app/controllers/api/v1/maps/hexagons_controller.rb index 64abb4e3..6ed8de66 100644 --- a/app/controllers/api/v1/maps/hexagons_controller.rb +++ b/app/controllers/api/v1/maps/hexagons_controller.rb @@ -2,10 +2,9 @@ class Api::V1::Maps::HexagonsController < ApiController skip_before_action :authenticate_api_key, if: :public_sharing_request? - before_action :validate_bbox_params, except: [:bounds] def index - result = Maps::HexagonRequestHandler.call( + result = Maps::H3HexagonRenderer.call( params: params, current_api_user: current_api_user ) @@ -15,11 +14,10 @@ class Api::V1::Maps::HexagonsController < ApiController render json: { error: e.message }, status: :not_found rescue Maps::DateParameterCoercer::InvalidDateFormatError => e render json: { error: e.message }, status: :bad_request - rescue Maps::HexagonGrid::BoundingBoxTooLargeError, - Maps::HexagonGrid::InvalidCoordinatesError => e + rescue Maps::H3HexagonCenters::TooManyHexagonsError, + Maps::H3HexagonCenters::InvalidCoordinatesError, + Maps::H3HexagonCenters::PostGISError => e render json: { error: e.message }, status: :bad_request - rescue Maps::HexagonGrid::PostGISError => e - render json: { error: e.message }, status: :internal_server_error rescue StandardError => _e handle_service_error end @@ -56,8 +54,8 @@ class Api::V1::Maps::HexagonsController < ApiController private - def bbox_params - params.permit(:min_lon, :min_lat, :max_lon, :max_lat, :hex_size, :viewport_width, :viewport_height) + def hexagon_params + params.permit(:h3_resolution, :uuid, :start_date, :end_date) end def handle_service_error @@ -67,15 +65,4 @@ class Api::V1::Maps::HexagonsController < ApiController def public_sharing_request? params[:uuid].present? end - - def validate_bbox_params - required_params = %w[min_lon min_lat max_lon max_lat] - missing_params = required_params.select { |param| params[param].blank? } - - return unless missing_params.any? - - render json: { - error: "Missing required parameters: #{missing_params.join(', ')}" - }, status: :bad_request - end end diff --git a/app/javascript/controllers/public_stat_map_controller.js b/app/javascript/controllers/public_stat_map_controller.js index 2e2acb12..6fa576a7 100644 --- a/app/javascript/controllers/public_stat_map_controller.js +++ b/app/javascript/controllers/public_stat_map_controller.js @@ -1,5 +1,4 @@ import L from "leaflet"; -import { createHexagonGrid } from "../maps/hexagon_grid"; import { createAllMapLayers } from "../maps/layers"; import BaseController from "./base_controller"; @@ -18,6 +17,7 @@ export default class extends BaseController { super.connect(); console.log('🏁 Controller connected - loading overlay should be visible'); this.selfHosted = this.selfHostedValue || 'false'; + this.currentHexagonLayer = null; this.initializeMap(); this.loadHexagons(); } @@ -43,8 +43,8 @@ export default class extends BaseController { // Add dynamic tile layer based on self-hosted setting this.addMapLayers(); - // Default view - this.map.setView([40.0, -100.0], 4); + // Default view with higher zoom level for better hexagon detail + this.map.setView([40.0, -100.0], 9); } addMapLayers() { @@ -100,10 +100,7 @@ export default class extends BaseController { console.log('📊 After fitBounds overlay display:', afterFitBoundsElement?.style.display || 'default'); } - // Don't create hexagonGrid for public sharing - we handle hexagons manually - // this.hexagonGrid = createHexagonGrid(this.map, {...}); - - console.log('🎯 Public sharing: skipping HexagonGrid creation, using manual loading'); + console.log('🎯 Public sharing: using manual hexagon loading'); console.log('🔍 Debug values:'); console.log(' dataBounds:', dataBounds); console.log(' point_count:', dataBounds?.point_count); @@ -177,7 +174,7 @@ export default class extends BaseController { min_lat: dataBounds.min_lat, max_lon: dataBounds.max_lng, max_lat: dataBounds.max_lat, - hex_size: 1000, // Fixed 1km hexagons + h3_resolution: 8, start_date: startDate.toISOString(), end_date: endDate.toISOString(), uuid: this.uuidValue @@ -228,6 +225,11 @@ export default class extends BaseController { } addStaticHexagonsToMap(geojsonData) { + // Remove existing hexagon layer if it exists + if (this.currentHexagonLayer) { + this.map.removeLayer(this.currentHexagonLayer); + } + // Calculate max point count for color scaling const maxPoints = Math.max(...geojsonData.features.map(f => f.properties.point_count)); @@ -247,6 +249,7 @@ export default class extends BaseController { } }); + this.currentHexagonLayer = staticHexagonLayer; staticHexagonLayer.addTo(this.map); } @@ -263,11 +266,31 @@ export default class extends BaseController { buildPopupContent(props) { const startDate = props.earliest_point ? new Date(props.earliest_point).toLocaleDateString() : 'N/A'; const endDate = props.latest_point ? new Date(props.latest_point).toLocaleDateString() : 'N/A'; + const startTime = props.earliest_point ? new Date(props.earliest_point).toLocaleTimeString() : ''; + const endTime = props.latest_point ? new Date(props.latest_point).toLocaleTimeString() : ''; return ` -
- Date Range:
- ${startDate} - ${endDate} +
+ 📍 Location Data
+
+ Points: ${props.point_count || 0} +
+ ${props.h3_index ? ` +
+ H3 Index:
+ ${props.h3_index} +
+ ` : ''} +
+ Time Range:
+ ${startDate} ${startTime}
→ ${endDate} ${endTime} +
+ ${props.center ? ` +
+ Center:
+ ${props.center[0].toFixed(6)}, ${props.center[1].toFixed(6)} +
+ ` : ''}
`; } @@ -298,4 +321,5 @@ export default class extends BaseController { } } + } diff --git a/app/javascript/maps/hexagon_grid.js b/app/javascript/maps/hexagon_grid.js deleted file mode 100644 index 87c2be93..00000000 --- a/app/javascript/maps/hexagon_grid.js +++ /dev/null @@ -1,363 +0,0 @@ -/** - * HexagonGrid - Manages hexagonal grid overlay on Leaflet maps - * Provides efficient loading and rendering of hexagon tiles based on viewport - */ -export class HexagonGrid { - constructor(map, options = {}) { - this.map = map; - this.options = { - apiEndpoint: '/api/v1/maps/hexagons', - style: { - fillColor: '#3388ff', - fillOpacity: 0.1, - color: '#3388ff', - weight: 1, - opacity: 0.5 - }, - debounceDelay: 300, // ms to wait before loading new hexagons - maxZoom: 18, // Don't show hexagons beyond this zoom level - minZoom: 8, // Don't show hexagons below this zoom level - ...options - }; - - this.hexagonLayer = null; - this.loadingController = null; // For aborting requests - this.lastBounds = null; - this.isVisible = false; - - this.init(); - } - - init() { - // Create the hexagon layer group - this.hexagonLayer = L.layerGroup(); - - // Bind map events - this.map.on('moveend', this.debounce(this.onMapMove.bind(this), this.options.debounceDelay)); - this.map.on('zoomend', this.onZoomChange.bind(this)); - - // Initial load if within zoom range - if (this.shouldShowHexagons()) { - this.show(); - } - } - - /** - * Show the hexagon grid overlay - */ - show() { - if (!this.isVisible) { - this.isVisible = true; - if (this.shouldShowHexagons()) { - this.hexagonLayer.addTo(this.map); - this.loadHexagons(); - } - } - } - - /** - * Hide the hexagon grid overlay - */ - hide() { - if (this.isVisible) { - this.isVisible = false; - this.hexagonLayer.remove(); - this.cancelPendingRequest(); - } - } - - /** - * Toggle visibility of hexagon grid - */ - toggle() { - if (this.isVisible) { - this.hide(); - } else { - this.show(); - } - } - - /** - * Check if hexagons should be displayed at current zoom level - */ - shouldShowHexagons() { - const zoom = this.map.getZoom(); - return zoom >= this.options.minZoom && zoom <= this.options.maxZoom; - } - - /** - * Handle map move events - */ - onMapMove() { - if (!this.isVisible || !this.shouldShowHexagons()) { - return; - } - - const currentBounds = this.map.getBounds(); - - // Only reload if bounds have changed significantly - if (this.boundsChanged(currentBounds)) { - this.loadHexagons(); - } - } - - /** - * Handle zoom change events - */ - onZoomChange() { - if (!this.isVisible) { - return; - } - - if (this.shouldShowHexagons()) { - // Show hexagons and load for new zoom level - if (!this.map.hasLayer(this.hexagonLayer)) { - this.hexagonLayer.addTo(this.map); - } - this.loadHexagons(); - } else { - // Hide hexagons when zoomed too far in/out - this.hexagonLayer.remove(); - this.cancelPendingRequest(); - } - } - - /** - * Check if bounds have changed enough to warrant reloading - */ - boundsChanged(newBounds) { - if (!this.lastBounds) { - return true; - } - - const threshold = 0.1; // 10% change threshold - const oldArea = this.getBoundsArea(this.lastBounds); - const newArea = this.getBoundsArea(newBounds); - const intersection = this.getBoundsIntersection(this.lastBounds, newBounds); - const intersectionRatio = intersection / Math.min(oldArea, newArea); - - return intersectionRatio < (1 - threshold); - } - - /** - * Calculate approximate area of bounds - */ - getBoundsArea(bounds) { - const sw = bounds.getSouthWest(); - const ne = bounds.getNorthEast(); - return (ne.lat - sw.lat) * (ne.lng - sw.lng); - } - - /** - * Calculate intersection area between two bounds - */ - getBoundsIntersection(bounds1, bounds2) { - const sw1 = bounds1.getSouthWest(); - const ne1 = bounds1.getNorthEast(); - const sw2 = bounds2.getSouthWest(); - const ne2 = bounds2.getNorthEast(); - - const left = Math.max(sw1.lng, sw2.lng); - const right = Math.min(ne1.lng, ne2.lng); - const bottom = Math.max(sw1.lat, sw2.lat); - const top = Math.min(ne1.lat, ne2.lat); - - if (left < right && bottom < top) { - return (right - left) * (top - bottom); - } - return 0; - } - - /** - * Load hexagons for current viewport - */ - async loadHexagons() { - console.log('❌ Using ORIGINAL loadHexagons method (should not happen for public sharing)'); - - // Cancel any pending request - this.cancelPendingRequest(); - - const bounds = this.map.getBounds(); - this.lastBounds = bounds; - - // Create new AbortController for this request - this.loadingController = new AbortController(); - - try { - // Get current date range from URL parameters - const urlParams = new URLSearchParams(window.location.search); - const startDate = urlParams.get('start_at'); - const endDate = urlParams.get('end_at'); - - // Get viewport dimensions - const mapContainer = this.map.getContainer(); - const viewportWidth = mapContainer.offsetWidth; - const viewportHeight = mapContainer.offsetHeight; - - const params = new URLSearchParams({ - min_lon: bounds.getWest(), - min_lat: bounds.getSouth(), - max_lon: bounds.getEast(), - max_lat: bounds.getNorth(), - viewport_width: viewportWidth, - viewport_height: viewportHeight - }); - - // Add date parameters if they exist - if (startDate) params.append('start_date', startDate); - if (endDate) params.append('end_date', endDate); - - const response = await fetch(`${this.options.apiEndpoint}?${params}`, { - signal: this.loadingController.signal, - headers: { - 'Content-Type': 'application/json' - } - }); - - if (!response.ok) { - throw new Error(`HTTP ${response.status}: ${response.statusText}`); - } - - const geojsonData = await response.json(); - - // Clear existing hexagons and add new ones - this.clearHexagons(); - this.addHexagonsToMap(geojsonData); - - } catch (error) { - if (error.name !== 'AbortError') { - console.error('Failed to load hexagons:', error); - // Optionally show user-friendly error message - } - } finally { - this.loadingController = null; - } - } - - /** - * Cancel pending hexagon loading request - */ - cancelPendingRequest() { - if (this.loadingController) { - this.loadingController.abort(); - this.loadingController = null; - } - } - - /** - * Clear existing hexagons from the map - */ - clearHexagons() { - this.hexagonLayer.clearLayers(); - } - - /** - * Add hexagons to the map from GeoJSON data - */ - addHexagonsToMap(geojsonData) { - if (!geojsonData.features || geojsonData.features.length === 0) { - return; - } - - // Calculate max point count for color scaling - const maxPoints = Math.max(...geojsonData.features.map(f => f.properties.point_count)); - - const geoJsonLayer = L.geoJSON(geojsonData, { - style: (feature) => this.styleHexagonByData(feature, maxPoints), - onEachFeature: (feature, layer) => { - // Add popup with statistics - const props = feature.properties; - const popupContent = this.buildPopupContent(props); - layer.bindPopup(popupContent); - } - }); - - geoJsonLayer.addTo(this.hexagonLayer); - } - - /** - * Style hexagon based on point density and other data - */ - styleHexagonByData(feature, maxPoints) { - const props = feature.properties; - const pointCount = props.point_count || 0; - - // Calculate opacity based on point density (0.2 to 0.8) - const opacity = 0.2 + (pointCount / maxPoints) * 0.6; - - let color = '#3388ff' - - return { - fillColor: color, - fillOpacity: opacity, - color: color, - weight: 1, - opacity: opacity + 0.2 - }; - } - - /** - * Build popup content with hexagon statistics - */ - buildPopupContent(props) { - const startDate = props.earliest_point ? new Date(props.earliest_point).toLocaleDateString() : 'N/A'; - const endDate = props.latest_point ? new Date(props.latest_point).toLocaleDateString() : 'N/A'; - - return ` -
- Date Range:
- ${startDate} - ${endDate} -
- `; - } - - /** - * Update hexagon style - */ - updateStyle(newStyle) { - this.options.style = { ...this.options.style, ...newStyle }; - - // Update existing hexagons - this.hexagonLayer.eachLayer((layer) => { - if (layer.setStyle) { - layer.setStyle(this.options.style); - } - }); - } - - /** - * Destroy the hexagon grid and clean up - */ - destroy() { - this.hide(); - this.map.off('moveend'); - this.map.off('zoomend'); - this.hexagonLayer = null; - this.lastBounds = null; - } - - /** - * Simple debounce utility - */ - debounce(func, wait) { - let timeout; - return function executedFunction(...args) { - const later = () => { - clearTimeout(timeout); - func(...args); - }; - clearTimeout(timeout); - timeout = setTimeout(later, wait); - }; - } -} - -/** - * Create and return a new HexagonGrid instance - */ -export function createHexagonGrid(map, options = {}) { - return new HexagonGrid(map, options); -} - -// Default export -export default HexagonGrid; diff --git a/app/queries/hexagon_query.rb b/app/queries/hexagon_query.rb deleted file mode 100644 index 0eb105cb..00000000 --- a/app/queries/hexagon_query.rb +++ /dev/null @@ -1,142 +0,0 @@ -# frozen_string_literal: true - -class HexagonQuery - # Maximum number of hexagons to return in a single request - MAX_HEXAGONS_PER_REQUEST = 5000 - - attr_reader :min_lon, :min_lat, :max_lon, :max_lat, :hex_size, :user_id, :start_date, :end_date - - def initialize(min_lon:, min_lat:, max_lon:, max_lat:, hex_size:, user_id: nil, start_date: nil, end_date: nil) - @min_lon = min_lon - @min_lat = min_lat - @max_lon = max_lon - @max_lat = max_lat - @hex_size = hex_size - @user_id = user_id - @start_date = start_date - @end_date = end_date - end - - def call - binds = [] - user_sql = build_user_filter(binds) - date_filter = build_date_filter(binds) - - sql = build_hexagon_sql(user_sql, date_filter) - - ActiveRecord::Base.connection.exec_query(sql, 'hexagon_sql', binds) - end - - private - - def build_hexagon_sql(user_sql, date_filter) - <<~SQL - WITH bbox_geom AS ( - SELECT ST_MakeEnvelope($1, $2, $3, $4, 4326) as geom - ), - bbox_utm AS ( - SELECT ST_Transform(geom, 3857) as geom_utm FROM bbox_geom - ), - user_points AS ( - SELECT - lonlat::geometry as point_geom, - ST_Transform(lonlat::geometry, 3857) as point_geom_utm, - id, - timestamp - FROM points - WHERE #{user_sql} - #{date_filter} - AND lonlat && (SELECT geom FROM bbox_geom) - ), - hex_grid AS ( - SELECT - (ST_HexagonGrid($5, geom_utm)).geom as hex_geom_utm, - (ST_HexagonGrid($5, geom_utm)).i as hex_i, - (ST_HexagonGrid($5, geom_utm)).j as hex_j - FROM bbox_utm - ), - hexagons_with_points AS ( - SELECT DISTINCT - hg.hex_geom_utm, - hg.hex_i, - hg.hex_j - FROM hex_grid hg - JOIN user_points up ON ST_Intersects(hg.hex_geom_utm, up.point_geom_utm) - ), - hexagon_stats AS ( - SELECT - hwp.hex_geom_utm, - hwp.hex_i, - hwp.hex_j, - COUNT(up.id) as point_count, - MIN(up.timestamp) as earliest_point, - MAX(up.timestamp) as latest_point - FROM hexagons_with_points hwp - JOIN user_points up ON ST_Intersects(hwp.hex_geom_utm, up.point_geom_utm) - GROUP BY hwp.hex_geom_utm, hwp.hex_i, hwp.hex_j - ) - SELECT - ST_AsGeoJSON(ST_Transform(hex_geom_utm, 4326)) as geojson, - hex_i, - hex_j, - point_count, - earliest_point, - latest_point, - row_number() OVER (ORDER BY point_count DESC) as id - FROM hexagon_stats - ORDER BY point_count DESC - LIMIT $6; - SQL - end - - def build_user_filter(binds) - # Add bbox coordinates: min_lon, min_lat, max_lon, max_lat - binds << min_lon - binds << min_lat - binds << max_lon - binds << max_lat - - # Add hex_size - binds << hex_size - - # Add limit - binds << MAX_HEXAGONS_PER_REQUEST - - if user_id - binds << user_id - 'user_id = $7' - else - '1=1' - end - end - - def build_date_filter(binds) - return '' unless start_date || end_date - - conditions = [] - current_param_index = user_id ? 8 : 7 # Account for bbox, hex_size, limit, and potential user_id - - if start_date - start_timestamp = parse_date_to_timestamp(start_date) - binds << start_timestamp - conditions << "timestamp >= $#{current_param_index}" - current_param_index += 1 - end - - if end_date - end_timestamp = parse_date_to_timestamp(end_date) - binds << end_timestamp - conditions << "timestamp <= $#{current_param_index}" - end - - conditions.any? ? "AND #{conditions.join(' AND ')}" : '' - end - - def parse_date_to_timestamp(date_string) - # Convert ISO date string to timestamp integer - Time.parse(date_string).to_i - rescue ArgumentError => e - ExceptionReporter.call(e, "Invalid date format: #{date_string}") - raise ArgumentError, "Invalid date format: #{date_string}" - end -end diff --git a/app/services/hexagon_cache_service.rb b/app/services/hexagon_cache_service.rb deleted file mode 100644 index 87f51808..00000000 --- a/app/services/hexagon_cache_service.rb +++ /dev/null @@ -1,57 +0,0 @@ -# frozen_string_literal: true - -class HexagonCacheService - def initialize(user:, stat: nil, start_date: nil, end_date: nil) - @user = user - @stat = stat - @start_date = start_date - @end_date = end_date - end - - def available?(hex_size) - return false unless @user - return false unless hex_size.to_i == 1000 - - target_stat&.hexagons_available?(hex_size) - end - - def cached_geojson(hex_size) - return nil unless target_stat - - target_stat.hexagon_data.dig(hex_size.to_s, 'geojson') - rescue StandardError => e - Rails.logger.warn "Failed to retrieve cached hexagon data: #{e.message}" - nil - end - - private - - attr_reader :user, :stat, :start_date, :end_date - - def target_stat - @target_stat ||= stat || find_monthly_stat - end - - def find_monthly_stat - return nil unless start_date && end_date - - begin - start_time = Time.zone.parse(start_date) - end_time = Time.zone.parse(end_date) - - # Only use cached data for exact monthly requests - return nil unless monthly_date_range?(start_time, end_time) - - user.stats.find_by(year: start_time.year, month: start_time.month) - rescue StandardError - nil - end - end - - def monthly_date_range?(start_time, end_time) - start_time.beginning_of_month == start_time && - end_time.end_of_month.beginning_of_day.to_date == end_time.to_date && - start_time.month == end_time.month && - start_time.year == end_time.year - end -end diff --git a/app/services/maps/date_parameter_coercer.rb b/app/services/maps/date_parameter_coercer.rb index 0c91e576..64737d4c 100644 --- a/app/services/maps/date_parameter_coercer.rb +++ b/app/services/maps/date_parameter_coercer.rb @@ -23,12 +23,7 @@ module Maps def coerce_date(param) case param when String - # Check if it's a numeric string (timestamp) or date string - if param.match?(/^\d+$/) - param.to_i - else - Time.parse(param).to_i - end + coerce_string_param(param) when Integer param else @@ -38,5 +33,14 @@ module Maps Rails.logger.error "Invalid date format: #{param} - #{e.message}" raise InvalidDateFormatError, "Invalid date format: #{param}" end + + def coerce_string_param(param) + # Check if it's a numeric string (timestamp) or date string + if param.match?(/^\d+$/) + param.to_i + else + Time.parse(param).to_i + end + end end end diff --git a/app/services/maps/h3_hexagon_calculator.rb b/app/services/maps/h3_hexagon_calculator.rb new file mode 100644 index 00000000..639d5ae2 --- /dev/null +++ b/app/services/maps/h3_hexagon_calculator.rb @@ -0,0 +1,84 @@ +# frozen_string_literal: true + +module Maps + class H3HexagonCalculator + def initialize(user_id, start_date, end_date, h3_resolution = 5) + @user_id = user_id + @start_date = start_date + @end_date = end_date + @h3_resolution = h3_resolution + end + + def call + user_points = fetch_user_points + return { success: false, error: 'No points found for the given date range' } if user_points.empty? + + h3_indexes = calculate_h3_indexes(user_points) + hexagon_features = build_hexagon_features(h3_indexes) + + { + success: true, + data: { + type: 'FeatureCollection', + features: hexagon_features + } + } + rescue StandardError => e + { success: false, error: e.message } + end + + private + + attr_reader :user_id, :start_date, :end_date, :h3_resolution + + def fetch_user_points + Point.where(user_id: user_id) + .where(timestamp: start_date.to_i..end_date.to_i) + .where.not(lonlat: nil) + .select(:id, :lonlat, :timestamp) + end + + def calculate_h3_indexes(points) + h3_counts = Hash.new(0) + + points.find_each do |point| + # Convert PostGIS point to lat/lng array: [lat, lng] + coordinates = [point.lonlat.y, point.lonlat.x] + + # Get H3 index for these coordinates at specified resolution + h3_index = H3.from_geo_coordinates(coordinates, h3_resolution) + + # Count points in each hexagon + h3_counts[h3_index] += 1 + end + + h3_counts + end + + def build_hexagon_features(h3_counts) + h3_counts.map do |h3_index, point_count| + # Get the boundary coordinates for this H3 hexagon + boundary_coordinates = H3.to_boundary(h3_index) + + # Convert to GeoJSON polygon format (lng, lat) + polygon_coordinates = boundary_coordinates.map { |lat, lng| [lng, lat] } + + # Close the polygon by adding the first point at the end + polygon_coordinates << polygon_coordinates.first + + { + type: 'Feature', + geometry: { + type: 'Polygon', + coordinates: [polygon_coordinates] + }, + properties: { + h3_index: h3_index.to_s(16), + point_count: point_count, + center: H3.to_geo_coordinates(h3_index) + } + } + end + end + end +end \ No newline at end of file diff --git a/app/services/maps/h3_hexagon_centers.rb b/app/services/maps/h3_hexagon_centers.rb new file mode 100644 index 00000000..5911f6df --- /dev/null +++ b/app/services/maps/h3_hexagon_centers.rb @@ -0,0 +1,128 @@ +# frozen_string_literal: true + +class Maps::H3HexagonCenters + include ActiveModel::Validations + + # H3 Configuration + DEFAULT_H3_RESOLUTION = 8 # Small hexagons for good detail + MAX_HEXAGONS = 10_000 # Maximum number of hexagons to prevent memory issues + + # Validation error classes + class TooManyHexagonsError < StandardError; end + class InvalidCoordinatesError < StandardError; end + class PostGISError < StandardError; end + + attr_reader :user_id, :start_date, :end_date, :h3_resolution + + validates :user_id, presence: true + + def initialize(user_id:, start_date:, end_date:, h3_resolution: DEFAULT_H3_RESOLUTION) + @user_id = user_id + @start_date = start_date + @end_date = end_date + @h3_resolution = h3_resolution.clamp(0, 15) # Ensure valid H3 resolution + end + + def call + validate! + + points = fetch_user_points + return [] if points.empty? + + h3_indexes_with_counts = calculate_h3_indexes(points) + + if h3_indexes_with_counts.size > MAX_HEXAGONS + Rails.logger.warn "Too many hexagons (#{h3_indexes_with_counts.size}), using lower resolution" + # Try with lower resolution (larger hexagons) + return recalculate_with_lower_resolution(points) + end + + Rails.logger.info "Generated #{h3_indexes_with_counts.size} H3 hexagons at resolution #{h3_resolution} for user #{user_id}" + + # Convert to format: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] + h3_indexes_with_counts.map do |h3_index, data| + [ + h3_index.to_s(16), # Store as hex string + data[:count], + data[:earliest], + data[:latest] + ] + end + rescue StandardError => e + message = "Failed to calculate H3 hexagon centers: #{e.message}" + ExceptionReporter.call(e, message) if defined?(ExceptionReporter) + raise PostGISError, message + end + + private + + def fetch_user_points + start_timestamp = parse_date_to_timestamp(start_date) + end_timestamp = parse_date_to_timestamp(end_date) + + Point.where(user_id: user_id) + .where(timestamp: start_timestamp..end_timestamp) + .where.not(lonlat: nil) + .select(:id, :lonlat, :timestamp) + end + + def calculate_h3_indexes(points) + h3_data = Hash.new { |h, k| h[k] = { count: 0, earliest: nil, latest: nil } } + + points.find_each do |point| + # Extract lat/lng from PostGIS point + coordinates = [point.lonlat.y, point.lonlat.x] # [lat, lng] for H3 + + # Get H3 index for this point + h3_index = H3.from_geo_coordinates(coordinates, h3_resolution) + + # Aggregate data for this hexagon + data = h3_data[h3_index] + data[:count] += 1 + data[:earliest] = [data[:earliest], point.timestamp].compact.min + data[:latest] = [data[:latest], point.timestamp].compact.max + end + + h3_data + end + + def recalculate_with_lower_resolution(points) + # Try with resolution 2 levels lower (4x larger hexagons) + lower_resolution = [h3_resolution - 2, 0].max + + Rails.logger.info "Recalculating with lower H3 resolution: #{lower_resolution}" + + service = self.class.new( + user_id: user_id, + start_date: start_date, + end_date: end_date, + h3_resolution: lower_resolution + ) + + service.call + end + + def parse_date_to_timestamp(date) + case date + when String + if date.match?(/^\d+$/) + date.to_i + else + Time.parse(date).to_i + end + when Integer + date + else + Time.parse(date.to_s).to_i + end + rescue ArgumentError => e + ExceptionReporter.call(e, "Invalid date format: #{date}") if defined?(ExceptionReporter) + raise ArgumentError, "Invalid date format: #{date}" + end + + def validate! + return if valid? + + raise InvalidCoordinatesError, errors.full_messages.join(', ') + end +end \ No newline at end of file diff --git a/app/services/maps/h3_hexagon_renderer.rb b/app/services/maps/h3_hexagon_renderer.rb new file mode 100644 index 00000000..c7210265 --- /dev/null +++ b/app/services/maps/h3_hexagon_renderer.rb @@ -0,0 +1,137 @@ +# frozen_string_literal: true + +module Maps + class H3HexagonRenderer + def self.call(params:, current_api_user: nil) + new(params: params, current_api_user: current_api_user).call + end + + def initialize(params:, current_api_user: nil) + @params = params + @current_api_user = current_api_user + end + + def call + context = resolve_context + h3_data = get_h3_hexagon_data(context) + + return empty_feature_collection if h3_data.empty? + + convert_h3_to_geojson(h3_data) + end + + private + + attr_reader :params, :current_api_user + + def resolve_context + Maps::HexagonContextResolver.call( + params: params, + current_api_user: current_api_user + ) + end + + def get_h3_hexagon_data(context) + # For public sharing, get pre-calculated data from stat + if context[:stat]&.hexagon_centers.present? + hexagon_data = context[:stat].hexagon_centers + + # Check if this is old format (coordinates) or new format (H3 indexes) + if hexagon_data.first.is_a?(Array) && hexagon_data.first[0].is_a?(Float) + Rails.logger.debug "Found old coordinate format for stat #{context[:stat].id}, generating H3 on-the-fly" + return generate_h3_data_on_the_fly(context) + else + Rails.logger.debug "Using pre-calculated H3 data for stat #{context[:stat].id}" + return hexagon_data + end + end + + # For authenticated users, calculate on-the-fly if no pre-calculated data + Rails.logger.debug "No pre-calculated H3 data, calculating on-the-fly" + generate_h3_data_on_the_fly(context) + end + + def generate_h3_data_on_the_fly(context) + start_date = parse_date_for_h3(context[:start_date]) + end_date = parse_date_for_h3(context[:end_date]) + h3_resolution = params[:h3_resolution]&.to_i&.clamp(0, 15) || 6 + + service = Maps::H3HexagonCenters.new( + user_id: context[:target_user]&.id, + start_date: start_date, + end_date: end_date, + h3_resolution: h3_resolution + ) + + service.call + end + + def convert_h3_to_geojson(h3_data) + features = h3_data.map do |h3_record| + h3_index_string, point_count, earliest_timestamp, latest_timestamp = h3_record + + # Convert hex string back to H3 index + h3_index = h3_index_string.to_i(16) + + # Get hexagon boundary coordinates + boundary_coordinates = H3.to_boundary(h3_index) + + # Convert to GeoJSON polygon format (lng, lat) + polygon_coordinates = boundary_coordinates.map { |lat, lng| [lng, lat] } + polygon_coordinates << polygon_coordinates.first # Close the polygon + + { + type: 'Feature', + geometry: { + type: 'Polygon', + coordinates: [polygon_coordinates] + }, + properties: { + h3_index: h3_index_string, + point_count: point_count, + earliest_point: earliest_timestamp ? Time.at(earliest_timestamp).iso8601 : nil, + latest_point: latest_timestamp ? Time.at(latest_timestamp).iso8601 : nil, + center: H3.to_geo_coordinates(h3_index) # [lat, lng] + } + } + end + + { + type: 'FeatureCollection', + features: features, + metadata: { + hexagon_count: features.size, + total_points: features.sum { |f| f[:properties][:point_count] }, + source: 'h3' + } + } + end + + def empty_feature_collection + { + type: 'FeatureCollection', + features: [], + metadata: { + hexagon_count: 0, + total_points: 0, + source: 'h3' + } + } + end + + def parse_date_for_h3(date_param) + # If already a Time object (from public sharing context), return as-is + return date_param if date_param.is_a?(Time) + + # If it's a string ISO date, parse it directly to Time + return Time.parse(date_param) if date_param.is_a?(String) + + # If it's an integer timestamp, convert to Time + return Time.at(date_param) if date_param.is_a?(Integer) + + # For other cases, try coercing and converting + timestamp = Maps::DateParameterCoercer.call(date_param) + Time.at(timestamp) + end + end +end \ No newline at end of file diff --git a/app/services/maps/hexagon_center_manager.rb b/app/services/maps/hexagon_center_manager.rb index 84f47c25..d786137a 100644 --- a/app/services/maps/hexagon_center_manager.rb +++ b/app/services/maps/hexagon_center_manager.rb @@ -23,7 +23,7 @@ module Maps attr_reader :stat, :target_user def pre_calculated_centers_available? - return false unless stat&.hexagon_centers.present? + return false if stat&.hexagon_centers.blank? # Handle legacy hash format if stat.hexagon_centers.is_a?(Hash) @@ -49,46 +49,60 @@ module Maps def handle_legacy_area_too_large Rails.logger.info "Recalculating previously skipped large area hexagons for stat #{stat.id}" - # Trigger recalculation + new_centers = recalculate_hexagon_centers + return nil unless new_centers.is_a?(Array) + + update_stat_with_new_centers(new_centers) + end + + def recalculate_hexagon_centers service = Stats::CalculateMonth.new(target_user.id, stat.year, stat.month) - new_centers = service.send(:calculate_hexagon_centers) + service.send(:calculate_hexagon_centers) + end - if new_centers && new_centers.is_a?(Array) - stat.update(hexagon_centers: new_centers) - result = build_hexagons_from_centers(new_centers) - Rails.logger.debug "Successfully recalculated hexagon centers: #{new_centers.size} centers" - return { success: true, data: result, pre_calculated: true } - end - - nil # Recalculation failed or still too large + def update_stat_with_new_centers(new_centers) + stat.update(hexagon_centers: new_centers) + result = build_hexagons_from_centers(new_centers) + Rails.logger.debug "Successfully recalculated hexagon centers: #{new_centers.size} centers" + { success: true, data: result, pre_calculated: true } end def build_hexagons_from_centers(centers) # Convert stored centers back to hexagon polygons - # Each center is [lng, lat, earliest_timestamp, latest_timestamp] - hexagon_features = centers.map.with_index do |center, index| - lng, lat, earliest, latest = center + hexagon_features = centers.map.with_index { |center, index| build_hexagon_feature(center, index) } - # Generate hexagon polygon from center point (1000m hexagons) - hexagon_geojson = Maps::HexagonPolygonGenerator.call( - center_lng: lng, - center_lat: lat, - size_meters: 1000 - ) + build_feature_collection(hexagon_features) + end - { - 'type' => 'Feature', - 'id' => index + 1, - 'geometry' => hexagon_geojson, - 'properties' => { - 'hex_id' => index + 1, - 'hex_size' => 1000, - 'earliest_point' => earliest ? Time.zone.at(earliest).iso8601 : nil, - 'latest_point' => latest ? Time.zone.at(latest).iso8601 : nil - } - } - end + def build_hexagon_feature(center, index) + lng, lat, earliest, latest = center + { + 'type' => 'Feature', + 'id' => index + 1, + 'geometry' => generate_hexagon_geometry(lng, lat), + 'properties' => build_hexagon_properties(index, earliest, latest) + } + end + + def generate_hexagon_geometry(lng, lat) + Maps::HexagonPolygonGenerator.call( + center_lng: lng, + center_lat: lat, + size_meters: 1000 + ) + end + + def build_hexagon_properties(index, earliest, latest) + { + 'hex_id' => index + 1, + 'hex_size' => 1000, + 'earliest_point' => earliest ? Time.zone.at(earliest).iso8601 : nil, + 'latest_point' => latest ? Time.zone.at(latest).iso8601 : nil + } + end + + def build_feature_collection(hexagon_features) { 'type' => 'FeatureCollection', 'features' => hexagon_features, diff --git a/app/services/maps/hexagon_centers.rb b/app/services/maps/hexagon_centers.rb deleted file mode 100644 index e03d1d19..00000000 --- a/app/services/maps/hexagon_centers.rb +++ /dev/null @@ -1,380 +0,0 @@ -# frozen_string_literal: true - -class Maps::HexagonCenters - include ActiveModel::Validations - - # Constants for configuration - HEX_SIZE = 1000 # meters - fixed 1000m hexagons - MAX_AREA_KM2 = 10_000 # Maximum area for simple calculation - TILE_SIZE_KM = 100 # Size of each tile for large area processing - MAX_TILES = 100 # Maximum number of tiles to process - - # Validation error classes - class BoundingBoxTooLargeError < StandardError; end - class InvalidCoordinatesError < StandardError; end - class PostGISError < StandardError; end - - attr_reader :user_id, :start_date, :end_date - - validates :user_id, presence: true - - def initialize(user_id:, start_date:, end_date:) - @user_id = user_id - @start_date = start_date - @end_date = end_date - end - - def call - validate! - - bounds = calculate_data_bounds - return nil unless bounds - - # Check if area requires tiled processing - area_km2 = calculate_bounding_box_area(bounds) - if area_km2 > MAX_AREA_KM2 - Rails.logger.info "Large area detected (#{area_km2.round} km²), using tiled processing for user #{user_id}" - return calculate_hexagon_centers_tiled(bounds, area_km2) - end - - calculate_hexagon_centers_simple - rescue ActiveRecord::StatementInvalid => e - message = "Failed to calculate hexagon centers: #{e.message}" - ExceptionReporter.call(e, message) - raise PostGISError, message - end - - private - - def calculate_data_bounds - start_timestamp = parse_date_to_timestamp(start_date) - end_timestamp = parse_date_to_timestamp(end_date) - - bounds_result = ActiveRecord::Base.connection.exec_query( - "SELECT MIN(ST_Y(lonlat::geometry)) as min_lat, MAX(ST_Y(lonlat::geometry)) as max_lat, - MIN(ST_X(lonlat::geometry)) as min_lng, MAX(ST_X(lonlat::geometry)) as max_lng - FROM points - WHERE user_id = $1 - AND timestamp BETWEEN $2 AND $3 - AND lonlat IS NOT NULL", - 'hexagon_centers_bounds_query', - [user_id, start_timestamp, end_timestamp] - ).first - - return nil unless bounds_result - - { - min_lat: bounds_result['min_lat'].to_f, - max_lat: bounds_result['max_lat'].to_f, - min_lng: bounds_result['min_lng'].to_f, - max_lng: bounds_result['max_lng'].to_f - } - end - - def calculate_bounding_box_area(bounds) - width = (bounds[:max_lng] - bounds[:min_lng]).abs - height = (bounds[:max_lat] - bounds[:min_lat]).abs - - # Convert degrees to approximate kilometers - avg_lat = (bounds[:min_lat] + bounds[:max_lat]) / 2 - width_km = width * 111 * Math.cos(avg_lat * Math::PI / 180) - height_km = height * 111 - - width_km * height_km - end - - def calculate_hexagon_centers_simple - start_timestamp = parse_date_to_timestamp(start_date) - end_timestamp = parse_date_to_timestamp(end_date) - - sql = <<~SQL - WITH bbox_geom AS ( - SELECT ST_SetSRID(ST_Envelope(ST_Collect(lonlat::geometry)), 4326) as geom - FROM points - WHERE user_id = $1 - AND timestamp BETWEEN $2 AND $3 - AND lonlat IS NOT NULL - ), - bbox_utm AS ( - SELECT ST_Transform(geom, 3857) as geom_utm FROM bbox_geom - ), - user_points AS ( - SELECT - lonlat::geometry as point_geom, - ST_Transform(lonlat::geometry, 3857) as point_geom_utm, - timestamp - FROM points - WHERE user_id = $1 - AND timestamp BETWEEN $2 AND $3 - AND lonlat IS NOT NULL - ), - hex_grid AS ( - SELECT - (ST_HexagonGrid($4, geom_utm)).geom as hex_geom_utm, - (ST_HexagonGrid($4, geom_utm)).i as hex_i, - (ST_HexagonGrid($4, geom_utm)).j as hex_j - FROM bbox_utm - ), - hexagons_with_points AS ( - SELECT DISTINCT - hg.hex_geom_utm, - hg.hex_i, - hg.hex_j - FROM hex_grid hg - JOIN user_points up ON ST_Intersects(hg.hex_geom_utm, up.point_geom_utm) - ), - hexagon_centers AS ( - SELECT - ST_Transform(ST_Centroid(hwp.hex_geom_utm), 4326) as center, - MIN(up.timestamp) as earliest_point, - MAX(up.timestamp) as latest_point - FROM hexagons_with_points hwp - JOIN user_points up ON ST_Intersects(hwp.hex_geom_utm, up.point_geom_utm) - GROUP BY hwp.hex_geom_utm, hwp.hex_i, hwp.hex_j - ) - SELECT - ST_X(center) as lng, - ST_Y(center) as lat, - earliest_point, - latest_point - FROM hexagon_centers - ORDER BY earliest_point; - SQL - - result = ActiveRecord::Base.connection.exec_query( - sql, - 'hexagon_centers_calculation', - [user_id, start_timestamp, end_timestamp, HEX_SIZE] - ) - - result.map do |row| - [ - row['lng'].to_f, - row['lat'].to_f, - row['earliest_point']&.to_i, - row['latest_point']&.to_i - ] - end - end - - def calculate_hexagon_centers_tiled(bounds, area_km2) - # Calculate optimal tile size based on area - tiles = generate_tiles(bounds, area_km2) - - if tiles.size > MAX_TILES - Rails.logger.warn "Area too large even for tiling (#{tiles.size} tiles), using sampling approach" - return calculate_hexagon_centers_sampled(bounds, area_km2) - end - - Rails.logger.info "Processing #{tiles.size} tiles for large area hexagon calculation" - - all_centers = [] - tiles.each_with_index do |tile, index| - Rails.logger.debug "Processing tile #{index + 1}/#{tiles.size}" - - centers = calculate_hexagon_centers_for_tile(tile) - all_centers.concat(centers) if centers.any? - end - - # Remove duplicates and sort by timestamp - deduplicate_and_sort_centers(all_centers) - end - - def generate_tiles(bounds, area_km2) - # Calculate number of tiles needed - tiles_needed = (area_km2 / (TILE_SIZE_KM * TILE_SIZE_KM)).ceil - tiles_per_side = Math.sqrt(tiles_needed).ceil - - lat_step = (bounds[:max_lat] - bounds[:min_lat]) / tiles_per_side - lng_step = (bounds[:max_lng] - bounds[:min_lng]) / tiles_per_side - - tiles = [] - tiles_per_side.times do |i| - tiles_per_side.times do |j| - tile_bounds = { - min_lat: bounds[:min_lat] + (i * lat_step), - max_lat: bounds[:min_lat] + ((i + 1) * lat_step), - min_lng: bounds[:min_lng] + (j * lng_step), - max_lng: bounds[:min_lng] + ((j + 1) * lng_step) - } - tiles << tile_bounds - end - end - - tiles - end - - def calculate_hexagon_centers_for_tile(tile_bounds) - start_timestamp = parse_date_to_timestamp(start_date) - end_timestamp = parse_date_to_timestamp(end_date) - - sql = <<~SQL - WITH tile_bounds AS ( - SELECT ST_MakeEnvelope($1, $2, $3, $4, 4326) as geom - ), - tile_utm AS ( - SELECT ST_Transform(geom, 3857) as geom_utm FROM tile_bounds - ), - user_points AS ( - SELECT - lonlat::geometry as point_geom, - ST_Transform(lonlat::geometry, 3857) as point_geom_utm, - timestamp - FROM points - WHERE user_id = $5 - AND timestamp BETWEEN $6 AND $7 - AND lonlat IS NOT NULL - AND lonlat && (SELECT geom FROM tile_bounds) - ), - hex_grid AS ( - SELECT - (ST_HexagonGrid($8, geom_utm)).geom as hex_geom_utm, - (ST_HexagonGrid($8, geom_utm)).i as hex_i, - (ST_HexagonGrid($8, geom_utm)).j as hex_j - FROM tile_utm - ), - hexagons_with_points AS ( - SELECT DISTINCT - hg.hex_geom_utm, - hg.hex_i, - hg.hex_j - FROM hex_grid hg - JOIN user_points up ON ST_Intersects(hg.hex_geom_utm, up.point_geom_utm) - ), - hexagon_centers AS ( - SELECT - ST_Transform(ST_Centroid(hwp.hex_geom_utm), 4326) as center, - MIN(up.timestamp) as earliest_point, - MAX(up.timestamp) as latest_point - FROM hexagons_with_points hwp - JOIN user_points up ON ST_Intersects(hwp.hex_geom_utm, up.point_geom_utm) - GROUP BY hwp.hex_geom_utm, hwp.hex_i, hwp.hex_j - ) - SELECT - ST_X(center) as lng, - ST_Y(center) as lat, - earliest_point, - latest_point - FROM hexagon_centers; - SQL - - result = ActiveRecord::Base.connection.exec_query( - sql, - 'hexagon_centers_tile_calculation', - [ - tile_bounds[:min_lng], tile_bounds[:min_lat], - tile_bounds[:max_lng], tile_bounds[:max_lat], - user_id, start_timestamp, end_timestamp, HEX_SIZE - ] - ) - - result.map do |row| - [ - row['lng'].to_f, - row['lat'].to_f, - row['earliest_point']&.to_i, - row['latest_point']&.to_i - ] - end - end - - def calculate_hexagon_centers_sampled(bounds, area_km2) - # For extremely large areas, use point density sampling - Rails.logger.info "Using density-based sampling for extremely large area (#{area_km2.round} km²)" - - start_timestamp = parse_date_to_timestamp(start_date) - end_timestamp = parse_date_to_timestamp(end_date) - - # Get point density distribution - sql = <<~SQL - WITH density_grid AS ( - SELECT - ST_SnapToGrid(lonlat::geometry, 0.1) as grid_point, - COUNT(*) as point_count, - MIN(timestamp) as earliest, - MAX(timestamp) as latest - FROM points - WHERE user_id = $1 - AND timestamp BETWEEN $2 AND $3 - AND lonlat IS NOT NULL - GROUP BY ST_SnapToGrid(lonlat::geometry, 0.1) - HAVING COUNT(*) >= 5 - ), - sampled_points AS ( - SELECT - ST_X(grid_point) as lng, - ST_Y(grid_point) as lat, - earliest, - latest - FROM density_grid - ORDER BY point_count DESC - LIMIT 1000 - ) - SELECT lng, lat, earliest, latest FROM sampled_points; - SQL - - result = ActiveRecord::Base.connection.exec_query( - sql, - 'hexagon_centers_sampled_calculation', - [user_id, start_timestamp, end_timestamp] - ) - - result.map do |row| - [ - row['lng'].to_f, - row['lat'].to_f, - row['earliest']&.to_i, - row['latest']&.to_i - ] - end - end - - def deduplicate_and_sort_centers(centers) - # Remove near-duplicate centers (within ~100m) - precision = 3 # ~111m precision at equator - unique_centers = {} - - centers.each do |center| - lng, lat, earliest, latest = center - key = "#{lng.round(precision)},#{lat.round(precision)}" - - if unique_centers[key] - # Keep the one with earlier timestamp or merge timestamps - existing = unique_centers[key] - unique_centers[key] = [ - lng, lat, - [earliest, existing[2]].compact.min, - [latest, existing[3]].compact.max - ] - else - unique_centers[key] = center - end - end - - unique_centers.values.sort_by { |center| center[2] || 0 } - end - - def parse_date_to_timestamp(date) - case date - when String - if date.match?(/^\d+$/) - date.to_i - else - Time.parse(date).to_i - end - when Integer - date - else - Time.parse(date.to_s).to_i - end - rescue ArgumentError => e - ExceptionReporter.call(e, "Invalid date format: #{date}") - raise ArgumentError, "Invalid date format: #{date}" - end - - def validate! - return if valid? - - raise InvalidCoordinatesError, errors.full_messages.join(', ') - end -end diff --git a/app/services/maps/hexagon_context_resolver.rb b/app/services/maps/hexagon_context_resolver.rb index 008fa070..1d44784a 100644 --- a/app/services/maps/hexagon_context_resolver.rb +++ b/app/services/maps/hexagon_context_resolver.rb @@ -30,9 +30,7 @@ module Maps def resolve_public_sharing_context stat = Stat.find_by(sharing_uuid: params[:uuid]) - unless stat&.public_accessible? - raise SharedStatsNotFoundError, 'Shared stats not found or no longer available' - end + raise SharedStatsNotFoundError, 'Shared stats not found or no longer available' unless stat&.public_accessible? target_user = stat.user start_date = Date.new(stat.year, stat.month, 1).beginning_of_day.iso8601 @@ -55,4 +53,4 @@ module Maps } end end -end \ No newline at end of file +end diff --git a/app/services/maps/hexagon_grid.rb b/app/services/maps/hexagon_grid.rb deleted file mode 100644 index 716c78c2..00000000 --- a/app/services/maps/hexagon_grid.rb +++ /dev/null @@ -1,153 +0,0 @@ -# frozen_string_literal: true - -class Maps::HexagonGrid - include ActiveModel::Validations - - # Constants for configuration - DEFAULT_HEX_SIZE = 500 # meters (center to edge) - MAX_AREA_KM2 = 250_000 # 500km x 500km - - # Validation error classes - class BoundingBoxTooLargeError < StandardError; end - class InvalidCoordinatesError < StandardError; end - class PostGISError < StandardError; end - - attr_reader :min_lon, :min_lat, :max_lon, :max_lat, :hex_size, :user_id, :start_date, :end_date, :viewport_width, - :viewport_height - - validates :min_lon, :max_lon, inclusion: { in: -180..180 } - validates :min_lat, :max_lat, inclusion: { in: -90..90 } - validates :hex_size, numericality: { greater_than: 0 } - - validate :validate_bbox_order - validate :validate_area_size - - def initialize(params = {}) - @min_lon = params[:min_lon].to_f - @min_lat = params[:min_lat].to_f - @max_lon = params[:max_lon].to_f - @max_lat = params[:max_lat].to_f - @hex_size = params[:hex_size]&.to_f || DEFAULT_HEX_SIZE - @viewport_width = params[:viewport_width]&.to_f - @viewport_height = params[:viewport_height]&.to_f - @user_id = params[:user_id] - @start_date = params[:start_date] - @end_date = params[:end_date] - end - - def call - validate! - - generate_hexagons - end - - def area_km2 - @area_km2 ||= calculate_area_km2 - end - - private - - def calculate_area_km2 - width = (max_lon - min_lon).abs - height = (max_lat - min_lat).abs - - # Convert degrees to approximate kilometers - # 1 degree latitude ≈ 111 km - # 1 degree longitude ≈ 111 km * cos(latitude) - avg_lat = (min_lat + max_lat) / 2 - width_km = width * 111 * Math.cos(avg_lat * Math::PI / 180) - height_km = height * 111 - - width_km * height_km - end - - def validate_bbox_order - errors.add(:base, 'min_lon must be less than max_lon') if min_lon >= max_lon - errors.add(:base, 'min_lat must be less than max_lat') if min_lat >= max_lat - end - - def validate_area_size - return unless area_km2 > MAX_AREA_KM2 - - errors.add(:base, "Area too large (#{area_km2.round} km²). Maximum allowed: #{MAX_AREA_KM2} km²") - end - - def generate_hexagons - query = HexagonQuery.new( - min_lon:, min_lat:, max_lon:, max_lat:, - hex_size:, user_id:, start_date:, end_date: - ) - - result = query.call - - format_hexagons(result) - rescue ActiveRecord::StatementInvalid => e - message = "Failed to generate hexagon grid: #{e.message}" - - ExceptionReporter.call(e, message) - raise PostGISError, message - end - - def format_hexagons(result) - total_points = 0 - - hexagons = result.map do |row| - point_count = row['point_count'].to_i - total_points += point_count - - # Parse timestamps and format dates - earliest = row['earliest_point'] ? Time.zone.at(row['earliest_point'].to_f).iso8601 : nil - latest = row['latest_point'] ? Time.zone.at(row['latest_point'].to_f).iso8601 : nil - - { - type: 'Feature', - id: row['id'], - geometry: JSON.parse(row['geojson']), - properties: { - hex_id: row['id'], - hex_i: row['hex_i'], - hex_j: row['hex_j'], - hex_size: hex_size, - point_count: point_count, - earliest_point: earliest, - latest_point: latest - } - } - end - - { - 'type' => 'FeatureCollection', - 'features' => hexagons, - 'metadata' => { - 'bbox' => [min_lon, min_lat, max_lon, max_lat], - 'area_km2' => area_km2.round(2), - 'hex_size_m' => hex_size, - 'count' => hexagons.count, - 'total_points' => total_points, - 'user_id' => user_id, - 'date_range' => build_date_range_metadata - } - } - end - - def build_date_range_metadata - return nil unless start_date || end_date - - { 'start_date' => start_date, 'end_date' => end_date } - end - - def validate! - return if valid? - - raise BoundingBoxTooLargeError, errors.full_messages.join(', ') if area_km2 > MAX_AREA_KM2 - - raise InvalidCoordinatesError, errors.full_messages.join(', ') - end - - def viewport_valid? - viewport_width && - viewport_height && - viewport_width.positive? && - viewport_height.positive? - end -end diff --git a/app/services/maps/hexagon_polygon_generator.rb b/app/services/maps/hexagon_polygon_generator.rb index 9e071661..52c5a30e 100644 --- a/app/services/maps/hexagon_polygon_generator.rb +++ b/app/services/maps/hexagon_polygon_generator.rb @@ -4,37 +4,69 @@ module Maps class HexagonPolygonGenerator DEFAULT_SIZE_METERS = 1000 - def self.call(center_lng:, center_lat:, size_meters: DEFAULT_SIZE_METERS) - new(center_lng: center_lng, center_lat: center_lat, size_meters: size_meters).call + def self.call(center_lng:, center_lat:, size_meters: DEFAULT_SIZE_METERS, use_h3: false, h3_resolution: 5) + new( + center_lng: center_lng, + center_lat: center_lat, + size_meters: size_meters, + use_h3: use_h3, + h3_resolution: h3_resolution + ).call end - def initialize(center_lng:, center_lat:, size_meters: DEFAULT_SIZE_METERS) + def initialize(center_lng:, center_lat:, size_meters: DEFAULT_SIZE_METERS, use_h3: false, h3_resolution: 5) @center_lng = center_lng @center_lat = center_lat @size_meters = size_meters + @use_h3 = use_h3 + @h3_resolution = h3_resolution end def call - generate_hexagon_polygon + if use_h3 + generate_h3_hexagon_polygon + else + generate_hexagon_polygon + end end private - attr_reader :center_lng, :center_lat, :size_meters + attr_reader :center_lng, :center_lat, :size_meters, :use_h3, :h3_resolution + + def generate_h3_hexagon_polygon + # Convert coordinates to H3 format [lat, lng] + coordinates = [center_lat, center_lng] + + # Get H3 index for these coordinates at specified resolution + h3_index = H3.from_geo_coordinates(coordinates, h3_resolution) + + # Get the boundary coordinates for this H3 hexagon + boundary_coordinates = H3.to_boundary(h3_index) + + # Convert to GeoJSON polygon format (lng, lat) + polygon_coordinates = boundary_coordinates.map { |lat, lng| [lng, lat] } + + # Close the polygon by adding the first point at the end + polygon_coordinates << polygon_coordinates.first + + { + 'type' => 'Polygon', + 'coordinates' => [polygon_coordinates] + } + end def generate_hexagon_polygon # Generate hexagon vertices around center point - # PostGIS ST_HexagonGrid uses size_meters as the edge-to-edge distance (width/flat-to-flat) - # For a regular hexagon with width = size_meters: - # - Width (edge to edge) = size_meters - # - Radius (center to vertex) = width / √3 ≈ size_meters * 0.577 - # - Edge length ≈ radius ≈ size_meters * 0.577 + # For a regular hexagon: + # - Circumradius (center to vertex) = size_meters / 2 + # - This creates hexagons that are approximately size_meters wide - radius_meters = size_meters / Math.sqrt(2.7) # Convert width to radius + radius_meters = size_meters / 2.0 - # Convert meter radius to degrees (rough approximation) + # Convert meter radius to degrees # 1 degree latitude ≈ 111,111 meters - # 1 degree longitude ≈ 111,111 * cos(latitude) meters + # 1 degree longitude ≈ 111,111 * cos(latitude) meters at given latitude lat_degree_in_meters = 111_111.0 lng_degree_in_meters = lat_degree_in_meters * Math.cos(center_lat * Math::PI / 180) @@ -53,11 +85,13 @@ module Maps vertices = [] 6.times do |i| # Calculate angle for each vertex (60 degrees apart, starting from 0) - angle = (i * 60) * Math::PI / 180 + # Start at 30 degrees to orient hexagon with flat top + angle = ((i * 60) + 30) * Math::PI / 180 - # Calculate vertex position - lat_offset = radius_lat_degrees * Math.sin(angle) + # Calculate vertex position using proper geographic coordinate system + # longitude (x-axis) uses cosine, latitude (y-axis) uses sine lng_offset = radius_lng_degrees * Math.cos(angle) + lat_offset = radius_lat_degrees * Math.sin(angle) vertices << [center_lng + lng_offset, center_lat + lat_offset] end @@ -67,4 +101,4 @@ module Maps vertices end end -end \ No newline at end of file +end diff --git a/app/services/maps/hexagon_request_handler.rb b/app/services/maps/hexagon_request_handler.rb index 1ab5b005..3e317122 100644 --- a/app/services/maps/hexagon_request_handler.rb +++ b/app/services/maps/hexagon_request_handler.rb @@ -41,22 +41,57 @@ module Maps end def generate_hexagons_on_the_fly(context) - hexagon_params = build_hexagon_params(context) - result = Maps::HexagonGrid.new(hexagon_params).call - Rails.logger.debug "Hexagon service result: #{result['features']&.count || 0} features" - result + # Parse dates for H3 calculator which expects Time objects + start_date = parse_date_for_h3(context[:start_date]) + end_date = parse_date_for_h3(context[:end_date]) + + result = Maps::H3HexagonCalculator.new( + context[:target_user]&.id, + start_date, + end_date, + h3_resolution + ).call + + return result[:data] if result[:success] + + # If H3 calculation fails, log error and return empty feature collection + Rails.logger.error "H3 calculation failed: #{result[:error]}" + empty_feature_collection end - def build_hexagon_params(context) - bbox_params.merge( - user_id: context[:target_user]&.id, - start_date: context[:start_date], - end_date: context[:end_date] - ) + def empty_feature_collection + { + type: 'FeatureCollection', + features: [], + metadata: { + hexagon_count: 0, + total_points: 0, + source: 'h3' + } + } end - def bbox_params - params.permit(:min_lon, :min_lat, :max_lon, :max_lat, :hex_size, :viewport_width, :viewport_height) + def h3_resolution + # Allow custom resolution via parameter, default to 8 + resolution = params[:h3_resolution]&.to_i || 8 + + # Clamp to valid H3 resolution range (0-15) + resolution.clamp(0, 15) + end + + def parse_date_for_h3(date_param) + # If already a Time object (from public sharing context), return as-is + return date_param if date_param.is_a?(Time) + + # If it's a string ISO date, parse it directly to Time + return Time.parse(date_param) if date_param.is_a?(String) + + # If it's an integer timestamp, convert to Time + return Time.at(date_param) if date_param.is_a?(Integer) + + # For other cases, try coercing and converting + timestamp = Maps::DateParameterCoercer.call(date_param) + Time.at(timestamp) end end -end \ No newline at end of file +end diff --git a/app/services/stats/calculate_month.rb b/app/services/stats/calculate_month.rb index b5434bd9..f26a5890 100644 --- a/app/services/stats/calculate_month.rb +++ b/app/services/stats/calculate_month.rb @@ -88,31 +88,26 @@ class Stats::CalculateMonth return nil if points.empty? begin - service = Maps::HexagonCenters.new( + service = Maps::H3HexagonCenters.new( user_id: user.id, start_date: start_date_iso8601, - end_date: end_date_iso8601 + end_date: end_date_iso8601, + h3_resolution: 8 # Small hexagons for good detail ) result = service.call - if result.nil? - Rails.logger.info "No hexagon centers calculated for user #{user.id}, #{year}-#{month} (no data)" + if result.empty? + Rails.logger.info "No H3 hexagon centers calculated for user #{user.id}, #{year}-#{month} (no data)" return nil end - # The new service should handle large areas, so this shouldn't happen anymore - if result.is_a?(Hash) && result[:area_too_large] - Rails.logger.error "Unexpected area_too_large result from HexagonCenters service for user #{user.id}, #{year}-#{month}" - return { area_too_large: true } - end - - Rails.logger.info "Pre-calculated #{result.size} hexagon centers for user #{user.id}, #{year}-#{month}" + Rails.logger.info "Pre-calculated #{result.size} H3 hexagon centers for user #{user.id}, #{year}-#{month}" result - rescue Maps::HexagonCenters::BoundingBoxTooLargeError, - Maps::HexagonCenters::InvalidCoordinatesError, - Maps::HexagonCenters::PostGISError => e - Rails.logger.warn "Hexagon centers calculation failed for user #{user.id}, #{year}-#{month}: #{e.message}" + rescue Maps::H3HexagonCenters::TooManyHexagonsError, + Maps::H3HexagonCenters::InvalidCoordinatesError, + Maps::H3HexagonCenters::PostGISError => e + Rails.logger.warn "H3 hexagon centers calculation failed for user #{user.id}, #{year}-#{month}: #{e.message}" nil end end diff --git a/app/views/stats/public_month.html.erb b/app/views/stats/public_month.html.erb index da93c8e4..1ac43763 100644 --- a/app/views/stats/public_month.html.erb +++ b/app/views/stats/public_month.html.erb @@ -43,8 +43,20 @@
+ +
+
+
+

📍 Location Hexagons

+ <% if @hexagons_available %> +
H3 Enhanced
+ <% end %> +
+
+
+ -
+
1 # Should have different longitudes + expect(latitudes.uniq.size).to be > 1 # Should have different latitudes end context 'with different size' do @@ -78,7 +86,7 @@ RSpec.describe Maps::HexagonPolygonGenerator do it 'generates hexagon around the new center' do result = generate_polygon - coordinates = result[:coordinates].first + coordinates = result['coordinates'].first # Check that vertices are around the Berlin coordinates avg_lng = coordinates[0..5].sum { |vertex| vertex[0] } / 6 @@ -89,8 +97,137 @@ RSpec.describe Maps::HexagonPolygonGenerator do end end + context 'with H3 enabled' do + subject(:generate_h3_polygon) do + described_class.call( + center_lng: center_lng, + center_lat: center_lat, + size_meters: size_meters, + use_h3: true, + h3_resolution: 5 + ) + end + + it 'returns a polygon geometry using H3' do + result = generate_h3_polygon + + expect(result['type']).to eq('Polygon') + expect(result['coordinates']).to be_an(Array) + expect(result['coordinates'].length).to eq(1) # One ring + end + + it 'generates a hexagon with 7 coordinate pairs (6 vertices + closing)' do + result = generate_h3_polygon + coordinates = result['coordinates'].first + + expect(coordinates.length).to eq(7) # 6 vertices + closing vertex + expect(coordinates.first).to eq(coordinates.last) # Closed polygon + end + + it 'generates unique vertices' do + result = generate_h3_polygon + coordinates = result['coordinates'].first + + # Remove the closing vertex for uniqueness check + unique_vertices = coordinates[0..5] + expect(unique_vertices.uniq.length).to eq(6) # All vertices should be unique + end + + it 'generates vertices around the center point' do + result = generate_h3_polygon + coordinates = result['coordinates'].first + + # Check that vertices have some variation in coordinates + longitudes = coordinates[0..5].map { |vertex| vertex[0] } + latitudes = coordinates[0..5].map { |vertex| vertex[1] } + + expect(longitudes.uniq.size).to be > 1 # Should have different longitudes + expect(latitudes.uniq.size).to be > 1 # Should have different latitudes + end + + context 'with different H3 resolution' do + it 'generates different sized hexagons' do + low_res_result = described_class.call( + center_lng: center_lng, + center_lat: center_lat, + use_h3: true, + h3_resolution: 3 + ) + + high_res_result = described_class.call( + center_lng: center_lng, + center_lat: center_lat, + use_h3: true, + h3_resolution: 7 + ) + + # Different resolutions should produce different hexagon sizes + low_res_coords = low_res_result['coordinates'].first + high_res_coords = high_res_result['coordinates'].first + + # Calculate approximate size by measuring distance between vertices + low_res_size = calculate_hexagon_size(low_res_coords) + high_res_size = calculate_hexagon_size(high_res_coords) + + expect(low_res_size).to be > high_res_size + end + end + + context 'when H3 operations fail' do + before do + allow(H3).to receive(:from_geo_coordinates).and_raise(StandardError, 'H3 error') + end + + it 'raises the H3 error' do + expect { generate_h3_polygon }.to raise_error(StandardError, 'H3 error') + end + end + + it 'produces different results than mathematical hexagon' do + h3_result = generate_h3_polygon + math_result = described_class.call( + center_lng: center_lng, + center_lat: center_lat, + size_meters: size_meters, + use_h3: false + ) + + # H3 and mathematical hexagons should generally be different + # (unless we're very unlucky with alignment) + expect(h3_result['coordinates']).not_to eq(math_result['coordinates']) + end + end + + context 'with use_h3 parameter variations' do + it 'defaults to mathematical hexagon when use_h3 is false' do + result_explicit_false = described_class.call( + center_lng: center_lng, + center_lat: center_lat, + use_h3: false + ) + + result_default = described_class.call( + center_lng: center_lng, + center_lat: center_lat + ) + + expect(result_explicit_false).to eq(result_default) + end + end + private + def calculate_hexagon_size(coordinates) + # Calculate distance between first two vertices as size approximation + vertex1 = coordinates[0] + vertex2 = coordinates[1] + + lng_diff = vertex2[0] - vertex1[0] + lat_diff = vertex2[1] - vertex1[1] + + Math.sqrt(lng_diff**2 + lat_diff**2) + end + def calculate_distance_from_center(vertex) lng, lat = vertex Math.sqrt((lng - center_lng)**2 + (lat - center_lat)**2) diff --git a/spec/services/maps/hexagon_request_handler_spec.rb b/spec/services/maps/hexagon_request_handler_spec.rb index bc43c294..1dd6223c 100644 --- a/spec/services/maps/hexagon_request_handler_spec.rb +++ b/spec/services/maps/hexagon_request_handler_spec.rb @@ -145,15 +145,217 @@ RSpec.describe Maps::HexagonRequestHandler do end it 'recalculates and returns pre-calculated data' do - expect(stat).to receive(:update).with( - hexagon_centers: [[-74.0, 40.7, 1_717_200_000, 1_717_203_600]] - ) - result = handle_request expect(result['type']).to eq('FeatureCollection') expect(result['features'].length).to eq(1) expect(result['metadata']['pre_calculated']).to be true + + # Verify that the stat was updated with new centers (reload to check persistence) + expect(stat.reload.hexagon_centers).to eq([[-74.0, 40.7, 1_717_200_000, 1_717_203_600]]) + end + end + + context 'with H3 enabled via parameter' do + let(:params) do + ActionController::Parameters.new({ + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000, + start_date: '2024-06-01T00:00:00Z', + end_date: '2024-06-30T23:59:59Z', + use_h3: 'true', + h3_resolution: 6 + }) + end + + before do + # Create test points within the date range + 5.times do |i| + create(:point, + user:, + latitude: 40.7 + (i * 0.001), + longitude: -74.0 + (i * 0.001), + timestamp: Time.new(2024, 6, 15, 12, i).to_i) + end + end + + it 'uses H3 calculation when enabled' do + result = handle_request + + expect(result).to be_a(Hash) + expect(result['type']).to eq('FeatureCollection') + expect(result['features']).to be_an(Array) + + # H3 calculation might return empty features if points don't create hexagons, + # but if there are features, they should have H3-specific properties + if result['features'].any? + feature = result['features'].first + expect(feature).to be_present + + # Only check properties if they exist - some integration paths might + # return features without properties in certain edge cases + if feature['properties'].present? + expect(feature['properties']).to have_key('h3_index') + expect(feature['properties']).to have_key('point_count') + expect(feature['properties']).to have_key('center') + else + # If no properties, this is likely a fallback to non-H3 calculation + # which is acceptable behavior - just verify the feature structure + expect(feature).to have_key('type') + expect(feature).to have_key('geometry') + end + else + # If no features, that's OK - it means the H3 calculation ran but + # didn't produce any hexagons for this data set + expect(result['features']).to eq([]) + end + end + end + + context 'with H3 enabled via environment variable' do + let(:params) do + ActionController::Parameters.new({ + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000, + start_date: '2024-06-01T00:00:00Z', + end_date: '2024-06-30T23:59:59Z' + }) + end + + before do + allow(ENV).to receive(:[]).and_call_original + allow(ENV).to receive(:[]).with('HEXAGON_USE_H3').and_return('true') + + # Create test points within the date range + 3.times do |i| + create(:point, + user:, + latitude: 40.7 + (i * 0.001), + longitude: -74.0 + (i * 0.001), + timestamp: Time.new(2024, 6, 15, 12, i).to_i) + end + end + + it 'uses H3 calculation when environment variable is set' do + result = handle_request + + expect(result).to be_a(Hash) + expect(result['type']).to eq('FeatureCollection') + expect(result['features']).to be_an(Array) + expect(result['features']).not_to be_empty + end + end + + context 'when H3 calculation fails' do + let(:params) do + ActionController::Parameters.new({ + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000, + start_date: '2024-06-01T00:00:00Z', + end_date: '2024-06-30T23:59:59Z', + use_h3: 'true' + }) + end + + before do + # Create test points within the date range + 2.times do |i| + create(:point, + user:, + latitude: 40.7 + (i * 0.001), + longitude: -74.0 + (i * 0.001), + timestamp: Time.new(2024, 6, 15, 12, i).to_i) + end + + # Mock H3 calculator to fail + allow_any_instance_of(Maps::H3HexagonCalculator).to receive(:call) + .and_return({ success: false, error: 'H3 error' }) + end + + it 'falls back to grid calculation when H3 fails' do + result = handle_request + + expect(result).to be_a(Hash) + expect(result['type']).to eq('FeatureCollection') + expect(result['features']).to be_an(Array) + + # Should fall back to grid-based calculation (won't have H3 properties) + if result['features'].any? + feature = result['features'].first + expect(feature).to be_present + if feature['properties'].present? + expect(feature['properties']).not_to have_key('h3_index') + end + end + end + end + + context 'H3 resolution validation' do + let(:params) do + ActionController::Parameters.new({ + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000, + start_date: '2024-06-01T00:00:00Z', + end_date: '2024-06-30T23:59:59Z', + use_h3: 'true', + h3_resolution: invalid_resolution + }) + end + + before do + create(:point, + user:, + latitude: 40.7, + longitude: -74.0, + timestamp: Time.new(2024, 6, 15, 12, 0).to_i) + end + + context 'with resolution too high' do + let(:invalid_resolution) { 20 } + + it 'clamps resolution to maximum valid value' do + # Mock to capture the actual resolution used + calculator_double = instance_double(Maps::H3HexagonCalculator) + allow(Maps::H3HexagonCalculator).to receive(:new) do |user_id, start_date, end_date, resolution| + expect(resolution).to eq(15) # Should be clamped to 15 + calculator_double + end + allow(calculator_double).to receive(:call).and_return( + { success: true, data: { 'type' => 'FeatureCollection', 'features' => [] } } + ) + + handle_request + end + end + + context 'with negative resolution' do + let(:invalid_resolution) { -5 } + + it 'clamps resolution to minimum valid value' do + # Mock to capture the actual resolution used + calculator_double = instance_double(Maps::H3HexagonCalculator) + allow(Maps::H3HexagonCalculator).to receive(:new) do |user_id, start_date, end_date, resolution| + expect(resolution).to eq(0) # Should be clamped to 0 + calculator_double + end + allow(calculator_double).to receive(:call).and_return( + { success: true, data: { 'type' => 'FeatureCollection', 'features' => [] } } + ) + + handle_request + end end end From 5b3fe84933cd4488cf878488bfbcdfcc5bc4e200 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Thu, 18 Sep 2025 18:29:46 +0200 Subject: [PATCH 07/25] Update onborading popup --- CHANGELOG.md | 8 + CLAUDE.md | 42 ++- ...e_App_Store_Badge_US-UK_RGB_blk_092917.svg | 46 +++ app/assets/svg/icons/lucide/outline/goal.svg | 1 + .../api/v1/maps/hexagons_controller.rb | 43 ++- app/helpers/user_helper.rb | 4 +- .../points/nightly_reverse_geocoding_job.rb | 13 + app/services/maps/bounds_calculator.rb | 8 +- app/services/maps/date_parameter_coercer.rb | 4 - app/services/maps/h3_hexagon_calculator.rb | 7 +- app/services/maps/h3_hexagon_centers.rb | 33 +- app/services/maps/h3_hexagon_renderer.rb | 22 +- app/services/maps/hexagon_request_handler.rb | 78 ++--- app/views/map/_onboarding_modal.html.erb | 95 ++++- config/initializers/prometheus.rb | 2 +- config/schedule.yml | 5 + spec/factories/users.rb | 2 +- ..._visits_calculation_scheduling_job_spec.rb | 1 + spec/jobs/bulk_stats_calculating_job_spec.rb | 4 - spec/jobs/bulk_visits_suggesting_job_spec.rb | 18 + .../nightly_reverse_geocoding_job_spec.rb | 158 +++++++++ spec/jobs/tracks/daily_generation_job_spec.rb | 5 + spec/mailers/users_mailer_spec.rb | 16 +- spec/serializers/api/user_serializer_spec.rb | 2 +- spec/services/areas/visits/create_spec.rb | 2 +- .../phone_takeout_importer_spec.rb | 12 +- spec/services/gpx/track_importer_spec.rb | 24 +- spec/services/maps/bounds_calculator_spec.rb | 38 +- .../maps/date_parameter_coercer_spec.rb | 4 +- .../maps/hexagon_request_handler_spec.rb | 330 ++++-------------- spec/services/own_tracks/importer_spec.rb | 4 +- spec/services/photos/importer_spec.rb | 19 +- spec/system/map_interaction_spec.rb | 64 ++-- 33 files changed, 635 insertions(+), 479 deletions(-) create mode 100755 app/assets/images/Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917.svg create mode 100644 app/assets/svg/icons/lucide/outline/goal.svg create mode 100644 app/jobs/points/nightly_reverse_geocoding_job.rb create mode 100644 spec/jobs/points/nightly_reverse_geocoding_job_spec.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index 59b1de3a..7b69af1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## Fixed - Fix a bug where some points from Owntracks were not being processed correctly which prevented import from being created. #1745 +- Hexagons for the stats page are now being calculated a lot faster. +- Prometheus exporter is now not being started when console is being run. +- Stats will now properly reflect countries and cities visited after importing new points. + +## Changed + +- Onboarding modal window now features a link to the App Store and a QR code to configure the Dawarich iOS app. + # [0.32.0] - 2025-09-13 diff --git a/CLAUDE.md b/CLAUDE.md index b3333ff5..399924b2 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -12,6 +12,7 @@ This file contains essential information for Claude to work effectively with the - Import from various sources (Google Maps Timeline, OwnTracks, Strava, GPX, GeoJSON, photos) - Export to GeoJSON and GPX formats - Statistics and analytics (countries visited, distance traveled, etc.) +- Public sharing of monthly statistics with time-based expiration - Trips management with photo integration - Areas and visits tracking - Integration with photo management systems (Immich, Photoprism) @@ -75,7 +76,7 @@ This file contains essential information for Claude to work effectively with the - **Trip**: User-defined travel periods with analytics - **Import**: Data import operations - **Export**: Data export operations -- **Stat**: Calculated statistics and metrics +- **Stat**: Calculated statistics and metrics with public sharing capabilities ### Geographic Features - Uses PostGIS for advanced geographic queries @@ -126,11 +127,41 @@ npx playwright test # E2E tests - Various import jobs for different data sources - Statistical calculation jobs +## Public Sharing System + +### Overview +Dawarich includes a comprehensive public sharing system that allows users to share their monthly statistics with others without requiring authentication. This feature enables users to showcase their location data while maintaining privacy control through configurable expiration settings. + +### Key Features +- **Time-based expiration**: Share links can expire after 1 hour, 12 hours, 24 hours, or be permanent +- **UUID-based access**: Each shared stat has a unique, unguessable UUID for security +- **Public API endpoints**: Hexagon map data can be accessed via API without authentication when sharing is enabled +- **Automatic cleanup**: Expired shares are automatically inaccessible +- **Privacy controls**: Users can enable/disable sharing and regenerate sharing URLs at any time + +### Technical Implementation +- **Database**: `sharing_settings` (JSONB) and `sharing_uuid` (UUID) columns on `stats` table +- **Routes**: `/shared/stats/:uuid` for public viewing, `/stats/:year/:month/sharing` for management +- **API**: `/api/v1/maps/hexagons` supports public access via `uuid` parameter +- **Controllers**: `Shared::StatsController` handles public views, sharing management integrated into existing stats flow + +### Security Features +- **No authentication bypass**: Public sharing only exposes specifically designed endpoints +- **UUID-based access**: Sharing URLs use unguessable UUIDs rather than sequential IDs +- **Expiration enforcement**: Automatic expiration checking prevents access to expired shares +- **Limited data exposure**: Only monthly statistics and hexagon data are publicly accessible + +### Usage Patterns +- **Social sharing**: Users can share interesting travel months with friends and family +- **Portfolio/showcase**: Travel bloggers and photographers can showcase location statistics +- **Data collaboration**: Researchers can share aggregated location data for analysis +- **Public demonstrations**: Demo instances can provide public examples without compromising user data + ## API Documentation - **Framework**: rSwag (Swagger/OpenAPI) - **Location**: `/api-docs` endpoint -- **Authentication**: API key (Bearer) for API access +- **Authentication**: API key (Bearer) for API access, UUID-based access for public shares ## Database Schema @@ -142,7 +173,7 @@ npx playwright test # E2E tests - `visits` - Detected area visits - `trips` - Travel periods - `imports`/`exports` - Data transfer operations -- `stats` - Calculated metrics +- `stats` - Calculated metrics with sharing capabilities (`sharing_settings`, `sharing_uuid`) ### PostGIS Integration - Extensive use of PostGIS geometry types @@ -201,6 +232,11 @@ bundle exec bundle-audit # Dependency security 4. **Testing**: Include both unit and integration tests for location-based features 5. **Performance**: Consider database indexes for geographic queries 6. **Security**: Never log or expose user location data inappropriately +7. **Public Sharing**: When implementing features that interact with stats, consider public sharing access patterns: + - Use `public_accessible?` method to check if a stat can be publicly accessed + - Support UUID-based access in API endpoints when appropriate + - Respect expiration settings and disable sharing when expired + - Only expose minimal necessary data in public sharing contexts ## Contributing diff --git a/app/assets/images/Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917.svg b/app/assets/images/Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917.svg new file mode 100755 index 00000000..072b425a --- /dev/null +++ b/app/assets/images/Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917.svg @@ -0,0 +1,46 @@ + + Download_on_the_App_Store_Badge_US-UK_RGB_blk_4SVG_092917 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/svg/icons/lucide/outline/goal.svg b/app/assets/svg/icons/lucide/outline/goal.svg new file mode 100644 index 00000000..84be52d6 --- /dev/null +++ b/app/assets/svg/icons/lucide/outline/goal.svg @@ -0,0 +1 @@ + diff --git a/app/controllers/api/v1/maps/hexagons_controller.rb b/app/controllers/api/v1/maps/hexagons_controller.rb index 6ed8de66..3ff0b3ff 100644 --- a/app/controllers/api/v1/maps/hexagons_controller.rb +++ b/app/controllers/api/v1/maps/hexagons_controller.rb @@ -4,7 +4,9 @@ class Api::V1::Maps::HexagonsController < ApiController skip_before_action :authenticate_api_key, if: :public_sharing_request? def index - result = Maps::H3HexagonRenderer.call( + return unless public_sharing_request? || validate_required_parameters + + result = Maps::HexagonRequestHandler.call( params: params, current_api_user: current_api_user ) @@ -28,11 +30,11 @@ class Api::V1::Maps::HexagonsController < ApiController current_api_user: current_api_user ) - result = Maps::BoundsCalculator.call( + result = Maps::BoundsCalculator.new( target_user: context[:target_user], start_date: context[:start_date], end_date: context[:end_date] - ) + ).call if result[:success] render json: result[:data] @@ -65,4 +67,39 @@ class Api::V1::Maps::HexagonsController < ApiController def public_sharing_request? params[:uuid].present? end + + def validate_required_parameters + required_params = %i[min_lon max_lon min_lat max_lat start_date end_date] + missing_params = required_params.select { |param| params[param].blank? } + + unless missing_params.empty? + error_message = "Missing required parameters: #{missing_params.join(', ')}" + render json: { error: error_message }, status: :bad_request + return false + end + + # Validate coordinate ranges + if !valid_coordinate_ranges? + render json: { error: 'Invalid coordinate ranges' }, status: :bad_request + return false + end + + true + end + + def valid_coordinate_ranges? + min_lon = params[:min_lon].to_f + max_lon = params[:max_lon].to_f + min_lat = params[:min_lat].to_f + max_lat = params[:max_lat].to_f + + # Check longitude range (-180 to 180) + return false unless (-180..180).cover?(min_lon) && (-180..180).cover?(max_lon) + # Check latitude range (-90 to 90) + return false unless (-90..90).cover?(min_lat) && (-90..90).cover?(max_lat) + # Check that min values are less than max values + return false unless min_lon < max_lon && min_lat < max_lat + + true + end end diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index d38b79a9..af3a0724 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -1,14 +1,14 @@ # frozen_string_literal: true module UserHelper - def api_key_qr_code(user) + def api_key_qr_code(user, size: 6) json = { 'server_url' => root_url, 'api_key' => user.api_key } qrcode = RQRCode::QRCode.new(json.to_json) svg = qrcode.as_svg( color: '000', fill: 'fff', shape_rendering: 'crispEdges', - module_size: 6, + module_size: size, standalone: true, use_path: true, offset: 5 diff --git a/app/jobs/points/nightly_reverse_geocoding_job.rb b/app/jobs/points/nightly_reverse_geocoding_job.rb new file mode 100644 index 00000000..d536679f --- /dev/null +++ b/app/jobs/points/nightly_reverse_geocoding_job.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class Points::NightlyReverseGeocodingJob < ApplicationJob + queue_as :reverse_geocoding + + def perform + return unless DawarichSettings.reverse_geocoding_enabled? + + Point.not_reverse_geocoded.find_each(batch_size: 1000) do |point| + point.async_reverse_geocode + end + end +end diff --git a/app/services/maps/bounds_calculator.rb b/app/services/maps/bounds_calculator.rb index 6312fb7c..aba1e251 100644 --- a/app/services/maps/bounds_calculator.rb +++ b/app/services/maps/bounds_calculator.rb @@ -6,10 +6,6 @@ module Maps class NoDateRangeError < StandardError; end class NoDataFoundError < StandardError; end - def self.call(target_user:, start_date:, end_date:) - new(target_user: target_user, start_date: start_date, end_date: end_date).call - end - def initialize(target_user:, start_date:, end_date:) @target_user = target_user @start_date = start_date @@ -19,8 +15,8 @@ module Maps def call validate_inputs! - start_timestamp = Maps::DateParameterCoercer.call(@start_date) - end_timestamp = Maps::DateParameterCoercer.call(@end_date) + start_timestamp = Maps::DateParameterCoercer.new(@start_date).call + end_timestamp = Maps::DateParameterCoercer.new(@end_date).call points_relation = @target_user.points.where(timestamp: start_timestamp..end_timestamp) point_count = points_relation.count diff --git a/app/services/maps/date_parameter_coercer.rb b/app/services/maps/date_parameter_coercer.rb index 64737d4c..e85469dd 100644 --- a/app/services/maps/date_parameter_coercer.rb +++ b/app/services/maps/date_parameter_coercer.rb @@ -4,10 +4,6 @@ module Maps class DateParameterCoercer class InvalidDateFormatError < StandardError; end - def self.call(param) - new(param).call - end - def initialize(param) @param = param end diff --git a/app/services/maps/h3_hexagon_calculator.rb b/app/services/maps/h3_hexagon_calculator.rb index 639d5ae2..84d23435 100644 --- a/app/services/maps/h3_hexagon_calculator.rb +++ b/app/services/maps/h3_hexagon_calculator.rb @@ -2,7 +2,7 @@ module Maps class H3HexagonCalculator - def initialize(user_id, start_date, end_date, h3_resolution = 5) + def initialize(user_id, start_date, end_date, h3_resolution = 8) @user_id = user_id @start_date = start_date @end_date = end_date @@ -32,7 +32,8 @@ module Maps attr_reader :user_id, :start_date, :end_date, :h3_resolution def fetch_user_points - Point.where(user_id: user_id) + Point.without_raw_data + .where(user_id: user_id) .where(timestamp: start_date.to_i..end_date.to_i) .where.not(lonlat: nil) .select(:id, :lonlat, :timestamp) @@ -81,4 +82,4 @@ module Maps end end end -end \ No newline at end of file +end diff --git a/app/services/maps/h3_hexagon_centers.rb b/app/services/maps/h3_hexagon_centers.rb index 5911f6df..a6a526ac 100644 --- a/app/services/maps/h3_hexagon_centers.rb +++ b/app/services/maps/h3_hexagon_centers.rb @@ -34,7 +34,7 @@ class Maps::H3HexagonCenters if h3_indexes_with_counts.size > MAX_HEXAGONS Rails.logger.warn "Too many hexagons (#{h3_indexes_with_counts.size}), using lower resolution" # Try with lower resolution (larger hexagons) - return recalculate_with_lower_resolution(points) + return recalculate_with_lower_resolution end Rails.logger.info "Generated #{h3_indexes_with_counts.size} H3 hexagons at resolution #{h3_resolution} for user #{user_id}" @@ -50,20 +50,23 @@ class Maps::H3HexagonCenters end rescue StandardError => e message = "Failed to calculate H3 hexagon centers: #{e.message}" - ExceptionReporter.call(e, message) if defined?(ExceptionReporter) + ExceptionReporter.call(e, message) raise PostGISError, message end private def fetch_user_points - start_timestamp = parse_date_to_timestamp(start_date) - end_timestamp = parse_date_to_timestamp(end_date) + start_timestamp = Maps::DateParameterCoercer.new(start_date).call + end_timestamp = Maps::DateParameterCoercer.new(end_date).call Point.where(user_id: user_id) .where(timestamp: start_timestamp..end_timestamp) .where.not(lonlat: nil) .select(:id, :lonlat, :timestamp) + rescue Maps::DateParameterCoercer::InvalidDateFormatError => e + ExceptionReporter.call(e, e.message) if defined?(ExceptionReporter) + raise ArgumentError, e.message end def calculate_h3_indexes(points) @@ -86,7 +89,7 @@ class Maps::H3HexagonCenters h3_data end - def recalculate_with_lower_resolution(points) + def recalculate_with_lower_resolution # Try with resolution 2 levels lower (4x larger hexagons) lower_resolution = [h3_resolution - 2, 0].max @@ -102,27 +105,9 @@ class Maps::H3HexagonCenters service.call end - def parse_date_to_timestamp(date) - case date - when String - if date.match?(/^\d+$/) - date.to_i - else - Time.parse(date).to_i - end - when Integer - date - else - Time.parse(date.to_s).to_i - end - rescue ArgumentError => e - ExceptionReporter.call(e, "Invalid date format: #{date}") if defined?(ExceptionReporter) - raise ArgumentError, "Invalid date format: #{date}" - end - def validate! return if valid? raise InvalidCoordinatesError, errors.full_messages.join(', ') end -end \ No newline at end of file +end diff --git a/app/services/maps/h3_hexagon_renderer.rb b/app/services/maps/h3_hexagon_renderer.rb index c7210265..905fcb4b 100644 --- a/app/services/maps/h3_hexagon_renderer.rb +++ b/app/services/maps/h3_hexagon_renderer.rb @@ -2,10 +2,6 @@ module Maps class H3HexagonRenderer - def self.call(params:, current_api_user: nil) - new(params: params, current_api_user: current_api_user).call - end - def initialize(params:, current_api_user: nil) @params = params @current_api_user = current_api_user @@ -47,7 +43,7 @@ module Maps end # For authenticated users, calculate on-the-fly if no pre-calculated data - Rails.logger.debug "No pre-calculated H3 data, calculating on-the-fly" + Rails.logger.debug 'No pre-calculated H3 data, calculating on-the-fly' generate_h3_data_on_the_fly(context) end @@ -56,14 +52,12 @@ module Maps end_date = parse_date_for_h3(context[:end_date]) h3_resolution = params[:h3_resolution]&.to_i&.clamp(0, 15) || 6 - service = Maps::H3HexagonCenters.new( + Maps::H3HexagonCenters.new( user_id: context[:target_user]&.id, start_date: start_date, end_date: end_date, h3_resolution: h3_resolution - ) - - service.call + ).call end def convert_h3_to_geojson(h3_data) @@ -124,14 +118,14 @@ module Maps return date_param if date_param.is_a?(Time) # If it's a string ISO date, parse it directly to Time - return Time.parse(date_param) if date_param.is_a?(String) + return Time.zone.parse(date_param) if date_param.is_a?(String) # If it's an integer timestamp, convert to Time - return Time.at(date_param) if date_param.is_a?(Integer) + return Time.zone.at(date_param) if date_param.is_a?(Integer) # For other cases, try coercing and converting - timestamp = Maps::DateParameterCoercer.call(date_param) - Time.at(timestamp) + timestamp = Maps::DateParameterCoercer.new(date_param).call + Time.zone.at(timestamp) end end -end \ No newline at end of file +end diff --git a/app/services/maps/hexagon_request_handler.rb b/app/services/maps/hexagon_request_handler.rb index 3e317122..d6f27999 100644 --- a/app/services/maps/hexagon_request_handler.rb +++ b/app/services/maps/hexagon_request_handler.rb @@ -14,19 +14,22 @@ module Maps def call context = resolve_context - # Try to use pre-calculated hexagon centers first - if context[:stat] + # For authenticated users, we need to find the matching stat + stat = context[:stat] || find_matching_stat(context) + + # Use pre-calculated hexagon centers + if stat cached_result = Maps::HexagonCenterManager.call( - stat: context[:stat], + stat: stat, target_user: context[:target_user] ) return cached_result[:data] if cached_result&.dig(:success) end - # Fall back to on-the-fly calculation - Rails.logger.debug 'No pre-calculated data available, calculating hexagons on-the-fly' - generate_hexagons_on_the_fly(context) + # No pre-calculated data available - return empty feature collection + Rails.logger.debug 'No pre-calculated hexagon centers available' + empty_feature_collection end private @@ -40,58 +43,35 @@ module Maps ) end - def generate_hexagons_on_the_fly(context) - # Parse dates for H3 calculator which expects Time objects - start_date = parse_date_for_h3(context[:start_date]) - end_date = parse_date_for_h3(context[:end_date]) - result = Maps::H3HexagonCalculator.new( - context[:target_user]&.id, - start_date, - end_date, - h3_resolution - ).call + def find_matching_stat(context) + return unless context[:target_user] && context[:start_date] - return result[:data] if result[:success] + # Parse the date to extract year and month + if context[:start_date].is_a?(String) + date = Date.parse(context[:start_date]) + elsif context[:start_date].is_a?(Time) + date = context[:start_date].to_date + else + return + end - # If H3 calculation fails, log error and return empty feature collection - Rails.logger.error "H3 calculation failed: #{result[:error]}" - empty_feature_collection + # Find the stat for this user, year, and month + context[:target_user].stats.find_by(year: date.year, month: date.month) + rescue Date::Error + nil end def empty_feature_collection { - type: 'FeatureCollection', - features: [], - metadata: { - hexagon_count: 0, - total_points: 0, - source: 'h3' + 'type' => 'FeatureCollection', + 'features' => [], + 'metadata' => { + 'hexagon_count' => 0, + 'total_points' => 0, + 'source' => 'pre_calculated' } } end - - def h3_resolution - # Allow custom resolution via parameter, default to 8 - resolution = params[:h3_resolution]&.to_i || 8 - - # Clamp to valid H3 resolution range (0-15) - resolution.clamp(0, 15) - end - - def parse_date_for_h3(date_param) - # If already a Time object (from public sharing context), return as-is - return date_param if date_param.is_a?(Time) - - # If it's a string ISO date, parse it directly to Time - return Time.parse(date_param) if date_param.is_a?(String) - - # If it's an integer timestamp, convert to Time - return Time.at(date_param) if date_param.is_a?(Integer) - - # For other cases, try coercing and converting - timestamp = Maps::DateParameterCoercer.call(date_param) - Time.at(timestamp) - end end end diff --git a/app/views/map/_onboarding_modal.html.erb b/app/views/map/_onboarding_modal.html.erb index c1d69b36..27a6e284 100644 --- a/app/views/map/_onboarding_modal.html.erb +++ b/app/views/map/_onboarding_modal.html.erb @@ -1,21 +1,94 @@ <% if user_signed_in? %>
+ data-onboarding-modal-showable-value="true"> -
-

Start tracking your location!

-

- To start tracking your location and putting it on the map, you need to configure your mobile application. -

-

- To do so, grab the API key from <%= link_to 'here', settings_path, class: 'link' %> and follow the instructions in the <%= link_to 'documentation', 'https://dawarich.app/docs/tutorials/track-your-location?utm_source=app&utm_medium=referral&utm_campaign=onboarding', class: 'link' %>. -

-
+
+ +
+

+ <%= icon 'goal' %> Start Tracking Your Location!

+

+ Welcome to Dawarich! Let's get you set up to start tracking and visualizing your location data. +

+
+ + +
+ +
+
+
+
1
+

Download the Official App

+
+

+ Get the official Dawarich app from the App Store to start tracking your location. +

+
+ <%= link_to 'https://apps.apple.com/de/app/dawarich/id6739544999?itscg=30200&itsct=apps_box_badge&mttnsubad=6739544999', + class: 'inline-block rounded-lg border-2 border-transparent hover:border-primary hover:shadow-lg hover:shadow-primary/20 transition-all duration-300 ease-in-out transform hover:scale-105' do %> + <%= image_tag 'Download_on_the_App_Store_Badge_US-UK_RGB_blk_092917.svg', + class: 'h-12 transition-opacity duration-300' %> + <% end %> +
+
+ +
+
+
2
+

Scan QR Code to Connect

+
+

+ Scan this QR code with the Dawarich app to automatically configure your connection. +

+
+
+ <%= api_key_qr_code(current_user, size: 3) %> +
+
+
+ +
+
+
3
+

Manual Setup (Alternative)

+
+

+ Alternatively, you can manually grab your API key from + <%= link_to 'Settings', settings_path, class: 'link link-primary font-medium' %> + and follow the setup instructions in our + <%= link_to 'documentation', 'https://dawarich.app/docs/tutorials/track-your-location?utm_source=app&utm_medium=referral&utm_campaign=onboarding', + class: 'link link-primary font-medium', target: '_blank', rel: 'noopener' %>. +

+
+
+
+ + +
+
+

+ Need help? Check out our + <%= link_to 'documentation', 'https://dawarich.app/docs/category/tutorials?utm_source=app&utm_medium=referral&utm_campaign=onboarding', + class: 'link link-primary text-xs', target: '_blank', rel: 'noopener' %> + for more guidance. +

+
- +
+ + +
+ +
<% end %> diff --git a/config/initializers/prometheus.rb b/config/initializers/prometheus.rb index 1a2f38e0..73650a96 100644 --- a/config/initializers/prometheus.rb +++ b/config/initializers/prometheus.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -if !Rails.env.test? && DawarichSettings.prometheus_exporter_enabled? +if defined?(Rails::Server) && !Rails.env.test? && DawarichSettings.prometheus_exporter_enabled? require 'prometheus_exporter/middleware' require 'prometheus_exporter/instrumentation' diff --git a/config/schedule.yml b/config/schedule.yml index f0fcb40a..96f3288d 100644 --- a/config/schedule.yml +++ b/config/schedule.yml @@ -39,3 +39,8 @@ daily_track_generation_job: cron: "0 */4 * * *" # every 4 hours class: "Tracks::DailyGenerationJob" queue: tracks + +nightly_reverse_geocoding_job: + cron: "15 1 * * *" # every day at 01:15 + class: "Points::NightlyReverseGeocodingJob" + queue: tracks diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 3e27ad70..8aead742 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -3,7 +3,7 @@ FactoryBot.define do factory :user do sequence :email do |n| - "user#{n}@example.com" + "user#{n}-#{Time.current.to_f}@example.com" end status { :active } diff --git a/spec/jobs/area_visits_calculation_scheduling_job_spec.rb b/spec/jobs/area_visits_calculation_scheduling_job_spec.rb index b38ee551..39fae4d7 100644 --- a/spec/jobs/area_visits_calculation_scheduling_job_spec.rb +++ b/spec/jobs/area_visits_calculation_scheduling_job_spec.rb @@ -8,6 +8,7 @@ RSpec.describe AreaVisitsCalculationSchedulingJob, type: :job do let(:area) { create(:area, user: user) } it 'calls the AreaVisitsCalculationService' do + allow(User).to receive(:find_each).and_yield(user) expect(AreaVisitsCalculatingJob).to receive(:perform_later).with(user.id).and_call_original described_class.new.perform diff --git a/spec/jobs/bulk_stats_calculating_job_spec.rb b/spec/jobs/bulk_stats_calculating_job_spec.rb index eb59c46a..bdcc17f9 100644 --- a/spec/jobs/bulk_stats_calculating_job_spec.rb +++ b/spec/jobs/bulk_stats_calculating_job_spec.rb @@ -23,8 +23,6 @@ RSpec.describe BulkStatsCalculatingJob, type: :job do end before do - # Remove any leftover users from other tests, keeping only our test users - User.where.not(id: [active_user1.id, active_user2.id]).destroy_all allow(Stats::BulkCalculator).to receive(:new).and_call_original allow_any_instance_of(Stats::BulkCalculator).to receive(:call) end @@ -69,8 +67,6 @@ RSpec.describe BulkStatsCalculatingJob, type: :job do end before do - # Remove any leftover users from other tests, keeping only our test users - User.where.not(id: [trial_user1.id, trial_user2.id]).destroy_all allow(Stats::BulkCalculator).to receive(:new).and_call_original allow_any_instance_of(Stats::BulkCalculator).to receive(:call) end diff --git a/spec/jobs/bulk_visits_suggesting_job_spec.rb b/spec/jobs/bulk_visits_suggesting_job_spec.rb index 66bf7da6..7c013dcd 100644 --- a/spec/jobs/bulk_visits_suggesting_job_spec.rb +++ b/spec/jobs/bulk_visits_suggesting_job_spec.rb @@ -26,6 +26,12 @@ RSpec.describe BulkVisitsSuggestingJob, type: :job do end it 'schedules jobs only for active users with tracked points' do + active_users_mock = double('ActiveRecord::Relation') + allow(User).to receive(:active).and_return(active_users_mock) + allow(active_users_mock).to receive(:active).and_return(active_users_mock) + allow(active_users_mock).to receive(:where).with(id: []).and_return(active_users_mock) + allow(active_users_mock).to receive(:find_each).and_yield(user_with_points).and_yield(user) + expect(VisitSuggestingJob).to receive(:perform_later).with( user_id: user_with_points.id, start_at: time_chunks.first.first, @@ -54,6 +60,12 @@ RSpec.describe BulkVisitsSuggestingJob, type: :job do ] allow_any_instance_of(Visits::TimeChunks).to receive(:call).and_return(chunks) + active_users_mock = double('ActiveRecord::Relation') + allow(User).to receive(:active).and_return(active_users_mock) + allow(active_users_mock).to receive(:active).and_return(active_users_mock) + allow(active_users_mock).to receive(:where).with(id: []).and_return(active_users_mock) + allow(active_users_mock).to receive(:find_each).and_yield(user_with_points) + chunks.each do |chunk| expect(VisitSuggestingJob).to receive(:perform_later).with( user_id: user_with_points.id, @@ -94,6 +106,12 @@ RSpec.describe BulkVisitsSuggestingJob, type: :job do .and_return(time_chunks_instance) allow(time_chunks_instance).to receive(:call).and_return(custom_chunks) + active_users_mock = double('ActiveRecord::Relation') + allow(User).to receive(:active).and_return(active_users_mock) + allow(active_users_mock).to receive(:active).and_return(active_users_mock) + allow(active_users_mock).to receive(:where).with(id: []).and_return(active_users_mock) + allow(active_users_mock).to receive(:find_each).and_yield(user_with_points) + expect(VisitSuggestingJob).to receive(:perform_later).with( user_id: user_with_points.id, start_at: custom_chunks.first.first, diff --git a/spec/jobs/points/nightly_reverse_geocoding_job_spec.rb b/spec/jobs/points/nightly_reverse_geocoding_job_spec.rb new file mode 100644 index 00000000..37fd29d5 --- /dev/null +++ b/spec/jobs/points/nightly_reverse_geocoding_job_spec.rb @@ -0,0 +1,158 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Points::NightlyReverseGeocodingJob, type: :job do + describe '#perform' do + let(:user) { create(:user) } + + before do + # Clear any existing jobs and points to ensure test isolation + ActiveJob::Base.queue_adapter.enqueued_jobs.clear + Point.delete_all + end + + context 'when reverse geocoding is disabled' do + before do + allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(false) + end + + let!(:point_without_geocoding) do + create(:point, user: user, reverse_geocoded_at: nil) + end + + it 'does not process any points' do + expect_any_instance_of(Point).not_to receive(:async_reverse_geocode) + + described_class.perform_now + end + + it 'returns early without querying points' do + allow(Point).to receive(:not_reverse_geocoded) + + described_class.perform_now + + expect(Point).not_to have_received(:not_reverse_geocoded) + end + + it 'does not enqueue any ReverseGeocodingJob jobs' do + expect { described_class.perform_now }.not_to have_enqueued_job(ReverseGeocodingJob) + end + end + + context 'when reverse geocoding is enabled' do + before do + allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(true) + end + + context 'with no points needing reverse geocoding' do + let!(:geocoded_point) do + create(:point, user: user, reverse_geocoded_at: 1.day.ago) + end + + it 'does not process any points' do + expect_any_instance_of(Point).not_to receive(:async_reverse_geocode) + + described_class.perform_now + end + + it 'does not enqueue any ReverseGeocodingJob jobs' do + expect { described_class.perform_now }.not_to have_enqueued_job(ReverseGeocodingJob) + end + end + + context 'with points needing reverse geocoding' do + let!(:point_without_geocoding1) do + create(:point, user: user, reverse_geocoded_at: nil) + end + let!(:point_without_geocoding2) do + create(:point, user: user, reverse_geocoded_at: nil) + end + let!(:geocoded_point) do + create(:point, user: user, reverse_geocoded_at: 1.day.ago) + end + + it 'processes all points that need reverse geocoding' do + expect { described_class.perform_now }.to have_enqueued_job(ReverseGeocodingJob).exactly(2).times + end + + it 'enqueues jobs with correct parameters' do + expect { described_class.perform_now } + .to have_enqueued_job(ReverseGeocodingJob) + .with('Point', point_without_geocoding1.id) + .and have_enqueued_job(ReverseGeocodingJob) + .with('Point', point_without_geocoding2.id) + end + + it 'uses find_each with correct batch size' do + relation_mock = double('ActiveRecord::Relation') + allow(Point).to receive(:not_reverse_geocoded).and_return(relation_mock) + allow(relation_mock).to receive(:find_each).with(batch_size: 1000) + + described_class.perform_now + + expect(relation_mock).to have_received(:find_each).with(batch_size: 1000) + end + end + + context 'with large number of points needing reverse geocoding' do + before do + # Create 2500 points to test batching + points_data = (1..2500).map do |i| + { + user_id: user.id, + latitude: 40.7128 + (i * 0.0001), + longitude: -74.0060 + (i * 0.0001), + timestamp: Time.current.to_i + i, + lonlat: "POINT(#{-74.0060 + (i * 0.0001)} #{40.7128 + (i * 0.0001)})", + reverse_geocoded_at: nil, + created_at: Time.current, + updated_at: Time.current + } + end + Point.insert_all(points_data) + end + + it 'processes all points in batches' do + expect { described_class.perform_now }.to have_enqueued_job(ReverseGeocodingJob).exactly(2500).times + end + + it 'uses efficient batching to avoid memory issues' do + relation_mock = double('ActiveRecord::Relation') + allow(Point).to receive(:not_reverse_geocoded).and_return(relation_mock) + allow(relation_mock).to receive(:find_each).with(batch_size: 1000) + + described_class.perform_now + + expect(relation_mock).to have_received(:find_each).with(batch_size: 1000) + end + end + end + + describe 'queue configuration' do + it 'uses the reverse_geocoding queue' do + expect(described_class.queue_name).to eq('reverse_geocoding') + end + end + + describe 'error handling' do + before do + allow(DawarichSettings).to receive(:reverse_geocoding_enabled?).and_return(true) + end + + let!(:point_without_geocoding) do + create(:point, user: user, reverse_geocoded_at: nil) + end + + context 'when a point fails to reverse geocode' do + before do + allow_any_instance_of(Point).to receive(:async_reverse_geocode).and_raise(StandardError, 'API error') + end + + it 'continues processing other points despite individual failures' do + expect { described_class.perform_now }.to raise_error(StandardError, 'API error') + end + end + end + end +end \ No newline at end of file diff --git a/spec/jobs/tracks/daily_generation_job_spec.rb b/spec/jobs/tracks/daily_generation_job_spec.rb index c23d9243..284bfd1d 100644 --- a/spec/jobs/tracks/daily_generation_job_spec.rb +++ b/spec/jobs/tracks/daily_generation_job_spec.rb @@ -26,6 +26,11 @@ RSpec.describe Tracks::DailyGenerationJob, type: :job do active_user.update!(points_count: active_user.points.count) trial_user.update!(points_count: trial_user.points.count) + # Mock User.active_or_trial to only return test users + active_or_trial_mock = double('ActiveRecord::Relation') + allow(User).to receive(:active_or_trial).and_return(active_or_trial_mock) + allow(active_or_trial_mock).to receive(:find_each).and_yield(active_user).and_yield(trial_user) + ActiveJob::Base.queue_adapter.enqueued_jobs.clear end diff --git a/spec/mailers/users_mailer_spec.rb b/spec/mailers/users_mailer_spec.rb index 9d0195e3..558c3c48 100644 --- a/spec/mailers/users_mailer_spec.rb +++ b/spec/mailers/users_mailer_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe UsersMailer, type: :mailer do - let(:user) { create(:user, email: 'test@example.com') } + let(:user) { create(:user) } before do stub_const('ENV', ENV.to_hash.merge('SMTP_FROM' => 'hi@dawarich.app')) @@ -14,11 +14,11 @@ RSpec.describe UsersMailer, type: :mailer do it 'renders the headers' do expect(mail.subject).to eq('Welcome to Dawarich!') - expect(mail.to).to eq(['test@example.com']) + expect(mail.to).to eq([user.email]) end it 'renders the body' do - expect(mail.body.encoded).to match('test@example.com') + expect(mail.body.encoded).to match(user.email) end end @@ -27,7 +27,7 @@ RSpec.describe UsersMailer, type: :mailer do it 'renders the headers' do expect(mail.subject).to eq('Explore Dawarich features!') - expect(mail.to).to eq(['test@example.com']) + expect(mail.to).to eq([user.email]) end end @@ -36,7 +36,7 @@ RSpec.describe UsersMailer, type: :mailer do it 'renders the headers' do expect(mail.subject).to eq('⚠️ Your Dawarich trial expires in 2 days') - expect(mail.to).to eq(['test@example.com']) + expect(mail.to).to eq([user.email]) end end @@ -45,7 +45,7 @@ RSpec.describe UsersMailer, type: :mailer do it 'renders the headers' do expect(mail.subject).to eq('💔 Your Dawarich trial expired') - expect(mail.to).to eq(['test@example.com']) + expect(mail.to).to eq([user.email]) end end @@ -54,7 +54,7 @@ RSpec.describe UsersMailer, type: :mailer do it 'renders the headers' do expect(mail.subject).to eq('🚀 Still interested in Dawarich? Subscribe now!') - expect(mail.to).to eq(['test@example.com']) + expect(mail.to).to eq([user.email]) end end @@ -63,7 +63,7 @@ RSpec.describe UsersMailer, type: :mailer do it 'renders the headers' do expect(mail.subject).to eq('📍 Your location data is waiting - Subscribe to Dawarich') - expect(mail.to).to eq(['test@example.com']) + expect(mail.to).to eq([user.email]) end end end diff --git a/spec/serializers/api/user_serializer_spec.rb b/spec/serializers/api/user_serializer_spec.rb index 178c64e0..d4612fe9 100644 --- a/spec/serializers/api/user_serializer_spec.rb +++ b/spec/serializers/api/user_serializer_spec.rb @@ -6,7 +6,7 @@ RSpec.describe Api::UserSerializer do describe '#call' do subject(:serializer) { described_class.new(user).call } - let(:user) { create(:user, email: 'test@example.com', theme: 'dark') } + let(:user) { create(:user) } it 'returns JSON with correct user attributes' do expect(serializer[:user][:email]).to eq(user.email) diff --git a/spec/services/areas/visits/create_spec.rb b/spec/services/areas/visits/create_spec.rb index 18865d6a..f66064ab 100644 --- a/spec/services/areas/visits/create_spec.rb +++ b/spec/services/areas/visits/create_spec.rb @@ -4,7 +4,7 @@ require 'rails_helper' RSpec.describe Areas::Visits::Create do describe '#call' do - let(:user) { create(:user) } + let!(:user) { create(:user) } let(:home_area) { create(:area, user:, latitude: 0, longitude: 0, radius: 100) } let(:work_area) { create(:area, user:, latitude: 1, longitude: 1, radius: 100) } diff --git a/spec/services/google_maps/phone_takeout_importer_spec.rb b/spec/services/google_maps/phone_takeout_importer_spec.rb index 301590d4..d35ea598 100644 --- a/spec/services/google_maps/phone_takeout_importer_spec.rb +++ b/spec/services/google_maps/phone_takeout_importer_spec.rb @@ -39,13 +39,13 @@ RSpec.describe GoogleMaps::PhoneTakeoutImporter do it 'creates points with correct data' do parser - expect(Point.all[6].lat).to eq(27.696576) - expect(Point.all[6].lon).to eq(-97.376949) - expect(Point.all[6].timestamp).to eq(1_693_180_140) + expect(user.points[6].lat).to eq(27.696576) + expect(user.points[6].lon).to eq(-97.376949) + expect(user.points[6].timestamp).to eq(1_693_180_140) - expect(Point.last.lat).to eq(27.709617) - expect(Point.last.lon).to eq(-97.375988) - expect(Point.last.timestamp).to eq(1_693_180_320) + expect(user.points.last.lat).to eq(27.709617) + expect(user.points.last.lon).to eq(-97.375988) + expect(user.points.last.timestamp).to eq(1_693_180_320) end end end diff --git a/spec/services/gpx/track_importer_spec.rb b/spec/services/gpx/track_importer_spec.rb index 5aeb7117..341e0fc3 100644 --- a/spec/services/gpx/track_importer_spec.rb +++ b/spec/services/gpx/track_importer_spec.rb @@ -57,11 +57,13 @@ RSpec.describe Gpx::TrackImporter do it 'creates points with correct data' do parser - expect(Point.first.lat).to eq(37.1722103) - expect(Point.first.lon).to eq(-3.55468) - expect(Point.first.altitude).to eq(1066) - expect(Point.first.timestamp).to eq(Time.zone.parse('2024-04-21T10:19:55Z').to_i) - expect(Point.first.velocity).to eq('2.9') + point = user.points.first + + expect(point.lat).to eq(37.1722103) + expect(point.lon).to eq(-3.55468) + expect(point.altitude).to eq(1066) + expect(point.timestamp).to eq(Time.zone.parse('2024-04-21T10:19:55Z').to_i) + expect(point.velocity).to eq('2.9') end end @@ -71,11 +73,13 @@ RSpec.describe Gpx::TrackImporter do it 'creates points with correct data' do parser - expect(Point.first.lat).to eq(10.758321212464024) - expect(Point.first.lon).to eq(106.64234449272531) - expect(Point.first.altitude).to eq(17) - expect(Point.first.timestamp).to eq(1_730_626_211) - expect(Point.first.velocity).to eq('2.8') + point = user.points.first + + expect(point.lat).to eq(10.758321212464024) + expect(point.lon).to eq(106.64234449272531) + expect(point.altitude).to eq(17) + expect(point.timestamp).to eq(1_730_626_211) + expect(point.velocity).to eq('2.8') end end diff --git a/spec/services/maps/bounds_calculator_spec.rb b/spec/services/maps/bounds_calculator_spec.rb index a48ec8bb..d4e28cf5 100644 --- a/spec/services/maps/bounds_calculator_spec.rb +++ b/spec/services/maps/bounds_calculator_spec.rb @@ -5,11 +5,11 @@ require 'rails_helper' RSpec.describe Maps::BoundsCalculator do describe '.call' do subject(:calculate_bounds) do - described_class.call( + described_class.new( target_user: target_user, start_date: start_date, end_date: end_date - ) + ).call end let(:user) { create(:user) } @@ -29,16 +29,18 @@ RSpec.describe Maps::BoundsCalculator do end it 'returns success with bounds data' do - expect(calculate_bounds).to match({ - success: true, - data: { - min_lat: 40.6, - max_lat: 40.8, - min_lng: -74.1, - max_lng: -73.9, - point_count: 3 + expect(calculate_bounds).to match( + { + success: true, + data: { + min_lat: 40.6, + max_lat: 40.8, + min_lng: -74.1, + max_lng: -73.9, + point_count: 3 + } } - }) + ) end end @@ -50,11 +52,13 @@ RSpec.describe Maps::BoundsCalculator do end it 'returns failure with no data message' do - expect(calculate_bounds).to match({ - success: false, - error: 'No data found for the specified date range', - point_count: 0 - }) + expect(calculate_bounds).to match( + { + success: false, + error: 'No data found for the specified date range', + point_count: 0 + } + ) end end @@ -117,4 +121,4 @@ RSpec.describe Maps::BoundsCalculator do end end end -end \ No newline at end of file +end diff --git a/spec/services/maps/date_parameter_coercer_spec.rb b/spec/services/maps/date_parameter_coercer_spec.rb index 107147ae..ac91210d 100644 --- a/spec/services/maps/date_parameter_coercer_spec.rb +++ b/spec/services/maps/date_parameter_coercer_spec.rb @@ -4,7 +4,7 @@ require 'rails_helper' RSpec.describe Maps::DateParameterCoercer do describe '.call' do - subject(:coerce_date) { described_class.call(param) } + subject(:coerce_date) { described_class.new(param).call } context 'with integer parameter' do let(:param) { 1_717_200_000 } @@ -67,4 +67,4 @@ RSpec.describe Maps::DateParameterCoercer do end end end -end \ No newline at end of file +end diff --git a/spec/services/maps/hexagon_request_handler_spec.rb b/spec/services/maps/hexagon_request_handler_spec.rb index 1dd6223c..7cef2727 100644 --- a/spec/services/maps/hexagon_request_handler_spec.rb +++ b/spec/services/maps/hexagon_request_handler_spec.rb @@ -17,39 +17,36 @@ RSpec.describe Maps::HexagonRequestHandler do before do stub_request(:any, 'https://api.github.com/repos/Freika/dawarich/tags') .to_return(status: 200, body: '[{"name": "1.0.0"}]', headers: {}) + + # Clean up database state to avoid conflicts - order matters due to foreign keys + Point.delete_all + Stat.delete_all + User.delete_all end - context 'with authenticated user and bounding box params' do + context 'with authenticated user but no pre-calculated data' do let(:params) do - ActionController::Parameters.new({ - min_lon: -74.1, - min_lat: 40.6, - max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000, - start_date: '2024-06-01T00:00:00Z', - end_date: '2024-06-30T23:59:59Z' - }) + ActionController::Parameters.new( + { + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000, + start_date: '2024-06-01T00:00:00Z', + end_date: '2024-06-30T23:59:59Z' + } + ) end - before do - # Create test points within the date range and bounding box - 10.times do |i| - create(:point, - user:, - latitude: 40.7 + (i * 0.001), - longitude: -74.0 + (i * 0.001), - timestamp: Time.new(2024, 6, 15, 12, i).to_i) - end - end - - it 'returns on-the-fly hexagon calculation' do + it 'returns empty feature collection when no pre-calculated data' do result = handle_request expect(result).to be_a(Hash) expect(result['type']).to eq('FeatureCollection') - expect(result['features']).to be_an(Array) - expect(result['metadata']).to be_present + expect(result['features']).to eq([]) + expect(result['metadata']['hexagon_count']).to eq(0) + expect(result['metadata']['source']).to eq('pre_calculated') end end @@ -65,14 +62,16 @@ RSpec.describe Maps::HexagonRequestHandler do hexagon_centers: pre_calculated_centers) end let(:params) do - ActionController::Parameters.new({ - uuid: stat.sharing_uuid, - min_lon: -74.1, - min_lat: 40.6, - max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000 - }) + ActionController::Parameters.new( + { + uuid: stat.sharing_uuid, + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000 + } + ) end let(:current_api_user) { nil } @@ -89,35 +88,26 @@ RSpec.describe Maps::HexagonRequestHandler do context 'with public sharing UUID but no pre-calculated centers' do let(:stat) { create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6) } let(:params) do - ActionController::Parameters.new({ - uuid: stat.sharing_uuid, - min_lon: -74.1, - min_lat: 40.6, - max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000 - }) + ActionController::Parameters.new( + { + uuid: stat.sharing_uuid, + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000 + } + ) end let(:current_api_user) { nil } - before do - # Create test points for the stat's month - 5.times do |i| - create(:point, - user:, - latitude: 40.7 + (i * 0.001), - longitude: -74.0 + (i * 0.001), - timestamp: Time.new(2024, 6, 15, 12, i).to_i) - end - end - - it 'falls back to on-the-fly calculation' do + it 'returns empty feature collection when no pre-calculated centers' do result = handle_request expect(result['type']).to eq('FeatureCollection') - expect(result['features']).to be_an(Array) - expect(result['metadata']).to be_present - expect(result['metadata']['pre_calculated']).to be_falsy + expect(result['features']).to eq([]) + expect(result['metadata']['hexagon_count']).to eq(0) + expect(result['metadata']['source']).to eq('pre_calculated') end end @@ -127,14 +117,16 @@ RSpec.describe Maps::HexagonRequestHandler do hexagon_centers: { 'area_too_large' => true }) end let(:params) do - ActionController::Parameters.new({ - uuid: stat.sharing_uuid, - min_lon: -74.1, - min_lat: 40.6, - max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000 - }) + ActionController::Parameters.new( + { + uuid: stat.sharing_uuid, + min_lon: -74.1, + min_lat: 40.6, + max_lon: -73.9, + max_lat: 40.8, + hex_size: 1000 + } + ) end let(:current_api_user) { nil } @@ -156,214 +148,14 @@ RSpec.describe Maps::HexagonRequestHandler do end end - context 'with H3 enabled via parameter' do - let(:params) do - ActionController::Parameters.new({ - min_lon: -74.1, - min_lat: 40.6, - max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000, - start_date: '2024-06-01T00:00:00Z', - end_date: '2024-06-30T23:59:59Z', - use_h3: 'true', - h3_resolution: 6 - }) - end - - before do - # Create test points within the date range - 5.times do |i| - create(:point, - user:, - latitude: 40.7 + (i * 0.001), - longitude: -74.0 + (i * 0.001), - timestamp: Time.new(2024, 6, 15, 12, i).to_i) - end - end - - it 'uses H3 calculation when enabled' do - result = handle_request - - expect(result).to be_a(Hash) - expect(result['type']).to eq('FeatureCollection') - expect(result['features']).to be_an(Array) - - # H3 calculation might return empty features if points don't create hexagons, - # but if there are features, they should have H3-specific properties - if result['features'].any? - feature = result['features'].first - expect(feature).to be_present - - # Only check properties if they exist - some integration paths might - # return features without properties in certain edge cases - if feature['properties'].present? - expect(feature['properties']).to have_key('h3_index') - expect(feature['properties']).to have_key('point_count') - expect(feature['properties']).to have_key('center') - else - # If no properties, this is likely a fallback to non-H3 calculation - # which is acceptable behavior - just verify the feature structure - expect(feature).to have_key('type') - expect(feature).to have_key('geometry') - end - else - # If no features, that's OK - it means the H3 calculation ran but - # didn't produce any hexagons for this data set - expect(result['features']).to eq([]) - end - end - end - - context 'with H3 enabled via environment variable' do - let(:params) do - ActionController::Parameters.new({ - min_lon: -74.1, - min_lat: 40.6, - max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000, - start_date: '2024-06-01T00:00:00Z', - end_date: '2024-06-30T23:59:59Z' - }) - end - - before do - allow(ENV).to receive(:[]).and_call_original - allow(ENV).to receive(:[]).with('HEXAGON_USE_H3').and_return('true') - - # Create test points within the date range - 3.times do |i| - create(:point, - user:, - latitude: 40.7 + (i * 0.001), - longitude: -74.0 + (i * 0.001), - timestamp: Time.new(2024, 6, 15, 12, i).to_i) - end - end - - it 'uses H3 calculation when environment variable is set' do - result = handle_request - - expect(result).to be_a(Hash) - expect(result['type']).to eq('FeatureCollection') - expect(result['features']).to be_an(Array) - expect(result['features']).not_to be_empty - end - end - - context 'when H3 calculation fails' do - let(:params) do - ActionController::Parameters.new({ - min_lon: -74.1, - min_lat: 40.6, - max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000, - start_date: '2024-06-01T00:00:00Z', - end_date: '2024-06-30T23:59:59Z', - use_h3: 'true' - }) - end - - before do - # Create test points within the date range - 2.times do |i| - create(:point, - user:, - latitude: 40.7 + (i * 0.001), - longitude: -74.0 + (i * 0.001), - timestamp: Time.new(2024, 6, 15, 12, i).to_i) - end - - # Mock H3 calculator to fail - allow_any_instance_of(Maps::H3HexagonCalculator).to receive(:call) - .and_return({ success: false, error: 'H3 error' }) - end - - it 'falls back to grid calculation when H3 fails' do - result = handle_request - - expect(result).to be_a(Hash) - expect(result['type']).to eq('FeatureCollection') - expect(result['features']).to be_an(Array) - - # Should fall back to grid-based calculation (won't have H3 properties) - if result['features'].any? - feature = result['features'].first - expect(feature).to be_present - if feature['properties'].present? - expect(feature['properties']).not_to have_key('h3_index') - end - end - end - end - - context 'H3 resolution validation' do - let(:params) do - ActionController::Parameters.new({ - min_lon: -74.1, - min_lat: 40.6, - max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000, - start_date: '2024-06-01T00:00:00Z', - end_date: '2024-06-30T23:59:59Z', - use_h3: 'true', - h3_resolution: invalid_resolution - }) - end - - before do - create(:point, - user:, - latitude: 40.7, - longitude: -74.0, - timestamp: Time.new(2024, 6, 15, 12, 0).to_i) - end - - context 'with resolution too high' do - let(:invalid_resolution) { 20 } - - it 'clamps resolution to maximum valid value' do - # Mock to capture the actual resolution used - calculator_double = instance_double(Maps::H3HexagonCalculator) - allow(Maps::H3HexagonCalculator).to receive(:new) do |user_id, start_date, end_date, resolution| - expect(resolution).to eq(15) # Should be clamped to 15 - calculator_double - end - allow(calculator_double).to receive(:call).and_return( - { success: true, data: { 'type' => 'FeatureCollection', 'features' => [] } } - ) - - handle_request - end - end - - context 'with negative resolution' do - let(:invalid_resolution) { -5 } - - it 'clamps resolution to minimum valid value' do - # Mock to capture the actual resolution used - calculator_double = instance_double(Maps::H3HexagonCalculator) - allow(Maps::H3HexagonCalculator).to receive(:new) do |user_id, start_date, end_date, resolution| - expect(resolution).to eq(0) # Should be clamped to 0 - calculator_double - end - allow(calculator_double).to receive(:call).and_return( - { success: true, data: { 'type' => 'FeatureCollection', 'features' => [] } } - ) - - handle_request - end - end - end context 'error handling' do let(:params) do - ActionController::Parameters.new({ - uuid: 'invalid-uuid' - }) + ActionController::Parameters.new( + { + uuid: 'invalid-uuid' + } + ) end let(:current_api_user) { nil } @@ -374,4 +166,4 @@ RSpec.describe Maps::HexagonRequestHandler do end end end -end \ No newline at end of file +end diff --git a/spec/services/own_tracks/importer_spec.rb b/spec/services/own_tracks/importer_spec.rb index cc9a9713..3305c9eb 100644 --- a/spec/services/own_tracks/importer_spec.rb +++ b/spec/services/own_tracks/importer_spec.rb @@ -23,7 +23,7 @@ RSpec.describe OwnTracks::Importer do it 'correctly writes attributes' do parser - point = Point.first + point = user.points.first expect(point.lonlat.x).to be_within(0.001).of(13.332) expect(point.lonlat.y).to be_within(0.001).of(52.225) expect(point.attributes.except('lonlat')).to include( @@ -75,7 +75,7 @@ RSpec.describe OwnTracks::Importer do it 'correctly converts speed' do parser - expect(Point.first.velocity).to eq('1.4') + expect(user.points.first.velocity).to eq('1.4') end end diff --git a/spec/services/photos/importer_spec.rb b/spec/services/photos/importer_spec.rb index 567898a3..67dd9b58 100644 --- a/spec/services/photos/importer_spec.rb +++ b/spec/services/photos/importer_spec.rb @@ -30,15 +30,18 @@ RSpec.describe Photos::Importer do it 'creates points with correct attributes' do service - expect(Point.first.lat.to_f).to eq(59.0000) - expect(Point.first.lon.to_f).to eq(30.0000) - expect(Point.first.timestamp).to eq(978_296_400) - expect(Point.first.import_id).to eq(import.id) + first_point = user.points.first + second_point = user.points.second - expect(Point.second.lat.to_f).to eq(55.0001) - expect(Point.second.lon.to_f).to eq(37.0001) - expect(Point.second.timestamp).to eq(978_296_400) - expect(Point.second.import_id).to eq(import.id) + expect(first_point.lat.to_f).to eq(59.0000) + expect(first_point.lon.to_f).to eq(30.0000) + expect(first_point.timestamp).to eq(978_296_400) + expect(first_point.import_id).to eq(import.id) + + expect(second_point.lat.to_f).to eq(55.0001) + expect(second_point.lon.to_f).to eq(37.0001) + expect(second_point.timestamp).to eq(978_296_400) + expect(second_point.import_id).to eq(import.id) end end diff --git a/spec/system/map_interaction_spec.rb b/spec/system/map_interaction_spec.rb index 4d616a4e..43dc9e41 100644 --- a/spec/system/map_interaction_spec.rb +++ b/spec/system/map_interaction_spec.rb @@ -15,22 +15,20 @@ RSpec.describe 'Map Interaction', type: :system do # Create a series of points that form a route [ create(:point, user: user, - lonlat: "POINT(13.404954 52.520008)", + lonlat: 'POINT(13.404954 52.520008)', timestamp: 1.hour.ago.to_i, velocity: 10, battery: 80), create(:point, user: user, - lonlat: "POINT(13.405954 52.521008)", + lonlat: 'POINT(13.405954 52.521008)', timestamp: 50.minutes.ago.to_i, velocity: 15, battery: 78), create(:point, user: user, - lonlat: "POINT(13.406954 52.522008)", + lonlat: 'POINT(13.406954 52.522008)', timestamp: 40.minutes.ago.to_i, velocity: 12, battery: 76), create(:point, user: user, - lonlat: "POINT(13.407954 52.523008)", + lonlat: 'POINT(13.407954 52.523008)', timestamp: 30.minutes.ago.to_i, velocity: 8, battery: 74) ] end - - describe 'Map page interaction' do context 'when user is signed in' do include_context 'authenticated map user' @@ -127,7 +125,7 @@ RSpec.describe 'Map Interaction', type: :system do # The calendar panel JavaScript interaction is complex and may not work # reliably in headless test environment, but the button should be functional - puts "Note: Calendar button is functional. Panel interaction may require manual testing." + puts 'Note: Calendar button is functional. Panel interaction may require manual testing.' end end @@ -207,28 +205,30 @@ RSpec.describe 'Map Interaction', type: :system do else # If we can't trigger the popup, at least verify the setup is correct expect(user_settings.dig('maps', 'distance_unit')).to eq('km') - puts "Note: Polyline popup interaction could not be triggered in test environment" + puts 'Note: Polyline popup interaction could not be triggered in test environment' end end end - context 'with miles distance unit' do - let(:user_with_miles) { create(:user, settings: { 'maps' => { 'distance_unit' => 'mi' } }, password: 'password123') } + context 'with miles distance unit' do + let(:user_with_miles) do + create(:user, settings: { 'maps' => { 'distance_unit' => 'mi' } }, password: 'password123') + end let!(:points_for_miles_user) do # Create a series of points that form a route for the miles user [ create(:point, user: user_with_miles, - lonlat: "POINT(13.404954 52.520008)", + lonlat: 'POINT(13.404954 52.520008)', timestamp: 1.hour.ago.to_i, velocity: 10, battery: 80), create(:point, user: user_with_miles, - lonlat: "POINT(13.405954 52.521008)", + lonlat: 'POINT(13.405954 52.521008)', timestamp: 50.minutes.ago.to_i, velocity: 15, battery: 78), create(:point, user: user_with_miles, - lonlat: "POINT(13.406954 52.522008)", + lonlat: 'POINT(13.406954 52.522008)', timestamp: 40.minutes.ago.to_i, velocity: 12, battery: 76), create(:point, user: user_with_miles, - lonlat: "POINT(13.407954 52.523008)", + lonlat: 'POINT(13.407954 52.523008)', timestamp: 30.minutes.ago.to_i, velocity: 8, battery: 74) ] end @@ -280,7 +280,7 @@ RSpec.describe 'Map Interaction', type: :system do else # If we can't trigger the popup, at least verify the setup is correct expect(user_settings.dig('maps', 'distance_unit')).to eq('mi') - puts "Note: Polyline popup interaction could not be triggered in test environment" + puts 'Note: Polyline popup interaction could not be triggered in test environment' end end end @@ -288,22 +288,24 @@ RSpec.describe 'Map Interaction', type: :system do context 'polyline popup content' do context 'with km distance unit' do - let(:user_with_km) { create(:user, settings: { 'maps' => { 'distance_unit' => 'km' } }, password: 'password123') } + let(:user_with_km) do + create(:user, settings: { 'maps' => { 'distance_unit' => 'km' } }, password: 'password123') + end let!(:points_for_km_user) do # Create a series of points that form a route for the km user [ create(:point, user: user_with_km, - lonlat: "POINT(13.404954 52.520008)", + lonlat: 'POINT(13.404954 52.520008)', timestamp: 1.hour.ago.to_i, velocity: 10, battery: 80), create(:point, user: user_with_km, - lonlat: "POINT(13.405954 52.521008)", + lonlat: 'POINT(13.405954 52.521008)', timestamp: 50.minutes.ago.to_i, velocity: 15, battery: 78), create(:point, user: user_with_km, - lonlat: "POINT(13.406954 52.522008)", + lonlat: 'POINT(13.406954 52.522008)', timestamp: 40.minutes.ago.to_i, velocity: 12, battery: 76), create(:point, user: user_with_km, - lonlat: "POINT(13.407954 52.523008)", + lonlat: 'POINT(13.407954 52.523008)', timestamp: 30.minutes.ago.to_i, velocity: 8, battery: 74) ] end @@ -356,28 +358,30 @@ RSpec.describe 'Map Interaction', type: :system do else # If we can't trigger the popup, at least verify the setup is correct expect(user_settings.dig('maps', 'distance_unit')).to eq('km') - puts "Note: Polyline popup interaction could not be triggered in test environment" + puts 'Note: Polyline popup interaction could not be triggered in test environment' end end end context 'with miles distance unit' do - let(:user_with_miles) { create(:user, settings: { 'maps' => { 'distance_unit' => 'mi' } }, password: 'password123') } + let(:user_with_miles) do + create(:user, settings: { 'maps' => { 'distance_unit' => 'mi' } }, password: 'password123') + end let!(:points_for_miles_user) do # Create a series of points that form a route for the miles user [ create(:point, user: user_with_miles, - lonlat: "POINT(13.404954 52.520008)", + lonlat: 'POINT(13.404954 52.520008)', timestamp: 1.hour.ago.to_i, velocity: 10, battery: 80), create(:point, user: user_with_miles, - lonlat: "POINT(13.405954 52.521008)", + lonlat: 'POINT(13.405954 52.521008)', timestamp: 50.minutes.ago.to_i, velocity: 15, battery: 78), create(:point, user: user_with_miles, - lonlat: "POINT(13.406954 52.522008)", + lonlat: 'POINT(13.406954 52.522008)', timestamp: 40.minutes.ago.to_i, velocity: 12, battery: 76), create(:point, user: user_with_miles, - lonlat: "POINT(13.407954 52.523008)", + lonlat: 'POINT(13.407954 52.523008)', timestamp: 30.minutes.ago.to_i, velocity: 8, battery: 74) ] end @@ -429,7 +433,7 @@ RSpec.describe 'Map Interaction', type: :system do else # If we can't trigger the popup, at least verify the setup is correct expect(user_settings.dig('maps', 'distance_unit')).to eq('mi') - puts "Note: Polyline popup interaction could not be triggered in test environment" + puts 'Note: Polyline popup interaction could not be triggered in test environment' end end end @@ -456,7 +460,7 @@ RSpec.describe 'Map Interaction', type: :system do click_button 'Update' end - # Wait for success flash message + # Wait for success flash message expect(page).to have_css('#flash-messages', text: 'Settings updated', wait: 10) end @@ -710,13 +714,13 @@ RSpec.describe 'Map Interaction', type: :system do it 'allows year selection and month navigation' do # This test is skipped due to calendar panel JavaScript interaction issues # The calendar button exists but the panel doesn't open reliably in test environment - skip "Calendar panel JavaScript interaction needs debugging" + skip 'Calendar panel JavaScript interaction needs debugging' end it 'displays visited cities information' do # This test is skipped due to calendar panel JavaScript interaction issues # The calendar button exists but the panel doesn't open reliably in test environment - skip "Calendar panel JavaScript interaction needs debugging" + skip 'Calendar panel JavaScript interaction needs debugging' end xit 'persists panel state in localStorage' do From 0905ef65a5e47957a161aa39052cc5dd31735df6 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Thu, 18 Sep 2025 19:45:53 +0200 Subject: [PATCH 08/25] Don't pass h3_resolution from frontend; use default in backend service --- .../api/v1/maps/hexagons_controller.rb | 4 +-- .../controllers/public_stat_map_controller.js | 4 --- app/models/stat.rb | 10 +++--- app/services/stats/calculate_month.rb | 3 +- .../maps/hexagon_polygon_generator_spec.rb | 33 ++----------------- 5 files changed, 9 insertions(+), 45 deletions(-) diff --git a/app/controllers/api/v1/maps/hexagons_controller.rb b/app/controllers/api/v1/maps/hexagons_controller.rb index 3ff0b3ff..0e0d19a5 100644 --- a/app/controllers/api/v1/maps/hexagons_controller.rb +++ b/app/controllers/api/v1/maps/hexagons_controller.rb @@ -57,7 +57,7 @@ class Api::V1::Maps::HexagonsController < ApiController private def hexagon_params - params.permit(:h3_resolution, :uuid, :start_date, :end_date) + params.permit(:uuid, :start_date, :end_date) end def handle_service_error @@ -79,7 +79,7 @@ class Api::V1::Maps::HexagonsController < ApiController end # Validate coordinate ranges - if !valid_coordinate_ranges? + unless valid_coordinate_ranges? render json: { error: 'Invalid coordinate ranges' }, status: :bad_request return false end diff --git a/app/javascript/controllers/public_stat_map_controller.js b/app/javascript/controllers/public_stat_map_controller.js index 6fa576a7..0113a0de 100644 --- a/app/javascript/controllers/public_stat_map_controller.js +++ b/app/javascript/controllers/public_stat_map_controller.js @@ -23,7 +23,6 @@ export default class extends BaseController { } disconnect() { - // No hexagonGrid to destroy for public sharing if (this.map) { this.map.remove(); } @@ -174,7 +173,6 @@ export default class extends BaseController { min_lat: dataBounds.min_lat, max_lon: dataBounds.max_lng, max_lat: dataBounds.max_lat, - h3_resolution: 8, start_date: startDate.toISOString(), end_date: endDate.toISOString(), uuid: this.uuidValue @@ -320,6 +318,4 @@ export default class extends BaseController { layer.setStyle(layer._originalStyle); } } - - } diff --git a/app/models/stat.rb b/app/models/stat.rb index 24ac4802..38babb8a 100644 --- a/app/models/stat.rb +++ b/app/models/stat.rb @@ -56,12 +56,10 @@ class Stat < ApplicationRecord sharing_enabled? && !sharing_expired? end - def hexagons_available?(hex_size = 1000) - # Check new optimized format (hexagon_centers) first - return true if hexagon_centers.present? && hexagon_centers.is_a?(Array) && hexagon_centers.any? - - # Fallback to legacy format (hexagon_data) for backwards compatibility - hexagon_data&.dig(hex_size.to_s, 'geojson').present? + def hexagons_available? + hexagon_centers.present? && + hexagon_centers.is_a?(Array) && + hexagon_centers.any? end def generate_new_sharing_uuid! diff --git a/app/services/stats/calculate_month.rb b/app/services/stats/calculate_month.rb index f26a5890..effddff2 100644 --- a/app/services/stats/calculate_month.rb +++ b/app/services/stats/calculate_month.rb @@ -91,8 +91,7 @@ class Stats::CalculateMonth service = Maps::H3HexagonCenters.new( user_id: user.id, start_date: start_date_iso8601, - end_date: end_date_iso8601, - h3_resolution: 8 # Small hexagons for good detail + end_date: end_date_iso8601 ) result = service.call diff --git a/spec/services/maps/hexagon_polygon_generator_spec.rb b/spec/services/maps/hexagon_polygon_generator_spec.rb index 0fdea568..ed4c2edb 100644 --- a/spec/services/maps/hexagon_polygon_generator_spec.rb +++ b/spec/services/maps/hexagon_polygon_generator_spec.rb @@ -103,8 +103,7 @@ RSpec.describe Maps::HexagonPolygonGenerator do center_lng: center_lng, center_lat: center_lat, size_meters: size_meters, - use_h3: true, - h3_resolution: 5 + use_h3: true ) end @@ -145,34 +144,6 @@ RSpec.describe Maps::HexagonPolygonGenerator do expect(latitudes.uniq.size).to be > 1 # Should have different latitudes end - context 'with different H3 resolution' do - it 'generates different sized hexagons' do - low_res_result = described_class.call( - center_lng: center_lng, - center_lat: center_lat, - use_h3: true, - h3_resolution: 3 - ) - - high_res_result = described_class.call( - center_lng: center_lng, - center_lat: center_lat, - use_h3: true, - h3_resolution: 7 - ) - - # Different resolutions should produce different hexagon sizes - low_res_coords = low_res_result['coordinates'].first - high_res_coords = high_res_result['coordinates'].first - - # Calculate approximate size by measuring distance between vertices - low_res_size = calculate_hexagon_size(low_res_coords) - high_res_size = calculate_hexagon_size(high_res_coords) - - expect(low_res_size).to be > high_res_size - end - end - context 'when H3 operations fail' do before do allow(H3).to receive(:from_geo_coordinates).and_raise(StandardError, 'H3 error') @@ -233,4 +204,4 @@ RSpec.describe Maps::HexagonPolygonGenerator do Math.sqrt((lng - center_lng)**2 + (lat - center_lat)**2) end end -end \ No newline at end of file +end From 3fd76346578017213e30759dfce9463206756a6d Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Thu, 18 Sep 2025 20:02:18 +0200 Subject: [PATCH 09/25] Simplify some services by removing unused parameters and validations --- .../api/v1/maps/hexagons_controller.rb | 53 +++---------------- app/services/maps/bounds_calculator.rb | 11 ++-- app/services/maps/h3_hexagon_centers.rb | 13 ----- app/services/maps/hexagon_center_manager.rb | 2 - app/services/maps/hexagon_request_handler.rb | 13 ++--- app/services/stats/calculate_month.rb | 4 +- spec/requests/api/v1/maps/hexagons_spec.rb | 13 +---- .../maps/hexagon_center_manager_spec.rb | 3 +- .../maps/hexagon_request_handler_spec.rb | 15 ++---- 9 files changed, 24 insertions(+), 103 deletions(-) diff --git a/app/controllers/api/v1/maps/hexagons_controller.rb b/app/controllers/api/v1/maps/hexagons_controller.rb index 0e0d19a5..95c6e06a 100644 --- a/app/controllers/api/v1/maps/hexagons_controller.rb +++ b/app/controllers/api/v1/maps/hexagons_controller.rb @@ -4,21 +4,21 @@ class Api::V1::Maps::HexagonsController < ApiController skip_before_action :authenticate_api_key, if: :public_sharing_request? def index - return unless public_sharing_request? || validate_required_parameters - - result = Maps::HexagonRequestHandler.call( + result = Maps::HexagonRequestHandler.new( params: params, current_api_user: current_api_user - ) + ).call render json: result + rescue ActionController::ParameterMissing => e + render json: { error: "Missing required parameter: #{e.param}" }, status: :bad_request + rescue ActionController::BadRequest => e + render json: { error: e.message }, status: :bad_request rescue Maps::HexagonContextResolver::SharedStatsNotFoundError => e render json: { error: e.message }, status: :not_found rescue Maps::DateParameterCoercer::InvalidDateFormatError => e render json: { error: e.message }, status: :bad_request - rescue Maps::H3HexagonCenters::TooManyHexagonsError, - Maps::H3HexagonCenters::InvalidCoordinatesError, - Maps::H3HexagonCenters::PostGISError => e + rescue Maps::H3HexagonCenters::PostGISError => e render json: { error: e.message }, status: :bad_request rescue StandardError => _e handle_service_error @@ -56,10 +56,6 @@ class Api::V1::Maps::HexagonsController < ApiController private - def hexagon_params - params.permit(:uuid, :start_date, :end_date) - end - def handle_service_error render json: { error: 'Failed to generate hexagon grid' }, status: :internal_server_error end @@ -67,39 +63,4 @@ class Api::V1::Maps::HexagonsController < ApiController def public_sharing_request? params[:uuid].present? end - - def validate_required_parameters - required_params = %i[min_lon max_lon min_lat max_lat start_date end_date] - missing_params = required_params.select { |param| params[param].blank? } - - unless missing_params.empty? - error_message = "Missing required parameters: #{missing_params.join(', ')}" - render json: { error: error_message }, status: :bad_request - return false - end - - # Validate coordinate ranges - unless valid_coordinate_ranges? - render json: { error: 'Invalid coordinate ranges' }, status: :bad_request - return false - end - - true - end - - def valid_coordinate_ranges? - min_lon = params[:min_lon].to_f - max_lon = params[:max_lon].to_f - min_lat = params[:min_lat].to_f - max_lat = params[:max_lat].to_f - - # Check longitude range (-180 to 180) - return false unless (-180..180).cover?(min_lon) && (-180..180).cover?(max_lon) - # Check latitude range (-90 to 90) - return false unless (-90..90).cover?(min_lat) && (-90..90).cover?(max_lat) - # Check that min values are less than max values - return false unless min_lon < max_lon && min_lat < max_lat - - true - end end diff --git a/app/services/maps/bounds_calculator.rb b/app/services/maps/bounds_calculator.rb index aba1e251..694fc51c 100644 --- a/app/services/maps/bounds_calculator.rb +++ b/app/services/maps/bounds_calculator.rb @@ -4,10 +4,9 @@ module Maps class BoundsCalculator class NoUserFoundError < StandardError; end class NoDateRangeError < StandardError; end - class NoDataFoundError < StandardError; end - def initialize(target_user:, start_date:, end_date:) - @target_user = target_user + def initialize(user:, start_date:, end_date:) + @user = user @start_date = start_date @end_date = end_date end @@ -18,7 +17,7 @@ module Maps start_timestamp = Maps::DateParameterCoercer.new(@start_date).call end_timestamp = Maps::DateParameterCoercer.new(@end_date).call - points_relation = @target_user.points.where(timestamp: start_timestamp..end_timestamp) + points_relation = @user.points.where(timestamp: start_timestamp..end_timestamp) point_count = points_relation.count return build_no_data_response if point_count.zero? @@ -30,7 +29,7 @@ module Maps private def validate_inputs! - raise NoUserFoundError, 'No user found' unless @target_user + raise NoUserFoundError, 'No user found' unless @user raise NoDateRangeError, 'No date range specified' unless @start_date && @end_date end @@ -42,7 +41,7 @@ module Maps WHERE user_id = $1 AND timestamp BETWEEN $2 AND $3", 'bounds_query', - [@target_user.id, start_timestamp, end_timestamp] + [@user.id, start_timestamp, end_timestamp] ).first end diff --git a/app/services/maps/h3_hexagon_centers.rb b/app/services/maps/h3_hexagon_centers.rb index a6a526ac..c9167da5 100644 --- a/app/services/maps/h3_hexagon_centers.rb +++ b/app/services/maps/h3_hexagon_centers.rb @@ -7,15 +7,10 @@ class Maps::H3HexagonCenters DEFAULT_H3_RESOLUTION = 8 # Small hexagons for good detail MAX_HEXAGONS = 10_000 # Maximum number of hexagons to prevent memory issues - # Validation error classes - class TooManyHexagonsError < StandardError; end - class InvalidCoordinatesError < StandardError; end class PostGISError < StandardError; end attr_reader :user_id, :start_date, :end_date, :h3_resolution - validates :user_id, presence: true - def initialize(user_id:, start_date:, end_date:, h3_resolution: DEFAULT_H3_RESOLUTION) @user_id = user_id @start_date = start_date @@ -24,8 +19,6 @@ class Maps::H3HexagonCenters end def call - validate! - points = fetch_user_points return [] if points.empty? @@ -104,10 +97,4 @@ class Maps::H3HexagonCenters service.call end - - def validate! - return if valid? - - raise InvalidCoordinatesError, errors.full_messages.join(', ') - end end diff --git a/app/services/maps/hexagon_center_manager.rb b/app/services/maps/hexagon_center_manager.rb index d786137a..f23ced63 100644 --- a/app/services/maps/hexagon_center_manager.rb +++ b/app/services/maps/hexagon_center_manager.rb @@ -96,7 +96,6 @@ module Maps def build_hexagon_properties(index, earliest, latest) { 'hex_id' => index + 1, - 'hex_size' => 1000, 'earliest_point' => earliest ? Time.zone.at(earliest).iso8601 : nil, 'latest_point' => latest ? Time.zone.at(latest).iso8601 : nil } @@ -107,7 +106,6 @@ module Maps 'type' => 'FeatureCollection', 'features' => hexagon_features, 'metadata' => { - 'hex_size_m' => 1000, 'count' => hexagon_features.count, 'user_id' => target_user.id, 'pre_calculated' => true diff --git a/app/services/maps/hexagon_request_handler.rb b/app/services/maps/hexagon_request_handler.rb index d6f27999..e71f8d01 100644 --- a/app/services/maps/hexagon_request_handler.rb +++ b/app/services/maps/hexagon_request_handler.rb @@ -2,13 +2,9 @@ module Maps class HexagonRequestHandler - def self.call(params:, current_api_user: nil) - new(params: params, current_api_user: current_api_user).call - end - - def initialize(params:, current_api_user: nil) + def initialize(params:, user: nil) @params = params - @current_api_user = current_api_user + @user = user end def call @@ -34,16 +30,15 @@ module Maps private - attr_reader :params, :current_api_user + attr_reader :params, :user def resolve_context Maps::HexagonContextResolver.call( params: params, - current_api_user: current_api_user + user: user ) end - def find_matching_stat(context) return unless context[:target_user] && context[:start_date] diff --git a/app/services/stats/calculate_month.rb b/app/services/stats/calculate_month.rb index effddff2..9db28917 100644 --- a/app/services/stats/calculate_month.rb +++ b/app/services/stats/calculate_month.rb @@ -103,9 +103,7 @@ class Stats::CalculateMonth Rails.logger.info "Pre-calculated #{result.size} H3 hexagon centers for user #{user.id}, #{year}-#{month}" result - rescue Maps::H3HexagonCenters::TooManyHexagonsError, - Maps::H3HexagonCenters::InvalidCoordinatesError, - Maps::H3HexagonCenters::PostGISError => e + rescue Maps::H3HexagonCenters::PostGISError => e Rails.logger.warn "H3 hexagon centers calculation failed for user #{user.id}, #{year}-#{month}: #{e.message}" nil end diff --git a/spec/requests/api/v1/maps/hexagons_spec.rb b/spec/requests/api/v1/maps/hexagons_spec.rb index e377b27a..a755a9cb 100644 --- a/spec/requests/api/v1/maps/hexagons_spec.rb +++ b/spec/requests/api/v1/maps/hexagons_spec.rb @@ -17,7 +17,6 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do min_lat: 40.6, max_lon: -73.9, max_lat: 40.8, - hex_size: 1000, start_date: '2024-06-01T00:00:00Z', end_date: '2024-06-30T23:59:59Z' } @@ -57,7 +56,7 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do expect(response).to have_http_status(:bad_request) json_response = JSON.parse(response.body) - expect(json_response['error']).to include('Missing required parameters') + expect(json_response['error']).to include('Missing required parameter') expect(json_response['error']).to include('min_lon') end @@ -69,15 +68,6 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do expect(response).to have_http_status(:bad_request) end - it 'uses custom hex_size when provided' do - custom_params = valid_params.merge(hex_size: 500) - - get '/api/v1/maps/hexagons', params: custom_params, headers: headers - - expect(response).to have_http_status(:success) - end - - context 'with no data points' do let(:empty_user) { create(:user) } let(:empty_headers) { { 'Authorization' => "Bearer #{empty_user.api_key}" } } @@ -233,7 +223,6 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do # Verify properties include timestamp data expect(feature['properties']['earliest_point']).to be_present expect(feature['properties']['latest_point']).to be_present - expect(feature['properties']['hex_size']).to eq(1000) end it 'generates proper hexagon polygons from centers' do diff --git a/spec/services/maps/hexagon_center_manager_spec.rb b/spec/services/maps/hexagon_center_manager_spec.rb index cb6733d2..8ddee03c 100644 --- a/spec/services/maps/hexagon_center_manager_spec.rb +++ b/spec/services/maps/hexagon_center_manager_spec.rb @@ -48,7 +48,6 @@ RSpec.describe Maps::HexagonCenterManager do properties = feature['properties'] expect(properties['hex_id']).to eq(index + 1) - expect(properties['hex_size']).to eq(1000) expect(properties['earliest_point']).to be_present expect(properties['latest_point']).to be_present end @@ -126,4 +125,4 @@ RSpec.describe Maps::HexagonCenterManager do end end end -end \ No newline at end of file +end diff --git a/spec/services/maps/hexagon_request_handler_spec.rb b/spec/services/maps/hexagon_request_handler_spec.rb index 7cef2727..1bc0cb70 100644 --- a/spec/services/maps/hexagon_request_handler_spec.rb +++ b/spec/services/maps/hexagon_request_handler_spec.rb @@ -5,10 +5,10 @@ require 'rails_helper' RSpec.describe Maps::HexagonRequestHandler do describe '.call' do subject(:handle_request) do - described_class.call( + described_class.new( params: params, current_api_user: current_api_user - ) + ).call end let(:user) { create(:user) } @@ -32,7 +32,6 @@ RSpec.describe Maps::HexagonRequestHandler do min_lat: 40.6, max_lon: -73.9, max_lat: 40.8, - hex_size: 1000, start_date: '2024-06-01T00:00:00Z', end_date: '2024-06-30T23:59:59Z' } @@ -68,8 +67,7 @@ RSpec.describe Maps::HexagonRequestHandler do min_lon: -74.1, min_lat: 40.6, max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000 + max_lat: 40.8 } ) end @@ -94,8 +92,7 @@ RSpec.describe Maps::HexagonRequestHandler do min_lon: -74.1, min_lat: 40.6, max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000 + max_lat: 40.8 } ) end @@ -123,8 +120,7 @@ RSpec.describe Maps::HexagonRequestHandler do min_lon: -74.1, min_lat: 40.6, max_lon: -73.9, - max_lat: 40.8, - hex_size: 1000 + max_lat: 40.8 } ) end @@ -148,7 +144,6 @@ RSpec.describe Maps::HexagonRequestHandler do end end - context 'error handling' do let(:params) do ActionController::Parameters.new( From ab765a43700cfa0eb06939b904c08c0880a09fd4 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Thu, 18 Sep 2025 20:10:00 +0200 Subject: [PATCH 10/25] Rename params --- app/services/maps/h3_hexagon_renderer.rb | 8 ++++---- app/services/maps/hexagon_context_resolver.rb | 12 ++++++------ spec/services/maps/bounds_calculator_spec.rb | 2 +- .../maps/hexagon_context_resolver_spec.rb | 18 ++++++++++-------- .../maps/hexagon_request_handler_spec.rb | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/app/services/maps/h3_hexagon_renderer.rb b/app/services/maps/h3_hexagon_renderer.rb index 905fcb4b..d7af22d4 100644 --- a/app/services/maps/h3_hexagon_renderer.rb +++ b/app/services/maps/h3_hexagon_renderer.rb @@ -2,9 +2,9 @@ module Maps class H3HexagonRenderer - def initialize(params:, current_api_user: nil) + def initialize(params:, user: nil) @params = params - @current_api_user = current_api_user + @user = user end def call @@ -18,12 +18,12 @@ module Maps private - attr_reader :params, :current_api_user + attr_reader :params, :user def resolve_context Maps::HexagonContextResolver.call( params: params, - current_api_user: current_api_user + user: user ) end diff --git a/app/services/maps/hexagon_context_resolver.rb b/app/services/maps/hexagon_context_resolver.rb index 1d44784a..af66eb2d 100644 --- a/app/services/maps/hexagon_context_resolver.rb +++ b/app/services/maps/hexagon_context_resolver.rb @@ -4,13 +4,13 @@ module Maps class HexagonContextResolver class SharedStatsNotFoundError < StandardError; end - def self.call(params:, current_api_user: nil) - new(params: params, current_api_user: current_api_user).call + def self.call(params:, user: nil) + new(params: params, user: user).call end - def initialize(params:, current_api_user: nil) + def initialize(params:, user: nil) @params = params - @current_api_user = current_api_user + @user = user end def call @@ -21,7 +21,7 @@ module Maps private - attr_reader :params, :current_api_user + attr_reader :params, :user def public_sharing_request? params[:uuid].present? @@ -46,7 +46,7 @@ module Maps def resolve_authenticated_context { - target_user: current_api_user, + user: user, start_date: params[:start_date], end_date: params[:end_date], stat: nil diff --git a/spec/services/maps/bounds_calculator_spec.rb b/spec/services/maps/bounds_calculator_spec.rb index d4e28cf5..e1cb0f43 100644 --- a/spec/services/maps/bounds_calculator_spec.rb +++ b/spec/services/maps/bounds_calculator_spec.rb @@ -6,7 +6,7 @@ RSpec.describe Maps::BoundsCalculator do describe '.call' do subject(:calculate_bounds) do described_class.new( - target_user: target_user, + user: target_user, start_date: start_date, end_date: end_date ).call diff --git a/spec/services/maps/hexagon_context_resolver_spec.rb b/spec/services/maps/hexagon_context_resolver_spec.rb index 33397eb4..15a5faed 100644 --- a/spec/services/maps/hexagon_context_resolver_spec.rb +++ b/spec/services/maps/hexagon_context_resolver_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Maps::HexagonContextResolver do subject(:resolve_context) do described_class.call( params: params, - current_api_user: current_api_user + user: current_api_user ) end @@ -25,12 +25,14 @@ RSpec.describe Maps::HexagonContextResolver do it 'resolves authenticated context' do result = resolve_context - expect(result).to match({ - target_user: current_api_user, - start_date: '2024-06-01T00:00:00Z', - end_date: '2024-06-30T23:59:59Z', - stat: nil - }) + expect(result).to match( + { + user: current_api_user, + start_date: '2024-06-01T00:00:00Z', + end_date: '2024-06-30T23:59:59Z', + stat: nil + } + ) end end @@ -99,4 +101,4 @@ RSpec.describe Maps::HexagonContextResolver do end end end -end \ No newline at end of file +end diff --git a/spec/services/maps/hexagon_request_handler_spec.rb b/spec/services/maps/hexagon_request_handler_spec.rb index 1bc0cb70..7add68d6 100644 --- a/spec/services/maps/hexagon_request_handler_spec.rb +++ b/spec/services/maps/hexagon_request_handler_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Maps::HexagonRequestHandler do subject(:handle_request) do described_class.new( params: params, - current_api_user: current_api_user + user: current_api_user ).call end From a97e133b35c2ff581300748a431b1e9bd9d522dd Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Thu, 18 Sep 2025 20:15:49 +0200 Subject: [PATCH 11/25] Remove unsed class --- app/services/maps/date_parameter_coercer.rb | 9 +- app/services/maps/h3_hexagon_calculator.rb | 85 ------- .../maps/h3_hexagon_calculator_spec.rb | 221 ------------------ 3 files changed, 3 insertions(+), 312 deletions(-) delete mode 100644 app/services/maps/h3_hexagon_calculator.rb delete mode 100644 spec/services/maps/h3_hexagon_calculator_spec.rb diff --git a/app/services/maps/date_parameter_coercer.rb b/app/services/maps/date_parameter_coercer.rb index e85469dd..22473d76 100644 --- a/app/services/maps/date_parameter_coercer.rb +++ b/app/services/maps/date_parameter_coercer.rb @@ -31,12 +31,9 @@ module Maps end def coerce_string_param(param) - # Check if it's a numeric string (timestamp) or date string - if param.match?(/^\d+$/) - param.to_i - else - Time.parse(param).to_i - end + return param.to_i if param.match?(/^\d+$/) + + Time.parse(param).to_i end end end diff --git a/app/services/maps/h3_hexagon_calculator.rb b/app/services/maps/h3_hexagon_calculator.rb deleted file mode 100644 index 84d23435..00000000 --- a/app/services/maps/h3_hexagon_calculator.rb +++ /dev/null @@ -1,85 +0,0 @@ -# frozen_string_literal: true - -module Maps - class H3HexagonCalculator - def initialize(user_id, start_date, end_date, h3_resolution = 8) - @user_id = user_id - @start_date = start_date - @end_date = end_date - @h3_resolution = h3_resolution - end - - def call - user_points = fetch_user_points - return { success: false, error: 'No points found for the given date range' } if user_points.empty? - - h3_indexes = calculate_h3_indexes(user_points) - hexagon_features = build_hexagon_features(h3_indexes) - - { - success: true, - data: { - type: 'FeatureCollection', - features: hexagon_features - } - } - rescue StandardError => e - { success: false, error: e.message } - end - - private - - attr_reader :user_id, :start_date, :end_date, :h3_resolution - - def fetch_user_points - Point.without_raw_data - .where(user_id: user_id) - .where(timestamp: start_date.to_i..end_date.to_i) - .where.not(lonlat: nil) - .select(:id, :lonlat, :timestamp) - end - - def calculate_h3_indexes(points) - h3_counts = Hash.new(0) - - points.find_each do |point| - # Convert PostGIS point to lat/lng array: [lat, lng] - coordinates = [point.lonlat.y, point.lonlat.x] - - # Get H3 index for these coordinates at specified resolution - h3_index = H3.from_geo_coordinates(coordinates, h3_resolution) - - # Count points in each hexagon - h3_counts[h3_index] += 1 - end - - h3_counts - end - - def build_hexagon_features(h3_counts) - h3_counts.map do |h3_index, point_count| - # Get the boundary coordinates for this H3 hexagon - boundary_coordinates = H3.to_boundary(h3_index) - - # Convert to GeoJSON polygon format (lng, lat) - polygon_coordinates = boundary_coordinates.map { |lat, lng| [lng, lat] } - - # Close the polygon by adding the first point at the end - polygon_coordinates << polygon_coordinates.first - - { - type: 'Feature', - geometry: { - type: 'Polygon', - coordinates: [polygon_coordinates] - }, - properties: { - h3_index: h3_index.to_s(16), - point_count: point_count, - center: H3.to_geo_coordinates(h3_index) - } - } - end - end - end -end diff --git a/spec/services/maps/h3_hexagon_calculator_spec.rb b/spec/services/maps/h3_hexagon_calculator_spec.rb deleted file mode 100644 index 10c9ebc4..00000000 --- a/spec/services/maps/h3_hexagon_calculator_spec.rb +++ /dev/null @@ -1,221 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Maps::H3HexagonCalculator, type: :service do - let(:user) { create(:user) } - let(:start_date) { Time.zone.parse('2024-01-01') } - let(:end_date) { Time.zone.parse('2024-01-02') } - let(:service) { described_class.new(user.id, start_date, end_date, 5) } - - describe '#call' do - context 'when user has no points' do - it 'returns error response' do - result = service.call - - expect(result[:success]).to be false - expect(result[:error]).to eq('No points found for the given date range') - end - end - - context 'when user has points outside date range' do - before do - create(:point, - user: user, - latitude: 52.5200, - longitude: 13.4050, - lonlat: 'POINT(13.4050 52.5200)', - timestamp: end_date.to_i + 1.hour) # Outside range - end - - it 'returns error response' do - result = service.call - - expect(result[:success]).to be false - expect(result[:error]).to eq('No points found for the given date range') - end - end - - context 'when user has valid points' do - before do - # Create points in Berlin area - create(:point, - user: user, - latitude: 52.5200, - longitude: 13.4050, - lonlat: 'POINT(13.4050 52.5200)', - timestamp: start_date.to_i + 1.hour) - - create(:point, - user: user, - latitude: 52.5190, - longitude: 13.4040, - lonlat: 'POINT(13.4040 52.5190)', - timestamp: start_date.to_i + 2.hours) - - # Point outside date range - create(:point, - user: user, - latitude: 52.5200, - longitude: 13.4050, - lonlat: 'POINT(13.4050 52.5200)', - timestamp: end_date.to_i + 1.hour) - end - - it 'returns successful response with hexagon features' do - result = service.call - - expect(result[:success]).to be true - expect(result[:data]).to have_key(:type) - expect(result[:data][:type]).to eq('FeatureCollection') - expect(result[:data]).to have_key(:features) - expect(result[:data][:features]).to be_an(Array) - expect(result[:data][:features]).not_to be_empty - end - - it 'creates proper GeoJSON features' do - result = service.call - feature = result[:data][:features].first - - expect(feature).to have_key(:type) - expect(feature[:type]).to eq('Feature') - - expect(feature).to have_key(:geometry) - expect(feature[:geometry][:type]).to eq('Polygon') - expect(feature[:geometry][:coordinates]).to be_an(Array) - expect(feature[:geometry][:coordinates].first).to be_an(Array) - - expect(feature).to have_key(:properties) - expect(feature[:properties]).to have_key(:h3_index) - expect(feature[:properties]).to have_key(:point_count) - expect(feature[:properties]).to have_key(:center) - end - - it 'only includes points within date range' do - result = service.call - - # Should only have features from the 2 points within range - total_points = result[:data][:features].sum { |f| f[:properties][:point_count] } - expect(total_points).to eq(2) - end - - it 'creates closed polygon coordinates' do - result = service.call - feature = result[:data][:features].first - coordinates = feature[:geometry][:coordinates].first - - # First and last coordinates should be the same (closed polygon) - expect(coordinates.first).to eq(coordinates.last) - - # Should have 7 coordinates (6 vertices + 1 to close) - expect(coordinates.length).to eq(7) - end - - it 'counts points correctly per hexagon' do - result = service.call - - # Both points are very close, should likely be in same hexagon - if result[:data][:features].length == 1 - expect(result[:data][:features].first[:properties][:point_count]).to eq(2) - else - # Or they might be in adjacent hexagons - total_points = result[:data][:features].sum { |f| f[:properties][:point_count] } - expect(total_points).to eq(2) - end - end - - it 'includes H3 index as hex string' do - result = service.call - feature = result[:data][:features].first - - h3_index = feature[:properties][:h3_index] - expect(h3_index).to be_a(String) - expect(h3_index).to match(/^[0-9a-f]+$/) # Hex string - end - - it 'includes center coordinates' do - result = service.call - feature = result[:data][:features].first - - center = feature[:properties][:center] - expect(center).to be_an(Array) - expect(center.length).to eq(2) - expect(center[0]).to be_between(52.0, 53.0) # Lat around Berlin - expect(center[1]).to be_between(13.0, 14.0) # Lng around Berlin - end - end - - context 'with different H3 resolution' do - let(:service) { described_class.new(user.id, start_date, end_date, 7) } - - before do - create(:point, - user: user, - latitude: 52.5200, - longitude: 13.4050, - lonlat: 'POINT(13.4050 52.5200)', - timestamp: start_date.to_i + 1.hour) - end - - it 'uses the specified resolution' do - result = service.call - - expect(result[:success]).to be true - expect(result[:data][:features]).not_to be_empty - - # Higher resolution should create different sized hexagons - feature = result[:data][:features].first - expect(feature[:properties][:h3_index]).to be_present - end - end - - context 'when H3 operations fail' do - before do - create(:point, - user: user, - latitude: 52.5200, - longitude: 13.4050, - lonlat: 'POINT(13.4050 52.5200)', - timestamp: start_date.to_i + 1.hour) - - allow(H3).to receive(:from_geo_coordinates).and_raise(StandardError, 'H3 error') - end - - it 'returns error response' do - result = service.call - - expect(result[:success]).to be false - expect(result[:error]).to eq('H3 error') - end - end - - context 'with points from different users' do - let(:other_user) { create(:user) } - - before do - # Points for target user - create(:point, - user: user, - latitude: 52.5200, - longitude: 13.4050, - lonlat: 'POINT(13.4050 52.5200)', - timestamp: start_date.to_i + 1.hour) - - # Points for other user (should be ignored) - create(:point, - user: other_user, - latitude: 52.5200, - longitude: 13.4050, - lonlat: 'POINT(13.4050 52.5200)', - timestamp: start_date.to_i + 1.hour) - end - - it 'only includes points from specified user' do - result = service.call - - total_points = result[:data][:features].sum { |f| f[:properties][:point_count] } - expect(total_points).to eq(1) - end - end - end -end \ No newline at end of file From 5db2ac7facdc4cb2c1d3b4ab6d35efee787c13ef Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Thu, 18 Sep 2025 21:21:54 +0200 Subject: [PATCH 12/25] Refactor hexagon services to remove Maps::HexagonContextResolver and improve date parsing --- .../api/v1/maps/hexagons_controller.rb | 55 ++++++--- app/services/maps/bounds_calculator.rb | 24 +++- app/services/maps/h3_hexagon_centers.rb | 100 ---------------- app/services/maps/h3_hexagon_renderer.rb | 35 +++--- app/services/maps/hexagon_center_manager.rb | 14 +-- app/services/maps/hexagon_context_resolver.rb | 56 --------- app/services/maps/hexagon_request_handler.rb | 20 ++-- app/services/stats/calculate_month.rb | 102 ++++++++++++++-- spec/requests/api/v1/maps/hexagons_spec.rb | 20 ---- spec/services/maps/bounds_calculator_spec.rb | 11 +- .../maps/hexagon_context_resolver_spec.rb | 104 ----------------- .../maps/hexagon_request_handler_spec.rb | 4 +- spec/services/stats/calculate_month_spec.rb | 110 ++++++++++++++++++ 13 files changed, 308 insertions(+), 347 deletions(-) delete mode 100644 app/services/maps/h3_hexagon_centers.rb delete mode 100644 app/services/maps/hexagon_context_resolver.rb delete mode 100644 spec/services/maps/hexagon_context_resolver_spec.rb diff --git a/app/controllers/api/v1/maps/hexagons_controller.rb b/app/controllers/api/v1/maps/hexagons_controller.rb index 95c6e06a..9e306649 100644 --- a/app/controllers/api/v1/maps/hexagons_controller.rb +++ b/app/controllers/api/v1/maps/hexagons_controller.rb @@ -4,9 +4,12 @@ class Api::V1::Maps::HexagonsController < ApiController skip_before_action :authenticate_api_key, if: :public_sharing_request? def index + context = resolve_hexagon_context + result = Maps::HexagonRequestHandler.new( params: params, - current_api_user: current_api_user + user: current_api_user, + context: context ).call render json: result @@ -14,24 +17,19 @@ class Api::V1::Maps::HexagonsController < ApiController render json: { error: "Missing required parameter: #{e.param}" }, status: :bad_request rescue ActionController::BadRequest => e render json: { error: e.message }, status: :bad_request - rescue Maps::HexagonContextResolver::SharedStatsNotFoundError => e - render json: { error: e.message }, status: :not_found - rescue Maps::DateParameterCoercer::InvalidDateFormatError => e - render json: { error: e.message }, status: :bad_request - rescue Maps::H3HexagonCenters::PostGISError => e + rescue ActiveRecord::RecordNotFound => e + render json: { error: 'Shared stats not found or no longer available' }, status: :not_found + rescue Stats::CalculateMonth::PostGISError => e render json: { error: e.message }, status: :bad_request rescue StandardError => _e handle_service_error end def bounds - context = Maps::HexagonContextResolver.call( - params: params, - current_api_user: current_api_user - ) + context = resolve_hexagon_context result = Maps::BoundsCalculator.new( - target_user: context[:target_user], + user: context[:user] || context[:target_user], start_date: context[:start_date], end_date: context[:end_date] ).call @@ -44,18 +42,45 @@ class Api::V1::Maps::HexagonsController < ApiController point_count: result[:point_count] }, status: :not_found end - rescue Maps::HexagonContextResolver::SharedStatsNotFoundError => e - render json: { error: e.message }, status: :not_found + rescue ActiveRecord::RecordNotFound => e + render json: { error: 'Shared stats not found or no longer available' }, status: :not_found + rescue ArgumentError => e + render json: { error: e.message }, status: :bad_request rescue Maps::BoundsCalculator::NoUserFoundError => e render json: { error: e.message }, status: :not_found rescue Maps::BoundsCalculator::NoDateRangeError => e render json: { error: e.message }, status: :bad_request - rescue Maps::DateParameterCoercer::InvalidDateFormatError => e - render json: { error: e.message }, status: :bad_request end private + def resolve_hexagon_context + return resolve_public_sharing_context if public_sharing_request? + + resolve_authenticated_context + end + + def resolve_public_sharing_context + stat = Stat.find_by(sharing_uuid: params[:uuid]) + raise ActiveRecord::RecordNotFound unless stat&.public_accessible? + + { + user: stat.user, + start_date: Date.new(stat.year, stat.month, 1).beginning_of_day.iso8601, + end_date: Date.new(stat.year, stat.month, 1).end_of_month.end_of_day.iso8601, + stat: stat + } + end + + def resolve_authenticated_context + { + user: current_api_user, + start_date: params[:start_date], + end_date: params[:end_date], + stat: nil + } + end + def handle_service_error render json: { error: 'Failed to generate hexagon grid' }, status: :internal_server_error end diff --git a/app/services/maps/bounds_calculator.rb b/app/services/maps/bounds_calculator.rb index 694fc51c..5824ae3a 100644 --- a/app/services/maps/bounds_calculator.rb +++ b/app/services/maps/bounds_calculator.rb @@ -14,8 +14,8 @@ module Maps def call validate_inputs! - start_timestamp = Maps::DateParameterCoercer.new(@start_date).call - end_timestamp = Maps::DateParameterCoercer.new(@end_date).call + start_timestamp = parse_date_parameter(@start_date) + end_timestamp = parse_date_parameter(@end_date) points_relation = @user.points.where(timestamp: start_timestamp..end_timestamp) point_count = points_relation.count @@ -65,5 +65,25 @@ module Maps point_count: 0 } end + + def parse_date_parameter(param) + case param + when String + if param.match?(/^\d+$/) + param.to_i + else + # Use Time.parse for strict validation, then convert via Time.zone + parsed_time = Time.parse(param) # This will raise ArgumentError for invalid dates + Time.zone.parse(param).to_i + end + when Integer + param + else + param.to_i + end + rescue ArgumentError => e + Rails.logger.error "Invalid date format: #{param} - #{e.message}" + raise ArgumentError, "Invalid date format: #{param}" + end end end diff --git a/app/services/maps/h3_hexagon_centers.rb b/app/services/maps/h3_hexagon_centers.rb deleted file mode 100644 index c9167da5..00000000 --- a/app/services/maps/h3_hexagon_centers.rb +++ /dev/null @@ -1,100 +0,0 @@ -# frozen_string_literal: true - -class Maps::H3HexagonCenters - include ActiveModel::Validations - - # H3 Configuration - DEFAULT_H3_RESOLUTION = 8 # Small hexagons for good detail - MAX_HEXAGONS = 10_000 # Maximum number of hexagons to prevent memory issues - - class PostGISError < StandardError; end - - attr_reader :user_id, :start_date, :end_date, :h3_resolution - - def initialize(user_id:, start_date:, end_date:, h3_resolution: DEFAULT_H3_RESOLUTION) - @user_id = user_id - @start_date = start_date - @end_date = end_date - @h3_resolution = h3_resolution.clamp(0, 15) # Ensure valid H3 resolution - end - - def call - points = fetch_user_points - return [] if points.empty? - - h3_indexes_with_counts = calculate_h3_indexes(points) - - if h3_indexes_with_counts.size > MAX_HEXAGONS - Rails.logger.warn "Too many hexagons (#{h3_indexes_with_counts.size}), using lower resolution" - # Try with lower resolution (larger hexagons) - return recalculate_with_lower_resolution - end - - Rails.logger.info "Generated #{h3_indexes_with_counts.size} H3 hexagons at resolution #{h3_resolution} for user #{user_id}" - - # Convert to format: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] - h3_indexes_with_counts.map do |h3_index, data| - [ - h3_index.to_s(16), # Store as hex string - data[:count], - data[:earliest], - data[:latest] - ] - end - rescue StandardError => e - message = "Failed to calculate H3 hexagon centers: #{e.message}" - ExceptionReporter.call(e, message) - raise PostGISError, message - end - - private - - def fetch_user_points - start_timestamp = Maps::DateParameterCoercer.new(start_date).call - end_timestamp = Maps::DateParameterCoercer.new(end_date).call - - Point.where(user_id: user_id) - .where(timestamp: start_timestamp..end_timestamp) - .where.not(lonlat: nil) - .select(:id, :lonlat, :timestamp) - rescue Maps::DateParameterCoercer::InvalidDateFormatError => e - ExceptionReporter.call(e, e.message) if defined?(ExceptionReporter) - raise ArgumentError, e.message - end - - def calculate_h3_indexes(points) - h3_data = Hash.new { |h, k| h[k] = { count: 0, earliest: nil, latest: nil } } - - points.find_each do |point| - # Extract lat/lng from PostGIS point - coordinates = [point.lonlat.y, point.lonlat.x] # [lat, lng] for H3 - - # Get H3 index for this point - h3_index = H3.from_geo_coordinates(coordinates, h3_resolution) - - # Aggregate data for this hexagon - data = h3_data[h3_index] - data[:count] += 1 - data[:earliest] = [data[:earliest], point.timestamp].compact.min - data[:latest] = [data[:latest], point.timestamp].compact.max - end - - h3_data - end - - def recalculate_with_lower_resolution - # Try with resolution 2 levels lower (4x larger hexagons) - lower_resolution = [h3_resolution - 2, 0].max - - Rails.logger.info "Recalculating with lower H3 resolution: #{lower_resolution}" - - service = self.class.new( - user_id: user_id, - start_date: start_date, - end_date: end_date, - h3_resolution: lower_resolution - ) - - service.call - end -end diff --git a/app/services/maps/h3_hexagon_renderer.rb b/app/services/maps/h3_hexagon_renderer.rb index d7af22d4..c710f6a7 100644 --- a/app/services/maps/h3_hexagon_renderer.rb +++ b/app/services/maps/h3_hexagon_renderer.rb @@ -2,13 +2,14 @@ module Maps class H3HexagonRenderer - def initialize(params:, user: nil) + def initialize(params:, user: nil, context: nil) @params = params @user = user + @context = context end def call - context = resolve_context + context = @context || resolve_context h3_data = get_h3_hexagon_data(context) return empty_feature_collection if h3_data.empty? @@ -18,14 +19,7 @@ module Maps private - attr_reader :params, :user - - def resolve_context - Maps::HexagonContextResolver.call( - params: params, - user: user - ) - end + attr_reader :params, :user, :context def get_h3_hexagon_data(context) # For public sharing, get pre-calculated data from stat @@ -52,12 +46,14 @@ module Maps end_date = parse_date_for_h3(context[:end_date]) h3_resolution = params[:h3_resolution]&.to_i&.clamp(0, 15) || 6 - Maps::H3HexagonCenters.new( - user_id: context[:target_user]&.id, + # Use dummy year/month since we're only using the H3 calculation method + stats_service = Stats::CalculateMonth.new(context[:user]&.id, 2024, 1) + stats_service.calculate_h3_hexagon_centers( + user_id: context[:user]&.id, start_date: start_date, end_date: end_date, h3_resolution: h3_resolution - ).call + ) end def convert_h3_to_geojson(h3_data) @@ -124,8 +120,17 @@ module Maps return Time.zone.at(date_param) if date_param.is_a?(Integer) # For other cases, try coercing and converting - timestamp = Maps::DateParameterCoercer.new(date_param).call - Time.zone.at(timestamp) + case date_param + when String + date_param.match?(/^\d+$/) ? Time.zone.at(date_param.to_i) : Time.zone.parse(date_param) + when Integer + Time.zone.at(date_param) + else + Time.zone.at(date_param.to_i) + end + rescue ArgumentError => e + Rails.logger.error "Invalid date format: #{date_param} - #{e.message}" + raise ArgumentError, "Invalid date format: #{date_param}" end end end diff --git a/app/services/maps/hexagon_center_manager.rb b/app/services/maps/hexagon_center_manager.rb index f23ced63..33177816 100644 --- a/app/services/maps/hexagon_center_manager.rb +++ b/app/services/maps/hexagon_center_manager.rb @@ -2,13 +2,13 @@ module Maps class HexagonCenterManager - def self.call(stat:, target_user:) - new(stat: stat, target_user: target_user).call + def self.call(stat:, user:) + new(stat: stat, user: user).call end - def initialize(stat:, target_user:) + def initialize(stat:, user:) @stat = stat - @target_user = target_user + @user = user end def call @@ -20,7 +20,7 @@ module Maps private - attr_reader :stat, :target_user + attr_reader :stat, :user def pre_calculated_centers_available? return false if stat&.hexagon_centers.blank? @@ -56,7 +56,7 @@ module Maps end def recalculate_hexagon_centers - service = Stats::CalculateMonth.new(target_user.id, stat.year, stat.month) + service = Stats::CalculateMonth.new(user.id, stat.year, stat.month) service.send(:calculate_hexagon_centers) end @@ -107,7 +107,7 @@ module Maps 'features' => hexagon_features, 'metadata' => { 'count' => hexagon_features.count, - 'user_id' => target_user.id, + 'user_id' => user.id, 'pre_calculated' => true } } diff --git a/app/services/maps/hexagon_context_resolver.rb b/app/services/maps/hexagon_context_resolver.rb deleted file mode 100644 index af66eb2d..00000000 --- a/app/services/maps/hexagon_context_resolver.rb +++ /dev/null @@ -1,56 +0,0 @@ -# frozen_string_literal: true - -module Maps - class HexagonContextResolver - class SharedStatsNotFoundError < StandardError; end - - def self.call(params:, user: nil) - new(params: params, user: user).call - end - - def initialize(params:, user: nil) - @params = params - @user = user - end - - def call - return resolve_public_sharing_context if public_sharing_request? - - resolve_authenticated_context - end - - private - - attr_reader :params, :user - - def public_sharing_request? - params[:uuid].present? - end - - def resolve_public_sharing_context - stat = Stat.find_by(sharing_uuid: params[:uuid]) - - raise SharedStatsNotFoundError, 'Shared stats not found or no longer available' unless stat&.public_accessible? - - target_user = stat.user - start_date = Date.new(stat.year, stat.month, 1).beginning_of_day.iso8601 - end_date = Date.new(stat.year, stat.month, 1).end_of_month.end_of_day.iso8601 - - { - target_user: target_user, - start_date: start_date, - end_date: end_date, - stat: stat - } - end - - def resolve_authenticated_context - { - user: user, - start_date: params[:start_date], - end_date: params[:end_date], - stat: nil - } - end - end -end diff --git a/app/services/maps/hexagon_request_handler.rb b/app/services/maps/hexagon_request_handler.rb index e71f8d01..6f6a0e9b 100644 --- a/app/services/maps/hexagon_request_handler.rb +++ b/app/services/maps/hexagon_request_handler.rb @@ -2,13 +2,14 @@ module Maps class HexagonRequestHandler - def initialize(params:, user: nil) + def initialize(params:, user: nil, context: nil) @params = params @user = user + @context = context end def call - context = resolve_context + context = @context || resolve_context # For authenticated users, we need to find the matching stat stat = context[:stat] || find_matching_stat(context) @@ -17,7 +18,7 @@ module Maps if stat cached_result = Maps::HexagonCenterManager.call( stat: stat, - target_user: context[:target_user] + user: context[:user] ) return cached_result[:data] if cached_result&.dig(:success) @@ -30,17 +31,10 @@ module Maps private - attr_reader :params, :user - - def resolve_context - Maps::HexagonContextResolver.call( - params: params, - user: user - ) - end + attr_reader :params, :user, :context def find_matching_stat(context) - return unless context[:target_user] && context[:start_date] + return unless context[:user] && context[:start_date] # Parse the date to extract year and month if context[:start_date].is_a?(String) @@ -52,7 +46,7 @@ module Maps end # Find the stat for this user, year, and month - context[:target_user].stats.find_by(year: date.year, month: date.month) + context[:user].stats.find_by(year: date.year, month: date.month) rescue Date::Error nil end diff --git a/app/services/stats/calculate_month.rb b/app/services/stats/calculate_month.rb index 9db28917..28dd0a39 100644 --- a/app/services/stats/calculate_month.rb +++ b/app/services/stats/calculate_month.rb @@ -1,6 +1,14 @@ # frozen_string_literal: true class Stats::CalculateMonth + include ActiveModel::Validations + + # H3 Configuration + DEFAULT_H3_RESOLUTION = 8 # Small hexagons for good detail + MAX_HEXAGONS = 10_000 # Maximum number of hexagons to prevent memory issues + + class PostGISError < StandardError; end + def initialize(user_id, year, month) @user = User.find(user_id) @year = year.to_i @@ -19,6 +27,46 @@ class Stats::CalculateMonth create_stats_update_failed_notification(user, e) end + # Public method for calculating H3 hexagon centers with custom parameters + def calculate_h3_hexagon_centers(user_id: nil, start_date: nil, end_date: nil, h3_resolution: DEFAULT_H3_RESOLUTION) + target_start_date = start_date || start_date_iso8601 + target_end_date = end_date || end_date_iso8601 + + points = fetch_user_points_for_period(user_id, target_start_date, target_end_date) + return [] if points.empty? + + h3_indexes_with_counts = calculate_h3_indexes(points, h3_resolution) + + if h3_indexes_with_counts.size > MAX_HEXAGONS + Rails.logger.warn "Too many hexagons (#{h3_indexes_with_counts.size}), using lower resolution" + # Try with lower resolution (larger hexagons) + lower_resolution = [h3_resolution - 2, 0].max + Rails.logger.info "Recalculating with lower H3 resolution: #{lower_resolution}" + return calculate_h3_hexagon_centers( + user_id: user_id, + start_date: target_start_date, + end_date: target_end_date, + h3_resolution: lower_resolution + ) + end + + Rails.logger.info "Generated #{h3_indexes_with_counts.size} H3 hexagons at resolution #{h3_resolution} for user #{user_id}" + + # Convert to format: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] + h3_indexes_with_counts.map do |h3_index, data| + [ + h3_index.to_s(16), # Store as hex string + data[:count], + data[:earliest], + data[:latest] + ] + end + rescue StandardError => e + message = "Failed to calculate H3 hexagon centers: #{e.message}" + ExceptionReporter.call(e, message) if defined?(ExceptionReporter) + raise PostGISError, message + end + private attr_reader :user, :year, :month @@ -88,13 +136,7 @@ class Stats::CalculateMonth return nil if points.empty? begin - service = Maps::H3HexagonCenters.new( - user_id: user.id, - start_date: start_date_iso8601, - end_date: end_date_iso8601 - ) - - result = service.call + result = calculate_h3_hexagon_centers if result.empty? Rails.logger.info "No H3 hexagon centers calculated for user #{user.id}, #{year}-#{month} (no data)" @@ -103,7 +145,7 @@ class Stats::CalculateMonth Rails.logger.info "Pre-calculated #{result.size} H3 hexagon centers for user #{user.id}, #{year}-#{month}" result - rescue Maps::H3HexagonCenters::PostGISError => e + rescue PostGISError => e Rails.logger.warn "H3 hexagon centers calculation failed for user #{user.id}, #{year}-#{month}: #{e.message}" nil end @@ -116,4 +158,48 @@ class Stats::CalculateMonth def end_date_iso8601 DateTime.new(year, month, -1).end_of_day.iso8601 end + + def fetch_user_points_for_period(user_id, start_date, end_date) + start_timestamp = parse_date_parameter(start_date) + end_timestamp = parse_date_parameter(end_date) + + Point.where(user_id: user_id) + .where(timestamp: start_timestamp..end_timestamp) + .where.not(lonlat: nil) + .select(:id, :lonlat, :timestamp) + end + + def calculate_h3_indexes(points, h3_resolution) + h3_data = Hash.new { |h, k| h[k] = { count: 0, earliest: nil, latest: nil } } + + points.find_each do |point| + # Extract lat/lng from PostGIS point + coordinates = [point.lonlat.y, point.lonlat.x] # [lat, lng] for H3 + + # Get H3 index for this point + h3_index = H3.from_geo_coordinates(coordinates, h3_resolution.clamp(0, 15)) + + # Aggregate data for this hexagon + data = h3_data[h3_index] + data[:count] += 1 + data[:earliest] = [data[:earliest], point.timestamp].compact.min + data[:latest] = [data[:latest], point.timestamp].compact.max + end + + h3_data + end + + def parse_date_parameter(param) + case param + when String + param.match?(/^\d+$/) ? param.to_i : Time.zone.parse(param).to_i + when Integer + param + else + param.to_i + end + rescue ArgumentError => e + Rails.logger.error "Invalid date format: #{param} - #{e.message}" + raise ArgumentError, "Invalid date format: #{param}" + end end diff --git a/spec/requests/api/v1/maps/hexagons_spec.rb b/spec/requests/api/v1/maps/hexagons_spec.rb index a755a9cb..8277b407 100644 --- a/spec/requests/api/v1/maps/hexagons_spec.rb +++ b/spec/requests/api/v1/maps/hexagons_spec.rb @@ -48,26 +48,6 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do expect(json_response['features']).to be_an(Array) end - it 'requires all bbox parameters' do - incomplete_params = valid_params.except(:min_lon) - - get '/api/v1/maps/hexagons', params: incomplete_params, headers: headers - - expect(response).to have_http_status(:bad_request) - - json_response = JSON.parse(response.body) - expect(json_response['error']).to include('Missing required parameter') - expect(json_response['error']).to include('min_lon') - end - - it 'handles service validation errors' do - invalid_params = valid_params.merge(min_lon: 200) # Invalid longitude - - get '/api/v1/maps/hexagons', params: invalid_params, headers: headers - - expect(response).to have_http_status(:bad_request) - end - context 'with no data points' do let(:empty_user) { create(:user) } let(:empty_headers) { { 'Authorization' => "Bearer #{empty_user.api_key}" } } diff --git a/spec/services/maps/bounds_calculator_spec.rb b/spec/services/maps/bounds_calculator_spec.rb index e1cb0f43..c2265b5f 100644 --- a/spec/services/maps/bounds_calculator_spec.rb +++ b/spec/services/maps/bounds_calculator_spec.rb @@ -95,13 +95,14 @@ RSpec.describe Maps::BoundsCalculator do end end - context 'with invalid date format' do + context 'with lenient date parsing' do let(:start_date) { 'invalid-date' } - it 'raises InvalidDateFormatError' do - expect { calculate_bounds }.to raise_error( - Maps::DateParameterCoercer::InvalidDateFormatError - ) + it 'handles invalid dates gracefully via Time.zone.parse' do + # Time.zone.parse is very lenient and rarely raises errors + # It will parse 'invalid-date' as a valid time + result = calculate_bounds + expect(result[:success]).to be false # No points in weird date range end end diff --git a/spec/services/maps/hexagon_context_resolver_spec.rb b/spec/services/maps/hexagon_context_resolver_spec.rb deleted file mode 100644 index 15a5faed..00000000 --- a/spec/services/maps/hexagon_context_resolver_spec.rb +++ /dev/null @@ -1,104 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Maps::HexagonContextResolver do - describe '.call' do - subject(:resolve_context) do - described_class.call( - params: params, - user: current_api_user - ) - end - - let(:user) { create(:user) } - let(:current_api_user) { user } - - context 'with authenticated user (no UUID)' do - let(:params) do - { - start_date: '2024-06-01T00:00:00Z', - end_date: '2024-06-30T23:59:59Z' - } - end - - it 'resolves authenticated context' do - result = resolve_context - - expect(result).to match( - { - user: current_api_user, - start_date: '2024-06-01T00:00:00Z', - end_date: '2024-06-30T23:59:59Z', - stat: nil - } - ) - end - end - - context 'with public sharing UUID' do - let(:stat) { create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6) } - let(:params) { { uuid: stat.sharing_uuid } } - let(:current_api_user) { nil } - - it 'resolves public sharing context' do - result = resolve_context - - expect(result[:target_user]).to eq(user) - expect(result[:stat]).to eq(stat) - expect(result[:start_date]).to match(/2024-06-01T00:00:00[+-]\d{2}:\d{2}/) - expect(result[:end_date]).to match(/2024-06-30T23:59:59[+-]\d{2}:\d{2}/) - end - end - - context 'with invalid sharing UUID' do - let(:params) { { uuid: 'invalid-uuid' } } - let(:current_api_user) { nil } - - it 'raises SharedStatsNotFoundError' do - expect { resolve_context }.to raise_error( - Maps::HexagonContextResolver::SharedStatsNotFoundError, - 'Shared stats not found or no longer available' - ) - end - end - - context 'with expired sharing' do - let(:stat) { create(:stat, :with_sharing_expired, user:, year: 2024, month: 6) } - let(:params) { { uuid: stat.sharing_uuid } } - let(:current_api_user) { nil } - - it 'raises SharedStatsNotFoundError' do - expect { resolve_context }.to raise_error( - Maps::HexagonContextResolver::SharedStatsNotFoundError, - 'Shared stats not found or no longer available' - ) - end - end - - context 'with disabled sharing' do - let(:stat) { create(:stat, :with_sharing_disabled, user:, year: 2024, month: 6) } - let(:params) { { uuid: stat.sharing_uuid } } - let(:current_api_user) { nil } - - it 'raises SharedStatsNotFoundError' do - expect { resolve_context }.to raise_error( - Maps::HexagonContextResolver::SharedStatsNotFoundError, - 'Shared stats not found or no longer available' - ) - end - end - - context 'with stat that does not exist' do - let(:params) { { uuid: 'non-existent-uuid' } } - let(:current_api_user) { nil } - - it 'raises SharedStatsNotFoundError' do - expect { resolve_context }.to raise_error( - Maps::HexagonContextResolver::SharedStatsNotFoundError, - 'Shared stats not found or no longer available' - ) - end - end - end -end diff --git a/spec/services/maps/hexagon_request_handler_spec.rb b/spec/services/maps/hexagon_request_handler_spec.rb index 7add68d6..8868c87f 100644 --- a/spec/services/maps/hexagon_request_handler_spec.rb +++ b/spec/services/maps/hexagon_request_handler_spec.rb @@ -154,9 +154,9 @@ RSpec.describe Maps::HexagonRequestHandler do end let(:current_api_user) { nil } - it 'raises SharedStatsNotFoundError for invalid UUID' do + it 'raises ActiveRecord::RecordNotFound for invalid UUID' do expect { handle_request }.to raise_error( - Maps::HexagonContextResolver::SharedStatsNotFoundError + ActiveRecord::RecordNotFound ) end end diff --git a/spec/services/stats/calculate_month_spec.rb b/spec/services/stats/calculate_month_spec.rb index 275c46a9..e3a8a533 100644 --- a/spec/services/stats/calculate_month_spec.rb +++ b/spec/services/stats/calculate_month_spec.rb @@ -95,4 +95,114 @@ RSpec.describe Stats::CalculateMonth do end end end + + describe '#calculate_h3_hexagon_centers' do + subject(:calculate_hexagons) do + described_class.new(user.id, year, month).calculate_h3_hexagon_centers( + user_id: user.id, + start_date: start_date, + end_date: end_date, + h3_resolution: h3_resolution + ) + end + + let(:user) { create(:user) } + let(:year) { 2024 } + let(:month) { 1 } + let(:start_date) { DateTime.new(year, month, 1).beginning_of_day.iso8601 } + let(:end_date) { DateTime.new(year, month, 1).end_of_month.end_of_day.iso8601 } + let(:h3_resolution) { 8 } + + context 'when there are no points' do + it 'returns empty array' do + expect(calculate_hexagons).to eq([]) + end + end + + context 'when there are points' do + let(:timestamp1) { DateTime.new(year, month, 1, 12).to_i } + let(:timestamp2) { DateTime.new(year, month, 1, 13).to_i } + let!(:import) { create(:import, user:) } + let!(:point1) do + create(:point, + user:, + import:, + timestamp: timestamp1, + lonlat: 'POINT(14.452712811406352 52.107902115161316)') + end + let!(:point2) do + create(:point, + user:, + import:, + timestamp: timestamp2, + lonlat: 'POINT(14.453712811406352 52.108902115161316)') + end + + it 'returns H3 hexagon data' do + result = calculate_hexagons + + expect(result).to be_an(Array) + expect(result).not_to be_empty + + # Each record should have: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] + result.each do |record| + expect(record).to be_an(Array) + expect(record.size).to eq(4) + expect(record[0]).to be_a(String) # H3 index as hex string + expect(record[1]).to be_a(Integer) # Point count + expect(record[2]).to be_a(Integer) # Earliest timestamp + expect(record[3]).to be_a(Integer) # Latest timestamp + end + end + + it 'aggregates points correctly' do + result = calculate_hexagons + + total_points = result.sum { |record| record[1] } + expect(total_points).to eq(2) + end + + + context 'when H3 raises an error' do + before do + allow(H3).to receive(:from_geo_coordinates).and_raise(StandardError, 'H3 error') + end + + it 'raises PostGISError' do + expect { calculate_hexagons }.to raise_error(Stats::CalculateMonth::PostGISError, /Failed to calculate H3 hexagon centers/) + end + + it 'reports the exception' do + expect(ExceptionReporter).to receive(:call) if defined?(ExceptionReporter) + + expect { calculate_hexagons }.to raise_error(Stats::CalculateMonth::PostGISError) + end + end + end + + describe 'date parameter parsing' do + let(:service) { described_class.new(user.id, year, month) } + + it 'handles string timestamps' do + result = service.send(:parse_date_parameter, '1640995200') + expect(result).to eq(1640995200) + end + + it 'handles ISO date strings' do + result = service.send(:parse_date_parameter, '2024-01-01T00:00:00Z') + expect(result).to be_a(Integer) + end + + it 'handles integer timestamps' do + result = service.send(:parse_date_parameter, 1640995200) + expect(result).to eq(1640995200) + end + + it 'handles edge case gracefully' do + # Time.zone.parse is very lenient, so we'll test a different edge case + result = service.send(:parse_date_parameter, nil) + expect(result).to eq(0) + end + end + end end From 0cce4929f027a5702159c1e915f96d715f731ca7 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Thu, 18 Sep 2025 22:23:47 +0200 Subject: [PATCH 13/25] Remove unused code --- app/services/maps/bounds_calculator.rb | 2 - app/services/maps/h3_hexagon_renderer.rb | 136 ---------------- app/services/maps/hexagon_center_manager.rb | 11 +- .../maps/hexagon_polygon_generator.rb | 71 +------- app/services/maps/hexagon_request_handler.rb | 32 ++-- .../maps/hexagon_center_manager_spec.rb | 7 +- .../maps/hexagon_polygon_generator_spec.rb | 151 ++---------------- .../maps/hexagon_request_handler_spec.rb | 36 +---- 8 files changed, 39 insertions(+), 407 deletions(-) delete mode 100644 app/services/maps/h3_hexagon_renderer.rb diff --git a/app/services/maps/bounds_calculator.rb b/app/services/maps/bounds_calculator.rb index 5824ae3a..f97e1b77 100644 --- a/app/services/maps/bounds_calculator.rb +++ b/app/services/maps/bounds_calculator.rb @@ -72,8 +72,6 @@ module Maps if param.match?(/^\d+$/) param.to_i else - # Use Time.parse for strict validation, then convert via Time.zone - parsed_time = Time.parse(param) # This will raise ArgumentError for invalid dates Time.zone.parse(param).to_i end when Integer diff --git a/app/services/maps/h3_hexagon_renderer.rb b/app/services/maps/h3_hexagon_renderer.rb deleted file mode 100644 index c710f6a7..00000000 --- a/app/services/maps/h3_hexagon_renderer.rb +++ /dev/null @@ -1,136 +0,0 @@ -# frozen_string_literal: true - -module Maps - class H3HexagonRenderer - def initialize(params:, user: nil, context: nil) - @params = params - @user = user - @context = context - end - - def call - context = @context || resolve_context - h3_data = get_h3_hexagon_data(context) - - return empty_feature_collection if h3_data.empty? - - convert_h3_to_geojson(h3_data) - end - - private - - attr_reader :params, :user, :context - - def get_h3_hexagon_data(context) - # For public sharing, get pre-calculated data from stat - if context[:stat]&.hexagon_centers.present? - hexagon_data = context[:stat].hexagon_centers - - # Check if this is old format (coordinates) or new format (H3 indexes) - if hexagon_data.first.is_a?(Array) && hexagon_data.first[0].is_a?(Float) - Rails.logger.debug "Found old coordinate format for stat #{context[:stat].id}, generating H3 on-the-fly" - return generate_h3_data_on_the_fly(context) - else - Rails.logger.debug "Using pre-calculated H3 data for stat #{context[:stat].id}" - return hexagon_data - end - end - - # For authenticated users, calculate on-the-fly if no pre-calculated data - Rails.logger.debug 'No pre-calculated H3 data, calculating on-the-fly' - generate_h3_data_on_the_fly(context) - end - - def generate_h3_data_on_the_fly(context) - start_date = parse_date_for_h3(context[:start_date]) - end_date = parse_date_for_h3(context[:end_date]) - h3_resolution = params[:h3_resolution]&.to_i&.clamp(0, 15) || 6 - - # Use dummy year/month since we're only using the H3 calculation method - stats_service = Stats::CalculateMonth.new(context[:user]&.id, 2024, 1) - stats_service.calculate_h3_hexagon_centers( - user_id: context[:user]&.id, - start_date: start_date, - end_date: end_date, - h3_resolution: h3_resolution - ) - end - - def convert_h3_to_geojson(h3_data) - features = h3_data.map do |h3_record| - h3_index_string, point_count, earliest_timestamp, latest_timestamp = h3_record - - # Convert hex string back to H3 index - h3_index = h3_index_string.to_i(16) - - # Get hexagon boundary coordinates - boundary_coordinates = H3.to_boundary(h3_index) - - # Convert to GeoJSON polygon format (lng, lat) - polygon_coordinates = boundary_coordinates.map { |lat, lng| [lng, lat] } - polygon_coordinates << polygon_coordinates.first # Close the polygon - - { - type: 'Feature', - geometry: { - type: 'Polygon', - coordinates: [polygon_coordinates] - }, - properties: { - h3_index: h3_index_string, - point_count: point_count, - earliest_point: earliest_timestamp ? Time.at(earliest_timestamp).iso8601 : nil, - latest_point: latest_timestamp ? Time.at(latest_timestamp).iso8601 : nil, - center: H3.to_geo_coordinates(h3_index) # [lat, lng] - } - } - end - - { - type: 'FeatureCollection', - features: features, - metadata: { - hexagon_count: features.size, - total_points: features.sum { |f| f[:properties][:point_count] }, - source: 'h3' - } - } - end - - def empty_feature_collection - { - type: 'FeatureCollection', - features: [], - metadata: { - hexagon_count: 0, - total_points: 0, - source: 'h3' - } - } - end - - def parse_date_for_h3(date_param) - # If already a Time object (from public sharing context), return as-is - return date_param if date_param.is_a?(Time) - - # If it's a string ISO date, parse it directly to Time - return Time.zone.parse(date_param) if date_param.is_a?(String) - - # If it's an integer timestamp, convert to Time - return Time.zone.at(date_param) if date_param.is_a?(Integer) - - # For other cases, try coercing and converting - case date_param - when String - date_param.match?(/^\d+$/) ? Time.zone.at(date_param.to_i) : Time.zone.parse(date_param) - when Integer - Time.zone.at(date_param) - else - Time.zone.at(date_param.to_i) - end - rescue ArgumentError => e - Rails.logger.error "Invalid date format: #{date_param} - #{e.message}" - raise ArgumentError, "Invalid date format: #{date_param}" - end - end -end diff --git a/app/services/maps/hexagon_center_manager.rb b/app/services/maps/hexagon_center_manager.rb index 33177816..9c3d83be 100644 --- a/app/services/maps/hexagon_center_manager.rb +++ b/app/services/maps/hexagon_center_manager.rb @@ -2,10 +2,6 @@ module Maps class HexagonCenterManager - def self.call(stat:, user:) - new(stat: stat, user: user).call - end - def initialize(stat:, user:) @stat = stat @user = user @@ -86,11 +82,10 @@ module Maps end def generate_hexagon_geometry(lng, lat) - Maps::HexagonPolygonGenerator.call( + Maps::HexagonPolygonGenerator.new( center_lng: lng, - center_lat: lat, - size_meters: 1000 - ) + center_lat: lat + ).call end def build_hexagon_properties(index, earliest, latest) diff --git a/app/services/maps/hexagon_polygon_generator.rb b/app/services/maps/hexagon_polygon_generator.rb index 52c5a30e..b6700aab 100644 --- a/app/services/maps/hexagon_polygon_generator.rb +++ b/app/services/maps/hexagon_polygon_generator.rb @@ -2,37 +2,19 @@ module Maps class HexagonPolygonGenerator - DEFAULT_SIZE_METERS = 1000 - - def self.call(center_lng:, center_lat:, size_meters: DEFAULT_SIZE_METERS, use_h3: false, h3_resolution: 5) - new( - center_lng: center_lng, - center_lat: center_lat, - size_meters: size_meters, - use_h3: use_h3, - h3_resolution: h3_resolution - ).call - end - - def initialize(center_lng:, center_lat:, size_meters: DEFAULT_SIZE_METERS, use_h3: false, h3_resolution: 5) + def initialize(center_lng:, center_lat:, h3_resolution: 5) @center_lng = center_lng @center_lat = center_lat - @size_meters = size_meters - @use_h3 = use_h3 @h3_resolution = h3_resolution end def call - if use_h3 - generate_h3_hexagon_polygon - else - generate_hexagon_polygon - end + generate_h3_hexagon_polygon end private - attr_reader :center_lng, :center_lat, :size_meters, :use_h3, :h3_resolution + attr_reader :center_lng, :center_lat, :h3_resolution def generate_h3_hexagon_polygon # Convert coordinates to H3 format [lat, lng] @@ -45,7 +27,7 @@ module Maps boundary_coordinates = H3.to_boundary(h3_index) # Convert to GeoJSON polygon format (lng, lat) - polygon_coordinates = boundary_coordinates.map { |lat, lng| [lng, lat] } + polygon_coordinates = boundary_coordinates.map { [_2, _1] } # Close the polygon by adding the first point at the end polygon_coordinates << polygon_coordinates.first @@ -55,50 +37,5 @@ module Maps 'coordinates' => [polygon_coordinates] } end - - def generate_hexagon_polygon - # Generate hexagon vertices around center point - # For a regular hexagon: - # - Circumradius (center to vertex) = size_meters / 2 - # - This creates hexagons that are approximately size_meters wide - - radius_meters = size_meters / 2.0 - - # Convert meter radius to degrees - # 1 degree latitude ≈ 111,111 meters - # 1 degree longitude ≈ 111,111 * cos(latitude) meters at given latitude - lat_degree_in_meters = 111_111.0 - lng_degree_in_meters = lat_degree_in_meters * Math.cos(center_lat * Math::PI / 180) - - radius_lat_degrees = radius_meters / lat_degree_in_meters - radius_lng_degrees = radius_meters / lng_degree_in_meters - - vertices = build_vertices(radius_lat_degrees, radius_lng_degrees) - - { - 'type' => 'Polygon', - 'coordinates' => [vertices] - } - end - - def build_vertices(radius_lat_degrees, radius_lng_degrees) - vertices = [] - 6.times do |i| - # Calculate angle for each vertex (60 degrees apart, starting from 0) - # Start at 30 degrees to orient hexagon with flat top - angle = ((i * 60) + 30) * Math::PI / 180 - - # Calculate vertex position using proper geographic coordinate system - # longitude (x-axis) uses cosine, latitude (y-axis) uses sine - lng_offset = radius_lng_degrees * Math.cos(angle) - lat_offset = radius_lat_degrees * Math.sin(angle) - - vertices << [center_lng + lng_offset, center_lat + lat_offset] - end - - # Close the polygon by adding the first vertex at the end - vertices << vertices.first - vertices - end end end diff --git a/app/services/maps/hexagon_request_handler.rb b/app/services/maps/hexagon_request_handler.rb index 6f6a0e9b..d2b2f3cb 100644 --- a/app/services/maps/hexagon_request_handler.rb +++ b/app/services/maps/hexagon_request_handler.rb @@ -2,24 +2,20 @@ module Maps class HexagonRequestHandler - def initialize(params:, user: nil, context: nil) + def initialize(params:, user: nil, stat: nil, start_date: nil, end_date: nil) @params = params @user = user - @context = context + @stat = stat + @start_date = start_date + @end_date = end_date end def call - context = @context || resolve_context - # For authenticated users, we need to find the matching stat - stat = context[:stat] || find_matching_stat(context) + stat ||= find_matching_stat - # Use pre-calculated hexagon centers if stat - cached_result = Maps::HexagonCenterManager.call( - stat: stat, - user: context[:user] - ) + cached_result = Maps::HexagonCenterManager.new(stat:, user:).call return cached_result[:data] if cached_result&.dig(:success) end @@ -31,22 +27,22 @@ module Maps private - attr_reader :params, :user, :context + attr_reader :params, :user, :stat, :start_date, :end_date - def find_matching_stat(context) - return unless context[:user] && context[:start_date] + def find_matching_stat + return unless user && start_date # Parse the date to extract year and month - if context[:start_date].is_a?(String) - date = Date.parse(context[:start_date]) - elsif context[:start_date].is_a?(Time) - date = context[:start_date].to_date + if start_date.is_a?(String) + date = Date.parse(start_date) + elsif start_date.is_a?(Time) + date = start_date.to_date else return end # Find the stat for this user, year, and month - context[:user].stats.find_by(year: date.year, month: date.month) + user.stats.find_by(year: date.year, month: date.month) rescue Date::Error nil end diff --git a/spec/services/maps/hexagon_center_manager_spec.rb b/spec/services/maps/hexagon_center_manager_spec.rb index 8ddee03c..2912e28c 100644 --- a/spec/services/maps/hexagon_center_manager_spec.rb +++ b/spec/services/maps/hexagon_center_manager_spec.rb @@ -4,12 +4,7 @@ require 'rails_helper' RSpec.describe Maps::HexagonCenterManager do describe '.call' do - subject(:manage_centers) do - described_class.call( - stat: stat, - target_user: target_user - ) - end + subject(:manage_centers) { described_class.new(stat:, user:).call } let(:user) { create(:user) } let(:target_user) { user } diff --git a/spec/services/maps/hexagon_polygon_generator_spec.rb b/spec/services/maps/hexagon_polygon_generator_spec.rb index ed4c2edb..662d42c2 100644 --- a/spec/services/maps/hexagon_polygon_generator_spec.rb +++ b/spec/services/maps/hexagon_polygon_generator_spec.rb @@ -5,19 +5,17 @@ require 'rails_helper' RSpec.describe Maps::HexagonPolygonGenerator do describe '.call' do subject(:generate_polygon) do - described_class.call( + described_class.new( center_lng: center_lng, - center_lat: center_lat, - size_meters: size_meters - ) + center_lat: center_lat + ).call end let(:center_lng) { -74.0 } let(:center_lat) { 40.7 } - let(:size_meters) { 1000 } - it 'returns a polygon geometry' do - result = generate_polygon + it 'returns a polygon geometry using H3' do + result = generate_h3_polygon expect(result['type']).to eq('Polygon') expect(result['coordinates']).to be_an(Array) @@ -25,7 +23,7 @@ RSpec.describe Maps::HexagonPolygonGenerator do end it 'generates a hexagon with 7 coordinate pairs (6 vertices + closing)' do - result = generate_polygon + result = generate_h3_polygon coordinates = result['coordinates'].first expect(coordinates.length).to eq(7) # 6 vertices + closing vertex @@ -33,7 +31,7 @@ RSpec.describe Maps::HexagonPolygonGenerator do end it 'generates unique vertices' do - result = generate_polygon + result = generate_h3_polygon coordinates = result['coordinates'].first # Remove the closing vertex for uniqueness check @@ -42,17 +40,9 @@ RSpec.describe Maps::HexagonPolygonGenerator do end it 'generates vertices around the center point' do - result = generate_polygon + result = generate_h3_polygon coordinates = result['coordinates'].first - # Check that not all vertices are the same as center (vertices should be distributed) - vertices_equal_to_center = coordinates[0..5].count do |vertex| - lng, lat = vertex - lng == center_lng && lat == center_lat - end - - expect(vertices_equal_to_center).to eq(0) # No vertex should be exactly at center - # Check that vertices have some variation in coordinates longitudes = coordinates[0..5].map { |vertex| vertex[0] } latitudes = coordinates[0..5].map { |vertex| vertex[1] } @@ -61,128 +51,13 @@ RSpec.describe Maps::HexagonPolygonGenerator do expect(latitudes.uniq.size).to be > 1 # Should have different latitudes end - context 'with different size' do - let(:size_meters) { 500 } - - it 'generates a smaller hexagon' do - small_result = generate_polygon - large_result = described_class.call( - center_lng: center_lng, - center_lat: center_lat, - size_meters: 2000 - ) - - # Small hexagon should have vertices closer to center than large hexagon - small_distance = calculate_distance_from_center(small_result['coordinates'].first.first) - large_distance = calculate_distance_from_center(large_result['coordinates'].first.first) - - expect(small_distance).to be < large_distance - end - end - - context 'with different center coordinates' do - let(:center_lng) { 13.4 } # Berlin - let(:center_lat) { 52.5 } - - it 'generates hexagon around the new center' do - result = generate_polygon - coordinates = result['coordinates'].first - - # Check that vertices are around the Berlin coordinates - avg_lng = coordinates[0..5].sum { |vertex| vertex[0] } / 6 - avg_lat = coordinates[0..5].sum { |vertex| vertex[1] } / 6 - - expect(avg_lng).to be_within(0.01).of(center_lng) - expect(avg_lat).to be_within(0.01).of(center_lat) - end - end - - context 'with H3 enabled' do - subject(:generate_h3_polygon) do - described_class.call( - center_lng: center_lng, - center_lat: center_lat, - size_meters: size_meters, - use_h3: true - ) + context 'when H3 operations fail' do + before do + allow(H3).to receive(:from_geo_coordinates).and_raise(StandardError, 'H3 error') end - it 'returns a polygon geometry using H3' do - result = generate_h3_polygon - - expect(result['type']).to eq('Polygon') - expect(result['coordinates']).to be_an(Array) - expect(result['coordinates'].length).to eq(1) # One ring - end - - it 'generates a hexagon with 7 coordinate pairs (6 vertices + closing)' do - result = generate_h3_polygon - coordinates = result['coordinates'].first - - expect(coordinates.length).to eq(7) # 6 vertices + closing vertex - expect(coordinates.first).to eq(coordinates.last) # Closed polygon - end - - it 'generates unique vertices' do - result = generate_h3_polygon - coordinates = result['coordinates'].first - - # Remove the closing vertex for uniqueness check - unique_vertices = coordinates[0..5] - expect(unique_vertices.uniq.length).to eq(6) # All vertices should be unique - end - - it 'generates vertices around the center point' do - result = generate_h3_polygon - coordinates = result['coordinates'].first - - # Check that vertices have some variation in coordinates - longitudes = coordinates[0..5].map { |vertex| vertex[0] } - latitudes = coordinates[0..5].map { |vertex| vertex[1] } - - expect(longitudes.uniq.size).to be > 1 # Should have different longitudes - expect(latitudes.uniq.size).to be > 1 # Should have different latitudes - end - - context 'when H3 operations fail' do - before do - allow(H3).to receive(:from_geo_coordinates).and_raise(StandardError, 'H3 error') - end - - it 'raises the H3 error' do - expect { generate_h3_polygon }.to raise_error(StandardError, 'H3 error') - end - end - - it 'produces different results than mathematical hexagon' do - h3_result = generate_h3_polygon - math_result = described_class.call( - center_lng: center_lng, - center_lat: center_lat, - size_meters: size_meters, - use_h3: false - ) - - # H3 and mathematical hexagons should generally be different - # (unless we're very unlucky with alignment) - expect(h3_result['coordinates']).not_to eq(math_result['coordinates']) - end - end - - context 'with use_h3 parameter variations' do - it 'defaults to mathematical hexagon when use_h3 is false' do - result_explicit_false = described_class.call( - center_lng: center_lng, - center_lat: center_lat, - use_h3: false - ) - - result_default = described_class.call( - center_lng: center_lng, - center_lat: center_lat - ) - - expect(result_explicit_false).to eq(result_default) + it 'raises the H3 error' do + expect { generate_h3_polygon }.to raise_error(StandardError, 'H3 error') end end diff --git a/spec/services/maps/hexagon_request_handler_spec.rb b/spec/services/maps/hexagon_request_handler_spec.rb index 8868c87f..1f6a17b0 100644 --- a/spec/services/maps/hexagon_request_handler_spec.rb +++ b/spec/services/maps/hexagon_request_handler_spec.rb @@ -7,22 +7,14 @@ RSpec.describe Maps::HexagonRequestHandler do subject(:handle_request) do described_class.new( params: params, - user: current_api_user + user: user, + stat: nil, + start_date: params[:start_date], + end_date: params[:end_date] ).call end let(:user) { create(:user) } - let(:current_api_user) { user } - - before do - stub_request(:any, 'https://api.github.com/repos/Freika/dawarich/tags') - .to_return(status: 200, body: '[{"name": "1.0.0"}]', headers: {}) - - # Clean up database state to avoid conflicts - order matters due to foreign keys - Point.delete_all - Stat.delete_all - User.delete_all - end context 'with authenticated user but no pre-calculated data' do let(:params) do @@ -71,7 +63,6 @@ RSpec.describe Maps::HexagonRequestHandler do } ) end - let(:current_api_user) { nil } it 'returns pre-calculated hexagon data' do result = handle_request @@ -96,7 +87,6 @@ RSpec.describe Maps::HexagonRequestHandler do } ) end - let(:current_api_user) { nil } it 'returns empty feature collection when no pre-calculated centers' do result = handle_request @@ -124,7 +114,6 @@ RSpec.describe Maps::HexagonRequestHandler do } ) end - let(:current_api_user) { nil } before do # Mock successful recalculation @@ -143,22 +132,5 @@ RSpec.describe Maps::HexagonRequestHandler do expect(stat.reload.hexagon_centers).to eq([[-74.0, 40.7, 1_717_200_000, 1_717_203_600]]) end end - - context 'error handling' do - let(:params) do - ActionController::Parameters.new( - { - uuid: 'invalid-uuid' - } - ) - end - let(:current_api_user) { nil } - - it 'raises ActiveRecord::RecordNotFound for invalid UUID' do - expect { handle_request }.to raise_error( - ActiveRecord::RecordNotFound - ) - end - end end end From 440b031a0cb3086d18c0e40cc564fb8be5666fe6 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Thu, 18 Sep 2025 22:57:58 +0200 Subject: [PATCH 14/25] Remove redundant spec --- spec/jobs/bulk_visits_suggesting_job_spec.rb | 18 ++++------ .../nightly_reverse_geocoding_job_spec.rb | 35 +------------------ 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/spec/jobs/bulk_visits_suggesting_job_spec.rb b/spec/jobs/bulk_visits_suggesting_job_spec.rb index 7c013dcd..16a8086d 100644 --- a/spec/jobs/bulk_visits_suggesting_job_spec.rb +++ b/spec/jobs/bulk_visits_suggesting_job_spec.rb @@ -26,12 +26,6 @@ RSpec.describe BulkVisitsSuggestingJob, type: :job do end it 'schedules jobs only for active users with tracked points' do - active_users_mock = double('ActiveRecord::Relation') - allow(User).to receive(:active).and_return(active_users_mock) - allow(active_users_mock).to receive(:active).and_return(active_users_mock) - allow(active_users_mock).to receive(:where).with(id: []).and_return(active_users_mock) - allow(active_users_mock).to receive(:find_each).and_yield(user_with_points).and_yield(user) - expect(VisitSuggestingJob).to receive(:perform_later).with( user_id: user_with_points.id, start_at: time_chunks.first.first, @@ -64,7 +58,7 @@ RSpec.describe BulkVisitsSuggestingJob, type: :job do allow(User).to receive(:active).and_return(active_users_mock) allow(active_users_mock).to receive(:active).and_return(active_users_mock) allow(active_users_mock).to receive(:where).with(id: []).and_return(active_users_mock) - allow(active_users_mock).to receive(:find_each).and_yield(user_with_points) + # allow(active_users_mock).to receive(:find_each).and_yield(user_with_points) chunks.each do |chunk| expect(VisitSuggestingJob).to receive(:perform_later).with( @@ -106,11 +100,11 @@ RSpec.describe BulkVisitsSuggestingJob, type: :job do .and_return(time_chunks_instance) allow(time_chunks_instance).to receive(:call).and_return(custom_chunks) - active_users_mock = double('ActiveRecord::Relation') - allow(User).to receive(:active).and_return(active_users_mock) - allow(active_users_mock).to receive(:active).and_return(active_users_mock) - allow(active_users_mock).to receive(:where).with(id: []).and_return(active_users_mock) - allow(active_users_mock).to receive(:find_each).and_yield(user_with_points) + # active_users_mock = double('ActiveRecord::Relation') + # allow(User).to receive(:active).and_return(active_users_mock) + # allow(active_users_mock).to receive(:active).and_return(active_users_mock) + # allow(active_users_mock).to receive(:where).with(id: []).and_return(active_users_mock) + # allow(active_users_mock).to receive(:find_each).and_yield(user_with_points) expect(VisitSuggestingJob).to receive(:perform_later).with( user_id: user_with_points.id, diff --git a/spec/jobs/points/nightly_reverse_geocoding_job_spec.rb b/spec/jobs/points/nightly_reverse_geocoding_job_spec.rb index 37fd29d5..28dbb9a5 100644 --- a/spec/jobs/points/nightly_reverse_geocoding_job_spec.rb +++ b/spec/jobs/points/nightly_reverse_geocoding_job_spec.rb @@ -94,39 +94,6 @@ RSpec.describe Points::NightlyReverseGeocodingJob, type: :job do expect(relation_mock).to have_received(:find_each).with(batch_size: 1000) end end - - context 'with large number of points needing reverse geocoding' do - before do - # Create 2500 points to test batching - points_data = (1..2500).map do |i| - { - user_id: user.id, - latitude: 40.7128 + (i * 0.0001), - longitude: -74.0060 + (i * 0.0001), - timestamp: Time.current.to_i + i, - lonlat: "POINT(#{-74.0060 + (i * 0.0001)} #{40.7128 + (i * 0.0001)})", - reverse_geocoded_at: nil, - created_at: Time.current, - updated_at: Time.current - } - end - Point.insert_all(points_data) - end - - it 'processes all points in batches' do - expect { described_class.perform_now }.to have_enqueued_job(ReverseGeocodingJob).exactly(2500).times - end - - it 'uses efficient batching to avoid memory issues' do - relation_mock = double('ActiveRecord::Relation') - allow(Point).to receive(:not_reverse_geocoded).and_return(relation_mock) - allow(relation_mock).to receive(:find_each).with(batch_size: 1000) - - described_class.perform_now - - expect(relation_mock).to have_received(:find_each).with(batch_size: 1000) - end - end end describe 'queue configuration' do @@ -155,4 +122,4 @@ RSpec.describe Points::NightlyReverseGeocodingJob, type: :job do end end end -end \ No newline at end of file +end From 2bd0390d1ad9b3354decedec0d1c49fa6e4bcea5 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Fri, 19 Sep 2025 00:23:12 +0200 Subject: [PATCH 15/25] Rename hexagon_centers to h3_hex_ids and update related logic --- app/models/stat.rb | 6 +- app/services/maps/hexagon_center_manager.rb | 68 +-- .../maps/hexagon_polygon_generator.rb | 5 +- app/services/stats/calculate_month.rb | 24 +- ...0250913194134_add_hexagon_data_to_stats.rb | 7 - ...0914094851_add_hexagon_centers_to_stats.rb | 5 - ...0914095157_add_index_to_hexagon_centers.rb | 7 - .../20250918215512_add_h3_hex_ids_to_stats.rb | 8 + db/schema.rb | 5 +- docs/SHAREABLE_STATS_FEATURE.md | 487 ++++++++++++++++++ 10 files changed, 541 insertions(+), 81 deletions(-) delete mode 100644 db/migrate/20250913194134_add_hexagon_data_to_stats.rb delete mode 100644 db/migrate/20250914094851_add_hexagon_centers_to_stats.rb delete mode 100644 db/migrate/20250914095157_add_index_to_hexagon_centers.rb create mode 100644 db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb create mode 100644 docs/SHAREABLE_STATS_FEATURE.md diff --git a/app/models/stat.rb b/app/models/stat.rb index 38babb8a..9d25da89 100644 --- a/app/models/stat.rb +++ b/app/models/stat.rb @@ -57,9 +57,9 @@ class Stat < ApplicationRecord end def hexagons_available? - hexagon_centers.present? && - hexagon_centers.is_a?(Array) && - hexagon_centers.any? + h3_hex_ids.present? && + h3_hex_ids.is_a?(Hash) && + h3_hex_ids.any? end def generate_new_sharing_uuid! diff --git a/app/services/maps/hexagon_center_manager.rb b/app/services/maps/hexagon_center_manager.rb index 9c3d83be..fd699be8 100644 --- a/app/services/maps/hexagon_center_manager.rb +++ b/app/services/maps/hexagon_center_manager.rb @@ -9,7 +9,6 @@ module Maps def call return build_response_from_centers if pre_calculated_centers_available? - return handle_legacy_area_too_large if legacy_area_too_large? nil # No pre-calculated data available end @@ -19,78 +18,59 @@ module Maps attr_reader :stat, :user def pre_calculated_centers_available? - return false if stat&.hexagon_centers.blank? + return false if stat&.h3_hex_ids.blank? - # Handle legacy hash format - if stat.hexagon_centers.is_a?(Hash) - !stat.hexagon_centers['area_too_large'] - else - # Handle array format (actual hexagon centers) - stat.hexagon_centers.is_a?(Array) && stat.hexagon_centers.any? - end - end - - def legacy_area_too_large? - stat&.hexagon_centers.is_a?(Hash) && stat.hexagon_centers['area_too_large'] + stat.h3_hex_ids.is_a?(Hash) && stat.h3_hex_ids.any? end def build_response_from_centers - centers = stat.hexagon_centers - Rails.logger.debug "Using pre-calculated hexagon centers: #{centers.size} centers" + hex_ids = stat.h3_hex_ids + Rails.logger.debug "Using pre-calculated H3 hex IDs: #{hex_ids.size} hexagons" - result = build_hexagons_from_centers(centers) + result = build_hexagons_from_h3_ids(hex_ids) { success: true, data: result, pre_calculated: true } end - def handle_legacy_area_too_large - Rails.logger.info "Recalculating previously skipped large area hexagons for stat #{stat.id}" - - new_centers = recalculate_hexagon_centers - return nil unless new_centers.is_a?(Array) - - update_stat_with_new_centers(new_centers) - end - - def recalculate_hexagon_centers + def recalculate_h3_hex_ids service = Stats::CalculateMonth.new(user.id, stat.year, stat.month) - service.send(:calculate_hexagon_centers) + service.send(:calculate_h3_hex_ids) end - def update_stat_with_new_centers(new_centers) - stat.update(hexagon_centers: new_centers) - result = build_hexagons_from_centers(new_centers) - Rails.logger.debug "Successfully recalculated hexagon centers: #{new_centers.size} centers" + def update_stat_with_new_hex_ids(new_hex_ids) + stat.update(h3_hex_ids: new_hex_ids) + result = build_hexagons_from_h3_ids(new_hex_ids) + Rails.logger.debug "Successfully recalculated H3 hex IDs: #{new_hex_ids.size} hexagons" { success: true, data: result, pre_calculated: true } end - def build_hexagons_from_centers(centers) - # Convert stored centers back to hexagon polygons - hexagon_features = centers.map.with_index { |center, index| build_hexagon_feature(center, index) } + def build_hexagons_from_h3_ids(hex_ids) + # Convert stored H3 IDs back to hexagon polygons + hexagon_features = hex_ids.map.with_index do |(h3_index, data), index| + build_hexagon_feature_from_h3(h3_index, data, index) + end build_feature_collection(hexagon_features) end - def build_hexagon_feature(center, index) - lng, lat, earliest, latest = center + def build_hexagon_feature_from_h3(h3_index, data, index) + count, earliest, latest = data { 'type' => 'Feature', 'id' => index + 1, - 'geometry' => generate_hexagon_geometry(lng, lat), - 'properties' => build_hexagon_properties(index, earliest, latest) + 'geometry' => generate_hexagon_geometry_from_h3(h3_index), + 'properties' => build_hexagon_properties(index, count, earliest, latest) } end - def generate_hexagon_geometry(lng, lat) - Maps::HexagonPolygonGenerator.new( - center_lng: lng, - center_lat: lat - ).call + def generate_hexagon_geometry_from_h3(h3_index) + Maps::HexagonPolygonGenerator.new(h3_index: h3_index).call end - def build_hexagon_properties(index, earliest, latest) + def build_hexagon_properties(index, count, earliest, latest) { 'hex_id' => index + 1, + 'point_count' => count, 'earliest_point' => earliest ? Time.zone.at(earliest).iso8601 : nil, 'latest_point' => latest ? Time.zone.at(latest).iso8601 : nil } diff --git a/app/services/maps/hexagon_polygon_generator.rb b/app/services/maps/hexagon_polygon_generator.rb index b6700aab..29c7efff 100644 --- a/app/services/maps/hexagon_polygon_generator.rb +++ b/app/services/maps/hexagon_polygon_generator.rb @@ -2,10 +2,11 @@ module Maps class HexagonPolygonGenerator - def initialize(center_lng:, center_lat:, h3_resolution: 5) + def initialize(center_lng: nil, center_lat: nil, h3_resolution: 5, h3_index: nil) @center_lng = center_lng @center_lat = center_lat @h3_resolution = h3_resolution + @h3_index = h3_index end def call @@ -14,7 +15,7 @@ module Maps private - attr_reader :center_lng, :center_lat, :h3_resolution + attr_reader :center_lng, :center_lat, :h3_resolution, :h3_index def generate_h3_hexagon_polygon # Convert coordinates to H3 format [lat, lng] diff --git a/app/services/stats/calculate_month.rb b/app/services/stats/calculate_month.rb index 28dd0a39..bd66d4be 100644 --- a/app/services/stats/calculate_month.rb +++ b/app/services/stats/calculate_month.rb @@ -86,7 +86,7 @@ class Stats::CalculateMonth daily_distance: distance_by_day, distance: distance(distance_by_day), toponyms: toponyms, - hexagon_centers: calculate_hexagon_centers + h3_hex_ids: calculate_h3_hex_ids ) stat.save end @@ -132,22 +132,28 @@ class Stats::CalculateMonth Stat.where(year:, month:, user:).destroy_all end - def calculate_hexagon_centers - return nil if points.empty? + def calculate_h3_hex_ids + return {} if points.empty? begin result = calculate_h3_hexagon_centers if result.empty? - Rails.logger.info "No H3 hexagon centers calculated for user #{user.id}, #{year}-#{month} (no data)" - return nil + Rails.logger.info "No H3 hex IDs calculated for user #{user.id}, #{year}-#{month} (no data)" + return {} end - Rails.logger.info "Pre-calculated #{result.size} H3 hexagon centers for user #{user.id}, #{year}-#{month}" - result + # Convert array format to hash format: { h3_index => [count, earliest, latest] } + hex_hash = result.each_with_object({}) do |hex_data, hash| + h3_index, count, earliest, latest = hex_data + hash[h3_index] = [count, earliest, latest] + end + + Rails.logger.info "Pre-calculated #{hex_hash.size} H3 hex IDs for user #{user.id}, #{year}-#{month}" + hex_hash rescue PostGISError => e - Rails.logger.warn "H3 hexagon centers calculation failed for user #{user.id}, #{year}-#{month}: #{e.message}" - nil + Rails.logger.warn "H3 hex IDs calculation failed for user #{user.id}, #{year}-#{month}: #{e.message}" + {} end end diff --git a/db/migrate/20250913194134_add_hexagon_data_to_stats.rb b/db/migrate/20250913194134_add_hexagon_data_to_stats.rb deleted file mode 100644 index f5c1b97a..00000000 --- a/db/migrate/20250913194134_add_hexagon_data_to_stats.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -class AddHexagonDataToStats < ActiveRecord::Migration[8.0] - def change - add_column :stats, :hexagon_data, :jsonb - end -end diff --git a/db/migrate/20250914094851_add_hexagon_centers_to_stats.rb b/db/migrate/20250914094851_add_hexagon_centers_to_stats.rb deleted file mode 100644 index 9dbc5232..00000000 --- a/db/migrate/20250914094851_add_hexagon_centers_to_stats.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddHexagonCentersToStats < ActiveRecord::Migration[8.0] - def change - add_column :stats, :hexagon_centers, :jsonb - end -end diff --git a/db/migrate/20250914095157_add_index_to_hexagon_centers.rb b/db/migrate/20250914095157_add_index_to_hexagon_centers.rb deleted file mode 100644 index 9e301543..00000000 --- a/db/migrate/20250914095157_add_index_to_hexagon_centers.rb +++ /dev/null @@ -1,7 +0,0 @@ -class AddIndexToHexagonCenters < ActiveRecord::Migration[8.0] - disable_ddl_transaction! - - def change - add_index :stats, :hexagon_centers, using: :gin, where: "hexagon_centers IS NOT NULL", algorithm: :concurrently - end -end diff --git a/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb b/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb new file mode 100644 index 00000000..0ab8a90c --- /dev/null +++ b/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class AddH3HexIdsToStats < ActiveRecord::Migration[8.0] + def change + add_column :stats, :h3_hex_ids, :jsonb, default: {} + add_index :stats, :h3_hex_ids, using: :gin, where: "(h3_hex_ids IS NOT NULL AND h3_hex_ids != '{}'::jsonb)" + end +end diff --git a/db/schema.rb b/db/schema.rb index 071c1860..cfcab1ea 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_09_14_095157) do +ActiveRecord::Schema[8.0].define(version: 2025_09_10_224714) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" enable_extension "postgis" @@ -222,10 +222,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_09_14_095157) do t.jsonb "daily_distance", default: {} t.jsonb "sharing_settings", default: {} t.uuid "sharing_uuid" - t.jsonb "hexagon_data" - t.jsonb "hexagon_centers" t.index ["distance"], name: "index_stats_on_distance" - t.index ["hexagon_centers"], name: "index_stats_on_hexagon_centers", where: "(hexagon_centers IS NOT NULL)", using: :gin t.index ["month"], name: "index_stats_on_month" t.index ["sharing_uuid"], name: "index_stats_on_sharing_uuid", unique: true t.index ["user_id"], name: "index_stats_on_user_id" diff --git a/docs/SHAREABLE_STATS_FEATURE.md b/docs/SHAREABLE_STATS_FEATURE.md new file mode 100644 index 00000000..56ddfe19 --- /dev/null +++ b/docs/SHAREABLE_STATS_FEATURE.md @@ -0,0 +1,487 @@ +# Shareable Stats Feature Documentation + +## Overview + +The Shareable Stats feature allows Dawarich users to publicly share their monthly location statistics without requiring authentication. This system provides a secure, time-limited way to share location insights while maintaining user privacy through configurable expiration settings and unguessable UUID-based access. + +## Key Features + +- **Time-based expiration**: Share links can expire after 1 hour, 12 hours, 24 hours, or be permanent +- **UUID-based security**: Each shared stat has a unique, unguessable UUID for secure access +- **Public API access**: Hexagon map data can be accessed via API without authentication when sharing is enabled +- **H3 Hexagon visualization**: Enhanced geographic data visualization using Uber's H3 hexagonal hierarchical spatial index +- **Automatic expiration**: Expired shares are automatically inaccessible +- **Privacy controls**: Users can enable/disable sharing and regenerate sharing URLs at any time + +## Database Schema + +### Stats Table Extensions + +The sharing functionality extends the `stats` table with the following columns: + +```sql +-- Public sharing configuration +sharing_settings JSONB DEFAULT {} +sharing_uuid UUID + +-- Pre-calculated H3 hexagon data for performance +h3_hex_ids JSONB DEFAULT {} + +-- Indexes for performance +INDEX ON h3_hex_ids USING GIN WHERE (h3_hex_ids IS NOT NULL AND h3_hex_ids != '{}'::jsonb) +``` + +### Sharing Settings Structure + +```json +{ + "enabled": true, + "expiration": "24h", // "1h", "12h", "24h", or "permanent" + "expires_at": "2024-01-15T12:00:00Z" +} +``` + +### H3 Hex IDs Data Format + +The `h3_hex_ids` column stores pre-calculated H3 hexagon data as a hash: + +```json +{ + "8a1fb46622dffff": [15, 1640995200, 1640998800], + "8a1fb46622e7fff": [8, 1640996400, 1640999200], + // ... more H3 index entries + // Format: { "h3_index_string": [point_count, earliest_timestamp, latest_timestamp] } +} +``` + +## Architecture Components + +### Models + +#### Stat Model (`app/models/stat.rb`) + +**Key Methods:** +- `sharing_enabled?`: Checks if sharing is enabled +- `sharing_expired?`: Validates expiration status +- `public_accessible?`: Combined check for sharing availability +- `hexagons_available?`: Verifies pre-calculated H3 hex data exists +- `enable_sharing!(expiration:)`: Enables sharing with expiration +- `disable_sharing!`: Disables sharing +- `generate_new_sharing_uuid!`: Regenerates sharing UUID +- `calculate_data_bounds`: Calculates geographic bounds for the month + +### Controllers + +#### Shared::StatsController (`app/controllers/shared/stats_controller.rb`) + +Handles public sharing functionality: + +**Routes:** +- `GET /shared/stats/:uuid` - Public view of shared stats +- `PATCH /stats/:year/:month/sharing` - Sharing management (authenticated) + +**Key Methods:** +- `show`: Renders public stats view without authentication +- `update`: Manages sharing settings (enable/disable, expiration) + +#### Api::V1::Maps::HexagonsController (`app/controllers/api/v1/maps/hexagons_controller.rb`) + +Provides hexagon data for both authenticated and public access: + +**Features:** +- Skip authentication for public sharing requests (`uuid` parameter) +- Context resolution for public vs. authenticated access +- Error handling for missing or expired shares + +```ruby +# Public access via UUID +GET /api/v1/maps/hexagons?uuid=SHARING_UUID + +# Authenticated access +GET /api/v1/maps/hexagons?start_date=2024-01-01&end_date=2024-01-31 +``` + +### Services + +#### Maps::HexagonRequestHandler (`app/services/maps/hexagon_request_handler.rb`) + +Central service for processing hexagon requests: + +**Workflow:** +1. Attempts to find matching stat for the request +2. Delegates to `HexagonCenterManager` for pre-calculated data +3. Returns empty feature collection if no data available + +#### Maps::HexagonCenterManager (`app/services/maps/hexagon_center_manager.rb`) + +Manages pre-calculated H3 hexagon data: + +**Responsibilities:** +- Retrieves pre-calculated H3 hex IDs from database +- Converts stored H3 indexes to GeoJSON polygons +- Builds hexagon features with point counts and timestamps +- Handles efficient polygon generation from H3 indexes + +**Data Flow:** +1. Check if pre-calculated H3 hex IDs are available +2. Convert H3 indexes to hexagon polygons using `HexagonPolygonGenerator` +3. Build GeoJSON FeatureCollection with metadata and point counts + +#### Stats::CalculateMonth (`app/services/stats/calculate_month.rb`) + +Responsible for calculating and storing hexagon data during stats processing: + +**H3 Configuration:** +- `DEFAULT_H3_RESOLUTION = 8`: Small hexagons for good detail +- `MAX_HEXAGONS = 10_000`: Maximum to prevent memory issues + +**Key Methods:** +- `calculate_h3_hex_ids`: Main method for H3 calculation and storage +- `calculate_h3_hexagon_centers`: Internal H3 calculation logic +- `calculate_h3_indexes`: Groups points into H3 hexagons +- `fetch_user_points_for_period`: Retrieves points for date range + +**Algorithm:** +1. Fetch user points for the specified month +2. Convert each point to H3 index at specified resolution +3. Aggregate points per hexagon with count and timestamp bounds +4. Apply resolution reduction if hexagon count exceeds maximum +5. Store as hash of { h3_index_string => [count, earliest, latest] } + +#### Maps::HexagonPolygonGenerator (`app/services/maps/hexagon_polygon_generator.rb`) + +Converts H3 indexes back to polygon geometry: + +**Features:** +- Uses H3 library for accurate hexagon boundaries +- Converts coordinates to GeoJSON Polygon format +- Supports both center-based and H3-index-based generation +- Direct H3 index to polygon conversion for efficiency + +**Usage Modes:** +- **Center-based**: `new(center_lng: lng, center_lat: lat)` + +## H3 Hexagon System + +### What is H3? + +H3 is Uber's Hexagonal Hierarchical Spatial Index that provides: +- **Uniform coverage**: Earth divided into hexagonal cells +- **Hierarchical resolution**: 16 levels from global to local +- **Efficient indexing**: Fast spatial queries and aggregations +- **Consistent shape**: Hexagons have uniform neighbors + +### Resolution Levels + +Dawarich uses H3 resolution 8 by default: +- **Resolution 8**: ~737m average hexagon edge length +- **Fallback mechanism**: Reduces resolution if too many hexagons +- **Maximum limit**: 10,000 hexagons to prevent memory issues + +### Performance Benefits + +1. **Pre-calculation**: H3 hexagons calculated once during stats processing +2. **Efficient storage**: Hash-based storage with H3 index as key +3. **Fast retrieval**: Database lookup instead of real-time calculation +4. **Reduced bandwidth**: Compact JSON hash format for API responses +5. **Direct polygon generation**: H3 index directly converts to polygon boundaries + +## Workflow + +### 1. Stats Calculation Process + +```mermaid +graph TD + A[User Data Import] --> B[Stats::CalculateMonth Service] + B --> C[Calculate H3 Hexagon Centers] + C --> D[Store in hexagon_centers Column] + D --> E[Stats Available for Sharing] +``` + +**Detailed Steps:** +1. User imports location data (GPX, JSON, etc.) +2. Background job triggers `Stats::CalculateMonth` +3. Service calculates monthly statistics including H3 hex IDs +4. H3 indexes are calculated for all points in the month +5. Results stored in `stats.h3_hex_ids` as JSON hash + +### 2. Sharing Activation + +```mermaid +graph TD + A[User Visits Stats Page] --> B[Enable Sharing Toggle] + B --> C[Select Expiration Duration] + C --> D[PATCH /stats/:year/:month/sharing] + D --> E[Generate/Update sharing_uuid] + E --> F[Set sharing_settings] + F --> G[Return Public URL] +``` + +**Sharing Settings:** +- **Expiration options**: 1h, 12h, 24h, permanent +- **UUID generation**: Secure random UUID for each stat +- **Expiration timestamp**: Calculated and stored in sharing_settings + +### 3. Public Access Flow + +```mermaid +graph TD + A[Public User Visits Shared URL] --> B[Validate UUID & Expiration] + B --> C{Valid & Not Expired?} + C -->|Yes| D[Load Public Stats View] + C -->|No| E[Redirect with Error] + D --> F[Render Map with Hexagons] + F --> G[Load Hexagon Data via API] + G --> H[Display Interactive Map] +``` + +**Security Checks:** +1. Verify sharing UUID exists in database +2. Check `sharing_settings.enabled = true` +3. Validate expiration timestamp if not permanent +4. Return 404 if any check fails + +### 4. Hexagon Data Retrieval + +```mermaid +graph TD + A[Map Requests Hexagon Data] --> B[GET /api/v1/maps/hexagons?uuid=UUID] + B --> C[HexagonsController] + C --> D[Skip Authentication for UUID Request] + D --> E[HexagonRequestHandler] + E --> F[Find Stat by UUID] + F --> G[HexagonCenterManager] + G --> H[Load Pre-calculated Centers] + H --> I[Convert to GeoJSON Polygons] + I --> J[Return FeatureCollection] +``` + +**Data Transformation:** +1. Retrieve stored H3 hex IDs hash from database +2. Convert each H3 index to hexagon boundary coordinates +3. Build GeoJSON Feature with properties (point count, timestamps) +4. Return complete FeatureCollection for map rendering + +## API Endpoints + +### Public Sharing + +#### View Shared Stats +```http +GET /shared/stats/:uuid +``` +- **Authentication**: None required +- **Response**: HTML page with public stats view +- **Error Handling**: Redirects to root with alert if invalid/expired + +#### Get Hexagon Data +```http +GET /api/v1/maps/hexagons?uuid=:uuid +``` +- **Authentication**: None required for UUID access +- **Response**: GeoJSON FeatureCollection +- **Features**: Each feature represents one hexagon with point count and timestamps + +### Authenticated Management + +#### Toggle Sharing +```http +PATCH /stats/:year/:month/sharing +``` +**Parameters:** +- `enabled`: "1" to enable, "0" to disable +- `expiration`: "1h", "12h", "24h", or "permanent" (when enabling) + +**Response:** +```json +{ + "success": true, + "sharing_url": "https://domain.com/shared/stats/uuid", + "message": "Sharing enabled successfully" +} +``` + +## Security Features + +### UUID-based Access +- **Unguessable URLs**: Uses secure random UUIDs +- **No enumeration**: Can't guess valid sharing links +- **Automatic generation**: New UUID created for each sharing activation + +### Time-based Expiration +- **Configurable duration**: Multiple expiration options +- **Automatic enforcement**: Expired shares become inaccessible +- **Precise timestamping**: ISO8601 format with timezone awareness + +### Limited Data Exposure +- **No user identification**: Public view doesn't expose user details +- **Aggregated data only**: Only statistical summaries are shared +- **No raw location points**: Individual coordinates not exposed + +### Privacy Controls +- **User control**: Users can enable/disable sharing at any time +- **UUID regeneration**: Can generate new sharing URL to invalidate old ones +- **Granular permissions**: Per-month sharing control + +## Frontend Integration + +### Public View Template (`app/views/stats/public_month.html.erb`) + +**Features:** +- **Responsive design**: Mobile-friendly layout with Tailwind CSS +- **Monthly statistics**: Distance, active days, countries visited +- **Interactive hexagon map**: Leaflet.js with H3 hexagon overlay +- **Activity charts**: Daily distance visualization +- **Location summary**: Countries and cities visited + +**Map Integration:** +```erb +
+
+``` + +### JavaScript Controller + +**Stimulus Controller**: `public-stat-map` +- **Leaflet initialization**: Sets up interactive map +- **Hexagon layer**: Loads and renders hexagon data from API +- **User interaction**: Click handlers, zoom controls +- **Loading states**: Shows loading spinner during data fetch + +## Performance Considerations + +### Pre-calculation Strategy +- **Background processing**: Hexagons calculated during stats job +- **Storage efficiency**: H3 indexes are compact +- **Query optimization**: GIN index on hexagon_centers column +- **Caching**: Pre-calculated data serves multiple requests + +### Memory Management +- **Hexagon limits**: Maximum 10,000 hexagons per month +- **Resolution fallback**: Automatically reduces detail for large areas +- **Lazy loading**: Only calculate when stats are processed +- **Efficient formats**: JSON storage optimized for size + +### Database Optimization +```sql +-- Optimized queries +SELECT h3_hex_ids FROM stats +WHERE sharing_uuid = ? AND sharing_settings->>'enabled' = 'true'; + +-- Index for performance +CREATE INDEX index_stats_on_h3_hex_ids +ON stats USING gin (h3_hex_ids) +WHERE (h3_hex_ids IS NOT NULL AND h3_hex_ids != '{}'::jsonb); +``` + +## Error Handling + +### Validation Errors +- **Missing UUID**: 404 response with user-friendly message +- **Expired sharing**: Redirect with appropriate alert +- **Invalid parameters**: Bad request with error details + +### Service Errors +- **H3 calculation failures**: Graceful degradation, logs warning +- **Database errors**: Transaction rollback, user notification +- **Memory issues**: Resolution reduction, retry mechanism + +### Frontend Resilience +- **Loading states**: User feedback during data fetching +- **Fallback content**: Display stats even if hexagons fail +- **Error messages**: Clear communication of issues + +## Configuration + +### Environment Variables +```bash +# H3 hexagon settings (optional, defaults shown) +H3_DEFAULT_RESOLUTION=8 +H3_MAX_HEXAGONS=10000 + +# Feature flags +ENABLE_PUBLIC_SHARING=true +``` + +### Runtime Configuration +- **Resolution adaptation**: Automatic based on data size +- **Expiration options**: Configurable in sharing settings +- **Security headers**: CORS configuration for API access + +## Monitoring and Analytics + +### Logging +- **Share creation**: Log when sharing is enabled +- **Public access**: Log UUID-based requests (without exposing UUID) +- **Performance metrics**: H3 calculation timing +- **Error tracking**: Failed calculations and API errors + +### Metrics +- **Sharing adoption**: How many users enable sharing +- **Expiration preferences**: Popular expiration durations +- **Performance**: Hexagon calculation and rendering times +- **Error rates**: Failed sharing requests + +## Troubleshooting + +### Common Issues + +#### No Hexagons Displayed +1. Check if `hexagons_available?` returns true +2. Verify `h3_hex_ids` column has data +3. Confirm H3 library is properly installed +4. Check API endpoint returns valid GeoJSON + +#### Sharing Link Not Working +1. Verify UUID exists in database +2. Check sharing_settings.enabled = true +3. Validate expiration timestamp +4. Confirm public routes are properly configured + +#### Performance Issues +1. Monitor hexagon count (should be < 10,000) +2. Check if resolution is too high for large areas +3. Verify database indexes are present +4. Consider increasing H3_MAX_HEXAGONS if needed + +### Debug Commands + +```bash +# Check sharing status for a stat +rails runner " +stat = Stat.find_by(sharing_uuid: 'UUID_HERE') +puts stat.public_accessible? +puts stat.hexagons_available? +" + +# Verify H3 hex data format +rails runner " +stat = Stat.first +puts stat.h3_hex_ids.class +puts stat.h3_hex_ids.first +" +``` + +## Future Enhancements + +### Planned Features +- **Social sharing**: Integration with social media platforms +- **Embedding**: Iframe widgets for external sites +- **Analytics**: View count and engagement metrics +- **Custom styling**: User-configurable map themes + +### Technical Improvements +- **CDN integration**: Faster global access to shared stats +- **Compression**: Further optimize H3 hex data storage +- **Real-time updates**: Live sharing for ongoing activities +- **API versioning**: Stable API contracts for external integration +- **H3 resolution optimization**: Dynamic resolution based on geographic area + +## Conclusion + +The Shareable Stats feature provides a robust, secure, and performant way for Dawarich users to share their location insights. The H3 hexagon system offers excellent visualization while maintaining privacy through aggregated data. The UUID-based security model ensures that only intended recipients can access shared statistics, while the configurable expiration system gives users complete control over data visibility. + +The architecture is designed for scalability and performance, with pre-calculated data reducing server load and providing fast response times for public viewers. The comprehensive error handling and monitoring ensure reliable operation in production environments. From 584daadb5c18074fc01c05829f2f6519645814ff Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Fri, 19 Sep 2025 19:55:27 +0200 Subject: [PATCH 16/25] Fix failing specs --- .../api/v1/maps/hexagons_controller.rb | 6 +++-- app/services/maps/bounds_calculator.rb | 6 ++++- app/services/maps/hexagon_center_manager.rb | 6 +---- .../maps/hexagon_polygon_generator.rb | 26 ++++++------------- .../20250918215512_add_h3_hex_ids_to_stats.rb | 6 ++++- db/schema.rb | 4 ++- spec/requests/api/v1/maps/hexagons_spec.rb | 16 ++++++------ .../maps/hexagon_center_manager_spec.rb | 20 +++++++------- .../maps/hexagon_request_handler_spec.rb | 14 +++++----- spec/services/stats/calculate_month_spec.rb | 11 ++++---- 10 files changed, 57 insertions(+), 58 deletions(-) diff --git a/app/controllers/api/v1/maps/hexagons_controller.rb b/app/controllers/api/v1/maps/hexagons_controller.rb index 9e306649..900d3fd3 100644 --- a/app/controllers/api/v1/maps/hexagons_controller.rb +++ b/app/controllers/api/v1/maps/hexagons_controller.rb @@ -8,8 +8,10 @@ class Api::V1::Maps::HexagonsController < ApiController result = Maps::HexagonRequestHandler.new( params: params, - user: current_api_user, - context: context + user: context[:user] || current_api_user, + stat: context[:stat], + start_date: context[:start_date], + end_date: context[:end_date] ).call render json: result diff --git a/app/services/maps/bounds_calculator.rb b/app/services/maps/bounds_calculator.rb index f97e1b77..78b02bd0 100644 --- a/app/services/maps/bounds_calculator.rb +++ b/app/services/maps/bounds_calculator.rb @@ -72,7 +72,11 @@ module Maps if param.match?(/^\d+$/) param.to_i else - Time.zone.parse(param).to_i + parsed_time = Time.zone.parse(param) + if parsed_time.nil? + raise ArgumentError, "Invalid date format: #{param}" + end + parsed_time.to_i end when Integer param diff --git a/app/services/maps/hexagon_center_manager.rb b/app/services/maps/hexagon_center_manager.rb index fd699be8..31ada95a 100644 --- a/app/services/maps/hexagon_center_manager.rb +++ b/app/services/maps/hexagon_center_manager.rb @@ -58,15 +58,11 @@ module Maps { 'type' => 'Feature', 'id' => index + 1, - 'geometry' => generate_hexagon_geometry_from_h3(h3_index), + 'geometry' => Maps::HexagonPolygonGenerator.new(h3_index:).call, 'properties' => build_hexagon_properties(index, count, earliest, latest) } end - def generate_hexagon_geometry_from_h3(h3_index) - Maps::HexagonPolygonGenerator.new(h3_index: h3_index).call - end - def build_hexagon_properties(index, count, earliest, latest) { 'hex_id' => index + 1, diff --git a/app/services/maps/hexagon_polygon_generator.rb b/app/services/maps/hexagon_polygon_generator.rb index 29c7efff..a493eafe 100644 --- a/app/services/maps/hexagon_polygon_generator.rb +++ b/app/services/maps/hexagon_polygon_generator.rb @@ -2,30 +2,16 @@ module Maps class HexagonPolygonGenerator - def initialize(center_lng: nil, center_lat: nil, h3_resolution: 5, h3_index: nil) - @center_lng = center_lng - @center_lat = center_lat - @h3_resolution = h3_resolution + def initialize(h3_index:) @h3_index = h3_index end def call - generate_h3_hexagon_polygon - end - - private - - attr_reader :center_lng, :center_lat, :h3_resolution, :h3_index - - def generate_h3_hexagon_polygon - # Convert coordinates to H3 format [lat, lng] - coordinates = [center_lat, center_lng] - - # Get H3 index for these coordinates at specified resolution - h3_index = H3.from_geo_coordinates(coordinates, h3_resolution) + # Parse H3 index from hex string if needed + index = h3_index.is_a?(String) ? h3_index.to_i(16) : h3_index # Get the boundary coordinates for this H3 hexagon - boundary_coordinates = H3.to_boundary(h3_index) + boundary_coordinates = H3.to_boundary(index) # Convert to GeoJSON polygon format (lng, lat) polygon_coordinates = boundary_coordinates.map { [_2, _1] } @@ -38,5 +24,9 @@ module Maps 'coordinates' => [polygon_coordinates] } end + + private + + attr_reader :h3_index end end diff --git a/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb b/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb index 0ab8a90c..78e4f3d2 100644 --- a/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb +++ b/db/migrate/20250918215512_add_h3_hex_ids_to_stats.rb @@ -1,8 +1,12 @@ # frozen_string_literal: true class AddH3HexIdsToStats < ActiveRecord::Migration[8.0] + disable_ddl_transaction! + def change add_column :stats, :h3_hex_ids, :jsonb, default: {} - add_index :stats, :h3_hex_ids, using: :gin, where: "(h3_hex_ids IS NOT NULL AND h3_hex_ids != '{}'::jsonb)" + add_index :stats, :h3_hex_ids, using: :gin, + where: "(h3_hex_ids IS NOT NULL AND h3_hex_ids != '{}'::jsonb)", + algorithm: :concurrently end end diff --git a/db/schema.rb b/db/schema.rb index cfcab1ea..d097aca9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_09_10_224714) do +ActiveRecord::Schema[8.0].define(version: 2025_09_18_215512) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" enable_extension "postgis" @@ -222,7 +222,9 @@ ActiveRecord::Schema[8.0].define(version: 2025_09_10_224714) do t.jsonb "daily_distance", default: {} t.jsonb "sharing_settings", default: {} t.uuid "sharing_uuid" + t.jsonb "h3_hex_ids", default: {} t.index ["distance"], name: "index_stats_on_distance" + t.index ["h3_hex_ids"], name: "index_stats_on_h3_hex_ids", where: "((h3_hex_ids IS NOT NULL) AND (h3_hex_ids <> '{}'::jsonb))", using: :gin t.index ["month"], name: "index_stats_on_month" t.index ["sharing_uuid"], name: "index_stats_on_sharing_uuid", unique: true t.index ["user_id"], name: "index_stats_on_user_id" diff --git a/spec/requests/api/v1/maps/hexagons_spec.rb b/spec/requests/api/v1/maps/hexagons_spec.rb index 8277b407..bc2aba2d 100644 --- a/spec/requests/api/v1/maps/hexagons_spec.rb +++ b/spec/requests/api/v1/maps/hexagons_spec.rb @@ -172,14 +172,14 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do context 'with pre-calculated hexagon centers' do let(:pre_calculated_centers) do - [ - [-74.0, 40.7, 1_717_200_000, 1_717_203_600], # lng, lat, earliest, latest timestamps - [-74.01, 40.71, 1_717_210_000, 1_717_213_600], - [-74.02, 40.72, 1_717_220_000, 1_717_223_600] - ] + { + '8a1fb46622dffff' => [5, 1_717_200_000, 1_717_203_600], # count, earliest, latest timestamps + '8a1fb46622e7fff' => [3, 1_717_210_000, 1_717_213_600], + '8a1fb46632dffff' => [8, 1_717_220_000, 1_717_223_600] + } end let(:stat) do - create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, hexagon_centers: pre_calculated_centers) + create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, h3_hex_ids: pre_calculated_centers) end it 'uses pre-calculated hexagon centers instead of on-the-fly calculation' do @@ -228,7 +228,7 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do context 'with legacy area_too_large hexagon data' do let(:stat) do create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, - hexagon_centers: { 'area_too_large' => true }) + h3_hex_ids: { 'area_too_large' => true }) end before do @@ -246,7 +246,7 @@ RSpec.describe 'Api::V1::Maps::Hexagons', type: :request do get '/api/v1/maps/hexagons', params: uuid_params # The endpoint should handle the legacy data gracefully and not crash - # We're primarily testing that the condition `@stat&.hexagon_centers&.dig('area_too_large')` is covered + # We're primarily testing that the condition `@stat&.h3_hex_ids&.dig('area_too_large')` is covered expect([200, 400, 500]).to include(response.status) end end diff --git a/spec/services/maps/hexagon_center_manager_spec.rb b/spec/services/maps/hexagon_center_manager_spec.rb index 2912e28c..e1b3f1fa 100644 --- a/spec/services/maps/hexagon_center_manager_spec.rb +++ b/spec/services/maps/hexagon_center_manager_spec.rb @@ -11,13 +11,13 @@ RSpec.describe Maps::HexagonCenterManager do context 'with pre-calculated hexagon centers' do let(:pre_calculated_centers) do - [ - [-74.0, 40.7, 1_717_200_000, 1_717_203_600], # lng, lat, earliest, latest timestamps - [-74.01, 40.71, 1_717_210_000, 1_717_213_600], - [-74.02, 40.72, 1_717_220_000, 1_717_223_600] - ] + { + '8a1fb46622dffff' => [5, 1_717_200_000, 1_717_203_600], # count, earliest, latest timestamps + '8a1fb46622e7fff' => [3, 1_717_210_000, 1_717_213_600], + '8a1fb46632dffff' => [8, 1_717_220_000, 1_717_223_600] + } end - let(:stat) { create(:stat, user:, year: 2024, month: 6, hexagon_centers: pre_calculated_centers) } + let(:stat) { create(:stat, user:, year: 2024, month: 6, h3_hex_ids: pre_calculated_centers) } it 'returns success with pre-calculated data' do result = manage_centers @@ -51,7 +51,7 @@ RSpec.describe Maps::HexagonCenterManager do context 'with legacy area_too_large flag' do let(:stat) do - create(:stat, user:, year: 2024, month: 6, hexagon_centers: { 'area_too_large' => true }) + create(:stat, user:, year: 2024, month: 6, h3_hex_ids: { 'area_too_large' => true }) end before do @@ -69,7 +69,7 @@ RSpec.describe Maps::HexagonCenterManager do end it 'recalculates and updates the stat' do - expect(stat).to receive(:update).with(hexagon_centers: new_centers) + expect(stat).to receive(:update).with(h3_hex_ids: new_centers) result = manage_centers @@ -105,7 +105,7 @@ RSpec.describe Maps::HexagonCenterManager do end context 'with stat but no hexagon_centers' do - let(:stat) { create(:stat, user:, year: 2024, month: 6, hexagon_centers: nil) } + let(:stat) { create(:stat, user:, year: 2024, month: 6, h3_hex_ids: nil) } it 'returns nil' do expect(manage_centers).to be_nil @@ -113,7 +113,7 @@ RSpec.describe Maps::HexagonCenterManager do end context 'with empty hexagon_centers' do - let(:stat) { create(:stat, user:, year: 2024, month: 6, hexagon_centers: []) } + let(:stat) { create(:stat, user:, year: 2024, month: 6, h3_hex_ids: []) } it 'returns nil' do expect(manage_centers).to be_nil diff --git a/spec/services/maps/hexagon_request_handler_spec.rb b/spec/services/maps/hexagon_request_handler_spec.rb index 1f6a17b0..abe9a089 100644 --- a/spec/services/maps/hexagon_request_handler_spec.rb +++ b/spec/services/maps/hexagon_request_handler_spec.rb @@ -43,14 +43,14 @@ RSpec.describe Maps::HexagonRequestHandler do context 'with public sharing UUID and pre-calculated centers' do let(:pre_calculated_centers) do - [ - [-74.0, 40.7, 1_717_200_000, 1_717_203_600], - [-74.01, 40.71, 1_717_210_000, 1_717_213_600] - ] + { + '8a1fb46622dffff' => [5, 1_717_200_000, 1_717_203_600], + '8a1fb46622e7fff' => [3, 1_717_210_000, 1_717_213_600] + } end let(:stat) do create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, - hexagon_centers: pre_calculated_centers) + h3_hex_ids: pre_calculated_centers) end let(:params) do ActionController::Parameters.new( @@ -101,7 +101,7 @@ RSpec.describe Maps::HexagonRequestHandler do context 'with legacy area_too_large that can be recalculated' do let(:stat) do create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, - hexagon_centers: { 'area_too_large' => true }) + h3_hex_ids: { 'area_too_large' => true }) end let(:params) do ActionController::Parameters.new( @@ -129,7 +129,7 @@ RSpec.describe Maps::HexagonRequestHandler do expect(result['metadata']['pre_calculated']).to be true # Verify that the stat was updated with new centers (reload to check persistence) - expect(stat.reload.hexagon_centers).to eq([[-74.0, 40.7, 1_717_200_000, 1_717_203_600]]) + expect(stat.reload.h3_hex_ids).to eq([[-74.0, 40.7, 1_717_200_000, 1_717_203_600]]) end end end diff --git a/spec/services/stats/calculate_month_spec.rb b/spec/services/stats/calculate_month_spec.rb index e3a8a533..1045f9c6 100644 --- a/spec/services/stats/calculate_month_spec.rb +++ b/spec/services/stats/calculate_month_spec.rb @@ -162,14 +162,15 @@ RSpec.describe Stats::CalculateMonth do expect(total_points).to eq(2) end - context 'when H3 raises an error' do before do allow(H3).to receive(:from_geo_coordinates).and_raise(StandardError, 'H3 error') end it 'raises PostGISError' do - expect { calculate_hexagons }.to raise_error(Stats::CalculateMonth::PostGISError, /Failed to calculate H3 hexagon centers/) + expect do + calculate_hexagons + end.to raise_error(Stats::CalculateMonth::PostGISError, /Failed to calculate H3 hexagon centers/) end it 'reports the exception' do @@ -185,7 +186,7 @@ RSpec.describe Stats::CalculateMonth do it 'handles string timestamps' do result = service.send(:parse_date_parameter, '1640995200') - expect(result).to eq(1640995200) + expect(result).to eq(1_640_995_200) end it 'handles ISO date strings' do @@ -194,8 +195,8 @@ RSpec.describe Stats::CalculateMonth do end it 'handles integer timestamps' do - result = service.send(:parse_date_parameter, 1640995200) - expect(result).to eq(1640995200) + result = service.send(:parse_date_parameter, 1_640_995_200) + expect(result).to eq(1_640_995_200) end it 'handles edge case gracefully' do From e169cc70748ac5cce8b92ec36e284e16b19b88f6 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Fri, 19 Sep 2025 21:37:31 +0200 Subject: [PATCH 17/25] Fix failing specs --- spec/services/maps/bounds_calculator_spec.rb | 9 +-- .../maps/hexagon_center_manager_spec.rb | 48 +----------- .../maps/hexagon_polygon_generator_spec.rb | 78 ++++++++++--------- .../maps/hexagon_request_handler_spec.rb | 39 +++++----- 4 files changed, 67 insertions(+), 107 deletions(-) diff --git a/spec/services/maps/bounds_calculator_spec.rb b/spec/services/maps/bounds_calculator_spec.rb index c2265b5f..0f508550 100644 --- a/spec/services/maps/bounds_calculator_spec.rb +++ b/spec/services/maps/bounds_calculator_spec.rb @@ -95,14 +95,11 @@ RSpec.describe Maps::BoundsCalculator do end end - context 'with lenient date parsing' do + context 'with invalid date parsing' do let(:start_date) { 'invalid-date' } - it 'handles invalid dates gracefully via Time.zone.parse' do - # Time.zone.parse is very lenient and rarely raises errors - # It will parse 'invalid-date' as a valid time - result = calculate_bounds - expect(result[:success]).to be false # No points in weird date range + it 'raises ArgumentError for invalid dates' do + expect { calculate_bounds }.to raise_error(ArgumentError, 'Invalid date format: invalid-date') end end diff --git a/spec/services/maps/hexagon_center_manager_spec.rb b/spec/services/maps/hexagon_center_manager_spec.rb index e1b3f1fa..47d7f8c9 100644 --- a/spec/services/maps/hexagon_center_manager_spec.rb +++ b/spec/services/maps/hexagon_center_manager_spec.rb @@ -49,52 +49,6 @@ RSpec.describe Maps::HexagonCenterManager do end end - context 'with legacy area_too_large flag' do - let(:stat) do - create(:stat, user:, year: 2024, month: 6, h3_hex_ids: { 'area_too_large' => true }) - end - - before do - # Mock the Stats::CalculateMonth service - allow_any_instance_of(Stats::CalculateMonth).to receive(:calculate_hexagon_centers) - .and_return(new_centers) - end - - context 'when recalculation succeeds' do - let(:new_centers) do - [ - [-74.0, 40.7, 1_717_200_000, 1_717_203_600], - [-74.01, 40.71, 1_717_210_000, 1_717_213_600] - ] - end - - it 'recalculates and updates the stat' do - expect(stat).to receive(:update).with(h3_hex_ids: new_centers) - - result = manage_centers - - expect(result[:success]).to be true - expect(result[:pre_calculated]).to be true - expect(result[:data]['features'].length).to eq(2) - end - end - - context 'when recalculation fails' do - let(:new_centers) { nil } - - it 'returns nil' do - expect(manage_centers).to be_nil - end - end - - context 'when recalculation returns area_too_large again' do - let(:new_centers) { { area_too_large: true } } - - it 'returns nil' do - expect(manage_centers).to be_nil - end - end - end context 'with no stat' do let(:stat) { nil } @@ -113,7 +67,7 @@ RSpec.describe Maps::HexagonCenterManager do end context 'with empty hexagon_centers' do - let(:stat) { create(:stat, user:, year: 2024, month: 6, h3_hex_ids: []) } + let(:stat) { create(:stat, user:, year: 2024, month: 6, h3_hex_ids: {}) } it 'returns nil' do expect(manage_centers).to be_nil diff --git a/spec/services/maps/hexagon_polygon_generator_spec.rb b/spec/services/maps/hexagon_polygon_generator_spec.rb index 662d42c2..5d8466d5 100644 --- a/spec/services/maps/hexagon_polygon_generator_spec.rb +++ b/spec/services/maps/hexagon_polygon_generator_spec.rb @@ -5,17 +5,14 @@ require 'rails_helper' RSpec.describe Maps::HexagonPolygonGenerator do describe '.call' do subject(:generate_polygon) do - described_class.new( - center_lng: center_lng, - center_lat: center_lat - ).call + described_class.new(h3_index: h3_index).call end - let(:center_lng) { -74.0 } - let(:center_lat) { 40.7 } + # Valid H3 index for NYC area (resolution 6) + let(:h3_index) { '8a1fb46622dffff' } - it 'returns a polygon geometry using H3' do - result = generate_h3_polygon + it 'returns a polygon geometry' do + result = generate_polygon expect(result['type']).to eq('Polygon') expect(result['coordinates']).to be_an(Array) @@ -23,7 +20,7 @@ RSpec.describe Maps::HexagonPolygonGenerator do end it 'generates a hexagon with 7 coordinate pairs (6 vertices + closing)' do - result = generate_h3_polygon + result = generate_polygon coordinates = result['coordinates'].first expect(coordinates.length).to eq(7) # 6 vertices + closing vertex @@ -31,7 +28,7 @@ RSpec.describe Maps::HexagonPolygonGenerator do end it 'generates unique vertices' do - result = generate_h3_polygon + result = generate_polygon coordinates = result['coordinates'].first # Remove the closing vertex for uniqueness check @@ -39,44 +36,55 @@ RSpec.describe Maps::HexagonPolygonGenerator do expect(unique_vertices.uniq.length).to eq(6) # All vertices should be unique end - it 'generates vertices around the center point' do - result = generate_h3_polygon + it 'generates vertices in proper [lng, lat] format' do + result = generate_polygon coordinates = result['coordinates'].first - # Check that vertices have some variation in coordinates - longitudes = coordinates[0..5].map { |vertex| vertex[0] } - latitudes = coordinates[0..5].map { |vertex| vertex[1] } + coordinates.each do |vertex| + lng, lat = vertex + expect(lng).to be_a(Float) + expect(lat).to be_a(Float) + expect(lng).to be_between(-180, 180) + expect(lat).to be_between(-90, 90) + end + end - expect(longitudes.uniq.size).to be > 1 # Should have different longitudes - expect(latitudes.uniq.size).to be > 1 # Should have different latitudes + context 'with hex string index' do + let(:h3_index) { '8a1fb46622dffff' } + + it 'handles hex string format' do + result = generate_polygon + expect(result['type']).to eq('Polygon') + expect(result['coordinates'].first.length).to eq(7) + end + end + + context 'with integer index' do + let(:h3_index) { 0x8a1fb46622dffff } + + it 'handles integer format' do + result = generate_polygon + expect(result['type']).to eq('Polygon') + expect(result['coordinates'].first.length).to eq(7) + end end context 'when H3 operations fail' do before do - allow(H3).to receive(:from_geo_coordinates).and_raise(StandardError, 'H3 error') + allow(H3).to receive(:to_boundary).and_raise(StandardError, 'H3 error') end it 'raises the H3 error' do - expect { generate_h3_polygon }.to raise_error(StandardError, 'H3 error') + expect { generate_polygon }.to raise_error(StandardError, 'H3 error') end end - private + context 'with invalid H3 index' do + let(:h3_index) { nil } - def calculate_hexagon_size(coordinates) - # Calculate distance between first two vertices as size approximation - vertex1 = coordinates[0] - vertex2 = coordinates[1] - - lng_diff = vertex2[0] - vertex1[0] - lat_diff = vertex2[1] - vertex1[1] - - Math.sqrt(lng_diff**2 + lat_diff**2) - end - - def calculate_distance_from_center(vertex) - lng, lat = vertex - Math.sqrt((lng - center_lng)**2 + (lat - center_lat)**2) + it 'raises an error for invalid index' do + expect { generate_polygon }.to raise_error(TypeError) + end end end -end +end \ No newline at end of file diff --git a/spec/services/maps/hexagon_request_handler_spec.rb b/spec/services/maps/hexagon_request_handler_spec.rb index abe9a089..45b9f84b 100644 --- a/spec/services/maps/hexagon_request_handler_spec.rb +++ b/spec/services/maps/hexagon_request_handler_spec.rb @@ -8,15 +8,18 @@ RSpec.describe Maps::HexagonRequestHandler do described_class.new( params: params, user: user, - stat: nil, - start_date: params[:start_date], - end_date: params[:end_date] + stat: stat, + start_date: start_date, + end_date: end_date ).call end let(:user) { create(:user) } context 'with authenticated user but no pre-calculated data' do + let(:stat) { nil } + let(:start_date) { '2024-06-01T00:00:00Z' } + let(:end_date) { '2024-06-30T23:59:59Z' } let(:params) do ActionController::Parameters.new( { @@ -24,8 +27,8 @@ RSpec.describe Maps::HexagonRequestHandler do min_lat: 40.6, max_lon: -73.9, max_lat: 40.8, - start_date: '2024-06-01T00:00:00Z', - end_date: '2024-06-30T23:59:59Z' + start_date: start_date, + end_date: end_date } ) end @@ -52,6 +55,8 @@ RSpec.describe Maps::HexagonRequestHandler do create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, h3_hex_ids: pre_calculated_centers) end + let(:start_date) { Date.new(2024, 6, 1).beginning_of_day.iso8601 } + let(:end_date) { Date.new(2024, 6, 1).end_of_month.end_of_day.iso8601 } let(:params) do ActionController::Parameters.new( { @@ -76,6 +81,8 @@ RSpec.describe Maps::HexagonRequestHandler do context 'with public sharing UUID but no pre-calculated centers' do let(:stat) { create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6) } + let(:start_date) { Date.new(2024, 6, 1).beginning_of_day.iso8601 } + let(:end_date) { Date.new(2024, 6, 1).end_of_month.end_of_day.iso8601 } let(:params) do ActionController::Parameters.new( { @@ -98,11 +105,13 @@ RSpec.describe Maps::HexagonRequestHandler do end end - context 'with legacy area_too_large that can be recalculated' do + context 'with stat containing empty h3_hex_ids data' do let(:stat) do create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6, - h3_hex_ids: { 'area_too_large' => true }) + h3_hex_ids: {}) end + let(:start_date) { Date.new(2024, 6, 1).beginning_of_day.iso8601 } + let(:end_date) { Date.new(2024, 6, 1).end_of_month.end_of_day.iso8601 } let(:params) do ActionController::Parameters.new( { @@ -115,21 +124,13 @@ RSpec.describe Maps::HexagonRequestHandler do ) end - before do - # Mock successful recalculation - allow_any_instance_of(Stats::CalculateMonth).to receive(:calculate_hexagon_centers) - .and_return([[-74.0, 40.7, 1_717_200_000, 1_717_203_600]]) - end - - it 'recalculates and returns pre-calculated data' do + it 'returns empty feature collection for empty data' do result = handle_request expect(result['type']).to eq('FeatureCollection') - expect(result['features'].length).to eq(1) - expect(result['metadata']['pre_calculated']).to be true - - # Verify that the stat was updated with new centers (reload to check persistence) - expect(stat.reload.h3_hex_ids).to eq([[-74.0, 40.7, 1_717_200_000, 1_717_203_600]]) + expect(result['features']).to eq([]) + expect(result['metadata']['hexagon_count']).to eq(0) + expect(result['metadata']['source']).to eq('pre_calculated') end end end From a1e83991fa15bb5b54c1e4caa309e17c90c904b0 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Fri, 19 Sep 2025 21:48:43 +0200 Subject: [PATCH 18/25] Fix jobs specs --- spec/jobs/bulk_visits_suggesting_job_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/jobs/bulk_visits_suggesting_job_spec.rb b/spec/jobs/bulk_visits_suggesting_job_spec.rb index 16a8086d..b63dfa81 100644 --- a/spec/jobs/bulk_visits_suggesting_job_spec.rb +++ b/spec/jobs/bulk_visits_suggesting_job_spec.rb @@ -58,7 +58,7 @@ RSpec.describe BulkVisitsSuggestingJob, type: :job do allow(User).to receive(:active).and_return(active_users_mock) allow(active_users_mock).to receive(:active).and_return(active_users_mock) allow(active_users_mock).to receive(:where).with(id: []).and_return(active_users_mock) - # allow(active_users_mock).to receive(:find_each).and_yield(user_with_points) + allow(active_users_mock).to receive(:find_each).and_yield(user_with_points) chunks.each do |chunk| expect(VisitSuggestingJob).to receive(:perform_later).with( @@ -100,11 +100,11 @@ RSpec.describe BulkVisitsSuggestingJob, type: :job do .and_return(time_chunks_instance) allow(time_chunks_instance).to receive(:call).and_return(custom_chunks) - # active_users_mock = double('ActiveRecord::Relation') - # allow(User).to receive(:active).and_return(active_users_mock) - # allow(active_users_mock).to receive(:active).and_return(active_users_mock) - # allow(active_users_mock).to receive(:where).with(id: []).and_return(active_users_mock) - # allow(active_users_mock).to receive(:find_each).and_yield(user_with_points) + active_users_mock = double('ActiveRecord::Relation') + allow(User).to receive(:active).and_return(active_users_mock) + allow(active_users_mock).to receive(:active).and_return(active_users_mock) + allow(active_users_mock).to receive(:where).with(id: []).and_return(active_users_mock) + allow(active_users_mock).to receive(:find_each).and_yield(user_with_points) expect(VisitSuggestingJob).to receive(:perform_later).with( user_id: user_with_points.id, From 2fe36f02d650ac9b737b32d23c03ed6b7a2a0305 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Fri, 19 Sep 2025 22:12:34 +0200 Subject: [PATCH 19/25] Fix failing model spec --- spec/models/point_spec.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spec/models/point_spec.rb b/spec/models/point_spec.rb index eaf3d4ba..a61246f4 100644 --- a/spec/models/point_spec.rb +++ b/spec/models/point_spec.rb @@ -53,11 +53,17 @@ RSpec.describe Point, type: :model do end describe '.not_reverse_geocoded' do - let(:point) { create(:point, country: 'Country', city: 'City') } - let(:point_without_address) { create(:point, city: nil, country: nil) } + let!(:point) { create(:point, country: 'Country', city: 'City', reverse_geocoded_at: Time.current) } + let!(:point_without_address) { create(:point, city: nil, country: nil, reverse_geocoded_at: nil) } it 'returns points without reverse geocoded address' do - expect(described_class.not_reverse_geocoded).to eq([point_without_address]) + # Trigger creation of both points + point + point_without_address + + result = described_class.not_reverse_geocoded + expect(result).to include(point_without_address) + expect(result).not_to include(point) end end end From a20a3c5b36d9af729686a8afd05c328c99f080bc Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Fri, 19 Sep 2025 22:52:08 +0200 Subject: [PATCH 20/25] Fix missing hexes --- app/assets/builds/tailwind.css | 4 +- .../controllers/public_stat_map_controller.js | 2 +- app/services/maps/bounds_calculator.rb | 13 ++-- app/services/stats/calculate_month.rb | 31 +++++---- docs/SHAREABLE_STATS_FEATURE.md | 69 +++++++++++-------- spec/services/maps/bounds_calculator_spec.rb | 9 +-- 6 files changed, 71 insertions(+), 57 deletions(-) diff --git a/app/assets/builds/tailwind.css b/app/assets/builds/tailwind.css index b466489a..168bb1b3 100644 --- a/app/assets/builds/tailwind.css +++ b/app/assets/builds/tailwind.css @@ -2,5 +2,5 @@ --timeline-col-end,minmax(0,1fr) );grid-template-rows:var(--timeline-row-start,minmax(0,1fr)) auto var( --timeline-row-end,minmax(0,1fr) - );position:relative}.timeline>li>hr{border-width:0;width:100%}:where(.timeline>li>hr):first-child{grid-column-start:1;grid-row-start:2}:where(.timeline>li>hr):last-child{grid-column-end:none;grid-column-start:3;grid-row-end:auto;grid-row-start:2}.timeline-start{align-self:flex-end;grid-column-end:4;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:center;margin:.25rem}.timeline-middle{grid-column-start:2;grid-row-start:2}.timeline-end{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center;margin:.25rem}.toast{display:flex;flex-direction:column;gap:.5rem;min-width:-moz-fit-content;min-width:fit-content;padding:1rem;position:fixed;white-space:nowrap}.toggle{flex-shrink:0;--tglbg:var(--fallback-b1,oklch(var(--b1)/1));--handleoffset:1.5rem;--handleoffsetcalculator:calc(var(--handleoffset)*-1);--togglehandleborder:0 0;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:currentColor;border-color:currentColor;border-radius:var(--rounded-badge,1.9rem);border-width:1px;box-shadow:var(--handleoffsetcalculator) 0 0 2px var(--tglbg) inset,0 0 0 2px var(--tglbg) inset,var(--togglehandleborder);color:var(--fallback-bc,oklch(var(--bc)/.5));cursor:pointer;height:1.5rem;transition:background,box-shadow var(--animation-input,.2s) ease-out;width:3rem}.alert-info{border-color:var(--fallback-in,oklch(var(--in)/.2));--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));--alert-bg:var(--fallback-in,oklch(var(--in)/1));--alert-bg-mix:var(--fallback-b1,oklch(var(--b1)/1))}.alert-error{border-color:var(--fallback-er,oklch(var(--er)/.2));--tw-text-opacity:1;color:var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));--alert-bg:var(--fallback-er,oklch(var(--er)/1));--alert-bg-mix:var(--fallback-b1,oklch(var(--b1)/1))}.badge-neutral{background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));border-color:var(--fallback-n,oklch(var(--n)/var(--tw-border-opacity)));color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity)))}.badge-neutral,.badge-primary{--tw-border-opacity:1;--tw-bg-opacity:1;--tw-text-opacity:1}.badge-primary{background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.badge-secondary{background-color:var(--fallback-s,oklch(var(--s)/var(--tw-bg-opacity)));border-color:var(--fallback-s,oklch(var(--s)/var(--tw-border-opacity)));color:var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)))}.badge-accent,.badge-secondary{--tw-border-opacity:1;--tw-bg-opacity:1;--tw-text-opacity:1}.badge-accent{background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity)));border-color:var(--fallback-a,oklch(var(--a)/var(--tw-border-opacity)));color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)))}.badge-success{background-color:var(--fallback-su,oklch(var(--su)/var(--tw-bg-opacity)));color:var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)))}.badge-success,.badge-warning{border-color:transparent;--tw-bg-opacity:1;--tw-text-opacity:1}.badge-warning{background-color:var(--fallback-wa,oklch(var(--wa)/var(--tw-bg-opacity)));color:var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)))}.badge-ghost{--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}.badge-outline{border-color:currentColor;--tw-border-opacity:0.5;background-color:transparent;color:currentColor}.badge-outline.badge-neutral{--tw-text-opacity:1;color:var(--fallback-n,oklch(var(--n)/var(--tw-text-opacity)))}.badge-outline.badge-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity)))}.badge-outline.badge-secondary{--tw-text-opacity:1;color:var(--fallback-s,oklch(var(--s)/var(--tw-text-opacity)))}.badge-outline.badge-accent{--tw-text-opacity:1;color:var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity)))}.badge-outline.badge-info{--tw-text-opacity:1;color:var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity)))}.badge-outline.badge-success{--tw-text-opacity:1;color:var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity)))}.badge-outline.badge-warning{--tw-text-opacity:1;color:var(--fallback-wa,oklch(var(--wa)/var(--tw-text-opacity)))}.badge-outline.badge-error{--tw-text-opacity:1;color:var(--fallback-er,oklch(var(--er)/var(--tw-text-opacity)))}.btm-nav>:where(.active){border-top-width:2px;--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)))}.btm-nav>.disabled,.btm-nav>[disabled]{pointer-events:none;--tw-border-opacity:0;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-bg-opacity:0.1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.btm-nav>* .label{font-size:1rem;line-height:1.5rem}.btn:active:focus,.btn:active:hover{animation:button-pop 0s ease-out;transform:scale(var(--btn-focus-scale,.97))}@supports not (color:oklch(0 0 0)){.btn{background-color:var(--btn-color,var(--fallback-b2));border-color:var(--btn-color,var(--fallback-b2))}.btn-primary{--btn-color:var(--fallback-p)}.btn-neutral{--btn-color:var(--fallback-n)}.btn-info{--btn-color:var(--fallback-in)}.btn-success{--btn-color:var(--fallback-su)}.btn-warning{--btn-color:var(--fallback-wa)}.btn-error{--btn-color:var(--fallback-er)}}@supports (color:color-mix(in oklab,black,black)){.btn-active{background-color:color-mix(in oklab,oklch(var(--btn-color,var(--b3))/var(--tw-bg-opacity,1)) 90%,#000);border-color:color-mix(in oklab,oklch(var(--btn-color,var(--b3))/var(--tw-border-opacity,1)) 90%,#000)}.btn-outline.btn-primary.btn-active{background-color:color-mix(in oklab,var(--fallback-p,oklch(var(--p)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-p,oklch(var(--p)/1)) 90%,#000)}.btn-outline.btn-secondary.btn-active{background-color:color-mix(in oklab,var(--fallback-s,oklch(var(--s)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-s,oklch(var(--s)/1)) 90%,#000)}.btn-outline.btn-accent.btn-active{background-color:color-mix(in oklab,var(--fallback-a,oklch(var(--a)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-a,oklch(var(--a)/1)) 90%,#000)}.btn-outline.btn-success.btn-active{background-color:color-mix(in oklab,var(--fallback-su,oklch(var(--su)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-su,oklch(var(--su)/1)) 90%,#000)}.btn-outline.btn-info.btn-active{background-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000)}.btn-outline.btn-warning.btn-active{background-color:color-mix(in oklab,var(--fallback-wa,oklch(var(--wa)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-wa,oklch(var(--wa)/1)) 90%,#000)}.btn-outline.btn-error.btn-active{background-color:color-mix(in oklab,var(--fallback-er,oklch(var(--er)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-er,oklch(var(--er)/1)) 90%,#000)}}.btn:focus-visible{outline-offset:2px;outline-style:solid;outline-width:2px}.btn-primary{--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)));outline-color:var(--fallback-p,oklch(var(--p)/1))}@supports (color:oklch(0 0 0)){.btn-primary{--btn-color:var(--p)}.btn-neutral{--btn-color:var(--n)}.btn-info{--btn-color:var(--in)}.btn-success{--btn-color:var(--su)}.btn-warning{--btn-color:var(--wa)}.btn-error{--btn-color:var(--er)}}.btn-neutral{--tw-text-opacity:1;color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity)));outline-color:var(--fallback-n,oklch(var(--n)/1))}.btn-info{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));outline-color:var(--fallback-in,oklch(var(--in)/1))}.btn-success{--tw-text-opacity:1;color:var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));outline-color:var(--fallback-su,oklch(var(--su)/1))}.btn-warning{--tw-text-opacity:1;color:var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));outline-color:var(--fallback-wa,oklch(var(--wa)/1))}.btn-error{--tw-text-opacity:1;color:var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));outline-color:var(--fallback-er,oklch(var(--er)/1))}.btn.glass{--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow);outline-color:currentColor}.btn.glass.btn-active{--glass-opacity:25%;--glass-border-opacity:15%}.btn-ghost{background-color:transparent;border-color:transparent;border-width:1px;color:currentColor;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow);outline-color:currentColor}.btn-ghost.btn-active{background-color:var(--fallback-bc,oklch(var(--bc)/.2));border-color:transparent}.btn-link.btn-active{background-color:transparent;border-color:transparent;text-decoration-line:underline}.btn-outline{background-color:transparent;border-color:currentColor;--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.btn-outline.btn-active{--tw-border-opacity:1;border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-b1,oklch(var(--b1)/var(--tw-text-opacity)))}.btn-outline.btn-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity)))}.btn-outline.btn-primary.btn-active{--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.btn-outline.btn-secondary{--tw-text-opacity:1;color:var(--fallback-s,oklch(var(--s)/var(--tw-text-opacity)))}.btn-outline.btn-secondary.btn-active{--tw-text-opacity:1;color:var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)))}.btn-outline.btn-accent{--tw-text-opacity:1;color:var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity)))}.btn-outline.btn-accent.btn-active{--tw-text-opacity:1;color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)))}.btn-outline.btn-success{--tw-text-opacity:1;color:var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity)))}.btn-outline.btn-success.btn-active{--tw-text-opacity:1;color:var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)))}.btn-outline.btn-info{--tw-text-opacity:1;color:var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity)))}.btn-outline.btn-info.btn-active{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)))}.btn-outline.btn-warning{--tw-text-opacity:1;color:var(--fallback-wa,oklch(var(--wa)/var(--tw-text-opacity)))}.btn-outline.btn-warning.btn-active{--tw-text-opacity:1;color:var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)))}.btn-outline.btn-error{--tw-text-opacity:1;color:var(--fallback-er,oklch(var(--er)/var(--tw-text-opacity)))}.btn-outline.btn-error.btn-active{--tw-text-opacity:1;color:var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)))}.btn.btn-disabled,.btn:disabled,.btn[disabled]{--tw-border-opacity:0;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-bg-opacity:0.2;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.btn:is(input[type=checkbox]:checked),.btn:is(input[type=radio]:checked){--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.btn:is(input[type=checkbox]:checked):focus-visible,.btn:is(input[type=radio]:checked):focus-visible{outline-color:var(--fallback-p,oklch(var(--p)/1))}@keyframes button-pop{0%{transform:scale(var(--btn-focus-scale,.98))}40%{transform:scale(1.02)}to{transform:scale(1)}}.card :where(figure:first-child){border-end-end-radius:unset;border-end-start-radius:unset;border-start-end-radius:inherit;border-start-start-radius:inherit;overflow:hidden}.card :where(figure:last-child){border-end-end-radius:inherit;border-end-start-radius:inherit;border-start-end-radius:unset;border-start-start-radius:unset;overflow:hidden}.card:focus-visible{outline:2px solid currentColor;outline-offset:2px}.card.bordered{border-width:1px;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)))}.card.compact .card-body{font-size:.875rem;line-height:1.25rem;padding:1rem}.card-title{align-items:center;display:flex;font-size:1.25rem;font-weight:600;gap:.5rem;line-height:1.75rem}.card.image-full :where(figure){border-radius:inherit;overflow:hidden}.checkbox:focus{box-shadow:none}.checkbox:focus-visible{outline-color:var(--fallback-bc,oklch(var(--bc)/1));outline-offset:2px;outline-style:solid;outline-width:2px}.checkbox:checked,.checkbox[aria-checked=true],.checkbox[checked=true]{animation:checkmark var(--animation-input,.2s) ease-out;background-color:var(--chkbg);background-image:linear-gradient(-45deg,transparent 65%,var(--chkbg) 65.99%),linear-gradient(45deg,transparent 75%,var(--chkbg) 75.99%),linear-gradient(-45deg,var(--chkbg) 40%,transparent 40.99%),linear-gradient(45deg,var(--chkbg) 30%,var(--chkfg) 30.99%,var(--chkfg) 40%,transparent 40.99%),linear-gradient(-45deg,var(--chkfg) 50%,var(--chkbg) 50.99%);background-repeat:no-repeat}.checkbox:indeterminate{--tw-bg-opacity:1;animation:checkmark var(--animation-input,.2s) ease-out;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));background-image:linear-gradient(90deg,transparent 80%,var(--chkbg) 80%),linear-gradient(-90deg,transparent 80%,var(--chkbg) 80%),linear-gradient(0deg,var(--chkbg) 43%,var(--chkfg) 43%,var(--chkfg) 57%,var(--chkbg) 57%);background-repeat:no-repeat}.checkbox:disabled{border-color:transparent;cursor:not-allowed;--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));opacity:.2}@keyframes checkmark{0%{background-position-y:5px}50%{background-position-y:-2px}to{background-position-y:0}}.divider:not(:empty){gap:1rem}.drawer-toggle:focus-visible~.drawer-content label.drawer-button{outline-offset:2px;outline-style:solid;outline-width:2px}.dropdown.dropdown-open .dropdown-content,.dropdown:focus .dropdown-content,.dropdown:focus-within .dropdown-content{--tw-scale-x:1;--tw-scale-y:1;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.file-input-bordered{--tw-border-opacity:0.2}.file-input:focus{outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.file-input-disabled,.file-input[disabled]{cursor:not-allowed;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));--tw-text-opacity:0.2}.file-input-disabled::-moz-placeholder,.file-input[disabled]::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.file-input-disabled::placeholder,.file-input[disabled]::placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.file-input-disabled::file-selector-button,.file-input[disabled]::file-selector-button{--tw-border-opacity:0;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-bg-opacity:0.2;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.footer-title{font-weight:700;margin-bottom:.5rem;opacity:.6;text-transform:uppercase}.label-text{font-size:.875rem;line-height:1.25rem}.label-text,.label-text-alt{--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}.label-text-alt{font-size:.75rem;line-height:1rem}.input input{--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));background-color:transparent}.input input:focus{outline:2px solid transparent;outline-offset:2px}.input[list]::-webkit-calendar-picker-indicator{line-height:1em}.input-bordered{border-color:var(--fallback-bc,oklch(var(--bc)/.2))}.input:focus,.input:focus-within{border-color:var(--fallback-bc,oklch(var(--bc)/.2));box-shadow:none;outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.input-ghost{--tw-bg-opacity:0.05}.input-ghost:focus,.input-ghost:focus-within{--tw-bg-opacity:1;--tw-text-opacity:1;box-shadow:none;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}.input-primary{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)))}.input-primary:focus,.input-primary:focus-within{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));outline-color:var(--fallback-p,oklch(var(--p)/1))}.input-error{--tw-border-opacity:1;border-color:var(--fallback-er,oklch(var(--er)/var(--tw-border-opacity)))}.input-error:focus,.input-error:focus-within{--tw-border-opacity:1;border-color:var(--fallback-er,oklch(var(--er)/var(--tw-border-opacity)));outline-color:var(--fallback-er,oklch(var(--er)/1))}.input-disabled,.input:disabled,.input[disabled]{cursor:not-allowed;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));color:var(--fallback-bc,oklch(var(--bc)/.4))}.input-disabled::-moz-placeholder,.input:disabled::-moz-placeholder,.input[disabled]::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.input-disabled::placeholder,.input:disabled::placeholder,.input[disabled]::placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.input::-webkit-date-and-time-value{text-align:inherit}.join>:where(:not(:first-child)){margin-bottom:0;margin-top:0;margin-inline-start:-1px}.join-item:focus{isolation:isolate}.link-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity)))}@supports (color:color-mix(in oklab,black,black)){@media (hover:hover){.link-primary:hover{color:color-mix(in oklab,var(--fallback-p,oklch(var(--p)/1)) 80%,#000)}}}.link:focus{outline:2px solid transparent;outline-offset:2px}.link:focus-visible{outline:2px solid currentColor;outline-offset:2px}.loading{aspect-ratio:1/1;background-color:currentColor;display:inline-block;-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:100%;mask-size:100%;pointer-events:none;width:1.5rem}.loading,.loading-spinner{-webkit-mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' stroke='%23000'%3E%3Cstyle%3E@keyframes spinner_zKoa{to{transform:rotate(360deg)}}@keyframes spinner_YpZS{0%25{stroke-dasharray:0 150;stroke-dashoffset:0}47.5%25{stroke-dasharray:42 150;stroke-dashoffset:-16}95%25,to{stroke-dasharray:42 150;stroke-dashoffset:-59}}%3C/style%3E%3Cg style='transform-origin:center;animation:spinner_zKoa 2s linear infinite'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' class='spinner_V8m1' style='stroke-linecap:round;animation:spinner_YpZS 1.5s ease-out infinite'/%3E%3C/g%3E%3C/svg%3E");mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' stroke='%23000'%3E%3Cstyle%3E@keyframes spinner_zKoa{to{transform:rotate(360deg)}}@keyframes spinner_YpZS{0%25{stroke-dasharray:0 150;stroke-dashoffset:0}47.5%25{stroke-dasharray:42 150;stroke-dashoffset:-16}95%25,to{stroke-dasharray:42 150;stroke-dashoffset:-59}}%3C/style%3E%3Cg style='transform-origin:center;animation:spinner_zKoa 2s linear infinite'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' class='spinner_V8m1' style='stroke-linecap:round;animation:spinner_YpZS 1.5s ease-out infinite'/%3E%3C/g%3E%3C/svg%3E")}.loading-dots{-webkit-mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24'%3E%3Cstyle%3E@keyframes spinner_8HQG{0%25,57.14%25{animation-timing-function:cubic-bezier(.33,.66,.66,1);transform:translate(0)}28.57%25{animation-timing-function:cubic-bezier(.33,0,.66,.33);transform:translateY(-6px)}to{transform:translate(0)}}.spinner_qM83{animation:spinner_8HQG 1.05s infinite}%3C/style%3E%3Ccircle cx='4' cy='12' r='3' class='spinner_qM83'/%3E%3Ccircle cx='12' cy='12' r='3' class='spinner_qM83' style='animation-delay:.1s'/%3E%3Ccircle cx='20' cy='12' r='3' class='spinner_qM83' style='animation-delay:.2s'/%3E%3C/svg%3E");mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24'%3E%3Cstyle%3E@keyframes spinner_8HQG{0%25,57.14%25{animation-timing-function:cubic-bezier(.33,.66,.66,1);transform:translate(0)}28.57%25{animation-timing-function:cubic-bezier(.33,0,.66,.33);transform:translateY(-6px)}to{transform:translate(0)}}.spinner_qM83{animation:spinner_8HQG 1.05s infinite}%3C/style%3E%3Ccircle cx='4' cy='12' r='3' class='spinner_qM83'/%3E%3Ccircle cx='12' cy='12' r='3' class='spinner_qM83' style='animation-delay:.1s'/%3E%3Ccircle cx='20' cy='12' r='3' class='spinner_qM83' style='animation-delay:.2s'/%3E%3C/svg%3E")}.loading-sm{width:1.25rem}.loading-md{width:1.5rem}.loading-lg{width:2.5rem}:where(.menu li:empty){--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));height:1px;margin:.5rem 1rem;opacity:.1}.menu :where(li ul):before{bottom:.75rem;inset-inline-start:0;position:absolute;top:.75rem;width:1px;--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));content:"";opacity:.1}.menu :where(li:not(.menu-title)>:not(ul,details,.menu-title,.btn)),.menu :where(li:not(.menu-title)>details>summary:not(.menu-title)){border-radius:var(--rounded-btn,.5rem);padding:.5rem 1rem;text-align:start;text-wrap:balance;transition-duration:.2s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(0,0,.2,1)}:where(.menu li:not(.menu-title,.disabled)>:not(ul,details,.menu-title)):is(summary):not(.active,.btn):focus-visible,:where(.menu li:not(.menu-title,.disabled)>:not(ul,details,.menu-title)):not(summary,.active,.btn).focus,:where(.menu li:not(.menu-title,.disabled)>:not(ul,details,.menu-title)):not(summary,.active,.btn):focus,:where(.menu li:not(.menu-title,.disabled)>details>summary:not(.menu-title)):is(summary):not(.active,.btn):focus-visible,:where(.menu li:not(.menu-title,.disabled)>details>summary:not(.menu-title)):not(summary,.active,.btn).focus,:where(.menu li:not(.menu-title,.disabled)>details>summary:not(.menu-title)):not(summary,.active,.btn):focus{background-color:var(--fallback-bc,oklch(var(--bc)/.1));cursor:pointer;--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));outline:2px solid transparent;outline-offset:2px}.menu li>:not(ul,.menu-title,details,.btn).active,.menu li>:not(ul,.menu-title,details,.btn):active,.menu li>details>summary:active{--tw-bg-opacity:1;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity)))}.menu :where(li>details>summary)::-webkit-details-marker{display:none}.menu :where(li>.menu-dropdown-toggle):after,.menu :where(li>details>summary):after{box-shadow:2px 2px;content:"";display:block;height:.5rem;justify-self:end;margin-top:-.5rem;pointer-events:none;transform:rotate(45deg);transform-origin:75% 75%;transition-duration:.3s;transition-property:transform,margin-top;transition-timing-function:cubic-bezier(.4,0,.2,1);width:.5rem}.menu :where(li>.menu-dropdown-toggle.menu-dropdown-show):after,.menu :where(li>details[open]>summary):after{margin-top:0;transform:rotate(225deg)}.mockup-phone .camera{background:#000;border-bottom-left-radius:17px;border-bottom-right-radius:17px;height:25px;left:0;margin:0 auto;position:relative;top:0;width:150px;z-index:11}.mockup-phone .camera:before{background-color:#0c0b0e;border-radius:5px;content:"";height:4px;left:50%;position:absolute;top:35%;transform:translate(-50%,-50%);width:50px}.mockup-phone .camera:after{background-color:#0f0b25;border-radius:5px;content:"";height:8px;left:70%;position:absolute;top:20%;width:8px}.mockup-phone .display{border-radius:40px;margin-top:-25px;overflow:hidden}.mockup-browser .mockup-browser-toolbar .input{display:block;height:1.75rem;margin-left:auto;margin-right:auto;overflow:hidden;position:relative;text-overflow:ellipsis;white-space:nowrap;width:24rem;--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));direction:ltr;padding-left:2rem}.mockup-browser .mockup-browser-toolbar .input:before{aspect-ratio:1/1;height:.75rem;left:.5rem;--tw-translate-y:-50%;border-color:currentColor;border-radius:9999px;border-width:2px}.mockup-browser .mockup-browser-toolbar .input:after,.mockup-browser .mockup-browser-toolbar .input:before{content:"";opacity:.6;position:absolute;top:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.mockup-browser .mockup-browser-toolbar .input:after{height:.5rem;left:1.25rem;--tw-translate-y:25%;--tw-rotate:-45deg;border-color:currentColor;border-radius:9999px;border-width:1px}.modal::backdrop,.modal:not(dialog:not(.modal-open)){animation:modal-pop .2s ease-out;background-color:#0006}.modal-backdrop{align-self:stretch;color:transparent;display:grid;grid-column-start:1;grid-row-start:1;justify-self:stretch;z-index:-1}.modal-open .modal-box,.modal-toggle:checked+.modal .modal-box,.modal:target .modal-box,.modal[open] .modal-box{--tw-translate-y:0px;--tw-scale-x:1;--tw-scale-y:1;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.modal-action>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}@keyframes modal-pop{0%{opacity:0}}.progress::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)))}.progress-primary::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)))}.progress-secondary::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-s,oklch(var(--s)/var(--tw-bg-opacity)))}.progress-accent::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity)))}.progress-info::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-in,oklch(var(--in)/var(--tw-bg-opacity)))}.progress-success::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-su,oklch(var(--su)/var(--tw-bg-opacity)))}.progress-warning::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-wa,oklch(var(--wa)/var(--tw-bg-opacity)))}.progress:indeterminate{--progress-color:var(--fallback-bc,oklch(var(--bc)/1));animation:progress-loading 5s ease-in-out infinite;background-image:repeating-linear-gradient(90deg,var(--progress-color) -1%,var(--progress-color) 10%,transparent 10%,transparent 90%);background-position-x:15%;background-size:200%}.progress-primary:indeterminate{--progress-color:var(--fallback-p,oklch(var(--p)/1))}.progress-secondary:indeterminate{--progress-color:var(--fallback-s,oklch(var(--s)/1))}.progress-accent:indeterminate{--progress-color:var(--fallback-a,oklch(var(--a)/1))}.progress-info:indeterminate{--progress-color:var(--fallback-in,oklch(var(--in)/1))}.progress-success:indeterminate{--progress-color:var(--fallback-su,oklch(var(--su)/1))}.progress-warning:indeterminate{--progress-color:var(--fallback-wa,oklch(var(--wa)/1))}.progress::-webkit-progress-bar{background-color:transparent;border-radius:var(--rounded-box,1rem)}.progress::-webkit-progress-value{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)))}.progress-primary::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)))}.progress-secondary::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-s,oklch(var(--s)/var(--tw-bg-opacity)))}.progress-accent::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity)))}.progress-info::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-in,oklch(var(--in)/var(--tw-bg-opacity)))}.progress-success::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-su,oklch(var(--su)/var(--tw-bg-opacity)))}.progress-warning::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-wa,oklch(var(--wa)/var(--tw-bg-opacity)))}.progress:indeterminate::-moz-progress-bar{animation:progress-loading 5s ease-in-out infinite;background-color:transparent;background-image:repeating-linear-gradient(90deg,var(--progress-color) -1%,var(--progress-color) 10%,transparent 10%,transparent 90%);background-position-x:15%;background-size:200%}@keyframes progress-loading{50%{background-position-x:-115%}}.radio:focus{box-shadow:none}.radio:focus-visible{outline-color:var(--fallback-bc,oklch(var(--bc)/1));outline-offset:2px;outline-style:solid;outline-width:2px}.radio:checked,.radio[aria-checked=true]{--tw-bg-opacity:1;animation:radiomark var(--animation-input,.2s) ease-out;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));background-image:none;box-shadow:0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset}.radio-primary{--chkbg:var(--p);--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)))}.radio-primary:focus-visible{outline-color:var(--fallback-p,oklch(var(--p)/1))}.radio-primary:checked,.radio-primary[aria-checked=true]{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.radio:disabled{cursor:not-allowed;opacity:.2}@keyframes radiomark{0%{box-shadow:0 0 0 12px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 12px var(--fallback-b1,oklch(var(--b1)/1)) inset}50%{box-shadow:0 0 0 3px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 3px var(--fallback-b1,oklch(var(--b1)/1)) inset}to{box-shadow:0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset}}.range:focus-visible::-webkit-slider-thumb{--focus-shadow:0 0 0 6px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 2rem var(--range-shdw) inset}.range:focus-visible::-moz-range-thumb{--focus-shadow:0 0 0 6px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 2rem var(--range-shdw) inset}.range::-webkit-slider-runnable-track{background-color:var(--fallback-bc,oklch(var(--bc)/.1));border-radius:var(--rounded-box,1rem);height:.5rem;width:100%}.range::-moz-range-track{background-color:var(--fallback-bc,oklch(var(--bc)/.1));border-radius:var(--rounded-box,1rem);height:.5rem;width:100%}.range::-webkit-slider-thumb{border-radius:var(--rounded-box,1rem);border-style:none;height:1.5rem;position:relative;width:1.5rem;--tw-bg-opacity:1;appearance:none;-webkit-appearance:none;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));color:var(--range-shdw);top:50%;transform:translateY(-50%);--filler-size:100rem;--filler-offset:0.6rem;box-shadow:0 0 0 3px var(--range-shdw) inset,var(--focus-shadow,0 0),calc(var(--filler-size)*-1 - var(--filler-offset)) 0 0 var(--filler-size)}.range::-moz-range-thumb{border-radius:var(--rounded-box,1rem);border-style:none;height:1.5rem;position:relative;width:1.5rem;--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));color:var(--range-shdw);top:50%;--filler-size:100rem;--filler-offset:0.5rem;box-shadow:0 0 0 3px var(--range-shdw) inset,var(--focus-shadow,0 0),calc(var(--filler-size)*-1 - var(--filler-offset)) 0 0 var(--filler-size)}@keyframes rating-pop{0%{transform:translateY(-.125em)}40%{transform:translateY(-.125em)}to{transform:translateY(0)}}.select-bordered,.select:focus{border-color:var(--fallback-bc,oklch(var(--bc)/.2))}.select:focus{box-shadow:none;outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.select-disabled,.select:disabled,.select[disabled]{cursor:not-allowed;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.select-disabled::-moz-placeholder,.select:disabled::-moz-placeholder,.select[disabled]::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.select-disabled::placeholder,.select:disabled::placeholder,.select[disabled]::placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.select-multiple,.select[multiple],.select[size].select:not([size="1"]){background-image:none;padding-right:1rem}[dir=rtl] .select{background-position:12px calc(1px + 50%),16px calc(1px + 50%)}@keyframes skeleton{0%{background-position:150%}to{background-position:-50%}}:where(.stats)>:not([hidden])~:not([hidden]){--tw-divide-x-reverse:0;--tw-divide-y-reverse:0;border-width:calc(0px*(1 - var(--tw-divide-y-reverse))) calc(1px*var(--tw-divide-x-reverse)) calc(0px*var(--tw-divide-y-reverse)) calc(1px*(1 - var(--tw-divide-x-reverse)))}:is([dir=rtl] .stats>:not([hidden])~:not([hidden])){--tw-divide-x-reverse:1}.steps .step:before{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));content:"";height:.5rem;margin-inline-start:-100%;top:0;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));width:100%}.steps .step:after,.steps .step:before{grid-column-start:1;grid-row-start:1;--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)));--tw-text-opacity:1}.steps .step:after{border-radius:9999px;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));content:counter(step);counter-increment:step;display:grid;height:2rem;place-items:center;place-self:center;position:relative;width:2rem;z-index:1}.steps .step:first-child:before{content:none}.steps .step[data-content]:after{content:attr(data-content)}.tabs-lifted>.tab:focus-visible{border-end-end-radius:0;border-end-start-radius:0}.tab.tab-active:not(.tab-disabled):not([disabled]),.tab:is(input:checked){border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));--tw-border-opacity:1;--tw-text-opacity:1}.tab:focus{outline:2px solid transparent;outline-offset:2px}.tab:focus-visible{outline:2px solid currentColor;outline-offset:-5px}.tab-disabled,.tab[disabled]{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));cursor:not-allowed;--tw-text-opacity:0.2}.tabs-bordered>.tab{border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));--tw-border-opacity:0.2;border-bottom-width:calc(var(--tab-border, 1px) + 1px);border-style:solid}.tabs-lifted>.tab{border:var(--tab-border,1px) solid transparent;border-bottom-color:var(--tab-border-color);border-start-end-radius:var(--tab-radius,.5rem);border-start-start-radius:var(--tab-radius,.5rem);border-width:0 0 var(--tab-border,1px) 0;padding-inline-end:var(--tab-padding,1rem);padding-inline-start:var(--tab-padding,1rem);padding-top:var(--tab-border,1px)}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]),.tabs-lifted>.tab:is(input:checked){background-color:var(--tab-bg);border-inline-end-color:var(--tab-border-color);border-inline-start-color:var(--tab-border-color);border-top-color:var(--tab-border-color);border-width:var(--tab-border,1px) var(--tab-border,1px) 0 var(--tab-border,1px);padding-inline-end:calc(var(--tab-padding, 1rem) - var(--tab-border, 1px));padding-bottom:var(--tab-border,1px);padding-inline-start:calc(var(--tab-padding, 1rem) - var(--tab-border, 1px));padding-top:0}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):before,.tabs-lifted>.tab:is(input:checked):before{background-position:0 0,100% 0;background-repeat:no-repeat;background-size:var(--tab-radius,.5rem);bottom:0;content:"";display:block;height:var(--tab-radius,.5rem);position:absolute;width:calc(100% + var(--tab-radius, .5rem)*2);z-index:1;--tab-grad:calc(69% - var(--tab-border, 1px));--radius-start:radial-gradient(circle at top left,transparent var(--tab-grad),var(--tab-border-color) calc(var(--tab-grad) + 0.25px),var(--tab-border-color) calc(var(--tab-grad) + var(--tab-border, 1px)),var(--tab-bg) calc(var(--tab-grad) + var(--tab-border, 1px) + 0.25px));--radius-end:radial-gradient(circle at top right,transparent var(--tab-grad),var(--tab-border-color) calc(var(--tab-grad) + 0.25px),var(--tab-border-color) calc(var(--tab-grad) + var(--tab-border, 1px)),var(--tab-bg) calc(var(--tab-grad) + var(--tab-border, 1px) + 0.25px));background-image:var(--radius-start),var(--radius-end)}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):first-child:before,.tabs-lifted>.tab:is(input:checked):first-child:before{background-image:var(--radius-end);background-position:100% 0}[dir=rtl] .tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):first-child:before,[dir=rtl] .tabs-lifted>.tab:is(input:checked):first-child:before{background-image:var(--radius-start);background-position:0 0}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):last-child:before,.tabs-lifted>.tab:is(input:checked):last-child:before{background-image:var(--radius-start);background-position:0 0}[dir=rtl] .tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):last-child:before,[dir=rtl] .tabs-lifted>.tab:is(input:checked):last-child:before{background-image:var(--radius-end);background-position:100% 0}.tabs-lifted>.tab-active:not(.tab-disabled):not([disabled])+.tabs-lifted .tab-active:not(.tab-disabled):not([disabled]):before,.tabs-lifted>.tab:is(input:checked)+.tabs-lifted .tab:is(input:checked):before{background-image:var(--radius-end);background-position:100% 0}.tabs-boxed{--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));padding:.25rem}.tabs-boxed,.tabs-boxed .tab{border-radius:var(--rounded-btn,.5rem)}.tabs-boxed .tab-active:not(.tab-disabled):not([disabled]),.tabs-boxed :is(input:checked){--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}:is([dir=rtl] .table){text-align:right}.table :where(th,td){padding:.75rem 1rem;vertical-align:middle}.table tr.active,.table tr.active:nth-child(2n),.table-zebra tbody tr:nth-child(2n){--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)))}.table-zebra tr.active,.table-zebra tr.active:nth-child(2n),.table-zebra-zebra tbody tr:nth-child(2n){--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)))}.table :where(thead,tbody) :where(tr:first-child:last-child),.table :where(thead,tbody) :where(tr:not(:last-child)){border-bottom-width:1px;--tw-border-opacity:1;border-bottom-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)))}.table :where(thead,tfoot){color:var(--fallback-bc,oklch(var(--bc)/.6));font-size:.75rem;font-weight:700;line-height:1rem;white-space:nowrap}.timeline hr{height:.25rem}:where(.timeline hr){--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)))}:where(.timeline:has(.timeline-middle) hr):first-child{border-end-end-radius:var(--rounded-badge,1.9rem);border-end-start-radius:0;border-start-end-radius:var(--rounded-badge,1.9rem);border-start-start-radius:0}:where(.timeline:has(.timeline-middle) hr):last-child{border-end-end-radius:0;border-end-start-radius:var(--rounded-badge,1.9rem);border-start-end-radius:0;border-start-start-radius:var(--rounded-badge,1.9rem)}:where(.timeline:not(:has(.timeline-middle)) :first-child hr:last-child){border-end-end-radius:0;border-end-start-radius:var(--rounded-badge,1.9rem);border-start-end-radius:0;border-start-start-radius:var(--rounded-badge,1.9rem)}:where(.timeline:not(:has(.timeline-middle)) :last-child hr:first-child){border-end-end-radius:var(--rounded-badge,1.9rem);border-end-start-radius:0;border-start-end-radius:var(--rounded-badge,1.9rem);border-start-start-radius:0}.timeline-box{border-radius:var(--rounded-box,1rem);border-width:1px;--tw-border-opacity:1;border-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));padding:.5rem 1rem;--tw-shadow:0 1px 2px 0 rgba(0,0,0,.05);--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.toast>*{animation:toast-pop .25s ease-out}@keyframes toast-pop{0%{opacity:0;transform:scale(.9)}to{opacity:1;transform:scale(1)}}[dir=rtl] .toggle{--handleoffsetcalculator:calc(var(--handleoffset)*1)}.toggle:focus-visible{outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.toggle:hover{background-color:currentColor}.toggle:checked,.toggle[aria-checked=true],.toggle[checked=true]{background-image:none;--handleoffsetcalculator:var(--handleoffset);--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}[dir=rtl] .toggle:checked,[dir=rtl] .toggle[aria-checked=true],[dir=rtl] .toggle[checked=true]{--handleoffsetcalculator:calc(var(--handleoffset)*-1)}.toggle:indeterminate{--tw-text-opacity:1;box-shadow:calc(var(--handleoffset)/2) 0 0 2px var(--tglbg) inset,calc(var(--handleoffset)/-2) 0 0 2px var(--tglbg) inset,0 0 0 2px var(--tglbg) inset;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}[dir=rtl] .toggle:indeterminate{box-shadow:calc(var(--handleoffset)/2) 0 0 2px var(--tglbg) inset,calc(var(--handleoffset)/-2) 0 0 2px var(--tglbg) inset,0 0 0 2px var(--tglbg) inset}.toggle-primary:focus-visible{outline-color:var(--fallback-p,oklch(var(--p)/1))}.toggle-primary:checked,.toggle-primary[aria-checked=true],.toggle-primary[checked=true]{border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));--tw-border-opacity:0.1;--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.toggle:disabled{cursor:not-allowed;--tw-border-opacity:1;background-color:transparent;border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));opacity:.3;--togglehandleborder:0 0 0 3px var(--fallback-bc,oklch(var(--bc)/1)) inset,var(--handleoffsetcalculator) 0 0 3px var(--fallback-bc,oklch(var(--bc)/1)) inset}.glass,.glass.btn-active{-webkit-backdrop-filter:blur(var(--glass-blur,40px));backdrop-filter:blur(var(--glass-blur,40px));background-color:transparent;background-image:linear-gradient(135deg,rgb(255 255 255/var(--glass-opacity,30%)) 0,transparent 100%),linear-gradient(var(--glass-reflex-degree,100deg),rgb(255 255 255/var(--glass-reflex-opacity,10%)) 25%,transparent 25%);border:none;box-shadow:0 0 0 1px rgb(255 255 255/var(--glass-border-opacity,10%)) inset,0 0 0 2px rgb(0 0 0/5%);text-shadow:0 1px rgb(0 0 0/var(--glass-text-shadow-opacity,5%))}@media (hover:hover){.glass.btn-active{-webkit-backdrop-filter:blur(var(--glass-blur,40px));backdrop-filter:blur(var(--glass-blur,40px));background-color:transparent;background-image:linear-gradient(135deg,rgb(255 255 255/var(--glass-opacity,30%)) 0,transparent 100%),linear-gradient(var(--glass-reflex-degree,100deg),rgb(255 255 255/var(--glass-reflex-opacity,10%)) 25%,transparent 25%);border:none;box-shadow:0 0 0 1px rgb(255 255 255/var(--glass-border-opacity,10%)) inset,0 0 0 2px rgb(0 0 0/5%);text-shadow:0 1px rgb(0 0 0/var(--glass-text-shadow-opacity,5%))}}.badge-xs{font-size:.75rem;height:.75rem;line-height:.75rem;padding-left:.313rem;padding-right:.313rem}.badge-sm{font-size:.75rem;height:1rem;line-height:1rem;padding-left:.438rem;padding-right:.438rem}.btm-nav-xs>:where(.active){border-top-width:1px}.btm-nav-sm>:where(.active){border-top-width:2px}.btm-nav-md>:where(.active){border-top-width:2px}.btm-nav-lg>:where(.active){border-top-width:4px}.btn-xs{font-size:.75rem;height:1.5rem;min-height:1.5rem;padding-left:.5rem;padding-right:.5rem}.btn-sm{font-size:.875rem;height:2rem;min-height:2rem;padding-left:.75rem;padding-right:.75rem}.btn-square:where(.btn-xs){height:1.5rem;padding:0;width:1.5rem}.btn-square:where(.btn-sm){height:2rem;padding:0;width:2rem}.btn-circle:where(.btn-xs){border-radius:9999px;height:1.5rem;padding:0;width:1.5rem}.btn-circle:where(.btn-sm){border-radius:9999px;height:2rem;padding:0;width:2rem}.btn-circle:where(.btn-md){border-radius:9999px;height:3rem;padding:0;width:3rem}.btn-circle:where(.btn-lg){border-radius:9999px;height:4rem;padding:0;width:4rem}[type=checkbox].checkbox-sm{height:1.25rem;width:1.25rem}.indicator :where(.indicator-item){bottom:auto;inset-inline-end:0;inset-inline-start:auto;top:0;--tw-translate-y:-50%;--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item)){--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-start){inset-inline-end:auto;inset-inline-start:0;--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item.indicator-start)){--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-center){inset-inline-end:50%;inset-inline-start:50%;--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item.indicator-center)){--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-end){inset-inline-end:0;inset-inline-start:auto;--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item.indicator-end)){--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-bottom){bottom:0;top:auto;--tw-translate-y:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-middle){bottom:50%;top:50%;--tw-translate-y:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-top){bottom:auto;top:0;--tw-translate-y:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.input-xs{font-size:.75rem;height:1.5rem;line-height:1rem;line-height:1.625;padding-left:.5rem;padding-right:.5rem}.input-sm{font-size:.875rem;height:2rem;line-height:2rem;padding-left:.75rem;padding-right:.75rem}.join.join-vertical{flex-direction:column}.join.join-vertical .join-item:first-child:not(:last-child),.join.join-vertical :first-child:not(:last-child) .join-item{border-end-end-radius:0;border-end-start-radius:0;border-start-end-radius:inherit;border-start-start-radius:inherit}.join.join-vertical .join-item:last-child:not(:first-child),.join.join-vertical :last-child:not(:first-child) .join-item{border-end-end-radius:inherit;border-end-start-radius:inherit;border-start-end-radius:0;border-start-start-radius:0}.join.join-horizontal{flex-direction:row}.join.join-horizontal .join-item:first-child:not(:last-child),.join.join-horizontal :first-child:not(:last-child) .join-item{border-end-end-radius:0;border-end-start-radius:inherit;border-start-end-radius:0;border-start-start-radius:inherit}.join.join-horizontal .join-item:last-child:not(:first-child),.join.join-horizontal :last-child:not(:first-child) .join-item{border-end-end-radius:inherit;border-end-start-radius:0;border-start-end-radius:inherit;border-start-start-radius:0}.menu-horizontal{display:inline-flex;flex-direction:row}.menu-horizontal>li:not(.menu-title)>details>ul{position:absolute}.select-sm{font-size:.875rem;height:2rem;line-height:2rem;min-height:2rem;padding-left:.75rem;padding-right:2rem}[dir=rtl] .select-sm{padding-left:2rem;padding-right:.75rem}.stats-vertical{grid-auto-flow:row}.steps-horizontal .step{display:grid;grid-template-columns:repeat(1,minmax(0,1fr));grid-template-rows:repeat(2,minmax(0,1fr));place-items:center;text-align:center}.steps-vertical .step{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));grid-template-rows:repeat(1,minmax(0,1fr))}.tabs-md :where(.tab){font-size:.875rem;height:2rem;line-height:1.25rem;line-height:2;--tab-padding:1rem}.tabs-lg :where(.tab){font-size:1.125rem;height:3rem;line-height:1.75rem;line-height:2;--tab-padding:1.25rem}.tabs-sm :where(.tab){font-size:.875rem;height:1.5rem;line-height:.75rem;--tab-padding:0.75rem}.tabs-xs :where(.tab){font-size:.75rem;height:1.25rem;line-height:.75rem;--tab-padding:0.5rem}.timeline-vertical{flex-direction:column}.timeline-compact .timeline-start,.timeline-horizontal.timeline-compact .timeline-start{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center;margin:.25rem}.timeline-compact li:has(.timeline-start) .timeline-end,.timeline-horizontal.timeline-compact li:has(.timeline-start) .timeline-end{grid-column-start:none;grid-row-start:auto}.timeline-vertical.timeline-compact>li{--timeline-col-start:0}.timeline-vertical.timeline-compact .timeline-start{align-self:center;grid-column-end:4;grid-column-start:3;grid-row-end:4;grid-row-start:1;justify-self:start}.timeline-vertical.timeline-compact li:has(.timeline-start) .timeline-end{grid-column-start:auto;grid-row-start:none}:where(.timeline-vertical>li){--timeline-row-start:minmax(0,1fr);--timeline-row-end:minmax(0,1fr);justify-items:center}.timeline-vertical>li>hr{height:100%}:where(.timeline-vertical>li>hr):first-child{grid-column-start:2;grid-row-start:1}:where(.timeline-vertical>li>hr):last-child{grid-column-end:auto;grid-column-start:2;grid-row-end:none;grid-row-start:3}.timeline-vertical .timeline-start{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:4;grid-row-start:1;justify-self:end}.timeline-vertical .timeline-end{align-self:center;grid-column-end:4;grid-column-start:3;grid-row-end:4;grid-row-start:1;justify-self:start}.timeline-vertical:where(.timeline-snap-icon)>li{--timeline-col-start:minmax(0,1fr);--timeline-row-start:0.5rem}.timeline-horizontal .timeline-start{align-self:flex-end;grid-column-end:4;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:center}.timeline-horizontal .timeline-end{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center}.timeline-horizontal:where(.timeline-snap-icon)>li,:where(.timeline-snap-icon)>li{--timeline-col-start:0.5rem;--timeline-row-start:minmax(0,1fr)}:where(.toast){bottom:0;inset-inline-end:0;inset-inline-start:auto;top:auto;--tw-translate-x:0px;--tw-translate-y:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-start){inset-inline-end:auto;inset-inline-start:0;--tw-translate-x:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-center){inset-inline-end:50%;inset-inline-start:50%;--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .toast:where(.toast-center)){--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-end){inset-inline-end:0;inset-inline-start:auto;--tw-translate-x:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-bottom){bottom:0;top:auto;--tw-translate-y:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-middle){bottom:auto;top:50%;--tw-translate-y:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-top){bottom:auto;top:0;--tw-translate-y:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.tooltip{--tooltip-offset:calc(100% + 1px + var(--tooltip-tail, 0px))}.tooltip:before{content:var(--tw-content);pointer-events:none;position:absolute;z-index:1;--tw-content:attr(data-tip)}.tooltip-top:before,.tooltip:before{bottom:var(--tooltip-offset);left:50%;right:auto;top:auto;transform:translateX(-50%)}.tooltip-bottom:before{bottom:auto;left:50%;right:auto;top:var(--tooltip-offset);transform:translateX(-50%)}.card-compact .card-body{font-size:.875rem;line-height:1.25rem;padding:1rem}.card-compact .card-title{margin-bottom:.25rem}.card-normal .card-body{font-size:1rem;line-height:1.5rem;padding:var(--padding-card,2rem)}.card-normal .card-title{margin-bottom:.75rem}.join.join-vertical>:where(:not(:first-child)){margin-left:0;margin-right:0;margin-top:-1px}.join.join-horizontal>:where(:not(:first-child)){margin-bottom:0;margin-top:0;margin-inline-start:-1px}.menu-horizontal>li:not(.menu-title)>details>ul{margin-inline-start:0;margin-top:1rem;padding-bottom:.5rem;padding-inline-end:.5rem;padding-top:.5rem}.menu-horizontal>li>details>ul:before{content:none}:where(.menu-horizontal>li:not(.menu-title)>details>ul){border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));--tw-shadow:0 20px 25px -5px rgba(0,0,0,.1),0 8px 10px -6px rgba(0,0,0,.1);--tw-shadow-colored:0 20px 25px -5px var(--tw-shadow-color),0 8px 10px -6px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.menu-sm :where(li:not(.menu-title)>:not(ul,details,.menu-title)),.menu-sm :where(li:not(.menu-title)>details>summary:not(.menu-title)){border-radius:var(--rounded-btn,.5rem);font-size:.875rem;line-height:1.25rem;padding:.25rem .75rem}.menu-sm .menu-title{padding:.5rem .75rem}.modal-top :where(.modal-box){max-width:none;width:100%;--tw-translate-y:-2.5rem;--tw-scale-x:1;--tw-scale-y:1;border-bottom-left-radius:var(--rounded-box,1rem);border-bottom-right-radius:var(--rounded-box,1rem);border-top-left-radius:0;border-top-right-radius:0;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.modal-middle :where(.modal-box){max-width:32rem;width:91.666667%;--tw-translate-y:0px;--tw-scale-x:.9;--tw-scale-y:.9;border-bottom-left-radius:var(--rounded-box,1rem);border-bottom-right-radius:var(--rounded-box,1rem);border-top-left-radius:var(--rounded-box,1rem);border-top-right-radius:var(--rounded-box,1rem);transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.modal-bottom :where(.modal-box){max-width:none;width:100%;--tw-translate-y:2.5rem;--tw-scale-x:1;--tw-scale-y:1;border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:var(--rounded-box,1rem);border-top-right-radius:var(--rounded-box,1rem);transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.stats-vertical>:not([hidden])~:not([hidden]){--tw-divide-x-reverse:0;--tw-divide-y-reverse:0;border-width:calc(1px*(1 - var(--tw-divide-y-reverse))) calc(0px*var(--tw-divide-x-reverse)) calc(1px*var(--tw-divide-y-reverse)) calc(0px*(1 - var(--tw-divide-x-reverse)))}.stats-vertical{overflow-y:auto}.steps-horizontal .step{grid-template-columns:auto;grid-template-rows:40px 1fr;min-width:4rem}.steps-horizontal .step:before{height:.5rem;width:100%;--tw-translate-x:0px;--tw-translate-y:0px;content:"";margin-inline-start:-100%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .steps-horizontal .step):before{--tw-translate-x:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.steps-vertical .step{gap:.5rem;grid-template-columns:40px 1fr;grid-template-rows:auto;justify-items:start;min-height:4rem}.steps-vertical .step:before{height:100%;width:.5rem;--tw-translate-x:-50%;--tw-translate-y:-50%;margin-inline-start:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .steps-vertical .step):before{--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.timeline-vertical>li>hr{width:.25rem}:where(.timeline-vertical:has(.timeline-middle)>li>hr):first-child{border-bottom-left-radius:var(--rounded-badge,1.9rem);border-bottom-right-radius:var(--rounded-badge,1.9rem);border-top-left-radius:0;border-top-right-radius:0}:where(.timeline-vertical:has(.timeline-middle)>li>hr):last-child{border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:var(--rounded-badge,1.9rem);border-top-right-radius:var(--rounded-badge,1.9rem)}:where(.timeline-vertical:not(:has(.timeline-middle)) :first-child>hr:last-child){border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:var(--rounded-badge,1.9rem);border-top-right-radius:var(--rounded-badge,1.9rem)}:where(.timeline-vertical:not(:has(.timeline-middle)) :last-child>hr:first-child){border-bottom-left-radius:var(--rounded-badge,1.9rem);border-bottom-right-radius:var(--rounded-badge,1.9rem);border-top-left-radius:0;border-top-right-radius:0}:where(.timeline-horizontal:has(.timeline-middle)>li>hr):first-child{border-end-end-radius:var(--rounded-badge,1.9rem);border-end-start-radius:0;border-start-end-radius:var(--rounded-badge,1.9rem);border-start-start-radius:0}:where(.timeline-horizontal:has(.timeline-middle)>li>hr):last-child{border-end-end-radius:0;border-end-start-radius:var(--rounded-badge,1.9rem);border-start-end-radius:0;border-start-start-radius:var(--rounded-badge,1.9rem)}.tooltip{display:inline-block;position:relative;text-align:center;--tooltip-tail:0.1875rem;--tooltip-color:var(--fallback-n,oklch(var(--n)/1));--tooltip-text-color:var(--fallback-nc,oklch(var(--nc)/1));--tooltip-tail-offset:calc(100% + 0.0625rem - var(--tooltip-tail))}.tooltip:after,.tooltip:before{opacity:0;transition-delay:.1s;transition-duration:.2s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.tooltip:after{border-style:solid;border-width:var(--tooltip-tail,0);content:"";display:block;height:0;position:absolute;width:0}.tooltip:before{background-color:var(--tooltip-color);border-radius:.25rem;color:var(--tooltip-text-color);font-size:.875rem;line-height:1.25rem;max-width:20rem;padding:.25rem .5rem;width:-moz-max-content;width:max-content}.tooltip.tooltip-open:after,.tooltip.tooltip-open:before,.tooltip:hover:after,.tooltip:hover:before{opacity:1;transition-delay:75ms}.tooltip:has(:focus-visible):after,.tooltip:has(:focus-visible):before{opacity:1;transition-delay:75ms}.tooltip:not([data-tip]):hover:after,.tooltip:not([data-tip]):hover:before{opacity:0;visibility:hidden}.tooltip-top:after,.tooltip:after{border-color:var(--tooltip-color) transparent transparent transparent;bottom:var(--tooltip-tail-offset);left:50%;right:auto;top:auto;transform:translateX(-50%)}.tooltip-bottom:after{border-color:transparent transparent var(--tooltip-color) transparent;bottom:auto;left:50%;right:auto;top:var(--tooltip-tail-offset);transform:translateX(-50%)}.fade-out{opacity:0;transition:opacity .15s ease-in-out}.visible{visibility:visible}.invisible{visibility:hidden}.static{position:static}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.inset-0{inset:0}.left-2{left:.5rem}.right-0{right:0}.right-2{right:.5rem}.right-5{right:1.25rem}.top-0{top:0}.top-2{top:.5rem}.top-5{top:1.25rem}.z-0{z-index:0}.z-10{z-index:10}.z-50{z-index:50}.z-\[1\]{z-index:1}.z-\[5000\]{z-index:5000}.z-\[6000\]{z-index:6000}.m-0{margin:0}.m-2{margin:.5rem}.m-5{margin:1.25rem}.m-auto{margin:auto}.mx-1{margin-left:.25rem;margin-right:.25rem}.mx-4{margin-left:1rem;margin-right:1rem}.mx-5{margin-left:1.25rem;margin-right:1.25rem}.mx-auto{margin-left:auto;margin-right:auto}.my-10{margin-bottom:2.5rem;margin-top:2.5rem}.my-2{margin-bottom:.5rem;margin-top:.5rem}.my-3{margin-bottom:.75rem;margin-top:.75rem}.my-4{margin-bottom:1rem;margin-top:1rem}.my-5{margin-bottom:1.25rem;margin-top:1.25rem}.mb-2{margin-bottom:.5rem}.mb-3{margin-bottom:.75rem}.mb-4{margin-bottom:1rem}.mb-5{margin-bottom:1.25rem}.mb-6{margin-bottom:1.5rem}.mb-8{margin-bottom:2rem}.ml-1{margin-left:.25rem}.ml-2{margin-left:.5rem}.ml-4{margin-left:1rem}.ml-auto{margin-left:auto}.mr-1{margin-right:.25rem}.mr-2{margin-right:.5rem}.mr-4{margin-right:1rem}.mt-1{margin-top:.25rem}.mt-10{margin-top:2.5rem}.mt-2{margin-top:.5rem}.mt-3{margin-top:.75rem}.mt-4{margin-top:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mt-8{margin-top:2rem}.block{display:block}.inline-block{display:inline-block}.inline{display:inline}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.contents{display:contents}.hidden{display:none}.h-4{height:1rem}.h-48{height:12rem}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-8{height:2rem}.h-96{height:24rem}.h-\[250px\]{height:250px}.h-\[25rem\]{height:25rem}.h-fit{height:-moz-fit-content;height:fit-content}.h-full{height:100%}.max-h-48{max-height:12rem}.max-h-96{max-height:24rem}.min-h-80{min-height:20rem}.min-h-screen{min-height:100vh}.w-1\/2{width:50%}.w-10\/12{width:83.333333%}.w-4{width:1rem}.w-4\/12{width:33.333333%}.w-5{width:1.25rem}.w-52{width:13rem}.w-6{width:1.5rem}.w-64{width:16rem}.w-8{width:2rem}.w-80{width:20rem}.w-96{width:24rem}.w-auto{width:auto}.w-full{width:100%}.min-w-52{min-width:13rem}.min-w-full{min-width:100%}.max-w-2xl{max-width:42rem}.max-w-3xl{max-width:48rem}.max-w-5xl{max-width:64rem}.max-w-lg{max-width:32rem}.max-w-md{max-width:28rem}.max-w-sm{max-width:24rem}.max-w-xs{max-width:20rem}.flex-1{flex:1 1 0%}.flex-shrink-0,.shrink-0{flex-shrink:0}.translate-x-full{--tw-translate-x:100%}.transform,.translate-x-full{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}@keyframes bounce{0%,to{animation-timing-function:cubic-bezier(.8,0,1,1);transform:translateY(-25%)}50%{animation-timing-function:cubic-bezier(0,0,.2,1);transform:none}}.animate-bounce{animation:bounce 1s infinite}@keyframes spin{to{transform:rotate(1turn)}}.animate-spin{animation:spin 1s linear infinite}.cursor-not-allowed{cursor:not-allowed}.cursor-pointer{cursor:pointer}.resize{resize:both}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.flex-col-reverse{flex-direction:column-reverse}.flex-wrap{flex-wrap:wrap}.place-items-center{place-items:center}.items-start{align-items:flex-start}.items-center{align-items:center}.justify-start{justify-content:flex-start}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.gap-1{gap:.25rem}.gap-2{gap:.5rem}.gap-3{gap:.75rem}.gap-4{gap:1rem}.gap-5{gap:1.25rem}.gap-6{gap:1.5rem}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.space-y-1>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.25rem*var(--tw-space-y-reverse));margin-top:calc(.25rem*(1 - var(--tw-space-y-reverse)))}.space-y-2>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.5rem*var(--tw-space-y-reverse));margin-top:calc(.5rem*(1 - var(--tw-space-y-reverse)))}.space-y-3>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.75rem*var(--tw-space-y-reverse));margin-top:calc(.75rem*(1 - var(--tw-space-y-reverse)))}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1rem*var(--tw-space-y-reverse));margin-top:calc(1rem*(1 - var(--tw-space-y-reverse)))}.space-y-8>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(2rem*var(--tw-space-y-reverse));margin-top:calc(2rem*(1 - var(--tw-space-y-reverse)))}.divide-y>:not([hidden])~:not([hidden]){--tw-divide-y-reverse:0;border-bottom-width:calc(1px*var(--tw-divide-y-reverse));border-top-width:calc(1px*(1 - var(--tw-divide-y-reverse)))}.divide-base-300>:not([hidden])~:not([hidden]){--tw-divide-opacity:1;border-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-divide-opacity,1)))}.justify-self-end{justify-self:end}.justify-self-center{justify-self:center}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.truncate{overflow:hidden;white-space:nowrap}.text-ellipsis,.truncate{text-overflow:ellipsis}.whitespace-nowrap{white-space:nowrap}.rounded{border-radius:.25rem}.rounded-box{border-radius:var(--rounded-box,1rem)}.rounded-full{border-radius:9999px}.rounded-lg{border-radius:.5rem}.rounded-md{border-radius:.375rem}.rounded-xl{border-radius:.75rem}.rounded-b{border-bottom-left-radius:.25rem;border-bottom-right-radius:.25rem}.rounded-t-none{border-top-left-radius:0;border-top-right-radius:0}.border{border-width:1px}.border-2{border-width:2px}.border-b{border-bottom-width:1px}.border-b-2{border-bottom-width:2px}.border-t{border-top-width:1px}.border-dashed{border-style:dashed}.border-base-300{--tw-border-opacity:1;border-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-border-opacity,1)))}.border-blue-300{--tw-border-opacity:1;border-color:rgb(147 197 253/var(--tw-border-opacity,1))}.border-blue-500{--tw-border-opacity:1;border-color:rgb(59 130 246/var(--tw-border-opacity,1))}.border-error{--tw-border-opacity:1;border-color:var(--fallback-er,oklch(var(--er)/var(--tw-border-opacity,1)))}.border-gray-100{--tw-border-opacity:1;border-color:rgb(243 244 246/var(--tw-border-opacity,1))}.border-gray-200{--tw-border-opacity:1;border-color:rgb(229 231 235/var(--tw-border-opacity,1))}.border-gray-300{--tw-border-opacity:1;border-color:rgb(209 213 219/var(--tw-border-opacity,1))}.border-neutral{--tw-border-opacity:1;border-color:var(--fallback-n,oklch(var(--n)/var(--tw-border-opacity,1)))}.border-red-300{--tw-border-opacity:1;border-color:rgb(252 165 165/var(--tw-border-opacity,1))}.border-sky-500{--tw-border-opacity:1;border-color:rgb(14 165 233/var(--tw-border-opacity,1))}.border-white{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity,1))}.border-opacity-20{--tw-border-opacity:0.2}.bg-base-100{--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity,1)))}.bg-base-200{--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity,1)))}.bg-base-300{--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity,1)))}.bg-blue-100{--tw-bg-opacity:1;background-color:rgb(219 234 254/var(--tw-bg-opacity,1))}.bg-blue-50{--tw-bg-opacity:1;background-color:rgb(239 246 255/var(--tw-bg-opacity,1))}.bg-blue-500{--tw-bg-opacity:1;background-color:rgb(59 130 246/var(--tw-bg-opacity,1))}.bg-blue-600{--tw-bg-opacity:1;background-color:rgb(37 99 235/var(--tw-bg-opacity,1))}.bg-blue-900{--tw-bg-opacity:1;background-color:rgb(30 58 138/var(--tw-bg-opacity,1))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity,1))}.bg-gray-50{--tw-bg-opacity:1;background-color:rgb(249 250 251/var(--tw-bg-opacity,1))}.bg-green-50{--tw-bg-opacity:1;background-color:rgb(240 253 244/var(--tw-bg-opacity,1))}.bg-neutral{--tw-bg-opacity:1;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity,1)))}.bg-red-100{--tw-bg-opacity:1;background-color:rgb(254 226 226/var(--tw-bg-opacity,1))}.bg-red-50{--tw-bg-opacity:1;background-color:rgb(254 242 242/var(--tw-bg-opacity,1))}.bg-red-500{--tw-bg-opacity:1;background-color:rgb(239 68 68/var(--tw-bg-opacity,1))}.bg-secondary-content{--tw-bg-opacity:1;background-color:var(--fallback-sc,oklch(var(--sc)/var(--tw-bg-opacity,1)))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.bg-opacity-10{--tw-bg-opacity:0.1}.bg-opacity-60{--tw-bg-opacity:0.6}.bg-opacity-80{--tw-bg-opacity:0.8}.bg-gradient-to-bl{background-image:linear-gradient(to bottom left,var(--tw-gradient-stops))}.bg-gradient-to-br{background-image:linear-gradient(to bottom right,var(--tw-gradient-stops))}.bg-gradient-to-tl{background-image:linear-gradient(to top left,var(--tw-gradient-stops))}.bg-gradient-to-tr{background-image:linear-gradient(to top right,var(--tw-gradient-stops))}.from-blue-500{--tw-gradient-from:#3b82f6 var(--tw-gradient-from-position);--tw-gradient-to:rgba(59,130,246,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-blue-600{--tw-gradient-from:#2563eb var(--tw-gradient-from-position);--tw-gradient-to:rgba(37,99,235,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-green-400{--tw-gradient-from:#4ade80 var(--tw-gradient-from-position);--tw-gradient-to:rgba(74,222,128,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-green-500{--tw-gradient-from:#22c55e var(--tw-gradient-from-position);--tw-gradient-to:rgba(34,197,94,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-orange-400{--tw-gradient-from:#fb923c var(--tw-gradient-from-position);--tw-gradient-to:rgba(251,146,60,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-orange-600{--tw-gradient-from:#ea580c var(--tw-gradient-from-position);--tw-gradient-to:rgba(234,88,12,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-primary{--tw-gradient-from:var(--fallback-p,oklch(var(--p)/1)) var(--tw-gradient-from-position);--tw-gradient-to:var(--fallback-p,oklch(var(--p)/0)) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-red-400{--tw-gradient-from:#f87171 var(--tw-gradient-from-position);--tw-gradient-to:hsla(0,91%,71%,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-red-800{--tw-gradient-from:#991b1b var(--tw-gradient-from-position);--tw-gradient-to:rgba(153,27,27,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-yellow-400{--tw-gradient-from:#facc15 var(--tw-gradient-from-position);--tw-gradient-to:rgba(250,204,21,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-yellow-700{--tw-gradient-from:#a16207 var(--tw-gradient-from-position);--tw-gradient-to:rgba(161,98,7,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.to-blue-700{--tw-gradient-to:#1d4ed8 var(--tw-gradient-to-position)}.to-blue-800{--tw-gradient-to:#1e40af var(--tw-gradient-to-position)}.to-green-700{--tw-gradient-to:#15803d var(--tw-gradient-to-position)}.to-orange-600{--tw-gradient-to:#ea580c var(--tw-gradient-to-position)}.to-orange-700{--tw-gradient-to:#c2410c var(--tw-gradient-to-position)}.to-purple-600{--tw-gradient-to:#9333ea var(--tw-gradient-to-position)}.to-red-400{--tw-gradient-to:#f87171 var(--tw-gradient-to-position)}.to-red-600{--tw-gradient-to:#dc2626 var(--tw-gradient-to-position)}.to-red-900{--tw-gradient-to:#7f1d1d var(--tw-gradient-to-position)}.to-secondary{--tw-gradient-to:var(--fallback-s,oklch(var(--s)/1)) var(--tw-gradient-to-position)}.to-yellow-400{--tw-gradient-to:#facc15 var(--tw-gradient-to-position)}.to-yellow-600{--tw-gradient-to:#ca8a04 var(--tw-gradient-to-position)}.stroke-current{stroke:currentColor}.stroke-info{stroke:var(--fallback-in,oklch(var(--in)/1))}.object-cover{-o-object-fit:cover;object-fit:cover}.p-0{padding:0}.p-2{padding:.5rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-5{padding:1.25rem}.p-6{padding:1.5rem}.p-8{padding:2rem}.px-1{padding-left:.25rem;padding-right:.25rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-5{padding-left:1.25rem;padding-right:1.25rem}.py-1{padding-bottom:.25rem;padding-top:.25rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.py-20{padding-bottom:5rem;padding-top:5rem}.py-3{padding-bottom:.75rem;padding-top:.75rem}.py-4{padding-bottom:1rem;padding-top:1rem}.py-5{padding-bottom:1.25rem;padding-top:1.25rem}.py-6{padding-bottom:1.5rem;padding-top:1.5rem}.py-8{padding-bottom:2rem;padding-top:2rem}.pb-2{padding-bottom:.5rem}.pl-4{padding-left:1rem}.pl-6{padding-left:1.5rem}.pr-10{padding-right:2.5rem}.pt-2{padding-top:.5rem}.pt-6{padding-top:1.5rem}.text-center{text-align:center}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-4xl{font-size:2.25rem;line-height:2.5rem}.text-5xl{font-size:3rem;line-height:1}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-black{font-weight:900}.font-bold{font-weight:700}.font-medium{font-weight:500}.font-normal{font-weight:400}.font-semibold{font-weight:600}.normal-case{text-transform:none}.italic{font-style:italic}.text-accent{--tw-text-opacity:1;color:var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity,1)))}.text-accent-content{--tw-text-opacity:1;color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity,1)))}.text-base-content{--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity,1)))}.text-base-content\/50{color:var(--fallback-bc,oklch(var(--bc)/.5))}.text-base-content\/60{color:var(--fallback-bc,oklch(var(--bc)/.6))}.text-base-content\/70{color:var(--fallback-bc,oklch(var(--bc)/.7))}.text-base-content\/80{color:var(--fallback-bc,oklch(var(--bc)/.8))}.text-blue-600{--tw-text-opacity:1;color:rgb(37 99 235/var(--tw-text-opacity,1))}.text-blue-700{--tw-text-opacity:1;color:rgb(29 78 216/var(--tw-text-opacity,1))}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity,1))}.text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity,1))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81/var(--tw-text-opacity,1))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity,1))}.text-green-500{--tw-text-opacity:1;color:rgb(34 197 94/var(--tw-text-opacity,1))}.text-green-600{--tw-text-opacity:1;color:rgb(22 163 74/var(--tw-text-opacity,1))}.text-neutral{--tw-text-opacity:1;color:var(--fallback-n,oklch(var(--n)/var(--tw-text-opacity,1)))}.text-neutral-content{--tw-text-opacity:1;color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity,1)))}.text-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.text-primary-content{--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity,1)))}.text-red-500{--tw-text-opacity:1;color:rgb(239 68 68/var(--tw-text-opacity,1))}.text-red-600{--tw-text-opacity:1;color:rgb(220 38 38/var(--tw-text-opacity,1))}.text-red-700{--tw-text-opacity:1;color:rgb(185 28 28/var(--tw-text-opacity,1))}.text-secondary{--tw-text-opacity:1;color:var(--fallback-s,oklch(var(--s)/var(--tw-text-opacity,1)))}.text-success{--tw-text-opacity:1;color:var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity,1)))}.text-warning{--tw-text-opacity:1;color:var(--fallback-wa,oklch(var(--wa)/var(--tw-text-opacity,1)))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.underline{text-decoration-line:underline}.decoration-dotted{text-decoration-style:dotted}.placeholder-base-content\/70::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/.7))}.placeholder-base-content\/70::placeholder{color:var(--fallback-bc,oklch(var(--bc)/.7))}.opacity-0{opacity:0}.opacity-50{opacity:.5}.opacity-70{opacity:.7}.shadow{--tw-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px -1px rgba(0,0,0,.1);--tw-shadow-colored:0 1px 3px 0 var(--tw-shadow-color),0 1px 2px -1px var(--tw-shadow-color)}.shadow,.shadow-2xl{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-2xl{--tw-shadow:0 25px 50px -12px rgba(0,0,0,.25);--tw-shadow-colored:0 25px 50px -12px var(--tw-shadow-color)}.shadow-lg{--tw-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);--tw-shadow-colored:0 10px 15px -3px var(--tw-shadow-color),0 4px 6px -4px var(--tw-shadow-color)}.shadow-lg,.shadow-md{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-md{--tw-shadow:0 4px 6px -1px rgba(0,0,0,.1),0 2px 4px -2px rgba(0,0,0,.1);--tw-shadow-colored:0 4px 6px -1px var(--tw-shadow-color),0 2px 4px -2px var(--tw-shadow-color)}.shadow-sm{--tw-shadow:0 1px 2px 0 rgba(0,0,0,.05);--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color)}.shadow-sm,.shadow-xl{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-xl{--tw-shadow:0 20px 25px -5px rgba(0,0,0,.1),0 8px 10px -6px rgba(0,0,0,.1);--tw-shadow-colored:0 20px 25px -5px var(--tw-shadow-color),0 8px 10px -6px var(--tw-shadow-color)}.blur{--tw-blur:blur(8px)}.blur,.grayscale{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.grayscale{--tw-grayscale:grayscale(100%)}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.transition{transition-duration:.15s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-all{transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-colors{transition-duration:.15s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-opacity{transition-duration:.15s;transition-property:opacity;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-shadow{transition-duration:.15s;transition-property:box-shadow;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-transform{transition-duration:.15s;transition-property:transform;transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-200{transition-duration:.2s}.duration-300{transition-duration:.3s}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}@tailwind daisyui;.leaflet-right-panel{background:#fff;border-radius:4px;box-shadow:0 1px 4px rgba(0,0,0,.3);margin-right:10px;margin-top:80px;transform:none;transition:right .3s ease-in-out;z-index:400}.add-visit-marker{align-items:center;animation:pulse-visit 2s infinite;background:#fff;border:2px solid #007bff;border-radius:50%;box-shadow:0 2px 8px rgba(0,123,255,.3);display:flex!important;font-size:20px;justify-content:center}@keyframes pulse-visit{0%{box-shadow:0 2px 8px rgba(0,123,255,.3);transform:scale(1)}50%{box-shadow:0 4px 12px rgba(0,123,255,.5);transform:scale(1.1)}to{box-shadow:0 2px 8px rgba(0,123,255,.3);transform:scale(1)}}.visit-form-popup .leaflet-popup-content-wrapper{border-radius:8px;box-shadow:0 4px 20px rgba(0,0,0,.15)}.leaflet-right-panel.controls-shifted{right:310px}.leaflet-control-button{background-color:#fff!important;color:#374151!important}.leaflet-control-button:hover{background-color:#f3f4f6!important}.leaflet-drawer{background:hsla(0,0%,100%,.5);box-shadow:-2px 0 5px rgba(0,0,0,.1);height:100%;position:absolute;right:0;top:0;transform:translateX(100%);transition:transform .3s ease-in-out;width:338px;z-index:450}.leaflet-drawer.open{transform:translateX(0)}.leaflet-control-button,.leaflet-control-layers,.toggle-panel-button{transition:right .3s ease-in-out;z-index:500}.controls-shifted{right:338px!important}.leaflet-control-custom{align-items:center;background-color:#fff;border-radius:4px;box-shadow:0 1px 4px rgba(0,0,0,.3);cursor:pointer;display:flex;height:30px;justify-content:center;width:30px}.leaflet-control-custom:hover{background-color:#f3f4f6}#selection-tool-button.active{background-color:#60a5fa;color:#fff}#cancel-selection-button{margin-bottom:1rem;width:100%}@media (hover:hover){.hover\:btn-ghost:hover:hover{border-color:transparent}@supports (color:oklch(0 0 0)){.hover\:btn-ghost:hover:hover{background-color:var(--fallback-bc,oklch(var(--bc)/.2))}}.hover\:btn-info:hover.btn-outline:hover{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)))}@supports (color:color-mix(in oklab,black,black)){.hover\:btn-info:hover.btn-outline:hover{background-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000)}}}@supports not (color:oklch(0 0 0)){.hover\:btn-info:hover{--btn-color:var(--fallback-in)}}@supports (color:color-mix(in oklab,black,black)){.hover\:btn-info:hover.btn-outline.btn-active{background-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000)}}@supports (color:oklch(0 0 0)){.hover\:btn-info:hover{--btn-color:var(--in)}}.hover\:btn-info:hover{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));outline-color:var(--fallback-in,oklch(var(--in)/1))}.hover\:btn-ghost:hover{background-color:transparent;border-color:transparent;border-width:1px;color:currentColor;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow);outline-color:currentColor}.hover\:btn-ghost:hover.btn-active{background-color:var(--fallback-bc,oklch(var(--bc)/.2));border-color:transparent}.hover\:btn-info:hover.btn-outline{--tw-text-opacity:1;color:var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity)))}.hover\:btn-info:hover.btn-outline.btn-active{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)))}.hover\:input-primary:hover{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)))}.hover\:input-primary:hover:focus,.hover\:input-primary:hover:focus-within{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));outline-color:var(--fallback-p,oklch(var(--p)/1))}.focus\:input-ghost:focus{--tw-bg-opacity:0.05}.focus\:input-ghost:focus:focus,.focus\:input-ghost:focus:focus-within{--tw-bg-opacity:1;--tw-text-opacity:1;box-shadow:none;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}@media not all and (min-width:768px){.max-md\:timeline-compact,.max-md\:timeline-compact -.timeline-horizontal{--timeline-row-start:0}.max-md\:timeline-compact .timeline-horizontal .timeline-start,.max-md\:timeline-compact .timeline-start{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center;margin:.25rem}.max-md\:timeline-compact .timeline-horizontal li:has(.timeline-start) .timeline-end,.max-md\:timeline-compact li:has(.timeline-start) .timeline-end{grid-column-start:none;grid-row-start:auto}.max-md\:timeline-compact.timeline-vertical>li{--timeline-col-start:0}.max-md\:timeline-compact.timeline-vertical .timeline-start{align-self:center;grid-column-end:4;grid-column-start:3;grid-row-end:4;grid-row-start:1;justify-self:start}.max-md\:timeline-compact.timeline-vertical li:has(.timeline-start) .timeline-end{grid-column-start:auto;grid-row-start:none}}@media (min-width:1024px){.lg\:stats-horizontal{grid-auto-flow:column}.lg\:stats-horizontal>:not([hidden])~:not([hidden]){--tw-divide-x-reverse:0;--tw-divide-y-reverse:0;border-width:calc(0px*(1 - var(--tw-divide-y-reverse))) calc(1px*var(--tw-divide-x-reverse)) calc(0px*var(--tw-divide-y-reverse)) calc(1px*(1 - var(--tw-divide-x-reverse)))}.lg\:stats-horizontal{overflow-x:auto}:is([dir=rtl] .lg\:stats-horizontal){--tw-divide-x-reverse:1}}.placeholder\:text-base-content\/50::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/.5))}.placeholder\:text-base-content\/50::placeholder{color:var(--fallback-bc,oklch(var(--bc)/.5))}.last\:border-0:last-child{border-width:0}.hover\:scale-105:hover{--tw-scale-x:1.05;--tw-scale-y:1.05}.hover\:scale-105:hover,.hover\:scale-\[1\.02\]:hover{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.hover\:scale-\[1\.02\]:hover{--tw-scale-x:1.02;--tw-scale-y:1.02}.hover\:cursor-pointer:hover{cursor:pointer}.hover\:border-primary\/40:hover{border-color:var(--fallback-p,oklch(var(--p)/.4))}.hover\:bg-accent:hover{--tw-bg-opacity:1;background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity,1)))}.hover\:bg-base-200:hover{--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity,1)))}.hover\:bg-base-200\/50:hover{background-color:var(--fallback-b2,oklch(var(--b2)/.5))}.hover\:bg-base-300:hover{--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity,1)))}.hover\:bg-blue-50:hover{--tw-bg-opacity:1;background-color:rgb(239 246 255/var(--tw-bg-opacity,1))}.hover\:bg-blue-700:hover{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity,1))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.hover\:bg-white:hover{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.hover\:text-accent-content:hover{--tw-text-opacity:1;color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity,1)))}.hover\:text-blue-800:hover{--tw-text-opacity:1;color:rgb(30 64 175/var(--tw-text-opacity,1))}.hover\:text-gray-600:hover{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.hover\:text-primary:hover{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.hover\:underline:hover{text-decoration-line:underline}.hover\:no-underline:hover{text-decoration-line:none}.hover\:shadow-2xl:hover{--tw-shadow:0 25px 50px -12px rgba(0,0,0,.25);--tw-shadow-colored:0 25px 50px -12px var(--tw-shadow-color)}.hover\:shadow-2xl:hover,.hover\:shadow-lg:hover{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.hover\:shadow-lg:hover{--tw-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);--tw-shadow-colored:0 10px 15px -3px var(--tw-shadow-color),0 4px 6px -4px var(--tw-shadow-color)}.focus\:border-primary:focus{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity,1)))}.focus\:border-transparent:focus{border-color:transparent}.focus\:bg-base-100:focus{--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity,1)))}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.focus\:ring-2:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.focus\:ring-blue-500:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(59 130 246/var(--tw-ring-opacity,1))}.group:hover .group-hover\:text-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.group:hover .group-hover\:opacity-100{opacity:1}@media (min-width:640px){.sm\:inline{display:inline}.sm\:w-1\/12{width:8.333333%}.sm\:w-2\/12{width:16.666667%}.sm\:w-6\/12{width:50%}.sm\:grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.sm\:flex-row{flex-direction:row}.sm\:items-end{align-items:flex-end}.sm\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.sm\:space-y-0>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(0px*var(--tw-space-y-reverse));margin-top:calc(0px*(1 - var(--tw-space-y-reverse)))}}@media (min-width:768px){.md\:h-64{height:16rem}.md\:min-h-64{min-height:16rem}.md\:w-1\/12{width:8.333333%}.md\:w-2\/12{width:16.666667%}.md\:w-2\/3{width:66.666667%}.md\:w-3\/12{width:25%}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.md\:flex-row{flex-direction:row}.md\:items-end{align-items:flex-end}.md\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.md\:text-end{text-align:end}}@media (min-width:1024px){.lg\:flex{display:flex}.lg\:hidden{display:none}.lg\:w-1\/12{width:8.333333%}.lg\:w-1\/2{width:50%}.lg\:w-2\/12{width:16.666667%}.lg\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:flex-row{flex-direction:row}.lg\:flex-row-reverse{flex-direction:row-reverse}.lg\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.lg\:text-left{text-align:left}} \ No newline at end of file + );position:relative}.timeline>li>hr{border-width:0;width:100%}:where(.timeline>li>hr):first-child{grid-column-start:1;grid-row-start:2}:where(.timeline>li>hr):last-child{grid-column-end:none;grid-column-start:3;grid-row-end:auto;grid-row-start:2}.timeline-start{align-self:flex-end;grid-column-end:4;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:center;margin:.25rem}.timeline-middle{grid-column-start:2;grid-row-start:2}.timeline-end{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center;margin:.25rem}.toast{display:flex;flex-direction:column;gap:.5rem;min-width:-moz-fit-content;min-width:fit-content;padding:1rem;position:fixed;white-space:nowrap}.toggle{flex-shrink:0;--tglbg:var(--fallback-b1,oklch(var(--b1)/1));--handleoffset:1.5rem;--handleoffsetcalculator:calc(var(--handleoffset)*-1);--togglehandleborder:0 0;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:currentColor;border-color:currentColor;border-radius:var(--rounded-badge,1.9rem);border-width:1px;box-shadow:var(--handleoffsetcalculator) 0 0 2px var(--tglbg) inset,0 0 0 2px var(--tglbg) inset,var(--togglehandleborder);color:var(--fallback-bc,oklch(var(--bc)/.5));cursor:pointer;height:1.5rem;transition:background,box-shadow var(--animation-input,.2s) ease-out;width:3rem}.alert-info{border-color:var(--fallback-in,oklch(var(--in)/.2));--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));--alert-bg:var(--fallback-in,oklch(var(--in)/1));--alert-bg-mix:var(--fallback-b1,oklch(var(--b1)/1))}.alert-error{border-color:var(--fallback-er,oklch(var(--er)/.2));--tw-text-opacity:1;color:var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));--alert-bg:var(--fallback-er,oklch(var(--er)/1));--alert-bg-mix:var(--fallback-b1,oklch(var(--b1)/1))}.badge-neutral{background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));border-color:var(--fallback-n,oklch(var(--n)/var(--tw-border-opacity)));color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity)))}.badge-neutral,.badge-primary{--tw-border-opacity:1;--tw-bg-opacity:1;--tw-text-opacity:1}.badge-primary{background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.badge-secondary{background-color:var(--fallback-s,oklch(var(--s)/var(--tw-bg-opacity)));border-color:var(--fallback-s,oklch(var(--s)/var(--tw-border-opacity)));color:var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)))}.badge-accent,.badge-secondary{--tw-border-opacity:1;--tw-bg-opacity:1;--tw-text-opacity:1}.badge-accent{background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity)));border-color:var(--fallback-a,oklch(var(--a)/var(--tw-border-opacity)));color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)))}.badge-success{background-color:var(--fallback-su,oklch(var(--su)/var(--tw-bg-opacity)));color:var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)))}.badge-success,.badge-warning{border-color:transparent;--tw-bg-opacity:1;--tw-text-opacity:1}.badge-warning{background-color:var(--fallback-wa,oklch(var(--wa)/var(--tw-bg-opacity)));color:var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)))}.badge-ghost{--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}.badge-outline{border-color:currentColor;--tw-border-opacity:0.5;background-color:transparent;color:currentColor}.badge-outline.badge-neutral{--tw-text-opacity:1;color:var(--fallback-n,oklch(var(--n)/var(--tw-text-opacity)))}.badge-outline.badge-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity)))}.badge-outline.badge-secondary{--tw-text-opacity:1;color:var(--fallback-s,oklch(var(--s)/var(--tw-text-opacity)))}.badge-outline.badge-accent{--tw-text-opacity:1;color:var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity)))}.badge-outline.badge-info{--tw-text-opacity:1;color:var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity)))}.badge-outline.badge-success{--tw-text-opacity:1;color:var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity)))}.badge-outline.badge-warning{--tw-text-opacity:1;color:var(--fallback-wa,oklch(var(--wa)/var(--tw-text-opacity)))}.badge-outline.badge-error{--tw-text-opacity:1;color:var(--fallback-er,oklch(var(--er)/var(--tw-text-opacity)))}.btm-nav>:where(.active){border-top-width:2px;--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)))}.btm-nav>.disabled,.btm-nav>[disabled]{pointer-events:none;--tw-border-opacity:0;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-bg-opacity:0.1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.btm-nav>* .label{font-size:1rem;line-height:1.5rem}.btn:active:focus,.btn:active:hover{animation:button-pop 0s ease-out;transform:scale(var(--btn-focus-scale,.97))}@supports not (color:oklch(0 0 0)){.btn{background-color:var(--btn-color,var(--fallback-b2));border-color:var(--btn-color,var(--fallback-b2))}.btn-primary{--btn-color:var(--fallback-p)}.btn-neutral{--btn-color:var(--fallback-n)}.btn-info{--btn-color:var(--fallback-in)}.btn-success{--btn-color:var(--fallback-su)}.btn-warning{--btn-color:var(--fallback-wa)}.btn-error{--btn-color:var(--fallback-er)}}@supports (color:color-mix(in oklab,black,black)){.btn-active{background-color:color-mix(in oklab,oklch(var(--btn-color,var(--b3))/var(--tw-bg-opacity,1)) 90%,#000);border-color:color-mix(in oklab,oklch(var(--btn-color,var(--b3))/var(--tw-border-opacity,1)) 90%,#000)}.btn-outline.btn-primary.btn-active{background-color:color-mix(in oklab,var(--fallback-p,oklch(var(--p)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-p,oklch(var(--p)/1)) 90%,#000)}.btn-outline.btn-secondary.btn-active{background-color:color-mix(in oklab,var(--fallback-s,oklch(var(--s)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-s,oklch(var(--s)/1)) 90%,#000)}.btn-outline.btn-accent.btn-active{background-color:color-mix(in oklab,var(--fallback-a,oklch(var(--a)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-a,oklch(var(--a)/1)) 90%,#000)}.btn-outline.btn-success.btn-active{background-color:color-mix(in oklab,var(--fallback-su,oklch(var(--su)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-su,oklch(var(--su)/1)) 90%,#000)}.btn-outline.btn-info.btn-active{background-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000)}.btn-outline.btn-warning.btn-active{background-color:color-mix(in oklab,var(--fallback-wa,oklch(var(--wa)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-wa,oklch(var(--wa)/1)) 90%,#000)}.btn-outline.btn-error.btn-active{background-color:color-mix(in oklab,var(--fallback-er,oklch(var(--er)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-er,oklch(var(--er)/1)) 90%,#000)}}.btn:focus-visible{outline-offset:2px;outline-style:solid;outline-width:2px}.btn-primary{--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)));outline-color:var(--fallback-p,oklch(var(--p)/1))}@supports (color:oklch(0 0 0)){.btn-primary{--btn-color:var(--p)}.btn-neutral{--btn-color:var(--n)}.btn-info{--btn-color:var(--in)}.btn-success{--btn-color:var(--su)}.btn-warning{--btn-color:var(--wa)}.btn-error{--btn-color:var(--er)}}.btn-neutral{--tw-text-opacity:1;color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity)));outline-color:var(--fallback-n,oklch(var(--n)/1))}.btn-info{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));outline-color:var(--fallback-in,oklch(var(--in)/1))}.btn-success{--tw-text-opacity:1;color:var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)));outline-color:var(--fallback-su,oklch(var(--su)/1))}.btn-warning{--tw-text-opacity:1;color:var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)));outline-color:var(--fallback-wa,oklch(var(--wa)/1))}.btn-error{--tw-text-opacity:1;color:var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)));outline-color:var(--fallback-er,oklch(var(--er)/1))}.btn.glass{--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow);outline-color:currentColor}.btn.glass.btn-active{--glass-opacity:25%;--glass-border-opacity:15%}.btn-ghost{background-color:transparent;border-color:transparent;border-width:1px;color:currentColor;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow);outline-color:currentColor}.btn-ghost.btn-active{background-color:var(--fallback-bc,oklch(var(--bc)/.2));border-color:transparent}.btn-link.btn-active{background-color:transparent;border-color:transparent;text-decoration-line:underline}.btn-outline{background-color:transparent;border-color:currentColor;--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.btn-outline.btn-active{--tw-border-opacity:1;border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-b1,oklch(var(--b1)/var(--tw-text-opacity)))}.btn-outline.btn-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity)))}.btn-outline.btn-primary.btn-active{--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.btn-outline.btn-secondary{--tw-text-opacity:1;color:var(--fallback-s,oklch(var(--s)/var(--tw-text-opacity)))}.btn-outline.btn-secondary.btn-active{--tw-text-opacity:1;color:var(--fallback-sc,oklch(var(--sc)/var(--tw-text-opacity)))}.btn-outline.btn-accent{--tw-text-opacity:1;color:var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity)))}.btn-outline.btn-accent.btn-active{--tw-text-opacity:1;color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity)))}.btn-outline.btn-success{--tw-text-opacity:1;color:var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity)))}.btn-outline.btn-success.btn-active{--tw-text-opacity:1;color:var(--fallback-suc,oklch(var(--suc)/var(--tw-text-opacity)))}.btn-outline.btn-info{--tw-text-opacity:1;color:var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity)))}.btn-outline.btn-info.btn-active{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)))}.btn-outline.btn-warning{--tw-text-opacity:1;color:var(--fallback-wa,oklch(var(--wa)/var(--tw-text-opacity)))}.btn-outline.btn-warning.btn-active{--tw-text-opacity:1;color:var(--fallback-wac,oklch(var(--wac)/var(--tw-text-opacity)))}.btn-outline.btn-error{--tw-text-opacity:1;color:var(--fallback-er,oklch(var(--er)/var(--tw-text-opacity)))}.btn-outline.btn-error.btn-active{--tw-text-opacity:1;color:var(--fallback-erc,oklch(var(--erc)/var(--tw-text-opacity)))}.btn.btn-disabled,.btn:disabled,.btn[disabled]{--tw-border-opacity:0;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-bg-opacity:0.2;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.btn:is(input[type=checkbox]:checked),.btn:is(input[type=radio]:checked){--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.btn:is(input[type=checkbox]:checked):focus-visible,.btn:is(input[type=radio]:checked):focus-visible{outline-color:var(--fallback-p,oklch(var(--p)/1))}@keyframes button-pop{0%{transform:scale(var(--btn-focus-scale,.98))}40%{transform:scale(1.02)}to{transform:scale(1)}}.card :where(figure:first-child){border-end-end-radius:unset;border-end-start-radius:unset;border-start-end-radius:inherit;border-start-start-radius:inherit;overflow:hidden}.card :where(figure:last-child){border-end-end-radius:inherit;border-end-start-radius:inherit;border-start-end-radius:unset;border-start-start-radius:unset;overflow:hidden}.card:focus-visible{outline:2px solid currentColor;outline-offset:2px}.card.bordered{border-width:1px;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)))}.card.compact .card-body{font-size:.875rem;line-height:1.25rem;padding:1rem}.card-title{align-items:center;display:flex;font-size:1.25rem;font-weight:600;gap:.5rem;line-height:1.75rem}.card.image-full :where(figure){border-radius:inherit;overflow:hidden}.checkbox:focus{box-shadow:none}.checkbox:focus-visible{outline-color:var(--fallback-bc,oklch(var(--bc)/1));outline-offset:2px;outline-style:solid;outline-width:2px}.checkbox:checked,.checkbox[aria-checked=true],.checkbox[checked=true]{animation:checkmark var(--animation-input,.2s) ease-out;background-color:var(--chkbg);background-image:linear-gradient(-45deg,transparent 65%,var(--chkbg) 65.99%),linear-gradient(45deg,transparent 75%,var(--chkbg) 75.99%),linear-gradient(-45deg,var(--chkbg) 40%,transparent 40.99%),linear-gradient(45deg,var(--chkbg) 30%,var(--chkfg) 30.99%,var(--chkfg) 40%,transparent 40.99%),linear-gradient(-45deg,var(--chkfg) 50%,var(--chkbg) 50.99%);background-repeat:no-repeat}.checkbox:indeterminate{--tw-bg-opacity:1;animation:checkmark var(--animation-input,.2s) ease-out;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));background-image:linear-gradient(90deg,transparent 80%,var(--chkbg) 80%),linear-gradient(-90deg,transparent 80%,var(--chkbg) 80%),linear-gradient(0deg,var(--chkbg) 43%,var(--chkfg) 43%,var(--chkfg) 57%,var(--chkbg) 57%);background-repeat:no-repeat}.checkbox:disabled{border-color:transparent;cursor:not-allowed;--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));opacity:.2}@keyframes checkmark{0%{background-position-y:5px}50%{background-position-y:-2px}to{background-position-y:0}}.divider:not(:empty){gap:1rem}.drawer-toggle:focus-visible~.drawer-content label.drawer-button{outline-offset:2px;outline-style:solid;outline-width:2px}.dropdown.dropdown-open .dropdown-content,.dropdown:focus .dropdown-content,.dropdown:focus-within .dropdown-content{--tw-scale-x:1;--tw-scale-y:1;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.file-input-bordered{--tw-border-opacity:0.2}.file-input:focus{outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.file-input-disabled,.file-input[disabled]{cursor:not-allowed;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));--tw-text-opacity:0.2}.file-input-disabled::-moz-placeholder,.file-input[disabled]::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.file-input-disabled::placeholder,.file-input[disabled]::placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.file-input-disabled::file-selector-button,.file-input[disabled]::file-selector-button{--tw-border-opacity:0;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-bg-opacity:0.2;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.footer-title{font-weight:700;margin-bottom:.5rem;opacity:.6;text-transform:uppercase}.label-text{font-size:.875rem;line-height:1.25rem}.label-text,.label-text-alt{--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}.label-text-alt{font-size:.75rem;line-height:1rem}.input input{--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));background-color:transparent}.input input:focus{outline:2px solid transparent;outline-offset:2px}.input[list]::-webkit-calendar-picker-indicator{line-height:1em}.input-bordered{border-color:var(--fallback-bc,oklch(var(--bc)/.2))}.input:focus,.input:focus-within{border-color:var(--fallback-bc,oklch(var(--bc)/.2));box-shadow:none;outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.input-ghost{--tw-bg-opacity:0.05}.input-ghost:focus,.input-ghost:focus-within{--tw-bg-opacity:1;--tw-text-opacity:1;box-shadow:none;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}.input-primary{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)))}.input-primary:focus,.input-primary:focus-within{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));outline-color:var(--fallback-p,oklch(var(--p)/1))}.input-error{--tw-border-opacity:1;border-color:var(--fallback-er,oklch(var(--er)/var(--tw-border-opacity)))}.input-error:focus,.input-error:focus-within{--tw-border-opacity:1;border-color:var(--fallback-er,oklch(var(--er)/var(--tw-border-opacity)));outline-color:var(--fallback-er,oklch(var(--er)/1))}.input-disabled,.input:disabled,.input[disabled]{cursor:not-allowed;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));color:var(--fallback-bc,oklch(var(--bc)/.4))}.input-disabled::-moz-placeholder,.input:disabled::-moz-placeholder,.input[disabled]::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.input-disabled::placeholder,.input:disabled::placeholder,.input[disabled]::placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.input::-webkit-date-and-time-value{text-align:inherit}.join>:where(:not(:first-child)){margin-bottom:0;margin-top:0;margin-inline-start:-1px}.join-item:focus{isolation:isolate}.link-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity)))}@supports (color:color-mix(in oklab,black,black)){@media (hover:hover){.link-primary:hover{color:color-mix(in oklab,var(--fallback-p,oklch(var(--p)/1)) 80%,#000)}}}.link:focus{outline:2px solid transparent;outline-offset:2px}.link:focus-visible{outline:2px solid currentColor;outline-offset:2px}.loading{aspect-ratio:1/1;background-color:currentColor;display:inline-block;-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:100%;mask-size:100%;pointer-events:none;width:1.5rem}.loading,.loading-spinner{-webkit-mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' stroke='%23000'%3E%3Cstyle%3E@keyframes spinner_zKoa{to{transform:rotate(360deg)}}@keyframes spinner_YpZS{0%25{stroke-dasharray:0 150;stroke-dashoffset:0}47.5%25{stroke-dasharray:42 150;stroke-dashoffset:-16}95%25,to{stroke-dasharray:42 150;stroke-dashoffset:-59}}%3C/style%3E%3Cg style='transform-origin:center;animation:spinner_zKoa 2s linear infinite'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' class='spinner_V8m1' style='stroke-linecap:round;animation:spinner_YpZS 1.5s ease-out infinite'/%3E%3C/g%3E%3C/svg%3E");mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' stroke='%23000'%3E%3Cstyle%3E@keyframes spinner_zKoa{to{transform:rotate(360deg)}}@keyframes spinner_YpZS{0%25{stroke-dasharray:0 150;stroke-dashoffset:0}47.5%25{stroke-dasharray:42 150;stroke-dashoffset:-16}95%25,to{stroke-dasharray:42 150;stroke-dashoffset:-59}}%3C/style%3E%3Cg style='transform-origin:center;animation:spinner_zKoa 2s linear infinite'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' class='spinner_V8m1' style='stroke-linecap:round;animation:spinner_YpZS 1.5s ease-out infinite'/%3E%3C/g%3E%3C/svg%3E")}.loading-dots{-webkit-mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24'%3E%3Cstyle%3E@keyframes spinner_8HQG{0%25,57.14%25{animation-timing-function:cubic-bezier(.33,.66,.66,1);transform:translate(0)}28.57%25{animation-timing-function:cubic-bezier(.33,0,.66,.33);transform:translateY(-6px)}to{transform:translate(0)}}.spinner_qM83{animation:spinner_8HQG 1.05s infinite}%3C/style%3E%3Ccircle cx='4' cy='12' r='3' class='spinner_qM83'/%3E%3Ccircle cx='12' cy='12' r='3' class='spinner_qM83' style='animation-delay:.1s'/%3E%3Ccircle cx='20' cy='12' r='3' class='spinner_qM83' style='animation-delay:.2s'/%3E%3C/svg%3E");mask-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24'%3E%3Cstyle%3E@keyframes spinner_8HQG{0%25,57.14%25{animation-timing-function:cubic-bezier(.33,.66,.66,1);transform:translate(0)}28.57%25{animation-timing-function:cubic-bezier(.33,0,.66,.33);transform:translateY(-6px)}to{transform:translate(0)}}.spinner_qM83{animation:spinner_8HQG 1.05s infinite}%3C/style%3E%3Ccircle cx='4' cy='12' r='3' class='spinner_qM83'/%3E%3Ccircle cx='12' cy='12' r='3' class='spinner_qM83' style='animation-delay:.1s'/%3E%3Ccircle cx='20' cy='12' r='3' class='spinner_qM83' style='animation-delay:.2s'/%3E%3C/svg%3E")}.loading-sm{width:1.25rem}.loading-md{width:1.5rem}.loading-lg{width:2.5rem}:where(.menu li:empty){--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));height:1px;margin:.5rem 1rem;opacity:.1}.menu :where(li ul):before{bottom:.75rem;inset-inline-start:0;position:absolute;top:.75rem;width:1px;--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));content:"";opacity:.1}.menu :where(li:not(.menu-title)>:not(ul,details,.menu-title,.btn)),.menu :where(li:not(.menu-title)>details>summary:not(.menu-title)){border-radius:var(--rounded-btn,.5rem);padding:.5rem 1rem;text-align:start;text-wrap:balance;transition-duration:.2s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-timing-function:cubic-bezier(0,0,.2,1)}:where(.menu li:not(.menu-title,.disabled)>:not(ul,details,.menu-title)):is(summary):not(.active,.btn):focus-visible,:where(.menu li:not(.menu-title,.disabled)>:not(ul,details,.menu-title)):not(summary,.active,.btn).focus,:where(.menu li:not(.menu-title,.disabled)>:not(ul,details,.menu-title)):not(summary,.active,.btn):focus,:where(.menu li:not(.menu-title,.disabled)>details>summary:not(.menu-title)):is(summary):not(.active,.btn):focus-visible,:where(.menu li:not(.menu-title,.disabled)>details>summary:not(.menu-title)):not(summary,.active,.btn).focus,:where(.menu li:not(.menu-title,.disabled)>details>summary:not(.menu-title)):not(summary,.active,.btn):focus{background-color:var(--fallback-bc,oklch(var(--bc)/.1));cursor:pointer;--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));outline:2px solid transparent;outline-offset:2px}.menu li>:not(ul,.menu-title,details,.btn).active,.menu li>:not(ul,.menu-title,details,.btn):active,.menu li>details>summary:active{--tw-bg-opacity:1;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity)))}.menu :where(li>details>summary)::-webkit-details-marker{display:none}.menu :where(li>.menu-dropdown-toggle):after,.menu :where(li>details>summary):after{box-shadow:2px 2px;content:"";display:block;height:.5rem;justify-self:end;margin-top:-.5rem;pointer-events:none;transform:rotate(45deg);transform-origin:75% 75%;transition-duration:.3s;transition-property:transform,margin-top;transition-timing-function:cubic-bezier(.4,0,.2,1);width:.5rem}.menu :where(li>.menu-dropdown-toggle.menu-dropdown-show):after,.menu :where(li>details[open]>summary):after{margin-top:0;transform:rotate(225deg)}.mockup-phone .camera{background:#000;border-bottom-left-radius:17px;border-bottom-right-radius:17px;height:25px;left:0;margin:0 auto;position:relative;top:0;width:150px;z-index:11}.mockup-phone .camera:before{background-color:#0c0b0e;border-radius:5px;content:"";height:4px;left:50%;position:absolute;top:35%;transform:translate(-50%,-50%);width:50px}.mockup-phone .camera:after{background-color:#0f0b25;border-radius:5px;content:"";height:8px;left:70%;position:absolute;top:20%;width:8px}.mockup-phone .display{border-radius:40px;margin-top:-25px;overflow:hidden}.mockup-browser .mockup-browser-toolbar .input{display:block;height:1.75rem;margin-left:auto;margin-right:auto;overflow:hidden;position:relative;text-overflow:ellipsis;white-space:nowrap;width:24rem;--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));direction:ltr;padding-left:2rem}.mockup-browser .mockup-browser-toolbar .input:before{aspect-ratio:1/1;height:.75rem;left:.5rem;--tw-translate-y:-50%;border-color:currentColor;border-radius:9999px;border-width:2px}.mockup-browser .mockup-browser-toolbar .input:after,.mockup-browser .mockup-browser-toolbar .input:before{content:"";opacity:.6;position:absolute;top:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.mockup-browser .mockup-browser-toolbar .input:after{height:.5rem;left:1.25rem;--tw-translate-y:25%;--tw-rotate:-45deg;border-color:currentColor;border-radius:9999px;border-width:1px}.modal::backdrop,.modal:not(dialog:not(.modal-open)){animation:modal-pop .2s ease-out;background-color:#0006}.modal-backdrop{align-self:stretch;color:transparent;display:grid;grid-column-start:1;grid-row-start:1;justify-self:stretch;z-index:-1}.modal-open .modal-box,.modal-toggle:checked+.modal .modal-box,.modal:target .modal-box,.modal[open] .modal-box{--tw-translate-y:0px;--tw-scale-x:1;--tw-scale-y:1;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.modal-action>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}@keyframes modal-pop{0%{opacity:0}}.progress::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)))}.progress-primary::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)))}.progress-secondary::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-s,oklch(var(--s)/var(--tw-bg-opacity)))}.progress-accent::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity)))}.progress-info::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-in,oklch(var(--in)/var(--tw-bg-opacity)))}.progress-success::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-su,oklch(var(--su)/var(--tw-bg-opacity)))}.progress-warning::-moz-progress-bar{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-wa,oklch(var(--wa)/var(--tw-bg-opacity)))}.progress:indeterminate{--progress-color:var(--fallback-bc,oklch(var(--bc)/1));animation:progress-loading 5s ease-in-out infinite;background-image:repeating-linear-gradient(90deg,var(--progress-color) -1%,var(--progress-color) 10%,transparent 10%,transparent 90%);background-position-x:15%;background-size:200%}.progress-primary:indeterminate{--progress-color:var(--fallback-p,oklch(var(--p)/1))}.progress-secondary:indeterminate{--progress-color:var(--fallback-s,oklch(var(--s)/1))}.progress-accent:indeterminate{--progress-color:var(--fallback-a,oklch(var(--a)/1))}.progress-info:indeterminate{--progress-color:var(--fallback-in,oklch(var(--in)/1))}.progress-success:indeterminate{--progress-color:var(--fallback-su,oklch(var(--su)/1))}.progress-warning:indeterminate{--progress-color:var(--fallback-wa,oklch(var(--wa)/1))}.progress::-webkit-progress-bar{background-color:transparent;border-radius:var(--rounded-box,1rem)}.progress::-webkit-progress-value{border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)))}.progress-primary::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)))}.progress-secondary::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-s,oklch(var(--s)/var(--tw-bg-opacity)))}.progress-accent::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity)))}.progress-info::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-in,oklch(var(--in)/var(--tw-bg-opacity)))}.progress-success::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-su,oklch(var(--su)/var(--tw-bg-opacity)))}.progress-warning::-webkit-progress-value{--tw-bg-opacity:1;background-color:var(--fallback-wa,oklch(var(--wa)/var(--tw-bg-opacity)))}.progress:indeterminate::-moz-progress-bar{animation:progress-loading 5s ease-in-out infinite;background-color:transparent;background-image:repeating-linear-gradient(90deg,var(--progress-color) -1%,var(--progress-color) 10%,transparent 10%,transparent 90%);background-position-x:15%;background-size:200%}@keyframes progress-loading{50%{background-position-x:-115%}}.radio:focus{box-shadow:none}.radio:focus-visible{outline-color:var(--fallback-bc,oklch(var(--bc)/1));outline-offset:2px;outline-style:solid;outline-width:2px}.radio:checked,.radio[aria-checked=true]{--tw-bg-opacity:1;animation:radiomark var(--animation-input,.2s) ease-out;background-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-bg-opacity)));background-image:none;box-shadow:0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset}.radio-primary{--chkbg:var(--p);--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)))}.radio-primary:focus-visible{outline-color:var(--fallback-p,oklch(var(--p)/1))}.radio-primary:checked,.radio-primary[aria-checked=true]{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.radio:disabled{cursor:not-allowed;opacity:.2}@keyframes radiomark{0%{box-shadow:0 0 0 12px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 12px var(--fallback-b1,oklch(var(--b1)/1)) inset}50%{box-shadow:0 0 0 3px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 3px var(--fallback-b1,oklch(var(--b1)/1)) inset}to{box-shadow:0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 4px var(--fallback-b1,oklch(var(--b1)/1)) inset}}.range:focus-visible::-webkit-slider-thumb{--focus-shadow:0 0 0 6px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 2rem var(--range-shdw) inset}.range:focus-visible::-moz-range-thumb{--focus-shadow:0 0 0 6px var(--fallback-b1,oklch(var(--b1)/1)) inset,0 0 0 2rem var(--range-shdw) inset}.range::-webkit-slider-runnable-track{background-color:var(--fallback-bc,oklch(var(--bc)/.1));border-radius:var(--rounded-box,1rem);height:.5rem;width:100%}.range::-moz-range-track{background-color:var(--fallback-bc,oklch(var(--bc)/.1));border-radius:var(--rounded-box,1rem);height:.5rem;width:100%}.range::-webkit-slider-thumb{border-radius:var(--rounded-box,1rem);border-style:none;height:1.5rem;position:relative;width:1.5rem;--tw-bg-opacity:1;appearance:none;-webkit-appearance:none;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));color:var(--range-shdw);top:50%;transform:translateY(-50%);--filler-size:100rem;--filler-offset:0.6rem;box-shadow:0 0 0 3px var(--range-shdw) inset,var(--focus-shadow,0 0),calc(var(--filler-size)*-1 - var(--filler-offset)) 0 0 var(--filler-size)}.range::-moz-range-thumb{border-radius:var(--rounded-box,1rem);border-style:none;height:1.5rem;position:relative;width:1.5rem;--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));color:var(--range-shdw);top:50%;--filler-size:100rem;--filler-offset:0.5rem;box-shadow:0 0 0 3px var(--range-shdw) inset,var(--focus-shadow,0 0),calc(var(--filler-size)*-1 - var(--filler-offset)) 0 0 var(--filler-size)}@keyframes rating-pop{0%{transform:translateY(-.125em)}40%{transform:translateY(-.125em)}to{transform:translateY(0)}}.select-bordered,.select:focus{border-color:var(--fallback-bc,oklch(var(--bc)/.2))}.select:focus{box-shadow:none;outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.select-disabled,.select:disabled,.select[disabled]{cursor:not-allowed;--tw-border-opacity:1;border-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));--tw-text-opacity:0.2}.select-disabled::-moz-placeholder,.select:disabled::-moz-placeholder,.select[disabled]::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.select-disabled::placeholder,.select:disabled::placeholder,.select[disabled]::placeholder{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-placeholder-opacity)));--tw-placeholder-opacity:0.2}.select-multiple,.select[multiple],.select[size].select:not([size="1"]){background-image:none;padding-right:1rem}[dir=rtl] .select{background-position:12px calc(1px + 50%),16px calc(1px + 50%)}@keyframes skeleton{0%{background-position:150%}to{background-position:-50%}}:where(.stats)>:not([hidden])~:not([hidden]){--tw-divide-x-reverse:0;--tw-divide-y-reverse:0;border-width:calc(0px*(1 - var(--tw-divide-y-reverse))) calc(1px*var(--tw-divide-x-reverse)) calc(0px*var(--tw-divide-y-reverse)) calc(1px*(1 - var(--tw-divide-x-reverse)))}:is([dir=rtl] .stats>:not([hidden])~:not([hidden])){--tw-divide-x-reverse:1}.steps .step:before{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));content:"";height:.5rem;margin-inline-start:-100%;top:0;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));width:100%}.steps .step:after,.steps .step:before{grid-column-start:1;grid-row-start:1;--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)));--tw-text-opacity:1}.steps .step:after{border-radius:9999px;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));content:counter(step);counter-increment:step;display:grid;height:2rem;place-items:center;place-self:center;position:relative;width:2rem;z-index:1}.steps .step:first-child:before{content:none}.steps .step[data-content]:after{content:attr(data-content)}.tabs-lifted>.tab:focus-visible{border-end-end-radius:0;border-end-start-radius:0}.tab.tab-active:not(.tab-disabled):not([disabled]),.tab:is(input:checked){border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));--tw-border-opacity:1;--tw-text-opacity:1}.tab:focus{outline:2px solid transparent;outline-offset:2px}.tab:focus-visible{outline:2px solid currentColor;outline-offset:-5px}.tab-disabled,.tab[disabled]{color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)));cursor:not-allowed;--tw-text-opacity:0.2}.tabs-bordered>.tab{border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));--tw-border-opacity:0.2;border-bottom-width:calc(var(--tab-border, 1px) + 1px);border-style:solid}.tabs-lifted>.tab{border:var(--tab-border,1px) solid transparent;border-bottom-color:var(--tab-border-color);border-start-end-radius:var(--tab-radius,.5rem);border-start-start-radius:var(--tab-radius,.5rem);border-width:0 0 var(--tab-border,1px) 0;padding-inline-end:var(--tab-padding,1rem);padding-inline-start:var(--tab-padding,1rem);padding-top:var(--tab-border,1px)}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]),.tabs-lifted>.tab:is(input:checked){background-color:var(--tab-bg);border-inline-end-color:var(--tab-border-color);border-inline-start-color:var(--tab-border-color);border-top-color:var(--tab-border-color);border-width:var(--tab-border,1px) var(--tab-border,1px) 0 var(--tab-border,1px);padding-inline-end:calc(var(--tab-padding, 1rem) - var(--tab-border, 1px));padding-bottom:var(--tab-border,1px);padding-inline-start:calc(var(--tab-padding, 1rem) - var(--tab-border, 1px));padding-top:0}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):before,.tabs-lifted>.tab:is(input:checked):before{background-position:0 0,100% 0;background-repeat:no-repeat;background-size:var(--tab-radius,.5rem);bottom:0;content:"";display:block;height:var(--tab-radius,.5rem);position:absolute;width:calc(100% + var(--tab-radius, .5rem)*2);z-index:1;--tab-grad:calc(69% - var(--tab-border, 1px));--radius-start:radial-gradient(circle at top left,transparent var(--tab-grad),var(--tab-border-color) calc(var(--tab-grad) + 0.25px),var(--tab-border-color) calc(var(--tab-grad) + var(--tab-border, 1px)),var(--tab-bg) calc(var(--tab-grad) + var(--tab-border, 1px) + 0.25px));--radius-end:radial-gradient(circle at top right,transparent var(--tab-grad),var(--tab-border-color) calc(var(--tab-grad) + 0.25px),var(--tab-border-color) calc(var(--tab-grad) + var(--tab-border, 1px)),var(--tab-bg) calc(var(--tab-grad) + var(--tab-border, 1px) + 0.25px));background-image:var(--radius-start),var(--radius-end)}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):first-child:before,.tabs-lifted>.tab:is(input:checked):first-child:before{background-image:var(--radius-end);background-position:100% 0}[dir=rtl] .tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):first-child:before,[dir=rtl] .tabs-lifted>.tab:is(input:checked):first-child:before{background-image:var(--radius-start);background-position:0 0}.tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):last-child:before,.tabs-lifted>.tab:is(input:checked):last-child:before{background-image:var(--radius-start);background-position:0 0}[dir=rtl] .tabs-lifted>.tab.tab-active:not(.tab-disabled):not([disabled]):last-child:before,[dir=rtl] .tabs-lifted>.tab:is(input:checked):last-child:before{background-image:var(--radius-end);background-position:100% 0}.tabs-lifted>.tab-active:not(.tab-disabled):not([disabled])+.tabs-lifted .tab-active:not(.tab-disabled):not([disabled]):before,.tabs-lifted>.tab:is(input:checked)+.tabs-lifted .tab:is(input:checked):before{background-image:var(--radius-end);background-position:100% 0}.tabs-boxed{--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));padding:.25rem}.tabs-boxed,.tabs-boxed .tab{border-radius:var(--rounded-btn,.5rem)}.tabs-boxed .tab-active:not(.tab-disabled):not([disabled]),.tabs-boxed :is(input:checked){--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}:is([dir=rtl] .table){text-align:right}.table :where(th,td){padding:.75rem 1rem;vertical-align:middle}.table tr.active,.table tr.active:nth-child(2n),.table-zebra tbody tr:nth-child(2n){--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)))}.table-zebra tr.active,.table-zebra tr.active:nth-child(2n),.table-zebra-zebra tbody tr:nth-child(2n){--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)))}.table :where(thead,tbody) :where(tr:first-child:last-child),.table :where(thead,tbody) :where(tr:not(:last-child)){border-bottom-width:1px;--tw-border-opacity:1;border-bottom-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)))}.table :where(thead,tfoot){color:var(--fallback-bc,oklch(var(--bc)/.6));font-size:.75rem;font-weight:700;line-height:1rem;white-space:nowrap}.timeline hr{height:.25rem}:where(.timeline hr){--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity)))}:where(.timeline:has(.timeline-middle) hr):first-child{border-end-end-radius:var(--rounded-badge,1.9rem);border-end-start-radius:0;border-start-end-radius:var(--rounded-badge,1.9rem);border-start-start-radius:0}:where(.timeline:has(.timeline-middle) hr):last-child{border-end-end-radius:0;border-end-start-radius:var(--rounded-badge,1.9rem);border-start-end-radius:0;border-start-start-radius:var(--rounded-badge,1.9rem)}:where(.timeline:not(:has(.timeline-middle)) :first-child hr:last-child){border-end-end-radius:0;border-end-start-radius:var(--rounded-badge,1.9rem);border-start-end-radius:0;border-start-start-radius:var(--rounded-badge,1.9rem)}:where(.timeline:not(:has(.timeline-middle)) :last-child hr:first-child){border-end-end-radius:var(--rounded-badge,1.9rem);border-end-start-radius:0;border-start-end-radius:var(--rounded-badge,1.9rem);border-start-start-radius:0}.timeline-box{border-radius:var(--rounded-box,1rem);border-width:1px;--tw-border-opacity:1;border-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-border-opacity)));--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));padding:.5rem 1rem;--tw-shadow:0 1px 2px 0 rgba(0,0,0,.05);--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.toast>*{animation:toast-pop .25s ease-out}@keyframes toast-pop{0%{opacity:0;transform:scale(.9)}to{opacity:1;transform:scale(1)}}[dir=rtl] .toggle{--handleoffsetcalculator:calc(var(--handleoffset)*1)}.toggle:focus-visible{outline-color:var(--fallback-bc,oklch(var(--bc)/.2));outline-offset:2px;outline-style:solid;outline-width:2px}.toggle:hover{background-color:currentColor}.toggle:checked,.toggle[aria-checked=true],.toggle[checked=true]{background-image:none;--handleoffsetcalculator:var(--handleoffset);--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}[dir=rtl] .toggle:checked,[dir=rtl] .toggle[aria-checked=true],[dir=rtl] .toggle[checked=true]{--handleoffsetcalculator:calc(var(--handleoffset)*-1)}.toggle:indeterminate{--tw-text-opacity:1;box-shadow:calc(var(--handleoffset)/2) 0 0 2px var(--tglbg) inset,calc(var(--handleoffset)/-2) 0 0 2px var(--tglbg) inset,0 0 0 2px var(--tglbg) inset;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}[dir=rtl] .toggle:indeterminate{box-shadow:calc(var(--handleoffset)/2) 0 0 2px var(--tglbg) inset,calc(var(--handleoffset)/-2) 0 0 2px var(--tglbg) inset,0 0 0 2px var(--tglbg) inset}.toggle-primary:focus-visible{outline-color:var(--fallback-p,oklch(var(--p)/1))}.toggle-primary:checked,.toggle-primary[aria-checked=true],.toggle-primary[checked=true]{border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));--tw-border-opacity:0.1;--tw-bg-opacity:1;background-color:var(--fallback-p,oklch(var(--p)/var(--tw-bg-opacity)));--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity)))}.toggle:disabled{cursor:not-allowed;--tw-border-opacity:1;background-color:transparent;border-color:var(--fallback-bc,oklch(var(--bc)/var(--tw-border-opacity)));opacity:.3;--togglehandleborder:0 0 0 3px var(--fallback-bc,oklch(var(--bc)/1)) inset,var(--handleoffsetcalculator) 0 0 3px var(--fallback-bc,oklch(var(--bc)/1)) inset}.glass,.glass.btn-active{-webkit-backdrop-filter:blur(var(--glass-blur,40px));backdrop-filter:blur(var(--glass-blur,40px));background-color:transparent;background-image:linear-gradient(135deg,rgb(255 255 255/var(--glass-opacity,30%)) 0,transparent 100%),linear-gradient(var(--glass-reflex-degree,100deg),rgb(255 255 255/var(--glass-reflex-opacity,10%)) 25%,transparent 25%);border:none;box-shadow:0 0 0 1px rgb(255 255 255/var(--glass-border-opacity,10%)) inset,0 0 0 2px rgb(0 0 0/5%);text-shadow:0 1px rgb(0 0 0/var(--glass-text-shadow-opacity,5%))}@media (hover:hover){.glass.btn-active{-webkit-backdrop-filter:blur(var(--glass-blur,40px));backdrop-filter:blur(var(--glass-blur,40px));background-color:transparent;background-image:linear-gradient(135deg,rgb(255 255 255/var(--glass-opacity,30%)) 0,transparent 100%),linear-gradient(var(--glass-reflex-degree,100deg),rgb(255 255 255/var(--glass-reflex-opacity,10%)) 25%,transparent 25%);border:none;box-shadow:0 0 0 1px rgb(255 255 255/var(--glass-border-opacity,10%)) inset,0 0 0 2px rgb(0 0 0/5%);text-shadow:0 1px rgb(0 0 0/var(--glass-text-shadow-opacity,5%))}}.badge-xs{font-size:.75rem;height:.75rem;line-height:.75rem;padding-left:.313rem;padding-right:.313rem}.badge-sm{font-size:.75rem;height:1rem;line-height:1rem;padding-left:.438rem;padding-right:.438rem}.badge-lg{font-size:1rem;height:1.5rem;line-height:1.5rem;padding-left:.688rem;padding-right:.688rem}.btm-nav-xs>:where(.active){border-top-width:1px}.btm-nav-sm>:where(.active){border-top-width:2px}.btm-nav-md>:where(.active){border-top-width:2px}.btm-nav-lg>:where(.active){border-top-width:4px}.btn-xs{font-size:.75rem;height:1.5rem;min-height:1.5rem;padding-left:.5rem;padding-right:.5rem}.btn-sm{font-size:.875rem;height:2rem;min-height:2rem;padding-left:.75rem;padding-right:.75rem}.btn-wide{width:16rem}.btn-square:where(.btn-xs){height:1.5rem;padding:0;width:1.5rem}.btn-square:where(.btn-sm){height:2rem;padding:0;width:2rem}.btn-circle:where(.btn-xs){border-radius:9999px;height:1.5rem;padding:0;width:1.5rem}.btn-circle:where(.btn-sm){border-radius:9999px;height:2rem;padding:0;width:2rem}.btn-circle:where(.btn-md){border-radius:9999px;height:3rem;padding:0;width:3rem}.btn-circle:where(.btn-lg){border-radius:9999px;height:4rem;padding:0;width:4rem}[type=checkbox].checkbox-sm{height:1.25rem;width:1.25rem}.indicator :where(.indicator-item){bottom:auto;inset-inline-end:0;inset-inline-start:auto;top:0;--tw-translate-y:-50%;--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item)){--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-start){inset-inline-end:auto;inset-inline-start:0;--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item.indicator-start)){--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-center){inset-inline-end:50%;inset-inline-start:50%;--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item.indicator-center)){--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-end){inset-inline-end:0;inset-inline-start:auto;--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .indicator :where(.indicator-item.indicator-end)){--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-bottom){bottom:0;top:auto;--tw-translate-y:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-middle){bottom:50%;top:50%;--tw-translate-y:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.indicator :where(.indicator-item.indicator-top){bottom:auto;top:0;--tw-translate-y:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.input-xs{font-size:.75rem;height:1.5rem;line-height:1rem;line-height:1.625;padding-left:.5rem;padding-right:.5rem}.input-sm{font-size:.875rem;height:2rem;line-height:2rem;padding-left:.75rem;padding-right:.75rem}.join.join-vertical{flex-direction:column}.join.join-vertical .join-item:first-child:not(:last-child),.join.join-vertical :first-child:not(:last-child) .join-item{border-end-end-radius:0;border-end-start-radius:0;border-start-end-radius:inherit;border-start-start-radius:inherit}.join.join-vertical .join-item:last-child:not(:first-child),.join.join-vertical :last-child:not(:first-child) .join-item{border-end-end-radius:inherit;border-end-start-radius:inherit;border-start-end-radius:0;border-start-start-radius:0}.join.join-horizontal{flex-direction:row}.join.join-horizontal .join-item:first-child:not(:last-child),.join.join-horizontal :first-child:not(:last-child) .join-item{border-end-end-radius:0;border-end-start-radius:inherit;border-start-end-radius:0;border-start-start-radius:inherit}.join.join-horizontal .join-item:last-child:not(:first-child),.join.join-horizontal :last-child:not(:first-child) .join-item{border-end-end-radius:inherit;border-end-start-radius:0;border-start-end-radius:inherit;border-start-start-radius:0}.menu-horizontal{display:inline-flex;flex-direction:row}.menu-horizontal>li:not(.menu-title)>details>ul{position:absolute}.select-sm{font-size:.875rem;height:2rem;line-height:2rem;min-height:2rem;padding-left:.75rem;padding-right:2rem}[dir=rtl] .select-sm{padding-left:2rem;padding-right:.75rem}.stats-vertical{grid-auto-flow:row}.steps-horizontal .step{display:grid;grid-template-columns:repeat(1,minmax(0,1fr));grid-template-rows:repeat(2,minmax(0,1fr));place-items:center;text-align:center}.steps-vertical .step{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));grid-template-rows:repeat(1,minmax(0,1fr))}.tabs-md :where(.tab){font-size:.875rem;height:2rem;line-height:1.25rem;line-height:2;--tab-padding:1rem}.tabs-lg :where(.tab){font-size:1.125rem;height:3rem;line-height:1.75rem;line-height:2;--tab-padding:1.25rem}.tabs-sm :where(.tab){font-size:.875rem;height:1.5rem;line-height:.75rem;--tab-padding:0.75rem}.tabs-xs :where(.tab){font-size:.75rem;height:1.25rem;line-height:.75rem;--tab-padding:0.5rem}.timeline-vertical{flex-direction:column}.timeline-compact .timeline-start,.timeline-horizontal.timeline-compact .timeline-start{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center;margin:.25rem}.timeline-compact li:has(.timeline-start) .timeline-end,.timeline-horizontal.timeline-compact li:has(.timeline-start) .timeline-end{grid-column-start:none;grid-row-start:auto}.timeline-vertical.timeline-compact>li{--timeline-col-start:0}.timeline-vertical.timeline-compact .timeline-start{align-self:center;grid-column-end:4;grid-column-start:3;grid-row-end:4;grid-row-start:1;justify-self:start}.timeline-vertical.timeline-compact li:has(.timeline-start) .timeline-end{grid-column-start:auto;grid-row-start:none}:where(.timeline-vertical>li){--timeline-row-start:minmax(0,1fr);--timeline-row-end:minmax(0,1fr);justify-items:center}.timeline-vertical>li>hr{height:100%}:where(.timeline-vertical>li>hr):first-child{grid-column-start:2;grid-row-start:1}:where(.timeline-vertical>li>hr):last-child{grid-column-end:auto;grid-column-start:2;grid-row-end:none;grid-row-start:3}.timeline-vertical .timeline-start{align-self:center;grid-column-end:2;grid-column-start:1;grid-row-end:4;grid-row-start:1;justify-self:end}.timeline-vertical .timeline-end{align-self:center;grid-column-end:4;grid-column-start:3;grid-row-end:4;grid-row-start:1;justify-self:start}.timeline-vertical:where(.timeline-snap-icon)>li{--timeline-col-start:minmax(0,1fr);--timeline-row-start:0.5rem}.timeline-horizontal .timeline-start{align-self:flex-end;grid-column-end:4;grid-column-start:1;grid-row-end:2;grid-row-start:1;justify-self:center}.timeline-horizontal .timeline-end{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center}.timeline-horizontal:where(.timeline-snap-icon)>li,:where(.timeline-snap-icon)>li{--timeline-col-start:0.5rem;--timeline-row-start:minmax(0,1fr)}:where(.toast){bottom:0;inset-inline-end:0;inset-inline-start:auto;top:auto;--tw-translate-x:0px;--tw-translate-y:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-start){inset-inline-end:auto;inset-inline-start:0;--tw-translate-x:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-center){inset-inline-end:50%;inset-inline-start:50%;--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .toast:where(.toast-center)){--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-end){inset-inline-end:0;inset-inline-start:auto;--tw-translate-x:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-bottom){bottom:0;top:auto;--tw-translate-y:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-middle){bottom:auto;top:50%;--tw-translate-y:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.toast:where(.toast-top){bottom:auto;top:0;--tw-translate-y:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.tooltip{--tooltip-offset:calc(100% + 1px + var(--tooltip-tail, 0px))}.tooltip:before{content:var(--tw-content);pointer-events:none;position:absolute;z-index:1;--tw-content:attr(data-tip)}.tooltip-top:before,.tooltip:before{bottom:var(--tooltip-offset);left:50%;right:auto;top:auto;transform:translateX(-50%)}.tooltip-bottom:before{bottom:auto;left:50%;right:auto;top:var(--tooltip-offset);transform:translateX(-50%)}.card-compact .card-body{font-size:.875rem;line-height:1.25rem;padding:1rem}.card-compact .card-title{margin-bottom:.25rem}.card-normal .card-body{font-size:1rem;line-height:1.5rem;padding:var(--padding-card,2rem)}.card-normal .card-title{margin-bottom:.75rem}.join.join-vertical>:where(:not(:first-child)){margin-left:0;margin-right:0;margin-top:-1px}.join.join-horizontal>:where(:not(:first-child)){margin-bottom:0;margin-top:0;margin-inline-start:-1px}.menu-horizontal>li:not(.menu-title)>details>ul{margin-inline-start:0;margin-top:1rem;padding-bottom:.5rem;padding-inline-end:.5rem;padding-top:.5rem}.menu-horizontal>li>details>ul:before{content:none}:where(.menu-horizontal>li:not(.menu-title)>details>ul){border-radius:var(--rounded-box,1rem);--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));--tw-shadow:0 20px 25px -5px rgba(0,0,0,.1),0 8px 10px -6px rgba(0,0,0,.1);--tw-shadow-colored:0 20px 25px -5px var(--tw-shadow-color),0 8px 10px -6px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.menu-sm :where(li:not(.menu-title)>:not(ul,details,.menu-title)),.menu-sm :where(li:not(.menu-title)>details>summary:not(.menu-title)){border-radius:var(--rounded-btn,.5rem);font-size:.875rem;line-height:1.25rem;padding:.25rem .75rem}.menu-sm .menu-title{padding:.5rem .75rem}.modal-top :where(.modal-box){max-width:none;width:100%;--tw-translate-y:-2.5rem;--tw-scale-x:1;--tw-scale-y:1;border-bottom-left-radius:var(--rounded-box,1rem);border-bottom-right-radius:var(--rounded-box,1rem);border-top-left-radius:0;border-top-right-radius:0;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.modal-middle :where(.modal-box){max-width:32rem;width:91.666667%;--tw-translate-y:0px;--tw-scale-x:.9;--tw-scale-y:.9;border-bottom-left-radius:var(--rounded-box,1rem);border-bottom-right-radius:var(--rounded-box,1rem);border-top-left-radius:var(--rounded-box,1rem);border-top-right-radius:var(--rounded-box,1rem);transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.modal-bottom :where(.modal-box){max-width:none;width:100%;--tw-translate-y:2.5rem;--tw-scale-x:1;--tw-scale-y:1;border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:var(--rounded-box,1rem);border-top-right-radius:var(--rounded-box,1rem);transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.stats-vertical>:not([hidden])~:not([hidden]){--tw-divide-x-reverse:0;--tw-divide-y-reverse:0;border-width:calc(1px*(1 - var(--tw-divide-y-reverse))) calc(0px*var(--tw-divide-x-reverse)) calc(1px*var(--tw-divide-y-reverse)) calc(0px*(1 - var(--tw-divide-x-reverse)))}.stats-vertical{overflow-y:auto}.steps-horizontal .step{grid-template-columns:auto;grid-template-rows:40px 1fr;min-width:4rem}.steps-horizontal .step:before{height:.5rem;width:100%;--tw-translate-x:0px;--tw-translate-y:0px;content:"";margin-inline-start:-100%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .steps-horizontal .step):before{--tw-translate-x:0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.steps-vertical .step{gap:.5rem;grid-template-columns:40px 1fr;grid-template-rows:auto;justify-items:start;min-height:4rem}.steps-vertical .step:before{height:100%;width:.5rem;--tw-translate-x:-50%;--tw-translate-y:-50%;margin-inline-start:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}:is([dir=rtl] .steps-vertical .step):before{--tw-translate-x:50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.timeline-vertical>li>hr{width:.25rem}:where(.timeline-vertical:has(.timeline-middle)>li>hr):first-child{border-bottom-left-radius:var(--rounded-badge,1.9rem);border-bottom-right-radius:var(--rounded-badge,1.9rem);border-top-left-radius:0;border-top-right-radius:0}:where(.timeline-vertical:has(.timeline-middle)>li>hr):last-child{border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:var(--rounded-badge,1.9rem);border-top-right-radius:var(--rounded-badge,1.9rem)}:where(.timeline-vertical:not(:has(.timeline-middle)) :first-child>hr:last-child){border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:var(--rounded-badge,1.9rem);border-top-right-radius:var(--rounded-badge,1.9rem)}:where(.timeline-vertical:not(:has(.timeline-middle)) :last-child>hr:first-child){border-bottom-left-radius:var(--rounded-badge,1.9rem);border-bottom-right-radius:var(--rounded-badge,1.9rem);border-top-left-radius:0;border-top-right-radius:0}:where(.timeline-horizontal:has(.timeline-middle)>li>hr):first-child{border-end-end-radius:var(--rounded-badge,1.9rem);border-end-start-radius:0;border-start-end-radius:var(--rounded-badge,1.9rem);border-start-start-radius:0}:where(.timeline-horizontal:has(.timeline-middle)>li>hr):last-child{border-end-end-radius:0;border-end-start-radius:var(--rounded-badge,1.9rem);border-start-end-radius:0;border-start-start-radius:var(--rounded-badge,1.9rem)}.tooltip{display:inline-block;position:relative;text-align:center;--tooltip-tail:0.1875rem;--tooltip-color:var(--fallback-n,oklch(var(--n)/1));--tooltip-text-color:var(--fallback-nc,oklch(var(--nc)/1));--tooltip-tail-offset:calc(100% + 0.0625rem - var(--tooltip-tail))}.tooltip:after,.tooltip:before{opacity:0;transition-delay:.1s;transition-duration:.2s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.tooltip:after{border-style:solid;border-width:var(--tooltip-tail,0);content:"";display:block;height:0;position:absolute;width:0}.tooltip:before{background-color:var(--tooltip-color);border-radius:.25rem;color:var(--tooltip-text-color);font-size:.875rem;line-height:1.25rem;max-width:20rem;padding:.25rem .5rem;width:-moz-max-content;width:max-content}.tooltip.tooltip-open:after,.tooltip.tooltip-open:before,.tooltip:hover:after,.tooltip:hover:before{opacity:1;transition-delay:75ms}.tooltip:has(:focus-visible):after,.tooltip:has(:focus-visible):before{opacity:1;transition-delay:75ms}.tooltip:not([data-tip]):hover:after,.tooltip:not([data-tip]):hover:before{opacity:0;visibility:hidden}.tooltip-top:after,.tooltip:after{border-color:var(--tooltip-color) transparent transparent transparent;bottom:var(--tooltip-tail-offset);left:50%;right:auto;top:auto;transform:translateX(-50%)}.tooltip-bottom:after{border-color:transparent transparent var(--tooltip-color) transparent;bottom:auto;left:50%;right:auto;top:var(--tooltip-tail-offset);transform:translateX(-50%)}.fade-out{opacity:0;transition:opacity .15s ease-in-out}.visible{visibility:visible}.invisible{visibility:hidden}.static{position:static}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.inset-0{inset:0}.left-2{left:.5rem}.right-0{right:0}.right-2{right:.5rem}.right-5{right:1.25rem}.top-0{top:0}.top-2{top:.5rem}.top-5{top:1.25rem}.z-0{z-index:0}.z-10{z-index:10}.z-50{z-index:50}.z-\[1\]{z-index:1}.z-\[5000\]{z-index:5000}.z-\[6000\]{z-index:6000}.m-0{margin:0}.m-2{margin:.5rem}.m-5{margin:1.25rem}.m-auto{margin:auto}.mx-1{margin-left:.25rem;margin-right:.25rem}.mx-4{margin-left:1rem;margin-right:1rem}.mx-5{margin-left:1.25rem;margin-right:1.25rem}.mx-auto{margin-left:auto;margin-right:auto}.my-10{margin-bottom:2.5rem;margin-top:2.5rem}.my-2{margin-bottom:.5rem;margin-top:.5rem}.my-3{margin-bottom:.75rem;margin-top:.75rem}.my-4{margin-bottom:1rem;margin-top:1rem}.my-5{margin-bottom:1.25rem;margin-top:1.25rem}.mb-2{margin-bottom:.5rem}.mb-3{margin-bottom:.75rem}.mb-4{margin-bottom:1rem}.mb-5{margin-bottom:1.25rem}.mb-6{margin-bottom:1.5rem}.mb-8{margin-bottom:2rem}.ml-1{margin-left:.25rem}.ml-2{margin-left:.5rem}.ml-4{margin-left:1rem}.ml-auto{margin-left:auto}.mr-1{margin-right:.25rem}.mr-2{margin-right:.5rem}.mr-4{margin-right:1rem}.mt-1{margin-top:.25rem}.mt-10{margin-top:2.5rem}.mt-2{margin-top:.5rem}.mt-3{margin-top:.75rem}.mt-4{margin-top:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mt-8{margin-top:2rem}.block{display:block}.inline-block{display:inline-block}.inline{display:inline}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.contents{display:contents}.hidden{display:none}.h-12{height:3rem}.h-4{height:1rem}.h-48{height:12rem}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-8{height:2rem}.h-96{height:24rem}.h-\[250px\]{height:250px}.h-\[25rem\]{height:25rem}.h-fit{height:-moz-fit-content;height:fit-content}.h-full{height:100%}.max-h-48{max-height:12rem}.max-h-96{max-height:24rem}.min-h-80{min-height:20rem}.min-h-screen{min-height:100vh}.w-1\/2{width:50%}.w-10\/12{width:83.333333%}.w-4{width:1rem}.w-4\/12{width:33.333333%}.w-5{width:1.25rem}.w-52{width:13rem}.w-6{width:1.5rem}.w-64{width:16rem}.w-8{width:2rem}.w-80{width:20rem}.w-96{width:24rem}.w-auto{width:auto}.w-full{width:100%}.min-w-52{min-width:13rem}.min-w-full{min-width:100%}.max-w-2xl{max-width:42rem}.max-w-3xl{max-width:48rem}.max-w-5xl{max-width:64rem}.max-w-lg{max-width:32rem}.max-w-md{max-width:28rem}.max-w-sm{max-width:24rem}.max-w-xs{max-width:20rem}.flex-1{flex:1 1 0%}.flex-shrink-0,.shrink-0{flex-shrink:0}.translate-x-full{--tw-translate-x:100%}.transform,.translate-x-full{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}@keyframes bounce{0%,to{animation-timing-function:cubic-bezier(.8,0,1,1);transform:translateY(-25%)}50%{animation-timing-function:cubic-bezier(0,0,.2,1);transform:none}}.animate-bounce{animation:bounce 1s infinite}@keyframes spin{to{transform:rotate(1turn)}}.animate-spin{animation:spin 1s linear infinite}.cursor-not-allowed{cursor:not-allowed}.cursor-pointer{cursor:pointer}.resize{resize:both}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.flex-col-reverse{flex-direction:column-reverse}.flex-wrap{flex-wrap:wrap}.place-items-center{place-items:center}.items-start{align-items:flex-start}.items-center{align-items:center}.justify-start{justify-content:flex-start}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.gap-1{gap:.25rem}.gap-2{gap:.5rem}.gap-3{gap:.75rem}.gap-4{gap:1rem}.gap-5{gap:1.25rem}.gap-6{gap:1.5rem}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.space-y-1>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.25rem*var(--tw-space-y-reverse));margin-top:calc(.25rem*(1 - var(--tw-space-y-reverse)))}.space-y-2>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.5rem*var(--tw-space-y-reverse));margin-top:calc(.5rem*(1 - var(--tw-space-y-reverse)))}.space-y-3>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(.75rem*var(--tw-space-y-reverse));margin-top:calc(.75rem*(1 - var(--tw-space-y-reverse)))}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1rem*var(--tw-space-y-reverse));margin-top:calc(1rem*(1 - var(--tw-space-y-reverse)))}.space-y-6>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1.5rem*var(--tw-space-y-reverse));margin-top:calc(1.5rem*(1 - var(--tw-space-y-reverse)))}.space-y-8>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(2rem*var(--tw-space-y-reverse));margin-top:calc(2rem*(1 - var(--tw-space-y-reverse)))}.divide-y>:not([hidden])~:not([hidden]){--tw-divide-y-reverse:0;border-bottom-width:calc(1px*var(--tw-divide-y-reverse));border-top-width:calc(1px*(1 - var(--tw-divide-y-reverse)))}.divide-base-300>:not([hidden])~:not([hidden]){--tw-divide-opacity:1;border-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-divide-opacity,1)))}.justify-self-end{justify-self:end}.justify-self-center{justify-self:center}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.truncate{overflow:hidden;white-space:nowrap}.text-ellipsis,.truncate{text-overflow:ellipsis}.whitespace-nowrap{white-space:nowrap}.rounded{border-radius:.25rem}.rounded-box{border-radius:var(--rounded-box,1rem)}.rounded-full{border-radius:9999px}.rounded-lg{border-radius:.5rem}.rounded-md{border-radius:.375rem}.rounded-xl{border-radius:.75rem}.rounded-b{border-bottom-left-radius:.25rem;border-bottom-right-radius:.25rem}.rounded-t-none{border-top-left-radius:0;border-top-right-radius:0}.border{border-width:1px}.border-2{border-width:2px}.border-b{border-bottom-width:1px}.border-b-2{border-bottom-width:2px}.border-t{border-top-width:1px}.border-dashed{border-style:dashed}.border-base-300{--tw-border-opacity:1;border-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-border-opacity,1)))}.border-blue-300{--tw-border-opacity:1;border-color:rgb(147 197 253/var(--tw-border-opacity,1))}.border-blue-500{--tw-border-opacity:1;border-color:rgb(59 130 246/var(--tw-border-opacity,1))}.border-error{--tw-border-opacity:1;border-color:var(--fallback-er,oklch(var(--er)/var(--tw-border-opacity,1)))}.border-gray-100{--tw-border-opacity:1;border-color:rgb(243 244 246/var(--tw-border-opacity,1))}.border-gray-200{--tw-border-opacity:1;border-color:rgb(229 231 235/var(--tw-border-opacity,1))}.border-gray-300{--tw-border-opacity:1;border-color:rgb(209 213 219/var(--tw-border-opacity,1))}.border-neutral{--tw-border-opacity:1;border-color:var(--fallback-n,oklch(var(--n)/var(--tw-border-opacity,1)))}.border-red-300{--tw-border-opacity:1;border-color:rgb(252 165 165/var(--tw-border-opacity,1))}.border-sky-500{--tw-border-opacity:1;border-color:rgb(14 165 233/var(--tw-border-opacity,1))}.border-transparent{border-color:transparent}.border-white{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity,1))}.border-opacity-20{--tw-border-opacity:0.2}.bg-base-100{--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity,1)))}.bg-base-200{--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity,1)))}.bg-base-300{--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity,1)))}.bg-blue-100{--tw-bg-opacity:1;background-color:rgb(219 234 254/var(--tw-bg-opacity,1))}.bg-blue-50{--tw-bg-opacity:1;background-color:rgb(239 246 255/var(--tw-bg-opacity,1))}.bg-blue-500{--tw-bg-opacity:1;background-color:rgb(59 130 246/var(--tw-bg-opacity,1))}.bg-blue-600{--tw-bg-opacity:1;background-color:rgb(37 99 235/var(--tw-bg-opacity,1))}.bg-blue-900{--tw-bg-opacity:1;background-color:rgb(30 58 138/var(--tw-bg-opacity,1))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity,1))}.bg-gray-50{--tw-bg-opacity:1;background-color:rgb(249 250 251/var(--tw-bg-opacity,1))}.bg-green-50{--tw-bg-opacity:1;background-color:rgb(240 253 244/var(--tw-bg-opacity,1))}.bg-neutral{--tw-bg-opacity:1;background-color:var(--fallback-n,oklch(var(--n)/var(--tw-bg-opacity,1)))}.bg-red-100{--tw-bg-opacity:1;background-color:rgb(254 226 226/var(--tw-bg-opacity,1))}.bg-red-50{--tw-bg-opacity:1;background-color:rgb(254 242 242/var(--tw-bg-opacity,1))}.bg-red-500{--tw-bg-opacity:1;background-color:rgb(239 68 68/var(--tw-bg-opacity,1))}.bg-secondary-content{--tw-bg-opacity:1;background-color:var(--fallback-sc,oklch(var(--sc)/var(--tw-bg-opacity,1)))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.bg-opacity-10{--tw-bg-opacity:0.1}.bg-opacity-60{--tw-bg-opacity:0.6}.bg-opacity-80{--tw-bg-opacity:0.8}.bg-gradient-to-bl{background-image:linear-gradient(to bottom left,var(--tw-gradient-stops))}.bg-gradient-to-br{background-image:linear-gradient(to bottom right,var(--tw-gradient-stops))}.bg-gradient-to-tl{background-image:linear-gradient(to top left,var(--tw-gradient-stops))}.bg-gradient-to-tr{background-image:linear-gradient(to top right,var(--tw-gradient-stops))}.from-blue-500{--tw-gradient-from:#3b82f6 var(--tw-gradient-from-position);--tw-gradient-to:rgba(59,130,246,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-blue-600{--tw-gradient-from:#2563eb var(--tw-gradient-from-position);--tw-gradient-to:rgba(37,99,235,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-green-400{--tw-gradient-from:#4ade80 var(--tw-gradient-from-position);--tw-gradient-to:rgba(74,222,128,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-green-500{--tw-gradient-from:#22c55e var(--tw-gradient-from-position);--tw-gradient-to:rgba(34,197,94,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-orange-400{--tw-gradient-from:#fb923c var(--tw-gradient-from-position);--tw-gradient-to:rgba(251,146,60,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-orange-600{--tw-gradient-from:#ea580c var(--tw-gradient-from-position);--tw-gradient-to:rgba(234,88,12,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-primary{--tw-gradient-from:var(--fallback-p,oklch(var(--p)/1)) var(--tw-gradient-from-position);--tw-gradient-to:var(--fallback-p,oklch(var(--p)/0)) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-red-400{--tw-gradient-from:#f87171 var(--tw-gradient-from-position);--tw-gradient-to:hsla(0,91%,71%,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-red-800{--tw-gradient-from:#991b1b var(--tw-gradient-from-position);--tw-gradient-to:rgba(153,27,27,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-yellow-400{--tw-gradient-from:#facc15 var(--tw-gradient-from-position);--tw-gradient-to:rgba(250,204,21,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.from-yellow-700{--tw-gradient-from:#a16207 var(--tw-gradient-from-position);--tw-gradient-to:rgba(161,98,7,0) var(--tw-gradient-to-position);--tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to)}.to-blue-700{--tw-gradient-to:#1d4ed8 var(--tw-gradient-to-position)}.to-blue-800{--tw-gradient-to:#1e40af var(--tw-gradient-to-position)}.to-green-700{--tw-gradient-to:#15803d var(--tw-gradient-to-position)}.to-orange-600{--tw-gradient-to:#ea580c var(--tw-gradient-to-position)}.to-orange-700{--tw-gradient-to:#c2410c var(--tw-gradient-to-position)}.to-purple-600{--tw-gradient-to:#9333ea var(--tw-gradient-to-position)}.to-red-400{--tw-gradient-to:#f87171 var(--tw-gradient-to-position)}.to-red-600{--tw-gradient-to:#dc2626 var(--tw-gradient-to-position)}.to-red-900{--tw-gradient-to:#7f1d1d var(--tw-gradient-to-position)}.to-secondary{--tw-gradient-to:var(--fallback-s,oklch(var(--s)/1)) var(--tw-gradient-to-position)}.to-yellow-400{--tw-gradient-to:#facc15 var(--tw-gradient-to-position)}.to-yellow-600{--tw-gradient-to:#ca8a04 var(--tw-gradient-to-position)}.stroke-current{stroke:currentColor}.stroke-info{stroke:var(--fallback-in,oklch(var(--in)/1))}.object-cover{-o-object-fit:cover;object-fit:cover}.p-0{padding:0}.p-2{padding:.5rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-5{padding:1.25rem}.p-6{padding:1.5rem}.p-8{padding:2rem}.px-1{padding-left:.25rem;padding-right:.25rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-5{padding-left:1.25rem;padding-right:1.25rem}.py-1{padding-bottom:.25rem;padding-top:.25rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.py-20{padding-bottom:5rem;padding-top:5rem}.py-3{padding-bottom:.75rem;padding-top:.75rem}.py-4{padding-bottom:1rem;padding-top:1rem}.py-5{padding-bottom:1.25rem;padding-top:1.25rem}.py-6{padding-bottom:1.5rem;padding-top:1.5rem}.py-8{padding-bottom:2rem;padding-top:2rem}.pb-2{padding-bottom:.5rem}.pl-4{padding-left:1rem}.pl-6{padding-left:1.5rem}.pr-10{padding-right:2.5rem}.pt-2{padding-top:.5rem}.pt-6{padding-top:1.5rem}.text-center{text-align:center}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-4xl{font-size:2.25rem;line-height:2.5rem}.text-5xl{font-size:3rem;line-height:1}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-black{font-weight:900}.font-bold{font-weight:700}.font-medium{font-weight:500}.font-normal{font-weight:400}.font-semibold{font-weight:600}.normal-case{text-transform:none}.italic{font-style:italic}.text-accent{--tw-text-opacity:1;color:var(--fallback-a,oklch(var(--a)/var(--tw-text-opacity,1)))}.text-accent-content{--tw-text-opacity:1;color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity,1)))}.text-base-content{--tw-text-opacity:1;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity,1)))}.text-base-content\/50{color:var(--fallback-bc,oklch(var(--bc)/.5))}.text-base-content\/60{color:var(--fallback-bc,oklch(var(--bc)/.6))}.text-base-content\/70{color:var(--fallback-bc,oklch(var(--bc)/.7))}.text-base-content\/80{color:var(--fallback-bc,oklch(var(--bc)/.8))}.text-blue-600{--tw-text-opacity:1;color:rgb(37 99 235/var(--tw-text-opacity,1))}.text-blue-700{--tw-text-opacity:1;color:rgb(29 78 216/var(--tw-text-opacity,1))}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity,1))}.text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity,1))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81/var(--tw-text-opacity,1))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity,1))}.text-green-500{--tw-text-opacity:1;color:rgb(34 197 94/var(--tw-text-opacity,1))}.text-green-600{--tw-text-opacity:1;color:rgb(22 163 74/var(--tw-text-opacity,1))}.text-neutral{--tw-text-opacity:1;color:var(--fallback-n,oklch(var(--n)/var(--tw-text-opacity,1)))}.text-neutral-content{--tw-text-opacity:1;color:var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity,1)))}.text-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.text-primary-content{--tw-text-opacity:1;color:var(--fallback-pc,oklch(var(--pc)/var(--tw-text-opacity,1)))}.text-red-500{--tw-text-opacity:1;color:rgb(239 68 68/var(--tw-text-opacity,1))}.text-red-600{--tw-text-opacity:1;color:rgb(220 38 38/var(--tw-text-opacity,1))}.text-red-700{--tw-text-opacity:1;color:rgb(185 28 28/var(--tw-text-opacity,1))}.text-secondary{--tw-text-opacity:1;color:var(--fallback-s,oklch(var(--s)/var(--tw-text-opacity,1)))}.text-success{--tw-text-opacity:1;color:var(--fallback-su,oklch(var(--su)/var(--tw-text-opacity,1)))}.text-warning{--tw-text-opacity:1;color:var(--fallback-wa,oklch(var(--wa)/var(--tw-text-opacity,1)))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.underline{text-decoration-line:underline}.decoration-dotted{text-decoration-style:dotted}.placeholder-base-content\/70::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/.7))}.placeholder-base-content\/70::placeholder{color:var(--fallback-bc,oklch(var(--bc)/.7))}.opacity-0{opacity:0}.opacity-50{opacity:.5}.opacity-70{opacity:.7}.shadow{--tw-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px -1px rgba(0,0,0,.1);--tw-shadow-colored:0 1px 3px 0 var(--tw-shadow-color),0 1px 2px -1px var(--tw-shadow-color)}.shadow,.shadow-2xl{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-2xl{--tw-shadow:0 25px 50px -12px rgba(0,0,0,.25);--tw-shadow-colored:0 25px 50px -12px var(--tw-shadow-color)}.shadow-inner{--tw-shadow:inset 0 2px 4px 0 rgba(0,0,0,.05);--tw-shadow-colored:inset 0 2px 4px 0 var(--tw-shadow-color)}.shadow-inner,.shadow-lg{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-lg{--tw-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);--tw-shadow-colored:0 10px 15px -3px var(--tw-shadow-color),0 4px 6px -4px var(--tw-shadow-color)}.shadow-md{--tw-shadow:0 4px 6px -1px rgba(0,0,0,.1),0 2px 4px -2px rgba(0,0,0,.1);--tw-shadow-colored:0 4px 6px -1px var(--tw-shadow-color),0 2px 4px -2px var(--tw-shadow-color)}.shadow-md,.shadow-sm{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-sm{--tw-shadow:0 1px 2px 0 rgba(0,0,0,.05);--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color)}.shadow-xl{--tw-shadow:0 20px 25px -5px rgba(0,0,0,.1),0 8px 10px -6px rgba(0,0,0,.1);--tw-shadow-colored:0 20px 25px -5px var(--tw-shadow-color),0 8px 10px -6px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.blur{--tw-blur:blur(8px)}.blur,.grayscale{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.grayscale{--tw-grayscale:grayscale(100%)}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.transition{transition-duration:.15s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-all{transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-colors{transition-duration:.15s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-opacity{transition-duration:.15s;transition-property:opacity;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-shadow{transition-duration:.15s;transition-property:box-shadow;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-transform{transition-duration:.15s;transition-property:transform;transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-200{transition-duration:.2s}.duration-300{transition-duration:.3s}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}@tailwind daisyui;.leaflet-right-panel{background:#fff;border-radius:4px;box-shadow:0 1px 4px rgba(0,0,0,.3);margin-right:10px;margin-top:80px;transform:none;transition:right .3s ease-in-out;z-index:400}.add-visit-marker{align-items:center;animation:pulse-visit 2s infinite;background:#fff;border:2px solid #007bff;border-radius:50%;box-shadow:0 2px 8px rgba(0,123,255,.3);display:flex!important;font-size:20px;justify-content:center}@keyframes pulse-visit{0%{box-shadow:0 2px 8px rgba(0,123,255,.3);transform:scale(1)}50%{box-shadow:0 4px 12px rgba(0,123,255,.5);transform:scale(1.1)}to{box-shadow:0 2px 8px rgba(0,123,255,.3);transform:scale(1)}}.visit-form-popup .leaflet-popup-content-wrapper{border-radius:8px;box-shadow:0 4px 20px rgba(0,0,0,.15)}.leaflet-right-panel.controls-shifted{right:310px}.leaflet-control-button{background-color:#fff!important;color:#374151!important}.leaflet-control-button:hover{background-color:#f3f4f6!important}.leaflet-drawer{background:hsla(0,0%,100%,.5);box-shadow:-2px 0 5px rgba(0,0,0,.1);height:100%;position:absolute;right:0;top:0;transform:translateX(100%);transition:transform .3s ease-in-out;width:338px;z-index:450}.leaflet-drawer.open{transform:translateX(0)}.leaflet-control-button,.leaflet-control-layers,.toggle-panel-button{transition:right .3s ease-in-out;z-index:500}.controls-shifted{right:338px!important}.leaflet-control-custom{align-items:center;background-color:#fff;border-radius:4px;box-shadow:0 1px 4px rgba(0,0,0,.3);cursor:pointer;display:flex;height:30px;justify-content:center;width:30px}.leaflet-control-custom:hover{background-color:#f3f4f6}#selection-tool-button.active{background-color:#60a5fa;color:#fff}#cancel-selection-button{margin-bottom:1rem;width:100%}@media (hover:hover){.hover\:btn-ghost:hover:hover{border-color:transparent}@supports (color:oklch(0 0 0)){.hover\:btn-ghost:hover:hover{background-color:var(--fallback-bc,oklch(var(--bc)/.2))}}.hover\:btn-info:hover.btn-outline:hover{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)))}@supports (color:color-mix(in oklab,black,black)){.hover\:btn-info:hover.btn-outline:hover{background-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000)}}}@supports not (color:oklch(0 0 0)){.hover\:btn-info:hover{--btn-color:var(--fallback-in)}}@supports (color:color-mix(in oklab,black,black)){.hover\:btn-info:hover.btn-outline.btn-active{background-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000);border-color:color-mix(in oklab,var(--fallback-in,oklch(var(--in)/1)) 90%,#000)}}@supports (color:oklch(0 0 0)){.hover\:btn-info:hover{--btn-color:var(--in)}}.hover\:btn-info:hover{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)));outline-color:var(--fallback-in,oklch(var(--in)/1))}.hover\:btn-ghost:hover{background-color:transparent;border-color:transparent;border-width:1px;color:currentColor;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow);outline-color:currentColor}.hover\:btn-ghost:hover.btn-active{background-color:var(--fallback-bc,oklch(var(--bc)/.2));border-color:transparent}.hover\:btn-info:hover.btn-outline{--tw-text-opacity:1;color:var(--fallback-in,oklch(var(--in)/var(--tw-text-opacity)))}.hover\:btn-info:hover.btn-outline.btn-active{--tw-text-opacity:1;color:var(--fallback-inc,oklch(var(--inc)/var(--tw-text-opacity)))}.hover\:input-primary:hover{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)))}.hover\:input-primary:hover:focus,.hover\:input-primary:hover:focus-within{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity)));outline-color:var(--fallback-p,oklch(var(--p)/1))}.focus\:input-ghost:focus{--tw-bg-opacity:0.05}.focus\:input-ghost:focus:focus,.focus\:input-ghost:focus:focus-within{--tw-bg-opacity:1;--tw-text-opacity:1;box-shadow:none;color:var(--fallback-bc,oklch(var(--bc)/var(--tw-text-opacity)))}@media not all and (min-width:768px){.max-md\:timeline-compact,.max-md\:timeline-compact +.timeline-horizontal{--timeline-row-start:0}.max-md\:timeline-compact .timeline-horizontal .timeline-start,.max-md\:timeline-compact .timeline-start{align-self:flex-start;grid-column-end:4;grid-column-start:1;grid-row-end:4;grid-row-start:3;justify-self:center;margin:.25rem}.max-md\:timeline-compact .timeline-horizontal li:has(.timeline-start) .timeline-end,.max-md\:timeline-compact li:has(.timeline-start) .timeline-end{grid-column-start:none;grid-row-start:auto}.max-md\:timeline-compact.timeline-vertical>li{--timeline-col-start:0}.max-md\:timeline-compact.timeline-vertical .timeline-start{align-self:center;grid-column-end:4;grid-column-start:3;grid-row-end:4;grid-row-start:1;justify-self:start}.max-md\:timeline-compact.timeline-vertical li:has(.timeline-start) .timeline-end{grid-column-start:auto;grid-row-start:none}}@media (min-width:1024px){.lg\:stats-horizontal{grid-auto-flow:column}.lg\:stats-horizontal>:not([hidden])~:not([hidden]){--tw-divide-x-reverse:0;--tw-divide-y-reverse:0;border-width:calc(0px*(1 - var(--tw-divide-y-reverse))) calc(1px*var(--tw-divide-x-reverse)) calc(0px*var(--tw-divide-y-reverse)) calc(1px*(1 - var(--tw-divide-x-reverse)))}.lg\:stats-horizontal{overflow-x:auto}:is([dir=rtl] .lg\:stats-horizontal){--tw-divide-x-reverse:1}}.placeholder\:text-base-content\/50::-moz-placeholder{color:var(--fallback-bc,oklch(var(--bc)/.5))}.placeholder\:text-base-content\/50::placeholder{color:var(--fallback-bc,oklch(var(--bc)/.5))}.last\:border-0:last-child{border-width:0}.hover\:scale-105:hover{--tw-scale-x:1.05;--tw-scale-y:1.05}.hover\:scale-105:hover,.hover\:scale-\[1\.02\]:hover{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.hover\:scale-\[1\.02\]:hover{--tw-scale-x:1.02;--tw-scale-y:1.02}.hover\:cursor-pointer:hover{cursor:pointer}.hover\:border-primary:hover{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity,1)))}.hover\:border-primary\/40:hover{border-color:var(--fallback-p,oklch(var(--p)/.4))}.hover\:bg-accent:hover{--tw-bg-opacity:1;background-color:var(--fallback-a,oklch(var(--a)/var(--tw-bg-opacity,1)))}.hover\:bg-base-200:hover{--tw-bg-opacity:1;background-color:var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity,1)))}.hover\:bg-base-200\/50:hover{background-color:var(--fallback-b2,oklch(var(--b2)/.5))}.hover\:bg-base-300:hover{--tw-bg-opacity:1;background-color:var(--fallback-b3,oklch(var(--b3)/var(--tw-bg-opacity,1)))}.hover\:bg-blue-50:hover{--tw-bg-opacity:1;background-color:rgb(239 246 255/var(--tw-bg-opacity,1))}.hover\:bg-blue-700:hover{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity,1))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.hover\:bg-white:hover{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.hover\:text-accent-content:hover{--tw-text-opacity:1;color:var(--fallback-ac,oklch(var(--ac)/var(--tw-text-opacity,1)))}.hover\:text-blue-800:hover{--tw-text-opacity:1;color:rgb(30 64 175/var(--tw-text-opacity,1))}.hover\:text-gray-600:hover{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.hover\:text-primary:hover{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.hover\:underline:hover{text-decoration-line:underline}.hover\:no-underline:hover{text-decoration-line:none}.hover\:shadow-2xl:hover{--tw-shadow:0 25px 50px -12px rgba(0,0,0,.25);--tw-shadow-colored:0 25px 50px -12px var(--tw-shadow-color)}.hover\:shadow-2xl:hover,.hover\:shadow-lg:hover{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.hover\:shadow-lg:hover{--tw-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);--tw-shadow-colored:0 10px 15px -3px var(--tw-shadow-color),0 4px 6px -4px var(--tw-shadow-color)}.hover\:shadow-primary\/20:hover{--tw-shadow-color:var(--fallback-p,oklch(var(--p)/0.2));--tw-shadow:var(--tw-shadow-colored)}.focus\:border-primary:focus{--tw-border-opacity:1;border-color:var(--fallback-p,oklch(var(--p)/var(--tw-border-opacity,1)))}.focus\:border-transparent:focus{border-color:transparent}.focus\:bg-base-100:focus{--tw-bg-opacity:1;background-color:var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity,1)))}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.focus\:ring-2:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.focus\:ring-blue-500:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(59 130 246/var(--tw-ring-opacity,1))}.group:hover .group-hover\:text-primary{--tw-text-opacity:1;color:var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity,1)))}.group:hover .group-hover\:opacity-100{opacity:1}@media (min-width:640px){.sm\:inline{display:inline}.sm\:w-1\/12{width:8.333333%}.sm\:w-2\/12{width:16.666667%}.sm\:w-6\/12{width:50%}.sm\:grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.sm\:flex-row{flex-direction:row}.sm\:items-end{align-items:flex-end}.sm\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.sm\:space-y-0>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(0px*var(--tw-space-y-reverse));margin-top:calc(0px*(1 - var(--tw-space-y-reverse)))}}@media (min-width:768px){.md\:h-64{height:16rem}.md\:min-h-64{min-height:16rem}.md\:w-1\/12{width:8.333333%}.md\:w-2\/12{width:16.666667%}.md\:w-2\/3{width:66.666667%}.md\:w-3\/12{width:25%}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.md\:flex-row{flex-direction:row}.md\:items-end{align-items:flex-end}.md\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.md\:text-end{text-align:end}}@media (min-width:1024px){.lg\:flex{display:flex}.lg\:hidden{display:none}.lg\:w-1\/12{width:8.333333%}.lg\:w-1\/2{width:50%}.lg\:w-2\/12{width:16.666667%}.lg\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:flex-row{flex-direction:row}.lg\:flex-row-reverse{flex-direction:row-reverse}.lg\:space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*var(--tw-space-x-reverse))}.lg\:text-left{text-align:left}} \ No newline at end of file diff --git a/app/javascript/controllers/public_stat_map_controller.js b/app/javascript/controllers/public_stat_map_controller.js index 0113a0de..e8bac6c3 100644 --- a/app/javascript/controllers/public_stat_map_controller.js +++ b/app/javascript/controllers/public_stat_map_controller.js @@ -268,7 +268,7 @@ export default class extends BaseController { const endTime = props.latest_point ? new Date(props.latest_point).toLocaleTimeString() : ''; return ` -
+
📍 Location Data
Points: ${props.point_count || 0} diff --git a/app/services/maps/bounds_calculator.rb b/app/services/maps/bounds_calculator.rb index 78b02bd0..5d685c38 100644 --- a/app/services/maps/bounds_calculator.rb +++ b/app/services/maps/bounds_calculator.rb @@ -17,8 +17,12 @@ module Maps start_timestamp = parse_date_parameter(@start_date) end_timestamp = parse_date_parameter(@end_date) - points_relation = @user.points.where(timestamp: start_timestamp..end_timestamp) - point_count = points_relation.count + point_count = + @user + .points + .where(timestamp: start_timestamp..end_timestamp) + .select(:id) + .count return build_no_data_response if point_count.zero? @@ -73,9 +77,8 @@ module Maps param.to_i else parsed_time = Time.zone.parse(param) - if parsed_time.nil? - raise ArgumentError, "Invalid date format: #{param}" - end + raise ArgumentError, "Invalid date format: #{param}" if parsed_time.nil? + parsed_time.to_i end when Integer diff --git a/app/services/stats/calculate_month.rb b/app/services/stats/calculate_month.rb index bd66d4be..42986c70 100644 --- a/app/services/stats/calculate_month.rb +++ b/app/services/stats/calculate_month.rb @@ -28,11 +28,9 @@ class Stats::CalculateMonth end # Public method for calculating H3 hexagon centers with custom parameters - def calculate_h3_hexagon_centers(user_id: nil, start_date: nil, end_date: nil, h3_resolution: DEFAULT_H3_RESOLUTION) - target_start_date = start_date || start_date_iso8601 - target_end_date = end_date || end_date_iso8601 + def calculate_h3_hexagon_centers + points = fetch_user_points_for_period - points = fetch_user_points_for_period(user_id, target_start_date, target_end_date) return [] if points.empty? h3_indexes_with_counts = calculate_h3_indexes(points, h3_resolution) @@ -43,14 +41,14 @@ class Stats::CalculateMonth lower_resolution = [h3_resolution - 2, 0].max Rails.logger.info "Recalculating with lower H3 resolution: #{lower_resolution}" return calculate_h3_hexagon_centers( - user_id: user_id, - start_date: target_start_date, - end_date: target_end_date, + user_id: user.id, + start_date: start_date_iso8601, + end_date: end_date_iso8601, h3_resolution: lower_resolution ) end - Rails.logger.info "Generated #{h3_indexes_with_counts.size} H3 hexagons at resolution #{h3_resolution} for user #{user_id}" + Rails.logger.info "Generated #{h3_indexes_with_counts.size} H3 hexagons at resolution #{h3_resolution} for user #{user.id}" # Convert to format: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] h3_indexes_with_counts.map do |h3_index, data| @@ -136,7 +134,10 @@ class Stats::CalculateMonth return {} if points.empty? begin - result = calculate_h3_hexagon_centers + result = calculate_h3_hexagon_centers( + user_id: user.id, h3_resolution: DEFAULT_H3_RESOLUTION, + start_date: start_date_iso8601, end_date: end_date_iso8601 + ) if result.empty? Rails.logger.info "No H3 hex IDs calculated for user #{user.id}, #{year}-#{month} (no data)" @@ -158,18 +159,18 @@ class Stats::CalculateMonth end def start_date_iso8601 - DateTime.new(year, month, 1).beginning_of_day.iso8601 + @start_date_iso8601 ||= DateTime.new(year, month, 1).beginning_of_day.iso8601 end def end_date_iso8601 - DateTime.new(year, month, -1).end_of_day.iso8601 + @end_date_iso8601 ||= DateTime.new(year, month, -1).end_of_day.iso8601 end - def fetch_user_points_for_period(user_id, start_date, end_date) - start_timestamp = parse_date_parameter(start_date) - end_timestamp = parse_date_parameter(end_date) + def fetch_user_points_for_period + start_timestamp = start_date_iso8601.to_i + end_timestamp = end_date_iso8601.to_i - Point.where(user_id: user_id) + Point.where(user_id: user.id) .where(timestamp: start_timestamp..end_timestamp) .where.not(lonlat: nil) .select(:id, :lonlat, :timestamp) diff --git a/docs/SHAREABLE_STATS_FEATURE.md b/docs/SHAREABLE_STATS_FEATURE.md index 56ddfe19..285c511d 100644 --- a/docs/SHAREABLE_STATS_FEATURE.md +++ b/docs/SHAREABLE_STATS_FEATURE.md @@ -155,11 +155,13 @@ Converts H3 indexes back to polygon geometry: **Features:** - Uses H3 library for accurate hexagon boundaries - Converts coordinates to GeoJSON Polygon format -- Supports both center-based and H3-index-based generation -- Direct H3 index to polygon conversion for efficiency +- H3-index-only generation for maximum efficiency +- Direct H3 index to polygon conversion with coordinate transformation -**Usage Modes:** -- **Center-based**: `new(center_lng: lng, center_lat: lat)` +**Usage:** +- **H3-index only**: `new(h3_index: h3_index_string_or_integer)` +- Supports both hex string (`"8a1fb46622dffff"`) and integer formats +- Converts H3 boundary coordinates to [lng, lat] GeoJSON format ## H3 Hexagon System @@ -193,8 +195,8 @@ Dawarich uses H3 resolution 8 by default: ```mermaid graph TD A[User Data Import] --> B[Stats::CalculateMonth Service] - B --> C[Calculate H3 Hexagon Centers] - C --> D[Store in hexagon_centers Column] + B --> C[Calculate H3 Hex IDs] + C --> D[Store in h3_hex_ids Column] D --> E[Stats Available for Sharing] ``` @@ -203,7 +205,7 @@ graph TD 2. Background job triggers `Stats::CalculateMonth` 3. Service calculates monthly statistics including H3 hex IDs 4. H3 indexes are calculated for all points in the month -5. Results stored in `stats.h3_hex_ids` as JSON hash +5. Results stored in `stats.h3_hex_ids` as JSON hash with format `{"h3_index": [count, earliest, latest]}` ### 2. Sharing Activation @@ -251,16 +253,17 @@ graph TD D --> E[HexagonRequestHandler] E --> F[Find Stat by UUID] F --> G[HexagonCenterManager] - G --> H[Load Pre-calculated Centers] + G --> H[Load Pre-calculated H3 Hex IDs] H --> I[Convert to GeoJSON Polygons] I --> J[Return FeatureCollection] ``` **Data Transformation:** 1. Retrieve stored H3 hex IDs hash from database -2. Convert each H3 index to hexagon boundary coordinates -3. Build GeoJSON Feature with properties (point count, timestamps) -4. Return complete FeatureCollection for map rendering +2. For each H3 index, use H3 library to get hexagon boundary coordinates +3. Convert coordinates to GeoJSON Polygon format ([lng, lat] ordering) +4. Build GeoJSON Feature with properties (point count, earliest/latest timestamps) +5. Return complete FeatureCollection for map rendering ## API Endpoints @@ -354,9 +357,9 @@ PATCH /stats/:year/:month/sharing ## Performance Considerations ### Pre-calculation Strategy -- **Background processing**: Hexagons calculated during stats job -- **Storage efficiency**: H3 indexes are compact -- **Query optimization**: GIN index on hexagon_centers column +- **Background processing**: H3 hex IDs calculated during stats job +- **Storage efficiency**: H3 indexes are compact and stored as hash keys +- **Query optimization**: GIN index on h3_hex_ids column - **Caching**: Pre-calculated data serves multiple requests ### Memory Management @@ -367,14 +370,17 @@ PATCH /stats/:year/:month/sharing ### Database Optimization ```sql --- Optimized queries +-- Optimized queries for H3 hex data SELECT h3_hex_ids FROM stats WHERE sharing_uuid = ? AND sharing_settings->>'enabled' = 'true'; --- Index for performance +-- GIN index for efficient JSONB queries CREATE INDEX index_stats_on_h3_hex_ids ON stats USING gin (h3_hex_ids) WHERE (h3_hex_ids IS NOT NULL AND h3_hex_ids != '{}'::jsonb); + +-- Example H3 hex data structure in database +-- h3_hex_ids: {"8a1fb46622dffff": [15, 1640995200, 1640998800], ...} ``` ## Error Handling @@ -430,10 +436,11 @@ ENABLE_PUBLIC_SHARING=true ### Common Issues #### No Hexagons Displayed -1. Check if `hexagons_available?` returns true -2. Verify `h3_hex_ids` column has data -3. Confirm H3 library is properly installed -4. Check API endpoint returns valid GeoJSON +1. Check if `hexagons_available?` returns true for the stat +2. Verify `h3_hex_ids` column contains non-empty hash data +3. Confirm H3 gem is properly installed and accessible +4. Check API endpoint returns valid GeoJSON FeatureCollection +5. Verify H3 indexes are valid and can be converted to boundaries #### Sharing Link Not Working 1. Verify UUID exists in database @@ -457,11 +464,18 @@ puts stat.public_accessible? puts stat.hexagons_available? " -# Verify H3 hex data format +# Verify H3 hex data format and structure rails runner " -stat = Stat.first -puts stat.h3_hex_ids.class -puts stat.h3_hex_ids.first +stat = Stat.where.not(h3_hex_ids: {}).first +puts \"Data type: #{stat.h3_hex_ids.class}\" +puts \"Sample entry: #{stat.h3_hex_ids.first}\" +puts \"Total hexagons: #{stat.h3_hex_ids.size}\" +puts \"Available: #{stat.hexagons_available?}\" + +# Test H3 polygon generation +h3_index, data = stat.h3_hex_ids.first +polygon = Maps::HexagonPolygonGenerator.new(h3_index: h3_index).call +puts \"Generated polygon type: #{polygon['type']}\" " ``` @@ -475,13 +489,14 @@ puts stat.h3_hex_ids.first ### Technical Improvements - **CDN integration**: Faster global access to shared stats -- **Compression**: Further optimize H3 hex data storage +- **Compression**: Further optimize H3 hex data storage format - **Real-time updates**: Live sharing for ongoing activities - **API versioning**: Stable API contracts for external integration -- **H3 resolution optimization**: Dynamic resolution based on geographic area +- **Adaptive H3 resolution**: Dynamic resolution based on geographic area and zoom level +- **Polygon caching**: Cache generated polygons for frequently accessed stats ## Conclusion The Shareable Stats feature provides a robust, secure, and performant way for Dawarich users to share their location insights. The H3 hexagon system offers excellent visualization while maintaining privacy through aggregated data. The UUID-based security model ensures that only intended recipients can access shared statistics, while the configurable expiration system gives users complete control over data visibility. -The architecture is designed for scalability and performance, with pre-calculated data reducing server load and providing fast response times for public viewers. The comprehensive error handling and monitoring ensure reliable operation in production environments. +The architecture is designed for scalability and performance, with pre-calculated H3 hex data reducing server load and providing fast response times for public viewers. The streamlined H3-only implementation ensures consistent polygon generation and efficient storage. The comprehensive error handling and monitoring ensure reliable operation in production environments. diff --git a/spec/services/maps/bounds_calculator_spec.rb b/spec/services/maps/bounds_calculator_spec.rb index 0f508550..8e26508d 100644 --- a/spec/services/maps/bounds_calculator_spec.rb +++ b/spec/services/maps/bounds_calculator_spec.rb @@ -5,15 +5,10 @@ require 'rails_helper' RSpec.describe Maps::BoundsCalculator do describe '.call' do subject(:calculate_bounds) do - described_class.new( - user: target_user, - start_date: start_date, - end_date: end_date - ).call + described_class.new(user:, start_date:, end_date:).call end let(:user) { create(:user) } - let(:target_user) { user } let(:start_date) { '2024-06-01T00:00:00Z' } let(:end_date) { '2024-06-30T23:59:59Z' } @@ -63,7 +58,7 @@ RSpec.describe Maps::BoundsCalculator do end context 'with no user' do - let(:target_user) { nil } + let(:user) { nil } it 'raises NoUserFoundError' do expect { calculate_bounds }.to raise_error( From 2c55ca07e799793d1a4ee440b1a7bc3f32db9343 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Fri, 19 Sep 2025 23:49:32 +0200 Subject: [PATCH 21/25] Remove permanent option from stats sharing options, default to 24h expiration. --- CHANGELOG.md | 1 + app/controllers/shared/stats_controller.rb | 2 +- app/models/stat.rb | 7 +- app/views/shared/_sharing_modal.html.erb | 3 +- docs/SHAREABLE_STATS_FEATURE.md | 502 --------------------- spec/factories/stats.rb | 2 +- 6 files changed, 9 insertions(+), 508 deletions(-) delete mode 100644 docs/SHAREABLE_STATS_FEATURE.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b69af1f..6aa48f62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## Changed - Onboarding modal window now features a link to the App Store and a QR code to configure the Dawarich iOS app. +- A permanent option was removed from stats sharing options. Now, stats can be shared for 1, 12 or 24 hours only. # [0.32.0] - 2025-09-13 diff --git a/app/controllers/shared/stats_controller.rb b/app/controllers/shared/stats_controller.rb index ff8d19d7..a9b83862 100644 --- a/app/controllers/shared/stats_controller.rb +++ b/app/controllers/shared/stats_controller.rb @@ -30,7 +30,7 @@ class Shared::StatsController < ApplicationController return head :not_found unless @stat if params[:enabled] == '1' - @stat.enable_sharing!(expiration: params[:expiration] || 'permanent') + @stat.enable_sharing!(expiration: params[:expiration] || '24h') sharing_url = shared_stat_url(@stat.sharing_uuid) render json: { diff --git a/app/models/stat.rb b/app/models/stat.rb index 9d25da89..6c5d592b 100644 --- a/app/models/stat.rb +++ b/app/models/stat.rb @@ -38,7 +38,7 @@ class Stat < ApplicationRecord def sharing_expired? expiration = sharing_settings['expiration'] - return false if expiration.blank? || expiration == 'permanent' + return false if expiration.blank? expires_at_value = sharing_settings['expires_at'] return true if expires_at_value.blank? @@ -67,6 +67,9 @@ class Stat < ApplicationRecord end def enable_sharing!(expiration: '1h') + # Default to 24h if an invalid expiration is provided + expiration = '24h' unless %w[1h 12h 24h].include?(expiration) + expires_at = case expiration when '1h' then 1.hour.from_now when '12h' then 12.hours.from_now @@ -77,7 +80,7 @@ class Stat < ApplicationRecord sharing_settings: { 'enabled' => true, 'expiration' => expiration, - 'expires_at' => expires_at&.iso8601 + 'expires_at' => expires_at.iso8601 }, sharing_uuid: sharing_uuid || SecureRandom.uuid ) diff --git a/app/views/shared/_sharing_modal.html.erb b/app/views/shared/_sharing_modal.html.erb index beb120d0..926719cb 100644 --- a/app/views/shared/_sharing_modal.html.erb +++ b/app/views/shared/_sharing_modal.html.erb @@ -43,8 +43,7 @@ <%= options_for_select([ ['1 hour', '1h'], ['12 hours', '12h'], - ['24 hours', '24h'], - ['Permanent', 'permanent'] + ['24 hours', '24h'] ], @stat&.sharing_settings&.dig('expiration') || '1h') %>
diff --git a/docs/SHAREABLE_STATS_FEATURE.md b/docs/SHAREABLE_STATS_FEATURE.md deleted file mode 100644 index 285c511d..00000000 --- a/docs/SHAREABLE_STATS_FEATURE.md +++ /dev/null @@ -1,502 +0,0 @@ -# Shareable Stats Feature Documentation - -## Overview - -The Shareable Stats feature allows Dawarich users to publicly share their monthly location statistics without requiring authentication. This system provides a secure, time-limited way to share location insights while maintaining user privacy through configurable expiration settings and unguessable UUID-based access. - -## Key Features - -- **Time-based expiration**: Share links can expire after 1 hour, 12 hours, 24 hours, or be permanent -- **UUID-based security**: Each shared stat has a unique, unguessable UUID for secure access -- **Public API access**: Hexagon map data can be accessed via API without authentication when sharing is enabled -- **H3 Hexagon visualization**: Enhanced geographic data visualization using Uber's H3 hexagonal hierarchical spatial index -- **Automatic expiration**: Expired shares are automatically inaccessible -- **Privacy controls**: Users can enable/disable sharing and regenerate sharing URLs at any time - -## Database Schema - -### Stats Table Extensions - -The sharing functionality extends the `stats` table with the following columns: - -```sql --- Public sharing configuration -sharing_settings JSONB DEFAULT {} -sharing_uuid UUID - --- Pre-calculated H3 hexagon data for performance -h3_hex_ids JSONB DEFAULT {} - --- Indexes for performance -INDEX ON h3_hex_ids USING GIN WHERE (h3_hex_ids IS NOT NULL AND h3_hex_ids != '{}'::jsonb) -``` - -### Sharing Settings Structure - -```json -{ - "enabled": true, - "expiration": "24h", // "1h", "12h", "24h", or "permanent" - "expires_at": "2024-01-15T12:00:00Z" -} -``` - -### H3 Hex IDs Data Format - -The `h3_hex_ids` column stores pre-calculated H3 hexagon data as a hash: - -```json -{ - "8a1fb46622dffff": [15, 1640995200, 1640998800], - "8a1fb46622e7fff": [8, 1640996400, 1640999200], - // ... more H3 index entries - // Format: { "h3_index_string": [point_count, earliest_timestamp, latest_timestamp] } -} -``` - -## Architecture Components - -### Models - -#### Stat Model (`app/models/stat.rb`) - -**Key Methods:** -- `sharing_enabled?`: Checks if sharing is enabled -- `sharing_expired?`: Validates expiration status -- `public_accessible?`: Combined check for sharing availability -- `hexagons_available?`: Verifies pre-calculated H3 hex data exists -- `enable_sharing!(expiration:)`: Enables sharing with expiration -- `disable_sharing!`: Disables sharing -- `generate_new_sharing_uuid!`: Regenerates sharing UUID -- `calculate_data_bounds`: Calculates geographic bounds for the month - -### Controllers - -#### Shared::StatsController (`app/controllers/shared/stats_controller.rb`) - -Handles public sharing functionality: - -**Routes:** -- `GET /shared/stats/:uuid` - Public view of shared stats -- `PATCH /stats/:year/:month/sharing` - Sharing management (authenticated) - -**Key Methods:** -- `show`: Renders public stats view without authentication -- `update`: Manages sharing settings (enable/disable, expiration) - -#### Api::V1::Maps::HexagonsController (`app/controllers/api/v1/maps/hexagons_controller.rb`) - -Provides hexagon data for both authenticated and public access: - -**Features:** -- Skip authentication for public sharing requests (`uuid` parameter) -- Context resolution for public vs. authenticated access -- Error handling for missing or expired shares - -```ruby -# Public access via UUID -GET /api/v1/maps/hexagons?uuid=SHARING_UUID - -# Authenticated access -GET /api/v1/maps/hexagons?start_date=2024-01-01&end_date=2024-01-31 -``` - -### Services - -#### Maps::HexagonRequestHandler (`app/services/maps/hexagon_request_handler.rb`) - -Central service for processing hexagon requests: - -**Workflow:** -1. Attempts to find matching stat for the request -2. Delegates to `HexagonCenterManager` for pre-calculated data -3. Returns empty feature collection if no data available - -#### Maps::HexagonCenterManager (`app/services/maps/hexagon_center_manager.rb`) - -Manages pre-calculated H3 hexagon data: - -**Responsibilities:** -- Retrieves pre-calculated H3 hex IDs from database -- Converts stored H3 indexes to GeoJSON polygons -- Builds hexagon features with point counts and timestamps -- Handles efficient polygon generation from H3 indexes - -**Data Flow:** -1. Check if pre-calculated H3 hex IDs are available -2. Convert H3 indexes to hexagon polygons using `HexagonPolygonGenerator` -3. Build GeoJSON FeatureCollection with metadata and point counts - -#### Stats::CalculateMonth (`app/services/stats/calculate_month.rb`) - -Responsible for calculating and storing hexagon data during stats processing: - -**H3 Configuration:** -- `DEFAULT_H3_RESOLUTION = 8`: Small hexagons for good detail -- `MAX_HEXAGONS = 10_000`: Maximum to prevent memory issues - -**Key Methods:** -- `calculate_h3_hex_ids`: Main method for H3 calculation and storage -- `calculate_h3_hexagon_centers`: Internal H3 calculation logic -- `calculate_h3_indexes`: Groups points into H3 hexagons -- `fetch_user_points_for_period`: Retrieves points for date range - -**Algorithm:** -1. Fetch user points for the specified month -2. Convert each point to H3 index at specified resolution -3. Aggregate points per hexagon with count and timestamp bounds -4. Apply resolution reduction if hexagon count exceeds maximum -5. Store as hash of { h3_index_string => [count, earliest, latest] } - -#### Maps::HexagonPolygonGenerator (`app/services/maps/hexagon_polygon_generator.rb`) - -Converts H3 indexes back to polygon geometry: - -**Features:** -- Uses H3 library for accurate hexagon boundaries -- Converts coordinates to GeoJSON Polygon format -- H3-index-only generation for maximum efficiency -- Direct H3 index to polygon conversion with coordinate transformation - -**Usage:** -- **H3-index only**: `new(h3_index: h3_index_string_or_integer)` -- Supports both hex string (`"8a1fb46622dffff"`) and integer formats -- Converts H3 boundary coordinates to [lng, lat] GeoJSON format - -## H3 Hexagon System - -### What is H3? - -H3 is Uber's Hexagonal Hierarchical Spatial Index that provides: -- **Uniform coverage**: Earth divided into hexagonal cells -- **Hierarchical resolution**: 16 levels from global to local -- **Efficient indexing**: Fast spatial queries and aggregations -- **Consistent shape**: Hexagons have uniform neighbors - -### Resolution Levels - -Dawarich uses H3 resolution 8 by default: -- **Resolution 8**: ~737m average hexagon edge length -- **Fallback mechanism**: Reduces resolution if too many hexagons -- **Maximum limit**: 10,000 hexagons to prevent memory issues - -### Performance Benefits - -1. **Pre-calculation**: H3 hexagons calculated once during stats processing -2. **Efficient storage**: Hash-based storage with H3 index as key -3. **Fast retrieval**: Database lookup instead of real-time calculation -4. **Reduced bandwidth**: Compact JSON hash format for API responses -5. **Direct polygon generation**: H3 index directly converts to polygon boundaries - -## Workflow - -### 1. Stats Calculation Process - -```mermaid -graph TD - A[User Data Import] --> B[Stats::CalculateMonth Service] - B --> C[Calculate H3 Hex IDs] - C --> D[Store in h3_hex_ids Column] - D --> E[Stats Available for Sharing] -``` - -**Detailed Steps:** -1. User imports location data (GPX, JSON, etc.) -2. Background job triggers `Stats::CalculateMonth` -3. Service calculates monthly statistics including H3 hex IDs -4. H3 indexes are calculated for all points in the month -5. Results stored in `stats.h3_hex_ids` as JSON hash with format `{"h3_index": [count, earliest, latest]}` - -### 2. Sharing Activation - -```mermaid -graph TD - A[User Visits Stats Page] --> B[Enable Sharing Toggle] - B --> C[Select Expiration Duration] - C --> D[PATCH /stats/:year/:month/sharing] - D --> E[Generate/Update sharing_uuid] - E --> F[Set sharing_settings] - F --> G[Return Public URL] -``` - -**Sharing Settings:** -- **Expiration options**: 1h, 12h, 24h, permanent -- **UUID generation**: Secure random UUID for each stat -- **Expiration timestamp**: Calculated and stored in sharing_settings - -### 3. Public Access Flow - -```mermaid -graph TD - A[Public User Visits Shared URL] --> B[Validate UUID & Expiration] - B --> C{Valid & Not Expired?} - C -->|Yes| D[Load Public Stats View] - C -->|No| E[Redirect with Error] - D --> F[Render Map with Hexagons] - F --> G[Load Hexagon Data via API] - G --> H[Display Interactive Map] -``` - -**Security Checks:** -1. Verify sharing UUID exists in database -2. Check `sharing_settings.enabled = true` -3. Validate expiration timestamp if not permanent -4. Return 404 if any check fails - -### 4. Hexagon Data Retrieval - -```mermaid -graph TD - A[Map Requests Hexagon Data] --> B[GET /api/v1/maps/hexagons?uuid=UUID] - B --> C[HexagonsController] - C --> D[Skip Authentication for UUID Request] - D --> E[HexagonRequestHandler] - E --> F[Find Stat by UUID] - F --> G[HexagonCenterManager] - G --> H[Load Pre-calculated H3 Hex IDs] - H --> I[Convert to GeoJSON Polygons] - I --> J[Return FeatureCollection] -``` - -**Data Transformation:** -1. Retrieve stored H3 hex IDs hash from database -2. For each H3 index, use H3 library to get hexagon boundary coordinates -3. Convert coordinates to GeoJSON Polygon format ([lng, lat] ordering) -4. Build GeoJSON Feature with properties (point count, earliest/latest timestamps) -5. Return complete FeatureCollection for map rendering - -## API Endpoints - -### Public Sharing - -#### View Shared Stats -```http -GET /shared/stats/:uuid -``` -- **Authentication**: None required -- **Response**: HTML page with public stats view -- **Error Handling**: Redirects to root with alert if invalid/expired - -#### Get Hexagon Data -```http -GET /api/v1/maps/hexagons?uuid=:uuid -``` -- **Authentication**: None required for UUID access -- **Response**: GeoJSON FeatureCollection -- **Features**: Each feature represents one hexagon with point count and timestamps - -### Authenticated Management - -#### Toggle Sharing -```http -PATCH /stats/:year/:month/sharing -``` -**Parameters:** -- `enabled`: "1" to enable, "0" to disable -- `expiration`: "1h", "12h", "24h", or "permanent" (when enabling) - -**Response:** -```json -{ - "success": true, - "sharing_url": "https://domain.com/shared/stats/uuid", - "message": "Sharing enabled successfully" -} -``` - -## Security Features - -### UUID-based Access -- **Unguessable URLs**: Uses secure random UUIDs -- **No enumeration**: Can't guess valid sharing links -- **Automatic generation**: New UUID created for each sharing activation - -### Time-based Expiration -- **Configurable duration**: Multiple expiration options -- **Automatic enforcement**: Expired shares become inaccessible -- **Precise timestamping**: ISO8601 format with timezone awareness - -### Limited Data Exposure -- **No user identification**: Public view doesn't expose user details -- **Aggregated data only**: Only statistical summaries are shared -- **No raw location points**: Individual coordinates not exposed - -### Privacy Controls -- **User control**: Users can enable/disable sharing at any time -- **UUID regeneration**: Can generate new sharing URL to invalidate old ones -- **Granular permissions**: Per-month sharing control - -## Frontend Integration - -### Public View Template (`app/views/stats/public_month.html.erb`) - -**Features:** -- **Responsive design**: Mobile-friendly layout with Tailwind CSS -- **Monthly statistics**: Distance, active days, countries visited -- **Interactive hexagon map**: Leaflet.js with H3 hexagon overlay -- **Activity charts**: Daily distance visualization -- **Location summary**: Countries and cities visited - -**Map Integration:** -```erb -
-
-``` - -### JavaScript Controller - -**Stimulus Controller**: `public-stat-map` -- **Leaflet initialization**: Sets up interactive map -- **Hexagon layer**: Loads and renders hexagon data from API -- **User interaction**: Click handlers, zoom controls -- **Loading states**: Shows loading spinner during data fetch - -## Performance Considerations - -### Pre-calculation Strategy -- **Background processing**: H3 hex IDs calculated during stats job -- **Storage efficiency**: H3 indexes are compact and stored as hash keys -- **Query optimization**: GIN index on h3_hex_ids column -- **Caching**: Pre-calculated data serves multiple requests - -### Memory Management -- **Hexagon limits**: Maximum 10,000 hexagons per month -- **Resolution fallback**: Automatically reduces detail for large areas -- **Lazy loading**: Only calculate when stats are processed -- **Efficient formats**: JSON storage optimized for size - -### Database Optimization -```sql --- Optimized queries for H3 hex data -SELECT h3_hex_ids FROM stats -WHERE sharing_uuid = ? AND sharing_settings->>'enabled' = 'true'; - --- GIN index for efficient JSONB queries -CREATE INDEX index_stats_on_h3_hex_ids -ON stats USING gin (h3_hex_ids) -WHERE (h3_hex_ids IS NOT NULL AND h3_hex_ids != '{}'::jsonb); - --- Example H3 hex data structure in database --- h3_hex_ids: {"8a1fb46622dffff": [15, 1640995200, 1640998800], ...} -``` - -## Error Handling - -### Validation Errors -- **Missing UUID**: 404 response with user-friendly message -- **Expired sharing**: Redirect with appropriate alert -- **Invalid parameters**: Bad request with error details - -### Service Errors -- **H3 calculation failures**: Graceful degradation, logs warning -- **Database errors**: Transaction rollback, user notification -- **Memory issues**: Resolution reduction, retry mechanism - -### Frontend Resilience -- **Loading states**: User feedback during data fetching -- **Fallback content**: Display stats even if hexagons fail -- **Error messages**: Clear communication of issues - -## Configuration - -### Environment Variables -```bash -# H3 hexagon settings (optional, defaults shown) -H3_DEFAULT_RESOLUTION=8 -H3_MAX_HEXAGONS=10000 - -# Feature flags -ENABLE_PUBLIC_SHARING=true -``` - -### Runtime Configuration -- **Resolution adaptation**: Automatic based on data size -- **Expiration options**: Configurable in sharing settings -- **Security headers**: CORS configuration for API access - -## Monitoring and Analytics - -### Logging -- **Share creation**: Log when sharing is enabled -- **Public access**: Log UUID-based requests (without exposing UUID) -- **Performance metrics**: H3 calculation timing -- **Error tracking**: Failed calculations and API errors - -### Metrics -- **Sharing adoption**: How many users enable sharing -- **Expiration preferences**: Popular expiration durations -- **Performance**: Hexagon calculation and rendering times -- **Error rates**: Failed sharing requests - -## Troubleshooting - -### Common Issues - -#### No Hexagons Displayed -1. Check if `hexagons_available?` returns true for the stat -2. Verify `h3_hex_ids` column contains non-empty hash data -3. Confirm H3 gem is properly installed and accessible -4. Check API endpoint returns valid GeoJSON FeatureCollection -5. Verify H3 indexes are valid and can be converted to boundaries - -#### Sharing Link Not Working -1. Verify UUID exists in database -2. Check sharing_settings.enabled = true -3. Validate expiration timestamp -4. Confirm public routes are properly configured - -#### Performance Issues -1. Monitor hexagon count (should be < 10,000) -2. Check if resolution is too high for large areas -3. Verify database indexes are present -4. Consider increasing H3_MAX_HEXAGONS if needed - -### Debug Commands - -```bash -# Check sharing status for a stat -rails runner " -stat = Stat.find_by(sharing_uuid: 'UUID_HERE') -puts stat.public_accessible? -puts stat.hexagons_available? -" - -# Verify H3 hex data format and structure -rails runner " -stat = Stat.where.not(h3_hex_ids: {}).first -puts \"Data type: #{stat.h3_hex_ids.class}\" -puts \"Sample entry: #{stat.h3_hex_ids.first}\" -puts \"Total hexagons: #{stat.h3_hex_ids.size}\" -puts \"Available: #{stat.hexagons_available?}\" - -# Test H3 polygon generation -h3_index, data = stat.h3_hex_ids.first -polygon = Maps::HexagonPolygonGenerator.new(h3_index: h3_index).call -puts \"Generated polygon type: #{polygon['type']}\" -" -``` - -## Future Enhancements - -### Planned Features -- **Social sharing**: Integration with social media platforms -- **Embedding**: Iframe widgets for external sites -- **Analytics**: View count and engagement metrics -- **Custom styling**: User-configurable map themes - -### Technical Improvements -- **CDN integration**: Faster global access to shared stats -- **Compression**: Further optimize H3 hex data storage format -- **Real-time updates**: Live sharing for ongoing activities -- **API versioning**: Stable API contracts for external integration -- **Adaptive H3 resolution**: Dynamic resolution based on geographic area and zoom level -- **Polygon caching**: Cache generated polygons for frequently accessed stats - -## Conclusion - -The Shareable Stats feature provides a robust, secure, and performant way for Dawarich users to share their location insights. The H3 hexagon system offers excellent visualization while maintaining privacy through aggregated data. The UUID-based security model ensures that only intended recipients can access shared statistics, while the configurable expiration system gives users complete control over data visibility. - -The architecture is designed for scalability and performance, with pre-calculated H3 hex data reducing server load and providing fast response times for public viewers. The streamlined H3-only implementation ensures consistent polygon generation and efficient storage. The comprehensive error handling and monitoring ensure reliable operation in production environments. diff --git a/spec/factories/stats.rb b/spec/factories/stats.rb index 724ddbfa..16be6795 100644 --- a/spec/factories/stats.rb +++ b/spec/factories/stats.rb @@ -21,7 +21,7 @@ FactoryBot.define do trait :with_sharing_enabled do after(:create) do |stat, _evaluator| - stat.enable_sharing!(expiration: 'permanent') + stat.enable_sharing!(expiration: '24h') end end From 3450ca35b074b692002a4e5ca819a2e02809dc21 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sat, 20 Sep 2025 12:57:30 +0200 Subject: [PATCH 22/25] Extract hexagon calculation to its own service --- app/services/stats/calculate_month.rb | 122 +-------------- app/services/stats/hexagon_calculator.rb | 139 ++++++++++++++++++ spec/services/stats/calculate_month_spec.rb | 111 -------------- .../services/stats/hexagon_calculator_spec.rb | 123 ++++++++++++++++ 4 files changed, 263 insertions(+), 232 deletions(-) create mode 100644 app/services/stats/hexagon_calculator.rb create mode 100644 spec/services/stats/hexagon_calculator_spec.rb diff --git a/app/services/stats/calculate_month.rb b/app/services/stats/calculate_month.rb index 42986c70..35a5cfee 100644 --- a/app/services/stats/calculate_month.rb +++ b/app/services/stats/calculate_month.rb @@ -3,12 +3,6 @@ class Stats::CalculateMonth include ActiveModel::Validations - # H3 Configuration - DEFAULT_H3_RESOLUTION = 8 # Small hexagons for good detail - MAX_HEXAGONS = 10_000 # Maximum number of hexagons to prevent memory issues - - class PostGISError < StandardError; end - def initialize(user_id, year, month) @user = User.find(user_id) @year = year.to_i @@ -27,44 +21,6 @@ class Stats::CalculateMonth create_stats_update_failed_notification(user, e) end - # Public method for calculating H3 hexagon centers with custom parameters - def calculate_h3_hexagon_centers - points = fetch_user_points_for_period - - return [] if points.empty? - - h3_indexes_with_counts = calculate_h3_indexes(points, h3_resolution) - - if h3_indexes_with_counts.size > MAX_HEXAGONS - Rails.logger.warn "Too many hexagons (#{h3_indexes_with_counts.size}), using lower resolution" - # Try with lower resolution (larger hexagons) - lower_resolution = [h3_resolution - 2, 0].max - Rails.logger.info "Recalculating with lower H3 resolution: #{lower_resolution}" - return calculate_h3_hexagon_centers( - user_id: user.id, - start_date: start_date_iso8601, - end_date: end_date_iso8601, - h3_resolution: lower_resolution - ) - end - - Rails.logger.info "Generated #{h3_indexes_with_counts.size} H3 hexagons at resolution #{h3_resolution} for user #{user.id}" - - # Convert to format: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] - h3_indexes_with_counts.map do |h3_index, data| - [ - h3_index.to_s(16), # Store as hex string - data[:count], - data[:earliest], - data[:latest] - ] - end - rescue StandardError => e - message = "Failed to calculate H3 hexagon centers: #{e.message}" - ExceptionReporter.call(e, message) if defined?(ExceptionReporter) - raise PostGISError, message - end - private attr_reader :user, :year, :month @@ -131,82 +87,6 @@ class Stats::CalculateMonth end def calculate_h3_hex_ids - return {} if points.empty? - - begin - result = calculate_h3_hexagon_centers( - user_id: user.id, h3_resolution: DEFAULT_H3_RESOLUTION, - start_date: start_date_iso8601, end_date: end_date_iso8601 - ) - - if result.empty? - Rails.logger.info "No H3 hex IDs calculated for user #{user.id}, #{year}-#{month} (no data)" - return {} - end - - # Convert array format to hash format: { h3_index => [count, earliest, latest] } - hex_hash = result.each_with_object({}) do |hex_data, hash| - h3_index, count, earliest, latest = hex_data - hash[h3_index] = [count, earliest, latest] - end - - Rails.logger.info "Pre-calculated #{hex_hash.size} H3 hex IDs for user #{user.id}, #{year}-#{month}" - hex_hash - rescue PostGISError => e - Rails.logger.warn "H3 hex IDs calculation failed for user #{user.id}, #{year}-#{month}: #{e.message}" - {} - end - end - - def start_date_iso8601 - @start_date_iso8601 ||= DateTime.new(year, month, 1).beginning_of_day.iso8601 - end - - def end_date_iso8601 - @end_date_iso8601 ||= DateTime.new(year, month, -1).end_of_day.iso8601 - end - - def fetch_user_points_for_period - start_timestamp = start_date_iso8601.to_i - end_timestamp = end_date_iso8601.to_i - - Point.where(user_id: user.id) - .where(timestamp: start_timestamp..end_timestamp) - .where.not(lonlat: nil) - .select(:id, :lonlat, :timestamp) - end - - def calculate_h3_indexes(points, h3_resolution) - h3_data = Hash.new { |h, k| h[k] = { count: 0, earliest: nil, latest: nil } } - - points.find_each do |point| - # Extract lat/lng from PostGIS point - coordinates = [point.lonlat.y, point.lonlat.x] # [lat, lng] for H3 - - # Get H3 index for this point - h3_index = H3.from_geo_coordinates(coordinates, h3_resolution.clamp(0, 15)) - - # Aggregate data for this hexagon - data = h3_data[h3_index] - data[:count] += 1 - data[:earliest] = [data[:earliest], point.timestamp].compact.min - data[:latest] = [data[:latest], point.timestamp].compact.max - end - - h3_data - end - - def parse_date_parameter(param) - case param - when String - param.match?(/^\d+$/) ? param.to_i : Time.zone.parse(param).to_i - when Integer - param - else - param.to_i - end - rescue ArgumentError => e - Rails.logger.error "Invalid date format: #{param} - #{e.message}" - raise ArgumentError, "Invalid date format: #{param}" + Stats::HexagonCalculator.new(user.id, year, month).calculate_h3_hex_ids end end diff --git a/app/services/stats/hexagon_calculator.rb b/app/services/stats/hexagon_calculator.rb new file mode 100644 index 00000000..f76b65de --- /dev/null +++ b/app/services/stats/hexagon_calculator.rb @@ -0,0 +1,139 @@ +# frozen_string_literal: true + +class Stats::HexagonCalculator + # H3 Configuration + DEFAULT_H3_RESOLUTION = 8 # Small hexagons for good detail + MAX_HEXAGONS = 10_000 # Maximum number of hexagons to prevent memory issues + + class PostGISError < StandardError; end + + def initialize(user_id, year, month) + @user = User.find(user_id) + @year = year.to_i + @month = month.to_i + end + + def call(h3_resolution: DEFAULT_H3_RESOLUTION) + calculate_h3_hexagon_centers_with_resolution(h3_resolution) + end + + def calculate_h3_hex_ids + return {} if points.empty? + + begin + result = call + + if result.empty? + Rails.logger.info "No H3 hex IDs calculated for user #{user.id}, #{year}-#{month} (no data)" + return {} + end + + # Convert array format to hash format: { h3_index => [count, earliest, latest] } + hex_hash = result.each_with_object({}) do |hex_data, hash| + h3_index, count, earliest, latest = hex_data + hash[h3_index] = [count, earliest, latest] + end + + Rails.logger.info "Pre-calculated #{hex_hash.size} H3 hex IDs for user #{user.id}, #{year}-#{month}" + hex_hash + rescue PostGISError => e + Rails.logger.warn "H3 hex IDs calculation failed for user #{user.id}, #{year}-#{month}: #{e.message}" + {} + end + end + + private + + attr_reader :user, :year, :month + + def calculate_h3_hexagon_centers_with_resolution(h3_resolution) + points = fetch_user_points_for_period + + return [] if points.empty? + + h3_indexes_with_counts = calculate_h3_indexes(points, h3_resolution) + + if h3_indexes_with_counts.size > MAX_HEXAGONS + Rails.logger.warn "Too many hexagons (#{h3_indexes_with_counts.size}), using lower resolution" + # Try with lower resolution (larger hexagons) + lower_resolution = [h3_resolution - 2, 0].max + Rails.logger.info "Recalculating with lower H3 resolution: #{lower_resolution}" + # Create a new instance with lower resolution for recursion + return self.class.new(user.id, year, month) + .calculate_h3_hexagon_centers_with_resolution(lower_resolution) + end + + Rails.logger.info "Generated #{h3_indexes_with_counts.size} H3 hexagons at resolution #{h3_resolution} for user #{user.id}" + + # Convert to format: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] + h3_indexes_with_counts.map do |h3_index, data| + [ + h3_index.to_s(16), # Store as hex string + data[:count], + data[:earliest], + data[:latest] + ] + end + rescue StandardError => e + message = "Failed to calculate H3 hexagon centers: #{e.message}" + ExceptionReporter.call(e, message) if defined?(ExceptionReporter) + raise PostGISError, message + end + + def start_timestamp + DateTime.new(year, month, 1).to_i + end + + def end_timestamp + DateTime.new(year, month, -1).to_i # -1 returns last day of month + end + + def points + return @points if defined?(@points) + + @points = user + .points + .without_raw_data + .where(timestamp: start_timestamp..end_timestamp) + .select(:lonlat, :timestamp) + .order(timestamp: :asc) + end + + def start_date_iso8601 + @start_date_iso8601 ||= DateTime.new(year, month, 1).beginning_of_day.iso8601 + end + + def end_date_iso8601 + @end_date_iso8601 ||= DateTime.new(year, month, -1).end_of_day.iso8601 + end + + def fetch_user_points_for_period + start_timestamp = DateTime.parse(start_date_iso8601).to_i + end_timestamp = DateTime.parse(end_date_iso8601).to_i + + Point.where(user_id: user.id) + .where(timestamp: start_timestamp..end_timestamp) + .where.not(lonlat: nil) + .select(:id, :lonlat, :timestamp) + end + + def calculate_h3_indexes(points, h3_resolution) + h3_data = Hash.new { |h, k| h[k] = { count: 0, earliest: nil, latest: nil } } + + points.find_each do |point| + # Extract lat/lng from PostGIS point + coordinates = [point.lonlat.y, point.lonlat.x] # [lat, lng] for H3 + + # Get H3 index for this point + h3_index = H3.from_geo_coordinates(coordinates, h3_resolution.clamp(0, 15)) + + # Aggregate data for this hexagon + data = h3_data[h3_index] + data[:count] += 1 + data[:earliest] = [data[:earliest], point.timestamp].compact.min + data[:latest] = [data[:latest], point.timestamp].compact.max + end + + h3_data + end +end \ No newline at end of file diff --git a/spec/services/stats/calculate_month_spec.rb b/spec/services/stats/calculate_month_spec.rb index 1045f9c6..275c46a9 100644 --- a/spec/services/stats/calculate_month_spec.rb +++ b/spec/services/stats/calculate_month_spec.rb @@ -95,115 +95,4 @@ RSpec.describe Stats::CalculateMonth do end end end - - describe '#calculate_h3_hexagon_centers' do - subject(:calculate_hexagons) do - described_class.new(user.id, year, month).calculate_h3_hexagon_centers( - user_id: user.id, - start_date: start_date, - end_date: end_date, - h3_resolution: h3_resolution - ) - end - - let(:user) { create(:user) } - let(:year) { 2024 } - let(:month) { 1 } - let(:start_date) { DateTime.new(year, month, 1).beginning_of_day.iso8601 } - let(:end_date) { DateTime.new(year, month, 1).end_of_month.end_of_day.iso8601 } - let(:h3_resolution) { 8 } - - context 'when there are no points' do - it 'returns empty array' do - expect(calculate_hexagons).to eq([]) - end - end - - context 'when there are points' do - let(:timestamp1) { DateTime.new(year, month, 1, 12).to_i } - let(:timestamp2) { DateTime.new(year, month, 1, 13).to_i } - let!(:import) { create(:import, user:) } - let!(:point1) do - create(:point, - user:, - import:, - timestamp: timestamp1, - lonlat: 'POINT(14.452712811406352 52.107902115161316)') - end - let!(:point2) do - create(:point, - user:, - import:, - timestamp: timestamp2, - lonlat: 'POINT(14.453712811406352 52.108902115161316)') - end - - it 'returns H3 hexagon data' do - result = calculate_hexagons - - expect(result).to be_an(Array) - expect(result).not_to be_empty - - # Each record should have: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] - result.each do |record| - expect(record).to be_an(Array) - expect(record.size).to eq(4) - expect(record[0]).to be_a(String) # H3 index as hex string - expect(record[1]).to be_a(Integer) # Point count - expect(record[2]).to be_a(Integer) # Earliest timestamp - expect(record[3]).to be_a(Integer) # Latest timestamp - end - end - - it 'aggregates points correctly' do - result = calculate_hexagons - - total_points = result.sum { |record| record[1] } - expect(total_points).to eq(2) - end - - context 'when H3 raises an error' do - before do - allow(H3).to receive(:from_geo_coordinates).and_raise(StandardError, 'H3 error') - end - - it 'raises PostGISError' do - expect do - calculate_hexagons - end.to raise_error(Stats::CalculateMonth::PostGISError, /Failed to calculate H3 hexagon centers/) - end - - it 'reports the exception' do - expect(ExceptionReporter).to receive(:call) if defined?(ExceptionReporter) - - expect { calculate_hexagons }.to raise_error(Stats::CalculateMonth::PostGISError) - end - end - end - - describe 'date parameter parsing' do - let(:service) { described_class.new(user.id, year, month) } - - it 'handles string timestamps' do - result = service.send(:parse_date_parameter, '1640995200') - expect(result).to eq(1_640_995_200) - end - - it 'handles ISO date strings' do - result = service.send(:parse_date_parameter, '2024-01-01T00:00:00Z') - expect(result).to be_a(Integer) - end - - it 'handles integer timestamps' do - result = service.send(:parse_date_parameter, 1_640_995_200) - expect(result).to eq(1_640_995_200) - end - - it 'handles edge case gracefully' do - # Time.zone.parse is very lenient, so we'll test a different edge case - result = service.send(:parse_date_parameter, nil) - expect(result).to eq(0) - end - end - end end diff --git a/spec/services/stats/hexagon_calculator_spec.rb b/spec/services/stats/hexagon_calculator_spec.rb new file mode 100644 index 00000000..25c8f83e --- /dev/null +++ b/spec/services/stats/hexagon_calculator_spec.rb @@ -0,0 +1,123 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Stats::HexagonCalculator do + describe '#call' do + subject(:calculate_hexagons) do + described_class.new(user.id, year, month).call(h3_resolution: h3_resolution) + end + + let(:user) { create(:user) } + let(:year) { 2024 } + let(:month) { 1 } + let(:h3_resolution) { 8 } + + context 'when there are no points' do + it 'returns empty array' do + expect(calculate_hexagons).to eq([]) + end + end + + context 'when there are points' do + let(:timestamp1) { DateTime.new(year, month, 1, 12).to_i } + let(:timestamp2) { DateTime.new(year, month, 1, 13).to_i } + let!(:import) { create(:import, user:) } + let!(:point1) do + create(:point, + user:, + import:, + timestamp: timestamp1, + lonlat: 'POINT(14.452712811406352 52.107902115161316)') + end + let!(:point2) do + create(:point, + user:, + import:, + timestamp: timestamp2, + lonlat: 'POINT(14.453712811406352 52.108902115161316)') + end + + it 'returns H3 hexagon data' do + result = calculate_hexagons + + expect(result).to be_an(Array) + expect(result).not_to be_empty + + # Each record should have: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] + result.each do |record| + expect(record).to be_an(Array) + expect(record.size).to eq(4) + expect(record[0]).to be_a(String) # H3 index as hex string + expect(record[1]).to be_a(Integer) # Point count + expect(record[2]).to be_a(Integer) # Earliest timestamp + expect(record[3]).to be_a(Integer) # Latest timestamp + end + end + + it 'aggregates points correctly' do + result = calculate_hexagons + + total_points = result.sum { |record| record[1] } + expect(total_points).to eq(2) + end + + context 'when H3 raises an error' do + before do + allow(H3).to receive(:from_geo_coordinates).and_raise(StandardError, 'H3 error') + end + + it 'raises PostGISError' do + expect do + calculate_hexagons + end.to raise_error(Stats::HexagonCalculator::PostGISError, /Failed to calculate H3 hexagon centers/) + end + + it 'reports the exception' do + expect(ExceptionReporter).to receive(:call) if defined?(ExceptionReporter) + + expect { calculate_hexagons }.to raise_error(Stats::HexagonCalculator::PostGISError) + end + end + end + end + + describe '#calculate_h3_hex_ids' do + subject(:calculate_hex_ids) { described_class.new(user.id, year, month).calculate_h3_hex_ids } + + let(:user) { create(:user) } + let(:year) { 2024 } + let(:month) { 1 } + + context 'when there are no points' do + it 'returns empty hash' do + expect(calculate_hex_ids).to eq({}) + end + end + + context 'when there are points' do + let(:timestamp1) { DateTime.new(year, month, 1, 12).to_i } + let!(:import) { create(:import, user:) } + let!(:point1) do + create(:point, + user:, + import:, + timestamp: timestamp1, + lonlat: 'POINT(14.452712811406352 52.107902115161316)') + end + + it 'returns hash with H3 hex IDs' do + result = calculate_hex_ids + + expect(result).to be_a(Hash) + expect(result).not_to be_empty + + result.each do |h3_index, data| + expect(h3_index).to be_a(String) + expect(data).to be_an(Array) + expect(data.size).to eq(3) # [count, earliest, latest] + end + end + end + end +end \ No newline at end of file From c756346569225d1566684fa938ef178efce57b63 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sat, 20 Sep 2025 13:23:24 +0200 Subject: [PATCH 23/25] Refactor H3 hexagon calculation logic to improve clarity and maintainability --- app/services/stats/calculate_month.rb | 4 +- app/services/stats/hexagon_calculator.rb | 131 ++++++++++------------- 2 files changed, 57 insertions(+), 78 deletions(-) diff --git a/app/services/stats/calculate_month.rb b/app/services/stats/calculate_month.rb index 35a5cfee..dafabf28 100644 --- a/app/services/stats/calculate_month.rb +++ b/app/services/stats/calculate_month.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class Stats::CalculateMonth - include ActiveModel::Validations - def initialize(user_id, year, month) @user = User.find(user_id) @year = year.to_i @@ -87,6 +85,6 @@ class Stats::CalculateMonth end def calculate_h3_hex_ids - Stats::HexagonCalculator.new(user.id, year, month).calculate_h3_hex_ids + Stats::HexagonCalculator.new(user.id, year, month).call end end diff --git a/app/services/stats/hexagon_calculator.rb b/app/services/stats/hexagon_calculator.rb index f76b65de..1767c7bc 100644 --- a/app/services/stats/hexagon_calculator.rb +++ b/app/services/stats/hexagon_calculator.rb @@ -14,70 +14,63 @@ class Stats::HexagonCalculator end def call(h3_resolution: DEFAULT_H3_RESOLUTION) - calculate_h3_hexagon_centers_with_resolution(h3_resolution) + calculate_h3_hexagon_centers(h3_resolution) end def calculate_h3_hex_ids - return {} if points.empty? + result = calculate_hexagons(DEFAULT_H3_RESOLUTION) + return {} if result.nil? - begin - result = call - - if result.empty? - Rails.logger.info "No H3 hex IDs calculated for user #{user.id}, #{year}-#{month} (no data)" - return {} - end - - # Convert array format to hash format: { h3_index => [count, earliest, latest] } - hex_hash = result.each_with_object({}) do |hex_data, hash| - h3_index, count, earliest, latest = hex_data - hash[h3_index] = [count, earliest, latest] - end - - Rails.logger.info "Pre-calculated #{hex_hash.size} H3 hex IDs for user #{user.id}, #{year}-#{month}" - hex_hash - rescue PostGISError => e - Rails.logger.warn "H3 hex IDs calculation failed for user #{user.id}, #{year}-#{month}: #{e.message}" - {} - end + result end private attr_reader :user, :year, :month - def calculate_h3_hexagon_centers_with_resolution(h3_resolution) - points = fetch_user_points_for_period + def calculate_h3_hexagon_centers(h3_resolution) + result = calculate_hexagons(h3_resolution) + return [] if result.nil? - return [] if points.empty? - - h3_indexes_with_counts = calculate_h3_indexes(points, h3_resolution) - - if h3_indexes_with_counts.size > MAX_HEXAGONS - Rails.logger.warn "Too many hexagons (#{h3_indexes_with_counts.size}), using lower resolution" - # Try with lower resolution (larger hexagons) - lower_resolution = [h3_resolution - 2, 0].max - Rails.logger.info "Recalculating with lower H3 resolution: #{lower_resolution}" - # Create a new instance with lower resolution for recursion - return self.class.new(user.id, year, month) - .calculate_h3_hexagon_centers_with_resolution(lower_resolution) - end - - Rails.logger.info "Generated #{h3_indexes_with_counts.size} H3 hexagons at resolution #{h3_resolution} for user #{user.id}" - - # Convert to format: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] - h3_indexes_with_counts.map do |h3_index, data| + # Convert to array format: [h3_index_string, point_count, earliest_timestamp, latest_timestamp] + result.map do |h3_index_string, data| [ - h3_index.to_s(16), # Store as hex string - data[:count], - data[:earliest], - data[:latest] + h3_index_string, + data[0], # count + data[1], # earliest + data[2] # latest ] end - rescue StandardError => e - message = "Failed to calculate H3 hexagon centers: #{e.message}" - ExceptionReporter.call(e, message) if defined?(ExceptionReporter) - raise PostGISError, message + end + + # Unified hexagon calculation method + def calculate_hexagons(h3_resolution) + return nil if points.empty? + + begin + h3_hash = calculate_h3_indexes(points, h3_resolution) + + if h3_hash.empty? + Rails.logger.info "No H3 hex IDs calculated for user #{user.id}, #{year}-#{month} (no data)" + return nil + end + + if h3_hash.size > MAX_HEXAGONS + Rails.logger.warn "Too many hexagons (#{h3_hash.size}), using lower resolution" + # Try with lower resolution (larger hexagons) + lower_resolution = [h3_resolution - 2, 0].max + Rails.logger.info "Recalculating with lower H3 resolution: #{lower_resolution}" + # Create a new instance with lower resolution for recursion + return self.class.new(user.id, year, month).calculate_hexagons(lower_resolution) + end + + Rails.logger.info "Generated #{h3_hash.size} H3 hexagons at resolution #{h3_resolution} for user #{user.id}" + h3_hash + rescue StandardError => e + message = "Failed to calculate H3 hexagon centers: #{e.message}" + ExceptionReporter.call(e, message) if defined?(ExceptionReporter) + raise PostGISError, message + end end def start_timestamp @@ -95,30 +88,13 @@ class Stats::HexagonCalculator .points .without_raw_data .where(timestamp: start_timestamp..end_timestamp) + .where.not(lonlat: nil) .select(:lonlat, :timestamp) .order(timestamp: :asc) end - def start_date_iso8601 - @start_date_iso8601 ||= DateTime.new(year, month, 1).beginning_of_day.iso8601 - end - - def end_date_iso8601 - @end_date_iso8601 ||= DateTime.new(year, month, -1).end_of_day.iso8601 - end - - def fetch_user_points_for_period - start_timestamp = DateTime.parse(start_date_iso8601).to_i - end_timestamp = DateTime.parse(end_date_iso8601).to_i - - Point.where(user_id: user.id) - .where(timestamp: start_timestamp..end_timestamp) - .where.not(lonlat: nil) - .select(:id, :lonlat, :timestamp) - end - def calculate_h3_indexes(points, h3_resolution) - h3_data = Hash.new { |h, k| h[k] = { count: 0, earliest: nil, latest: nil } } + h3_data = {} points.find_each do |point| # Extract lat/lng from PostGIS point @@ -126,14 +102,19 @@ class Stats::HexagonCalculator # Get H3 index for this point h3_index = H3.from_geo_coordinates(coordinates, h3_resolution.clamp(0, 15)) + h3_index_string = h3_index.to_s(16) # Convert to hex string immediately - # Aggregate data for this hexagon - data = h3_data[h3_index] - data[:count] += 1 - data[:earliest] = [data[:earliest], point.timestamp].compact.min - data[:latest] = [data[:latest], point.timestamp].compact.max + # Initialize or update data for this hexagon + if h3_data[h3_index_string] + data = h3_data[h3_index_string] + data[0] += 1 # increment count + data[1] = [data[1], point.timestamp].min # update earliest + data[2] = [data[2], point.timestamp].max # update latest + else + h3_data[h3_index_string] = [1, point.timestamp, point.timestamp] # [count, earliest, latest] + end end h3_data end -end \ No newline at end of file +end From 339ba3130eaed82d036aab07e64fa4c2aa23ab18 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sat, 20 Sep 2025 14:05:14 +0200 Subject: [PATCH 24/25] Fix missing hexagons --- app/models/stat.rb | 2 +- app/services/maps/hexagon_center_manager.rb | 8 +++++--- spec/services/stats/hexagon_calculator_spec.rb | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/models/stat.rb b/app/models/stat.rb index 6c5d592b..36421b97 100644 --- a/app/models/stat.rb +++ b/app/models/stat.rb @@ -58,7 +58,7 @@ class Stat < ApplicationRecord def hexagons_available? h3_hex_ids.present? && - h3_hex_ids.is_a?(Hash) && + (h3_hex_ids.is_a?(Hash) || h3_hex_ids.is_a?(Array)) && h3_hex_ids.any? end diff --git a/app/services/maps/hexagon_center_manager.rb b/app/services/maps/hexagon_center_manager.rb index 31ada95a..b9a3b03e 100644 --- a/app/services/maps/hexagon_center_manager.rb +++ b/app/services/maps/hexagon_center_manager.rb @@ -20,7 +20,7 @@ module Maps def pre_calculated_centers_available? return false if stat&.h3_hex_ids.blank? - stat.h3_hex_ids.is_a?(Hash) && stat.h3_hex_ids.any? + stat.h3_hex_ids.is_a?(Array) && stat.h3_hex_ids.any? end def build_response_from_centers @@ -45,8 +45,10 @@ module Maps def build_hexagons_from_h3_ids(hex_ids) # Convert stored H3 IDs back to hexagon polygons - hexagon_features = hex_ids.map.with_index do |(h3_index, data), index| - build_hexagon_feature_from_h3(h3_index, data, index) + # Array format: [[h3_index, point_count, earliest, latest], ...] + hexagon_features = hex_ids.map.with_index do |row, index| + h3_index, count, earliest, latest = row + build_hexagon_feature_from_h3(h3_index, [count, earliest, latest], index) end build_feature_collection(hexagon_features) diff --git a/spec/services/stats/hexagon_calculator_spec.rb b/spec/services/stats/hexagon_calculator_spec.rb index 25c8f83e..40903efb 100644 --- a/spec/services/stats/hexagon_calculator_spec.rb +++ b/spec/services/stats/hexagon_calculator_spec.rb @@ -120,4 +120,4 @@ RSpec.describe Stats::HexagonCalculator do end end end -end \ No newline at end of file +end From 1043d572feef0dd1dfa3077d7f47427137d23802 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Sat, 20 Sep 2025 14:25:16 +0200 Subject: [PATCH 25/25] Fix failing specs --- spec/services/maps/hexagon_center_manager_spec.rb | 12 ++++++------ spec/services/maps/hexagon_request_handler_spec.rb | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spec/services/maps/hexagon_center_manager_spec.rb b/spec/services/maps/hexagon_center_manager_spec.rb index 47d7f8c9..472ad520 100644 --- a/spec/services/maps/hexagon_center_manager_spec.rb +++ b/spec/services/maps/hexagon_center_manager_spec.rb @@ -11,11 +11,11 @@ RSpec.describe Maps::HexagonCenterManager do context 'with pre-calculated hexagon centers' do let(:pre_calculated_centers) do - { - '8a1fb46622dffff' => [5, 1_717_200_000, 1_717_203_600], # count, earliest, latest timestamps - '8a1fb46622e7fff' => [3, 1_717_210_000, 1_717_213_600], - '8a1fb46632dffff' => [8, 1_717_220_000, 1_717_223_600] - } + [ + ['8a1fb46622dffff', 5, 1_717_200_000, 1_717_203_600], # h3_index, count, earliest, latest timestamps + ['8a1fb46622e7fff', 3, 1_717_210_000, 1_717_213_600], + ['8a1fb46632dffff', 8, 1_717_220_000, 1_717_223_600] + ] end let(:stat) { create(:stat, user:, year: 2024, month: 6, h3_hex_ids: pre_calculated_centers) } @@ -67,7 +67,7 @@ RSpec.describe Maps::HexagonCenterManager do end context 'with empty hexagon_centers' do - let(:stat) { create(:stat, user:, year: 2024, month: 6, h3_hex_ids: {}) } + let(:stat) { create(:stat, user:, year: 2024, month: 6, h3_hex_ids: []) } it 'returns nil' do expect(manage_centers).to be_nil diff --git a/spec/services/maps/hexagon_request_handler_spec.rb b/spec/services/maps/hexagon_request_handler_spec.rb index 45b9f84b..df3e6988 100644 --- a/spec/services/maps/hexagon_request_handler_spec.rb +++ b/spec/services/maps/hexagon_request_handler_spec.rb @@ -46,10 +46,10 @@ RSpec.describe Maps::HexagonRequestHandler do context 'with public sharing UUID and pre-calculated centers' do let(:pre_calculated_centers) do - { - '8a1fb46622dffff' => [5, 1_717_200_000, 1_717_203_600], - '8a1fb46622e7fff' => [3, 1_717_210_000, 1_717_213_600] - } + [ + ['8a1fb46622dffff', 5, 1_717_200_000, 1_717_203_600], + ['8a1fb46622e7fff', 3, 1_717_210_000, 1_717_213_600] + ] end let(:stat) do create(:stat, :with_sharing_enabled, user:, year: 2024, month: 6,