From b9a1ca4125557f1efc660418adf8cb1c1ff3b485 Mon Sep 17 00:00:00 2001
From: grigo <blacksmoke576@gmail.com>
Date: Tue, 23 Jun 2026 15:44:31 +0300
Subject: [PATCH] added fresnel zone

---
 API.md                                        |   6 ++++--
 .../__pycache__/terrain.cpython-313.pyc       | Bin 4550 -> 4629 bytes
 api/app/models/terrain.py                     |   2 ++
 .../__pycache__/terrain.cpython-313.pyc       | Bin 9654 -> 9837 bytes
 api/app/services/terrain.py                   |   2 ++
 .../test_api.cpython-313-pytest-9.0.3.pyc     | Bin 20965 -> 21012 bytes
 api/tests/test_api.py                         |   2 ++
 7 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/API.md b/API.md
index 393c4b9..11081d1 100644
--- a/API.md
+++ b/API.md
@@ -246,6 +246,8 @@ curl -s -X POST http://localhost:5603/api/v1/terrain/los \
   "clearance_m": 11.28,
   "fresnel_radius_m": 11.9,
   "required_clearance_m": 7.14,
+  "fresnel_upper_60pct_m": 36.84,
+  "fresnel_upper_100pct_m": 41.6,
   "fresnel_lower_60pct_m": 22.56,
   "fresnel_lower_100pct_m": 17.8,
   "type": "terrain"
@@ -257,8 +259,8 @@ curl -s -X POST http://localhost:5603/api/v1/terrain/los \
 - `distance_m` по X.
 - `surface_m` как земля/DSM.
 - `path_height_m` как прямая TX-RX.
-- `fresnel_lower_60pct_m` как нижняя граница требуемой свободной зоны.
-- `fresnel_lower_100pct_m` как нижняя граница полной первой зоны Френеля.
+- `fresnel_lower_60pct_m` и `fresnel_upper_60pct_m` как требуемая свободная зона.
+- `fresnel_lower_100pct_m` и `fresnel_upper_100pct_m` как полная первая зона Френеля.
 - точки, где `clearance_m < required_clearance_m`, подсветить как нарушения.
 
 ## Buildings
