From f8b68708636e35fe64360c53f444ce4f327bb383 Mon Sep 17 00:00:00 2001
From: sasbot <>
Date: Sat, 6 Jun 2020 12:00:00 +0000
Subject: [PATCH] update zmp

---
 ProGorod1.zmp/GetUrlScript.txt | 48 ++++++++++++++++++----------------
 ProGorod1.zmp/info.txt         |  2 ++
 ProGorod1.zmp/params.txt       |  4 +--
 3 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 ProGorod1.zmp/info.txt

diff --git a/ProGorod1.zmp/GetUrlScript.txt b/ProGorod1.zmp/GetUrlScript.txt
index f939c2059..b16e747a4 100644
--- a/ProGorod1.zmp/GetUrlScript.txt
+++ b/ProGorod1.zmp/GetUrlScript.txt
@@ -17,24 +17,26 @@ begin
 sh_x[0]:=0; sh_y[0]:=0;
 sh_x[1]:=0; sh_y[1]:=0;
 sh_x[2]:=0; sh_y[2]:=0;
-sh_x[3]:=-1; sh_y[3]:=1;
-sh_x[4]:=-1; sh_y[4]:=2;
-sh_x[5]:=0; sh_y[5]:=2;
-sh_x[6]:=0; sh_y[6]:=4;
-sh_x[7]:=0; sh_y[7]:=7;
-sh_x[8]:=0; sh_y[8]:=14;
-sh_x[9]:=0; sh_y[9]:=29;
-
-sh_x[10]:=1; sh_y[10]:=57;
-sh_x[11]:=4; sh_y[11]:=113;
-sh_x[12]:=6; sh_y[12]:=227;
-sh_x[13]:=12; sh_y[13]:=454;
-sh_x[14]:=23; sh_y[14]:=908;
-sh_x[15]:=46; sh_y[15]:=1816;
-sh_x[16]:=-116; sh_y[16]:=3813;
-sh_x[17]:=-233; sh_y[17]:=7626;
-sh_x[18]:=0; sh_y[18]:=0;
-sh_x[19]:=0; sh_y[19]:=0;
+sh_x[3]:=0; sh_y[3]:=0;
+sh_x[4]:=0; sh_y[4]:=0;
+sh_x[5]:=0; sh_y[5]:=0;
+sh_x[6]:=0; sh_y[6]:=0;
+sh_x[7]:=0; sh_y[7]:=0;
+sh_x[8]:=0; sh_y[8]:=0;
+sh_x[9]:=0; sh_y[9]:=1;
+
+sh_x[10]:=0; sh_y[10]:=1;
+sh_x[11]:=0; sh_y[11]:=3;
+sh_x[12]:=0; sh_y[12]:=6;
+
+sh_x[13]:=0; sh_y[13]:=11;
+
+sh_x[14]:=0; sh_y[14]:=22;
+sh_x[15]:=0; sh_y[15]:=44;
+sh_x[16]:=0; sh_y[16]:=88;
+sh_x[17]:=0; sh_y[17]:=175;
+sh_x[18]:=0; sh_y[18]:=350;
+sh_x[19]:=-90; sh_y[19]:=946;
 
 sh_x[20]:=0; sh_y[20]:=0;
 sh_x[21]:=0; sh_y[21]:=0;
@@ -44,12 +46,12 @@ sh_x[24]:=0; sh_y[24]:=0;
 
 tx:=getx+sh_x[getz];
 
-dx:=(tx div 999);
-sx:=addzero(tx-dx*999);
+dx:=(tx div 1000);
+sx:=addzero(tx-dx*1000);
 ty:=(round(intpower(2,GetZ-1))-Gety)-sh_y[getz];
-dy:=(ty div 999);
-ty:=ty-dy*999-1;
+dy:=(ty div 1000);
+ty:=ty-dy*1000-1;
 sy:=addzero(ty);
 sz:=inttostr(Getz-1);
-ResultURL:=GetUrlBase+sz+'/00/000/'+addzero(dx)+'/'+sx+'/000/'+addzero(dy)+'/'+sy+'.png';
+ResultURL:=GetUrlBase+sz+'/00/000/'+addzero(dx)+'/'+sx+'/000/'+addzero(dy)+'/'+sy+'.png'+'?e16a5f67e5cc3887282038bf6bc27657';
 end.
\ No newline at end of file
diff --git a/ProGorod1.zmp/info.txt b/ProGorod1.zmp/info.txt
new file mode 100644
index 000000000..0eaaf5c0c
--- /dev/null
+++ b/ProGorod1.zmp/info.txt
@@ -0,0 +1,2 @@
+На зумах 16 и меньше привязка сильно съезжает по оси y (а на z17 и z18 всё нормально). 
+Проблема связана с ошибкой округления и, по-моему, не решается.
\ No newline at end of file
diff --git a/ProGorod1.zmp/params.txt b/ProGorod1.zmp/params.txt
index 60037b07e..678a07936 100644
--- a/ProGorod1.zmp/params.txt
+++ b/ProGorod1.zmp/params.txt
@@ -1,8 +1,8 @@
 [PARAMS]
 pnum=119
 GUID={714D22FC-40A0-41ED-A6E3-4DFFA1589CBA}
-name=Карта (pro-gorod.ru 1)
-name_9=Map (pro-gorod.ru 1)
+name=Карта (pro-gorod.ru)
+name_9=Map (pro-gorod.ru)
 ParentSubMenu=Другие карты
 ParentSubMenu_9=Other maps
 asLayer=0