From 989fc3537a6ff2dc4a13de16a3f2a8a9972c41f0 Mon Sep 17 00:00:00 2001
From: Stream <stream@openclaw>
Date: Mon, 4 May 2026 00:10:01 +0300
Subject: [PATCH] auto-sync: 2026-05-04 00:10:01

---
 .../telegram_collector.session                | Bin 151552 -> 151552 bytes
 tasks/enduro-trails/osrm/enduro.lua           |  45 +++++++++---------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/skills/telegram-collector/telegram_collector.session b/skills/telegram-collector/telegram_collector.session
index a91c1fa52d22f60a9e3d4f6dfbb83ae720e41dc3..f7d872fe6ee764ec3544dc9bda5749552a69d9dd 100644
GIT binary patch
delta 1480
zcmXw3e@s<n7~XUE6~Z8sDFjG`ex9?kNz0YE<PW!IOlho0t(MY4Gy^oti3npwkQ-)~
z<L!XTMTUf^%k;Run1M7xexy-u+Alx>Z(5r;i664mb>H``zrJVB`@GNle$RLAEj<)o
zdMNzUc=$aD%i%w{{y;&<REvW5)RxTfps5zieYsEt1%T-m?@9-Q-eQY@awkjj!-%nS
z%TxJ0Twcb7$1C0nVWO%sors1jl?E4vKiR{;e%G^riG!XrvasyI>N|ncw12Isr_(Lo
zpF%?{_vC>{YO(D0+B_x}`JR<MHrIIt1l2c)q`4uBB{<wcgz0vDp2{wE@R7T064d+~
zE3P)1!3-k4m=X};K2Jc|8Tt{fY}Kt%1niV^{=jLvab4f@Jo|e0G%H7X(pWIR_Y9rx
zNbkcu?bP{P$?ok-%VdvZKNnGm%C&yKB|FCtd`Knb)?ZmoCCmM1I9GPfxpt6=V1KK0
ze|LRTXn-;8MWdXvn>RYbZ(_eRwv(jxk7Im2x9{)IWW|jWiVL2Jh1BVOJF!isJTrZc
zywqvzrqgmNL$QY>PC^*A5Yx0b4E%b!DiSMc1IrnTLO+Rgdo;3mf{vYuE?&<Wo`pUx
zo{mAi6xYlKXQdn!3o}quPG;<Xs^mEM*;Pj*K#PCpTx7F_m4s%Zl)m&R`p8V_rexfb
zh8l%wL0$_R=($Yi{z9y0S@x4y$1kWmp28a0WA4)k<>>T+R3vkQUbPGt=y^<?xB@9+
zmzj?Dx!38*z&ID%U&JKEpq!R03<rRveXqbrdQ+#ZMZPTe<*VSxm44xMbUr{jXJ!s^
zs8bi_V2nL<{${)*tpj;@j#@1zu>eo7+sXoX<T6*c@nuZC{5=?=U$Gsvf^O_U7$N11
z?SzL1lo#POF}t=4xonnEj6|k%ehISa$EEbek8qhdQy;6q4nj(+-6*AXmDB9OVy1>X
z2$t3xRXEEs=jc9Ea_15+%6Jc_-N8lHd#f=h5pDOOmQ}Osa9^l7jc8=*Y~%kISa$>)
z<SN}qu~uGV-U;mEC7aHC1@UkD8gB$TEuGYY6a1Y!KYfEj9=WO&C9>ELZJeIc_u9}X
zZ`|04c+q!sgZ_9-{a_C^%AlePh>9l8sqDulHoMc0SrSInVBq@>aF)I~gkK`Kwfkn^
z_dq&l>1`b6;$OEV150lm$0+}C={N7<F)^vQhmR%iheC`p;!Ir=YUFdudPcPI!3?s~
zd*h5qd2U~#LCKr?a-uOQCVfdp3<YTEKjs<Zk=!tlVw{)ljxRRq1Z6BSswK-mml|_o
F{snl0g*X5J

delta 1480
zcmXw3X-t$?6wUdDMTCG>qEHx7v7@AF7*o@VQGS>hB}zjSm$p%9isMoSt*sFeLKLAU
z<1&o+L6t#*BaRxaVtg6}X%JaluqN6KP#CG!M2rZd#3eH4(qHf7oO{o`@4Rm&??_PI
zk)Zui@Ytj0!gF@@p-g|T#f<oK8&iS|Ud#0AC0Ql|LC*Fh5VYjP3Gn7x1AUCcQjoy&
zXhA+JJ}vytpG1)@$#+&huxS*!_U<8Y{9vC%;;=nYEILYFv*WMQ3JN*Dm}SV>Lm|>q
zSC&B~-uZ<n8_J6X7%D2I#9f)n5*)3Ud5y;sSmN+I{+9Lz_us5|=$`CH5PbTT0RQTF
z1de1ij>;xg6UrX*^==Z8jW@*Xank?=Pje#APg*Xsz|-<E3(noNNOtS*&5=D${*f&q
z#{KhLc8+S_DN@CQWg@-lvWR{9qr<fG>#mWKYme6ja8P^?bFR+l@vz6SxOW?cJH5PK
zb?eK6;<2{hM8V!am0rK~Z<Z;a4_v3$dF<w?+XAr1SE5G;VxtdK?F$57PZfn=Ave%F
zL(%5bR9zTSIYC8?M5BmZqtHt6d^jpZTs|6-m2Qf_WZI`h3{}NOqMMB>I2uYU8pa}x
z7I86fi+FE5TE(m?7SDw%HDN$daU9n0x%Br_v6`)E)3Az^s-KSK(mM7t1n`<_QUYQ{
zT{H)`_&mxuA7-&jNy1NJ*PM*LK|8am`x0KppkGQw7biHE!YTEMD`1rgzkUUYTrKzp
z4a0nO`p9&o8(!AmQCaEel_;$n@V&3qtlBd$o2|Mr6I1BBFcWr}{&4fqW#;|}O-9Y%
zf-*r*wjz*7@7)GFI}5V$wU|BH4hyN|92jLaYcA6G<5G8b;l6Mu3$ay@X*cp@UAG-G
z*xG4_pNLP2aFs|uaR4@oGmDWg)9ZBHB~@I44vA=s6J?}Em*c%qV_a~Ny6XD>0;`T=
zja;Sa1XjpvOgw`FT(au&1&Dv`MXY3J%q5)RSF8Vi1zDsP)gV_EyInh!-n&}3<c(bo
zh?4sHCh(6(jcCSN8I*ksp<zA`-PVS6G<)5KQF7nVj=}Gn+_O&n8BEmlZ1DHMhFLFg
ziqz8=Lm8+|edv*FzkQ1dVp8}HKMVJfzm_jtX@F*B%4&F+wqy99i&^c9)I#LBokmTP
szi-sM($E^Ch07=N??kOHgk#&y+D+N+)C{d$Q1VQzM6&#EmNq8*1IE)?EC2ui

diff --git a/tasks/enduro-trails/osrm/enduro.lua b/tasks/enduro-trails/osrm/enduro.lua
index b54993a..222a081 100644
--- a/tasks/enduro-trails/osrm/enduro.lua
+++ b/tasks/enduro-trails/osrm/enduro.lua
@@ -1,12 +1,11 @@
 -- enduro.lua — OSRM профиль для эндуро-роутинга "Дикий путь"
--- Стратегия: weight = distance_meters * penalty
--- Грунтовки penalty=1, асфальт penalty=10+
--- OSRM минимизирует суммарный weight → выбирает грунтовки
+-- weight = штраф для выбора маршрута (грунтовки дешевле асфальта)
+-- duration = реальное время (для ETA)
+-- Разделены явно через result.weight и result.duration
 
 api_version = 4
 
 -- Штраф за метр пути (меньше = предпочтительнее)
--- Грунтовки ~1, асфальт ~10+
 local highway_penalty = {
   track        = 1.0,
   bridleway    = 1.2,
@@ -16,19 +15,19 @@ local highway_penalty = {
   unclassified = 3.0,
   residential  = 5.0,
   service      = 6.0,
-  tertiary     = 12.0,
-  tertiary_link= 12.0,
-  secondary    = 18.0,
-  secondary_link = 18.0,
-  primary      = 25.0,
-  primary_link = 25.0,
-  trunk        = 40.0,
-  trunk_link   = 40.0,
+  tertiary     = 15.0,
+  tertiary_link= 15.0,
+  secondary    = 25.0,
+  secondary_link = 25.0,
+  primary      = 40.0,
+  primary_link = 40.0,
+  trunk        = 60.0,
+  trunk_link   = 60.0,
   motorway     = 999.0,
   motorway_link= 999.0,
 }
 
--- Скорости (км/ч) — только для ETA, не влияют на выбор маршрута
+-- Скорости (км/ч) — только для ETA
 local highway_speeds = {
   track        = 30,
   bridleway    = 20,
@@ -50,7 +49,7 @@ local highway_speeds = {
   motorway_link= 90,
 }
 
--- Мультипликатор по качеству грунтовки (grade1=лучший, grade5=тяжёлый)
+-- Мультипликатор по качеству грунтовки
 local tracktype_multiplier = {
   grade1 = 1.0,
   grade2 = 1.1,
@@ -62,7 +61,7 @@ local tracktype_multiplier = {
 function setup()
   return {
     properties = {
-      weight_name        = 'duration',
+      weight_name        = 'routability',
       max_speed_for_map_matching = 30/3.6,
       call_tagless_node_function = false,
       traffic_light_penalty      = 2,
@@ -89,7 +88,7 @@ function process_way(profile, way, result)
 
   local speed = highway_speeds[highway] or 30
 
-  -- Мультипликатор по tracktype для грунтовок
+  -- Мультипликатор по tracktype
   local tracktype = way:get_value_by_key("tracktype")
   if tracktype and tracktype_multiplier[tracktype] then
     penalty = penalty * tracktype_multiplier[tracktype]
@@ -97,16 +96,16 @@ function process_way(profile, way, result)
 
   result.forward_mode  = mode.driving
   result.backward_mode = mode.driving
+
+  -- duration = реальное время (секунды на метр)
+  local speed_mps = speed / 3.6
   result.forward_speed  = speed
   result.backward_speed = speed
 
-  -- duration = реальное время (секунды) — используется для ETA
-  -- weight = штраф для роутера — грунтовки дешевле асфальта
-  -- Задаём rate: weight_per_meter = penalty / speed_mps
-  -- OSRM считает weight = rate * distance
-  local speed_mps = speed / 3.6
-  result.forward_rate  = penalty / speed_mps
-  result.backward_rate = penalty / speed_mps
+  -- weight = штраф для роутера (penalty на метр)
+  -- forward_rate/backward_rate задают weight_per_meter
+  result.forward_rate  = penalty
+  result.backward_rate = penalty
 
   -- Одностороннее движение
   local oneway = way:get_value_by_key("oneway")