diff --git a/api/app/models/__pycache__/terrain.cpython-313.pyc b/api/app/models/__pycache__/terrain.cpython-313.pyc
index 4cb4170d3fb58638e72aa373742f7940534eee34..b18207c836490e7998cf5a395727935cb0d0c5fe 100644
GIT binary patch
delta 224
zcmX@6JXMA7GcPX}0}v?HTV=^{ZRA_Q&A4gu0yc%oYZ*Bv-{(%59LvY0$QHvI%&!hq
z6~i7ZzzU*Sg9SnSV4)(8bYV@A$x%G{s-*=5sYUT-1_j9_@wvCe(uz`x^HOu-A;N|R
z5b??Td3qS*C;RYvZ|>$5WMmB3JeRMLkt+dcSP_T_n5-et$e1vBl|Z>XSWp-wBMl;C
tfW$2ho80`A(wtPgqT<O8g4xpijK(u8zc2u)FDiVDq7yW~G5{&C1^^nQI)eZJ

delta 156
zcmbQLa!i@;GcPX}0}u$+SY_Sh+{m|rn{nRc1#AkF*D`WUzR#T^&K}Ii3Y3pw4dzz|
z(!l~n9O;6ZLX-1&@|kn;%O^kJ5t*#ao6Q(Jxu4g2^D|ynMn=EQZ}=J+x#EDzi$H|m
y<Z^*V#<<Bp1<HYBp`a{d;pBe7Y-wIb;~AD;7=Y9l1wKa637TISfK-t*PzwOhswpJ^

diff --git a/api/app/models/terrain.py b/api/app/models/terrain.py
index b7777a1..c52dace 100644
--- a/api/app/models/terrain.py
+++ b/api/app/models/terrain.py
@@ -70,6 +70,8 @@ class FresnelProfileSample(BaseModel):
     clearance_m: float
     fresnel_radius_m: float
     required_clearance_m: float
+    fresnel_upper_60pct_m: float
+    fresnel_upper_100pct_m: float
     fresnel_lower_60pct_m: float
     fresnel_lower_100pct_m: float
     type: Literal["terrain", "building", "canopy"]
diff --git a/api/app/services/__pycache__/terrain.cpython-313.pyc b/api/app/services/__pycache__/terrain.cpython-313.pyc
index f74b3060180d261a27b88bfe30394c1bc6a8d4b1..af2670ce03fccc84ccc23064a7d15adf19fdee02 100644
GIT binary patch
delta 540
zcmdny{nm%?GcPX}0}!~^TV*xNZRC3)#3cme3NtV;e%`Q2n1zuY$O~l*;+pIzEIL_1
zL<EKZK{$bfUxh)F$xoAia)d~PYH2}1YEitIK|yj!eC{o=w4&7Fywsd{h_ImnM11lx
zk>iXzCg+JZPChPb$SyA+!1aMaVDo>`35<*xlP8Gx$j1XMEpi1Bo*+U3L_~v#7!VOV
z*;-;ZcPNNy2O<(CGfLVqR&92W%wl8}Waavxv3b4JB_`H-pybBQZL<1IMukA;E!MQ0
z{KS$XkZ=*mlbUQrHXybxh|mKO`XHhSL^Mx+E-%ZtZ!@ccJfmC$P^6d@NGO0nkp@VC
zC5*T{*-6n_r4z(e1`%ME0+4l!xwxdLC<7!W3L<JIFH}@j1oLHpe4y>tAYpM30k*gg
z#LAfbT+x6H%9K@-XY8MBt0W5(NKn#{0?S2$)LMavC^#!)@**W=#`ev}lsp+3YbOh+
z=&)6RB<m+Tsi-r~pPZ#qubjom$aaHQ`~x$H@qk0@11pH}fsKJp@GCo*88w+lbrk?{
Cf`C8(

delta 468
zcmaFsv(20DGcPX}0}yD}SY_Ri-N^Ssh)V#-6=q;y{2Z`Jn1yk2iii&fuL^@Elb<H<
z<Q*arlkG+KGESKMSF}+;Q2e@}#zjGmkJ5YsTpt+tHg6M~z{r?3*<GSXJ{D+7kt>Ms
z1Q8M-A`(PIfr#kIpCon*1cR7%AR-P(+!CF9KwNb4B}o;=ip}38vlv<VS-C!_Y)+HD
z#Kc+)RIq-tt(-m+Z$3yZYg$fzVo6c$<Vpp3wg#X`QRC!!3bKrQHt$i8XJibUd`D4+
z@#5s4iq<OaAX#M)0cI%xS+|&rONxrpKw_dGqH1!4k}A;QbxKlfJs^R!$@7#9JRwXV
zze*@4v$!N0Y-g-Oje=i(UaBTnkqt;`FNn|u5mq2V56;pDv7n}jD{DxBnc;Bh2skTk
za-^~{W9#NxWlu)N>dD7dbl56DlC_h6s;D#0ovf%@ubjci$aaHQ`~x$H@qk0@11pH}
SfsKJp@GCo*88-Q_>M8(D&UgL*

diff --git a/api/app/services/terrain.py b/api/app/services/terrain.py
index 712f68b..73f7bdb 100644
--- a/api/app/services/terrain.py
+++ b/api/app/services/terrain.py
@@ -130,6 +130,8 @@ def los(
             clearance_m=sample.clearance_m,
             fresnel_radius_m=sample.fresnel_radius_m,
             required_clearance_m=sample.required_clearance_m,
+            fresnel_upper_60pct_m=sample.path_height_m + sample.required_clearance_m,
+            fresnel_upper_100pct_m=sample.path_height_m + sample.fresnel_radius_m,
             fresnel_lower_60pct_m=sample.path_height_m - sample.required_clearance_m,
             fresnel_lower_100pct_m=sample.path_height_m - sample.fresnel_radius_m,
             type=sample.obstruction_type,
diff --git a/api/tests/__pycache__/test_api.cpython-313-pytest-9.0.3.pyc b/api/tests/__pycache__/test_api.cpython-313-pytest-9.0.3.pyc
index 7920574373b1ec6dd8d32653d5b07bb727417861..5ba29df56bd2cd4a4b773635f4d889d42a07fe86 100644
GIT binary patch
delta 339
zcmaF5m~qMyM&8f7yj%=G;9GB%m9vp|za1mz<g<23Jfdkusl|DzIq{_h1(Q|mm3VK7
zA&G3Zw&!4C?Aq+&D9lvP#l!Z2fs0l9y9fh2e`Cf6Q6T$+2!nvg1rgPY{AvpdFY;?b
z1R1z^_(3vSpGCQNw85Ib0>!j}1X#P0_CiUxO1AGHQJBdnQvAqLK@12vklEkC_G2?q
z8>|gXe1ghLXkQeE=l~0U1Y0S#S;M7_ld*sEeBTI0)@i`dN#Fd(uY!rK3&<>*Hn}QL
ZigEtrsew*>DvWGj{TRg=m5TI$QULPEULODe

delta 333
zcmbQTgz@QOM&8f7yj%=GU|VCArM{7Oza1m{<g<23lilpaH<#M~Wn}EwT<j>!RL{Y~
z_JM(eRr|XD13Q0X#s@(l`-1?3fXD?A)r<UU3komtYeEDWIC%I$GFqPnIe4_en!W<X
zw1EUzyOQ=oNw`Y3?;uf_$tY6%$WlQJ2sx11-@*1{Gf^9?4NQE3%1dZp6o=>l3x5P#
zDYQA<rHqrYck?;l2u9W^z#vH7tnFXHq}Tyu7J>LH8H)5kY#ktRi^C>2KczG$)vjpn
U<RgJjd`gULU%eQ`8I{0l0LDpJ*8l(j

diff --git a/api/tests/test_api.py b/api/tests/test_api.py
index 9b4e649..ae13fff 100644
--- a/api/tests/test_api.py
+++ b/api/tests/test_api.py
@@ -86,6 +86,8 @@ def test_los_endpoint_returns_obstruction_summary_fields() -> None:
         "path_height_m",
         "fresnel_radius_m",
         "required_clearance_m",
+        "fresnel_upper_60pct_m",
+        "fresnel_upper_100pct_m",
         "fresnel_lower_60pct_m",
         "fresnel_lower_100pct_m",
     }.issubset(data["fresnel_profile"][0])