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

---
 {_Ovi => _Nokia}/ovi_hyb.zmp/18.bmp    | Bin
 {_Ovi => _Nokia}/ovi_hyb.zmp/24.bmp    | Bin
 _Nokia/ovi_hyb.zmp/GetUrlScript.txt    |   6 ++++++
 {_Ovi => _Nokia}/ovi_hyb.zmp/info.txt  |   0
 _Nokia/ovi_hyb.zmp/params.txt          |  27 +++++++++++++++++++++++++
 {_Ovi => _Nokia}/ovi_land.zmp/18.bmp   | Bin
 {_Ovi => _Nokia}/ovi_land.zmp/24.bmp   | Bin
 _Nokia/ovi_land.zmp/GetUrlScript.txt   |   6 ++++++
 {_Ovi => _Nokia}/ovi_land.zmp/info.txt |   0
 _Nokia/ovi_land.zmp/params.txt         |  27 +++++++++++++++++++++++++
 {_Ovi => _Nokia}/ovi_map.zmp/18.bmp    | Bin
 {_Ovi => _Nokia}/ovi_map.zmp/24.bmp    | Bin
 _Nokia/ovi_map.zmp/GetUrlScript.txt    |   6 ++++++
 {_Ovi => _Nokia}/ovi_map.zmp/info.txt  |   0
 _Nokia/ovi_map.zmp/params.txt          |  27 +++++++++++++++++++++++++
 {_Ovi => _Nokia}/ovi_sat.zmp/18.bmp    | Bin
 {_Ovi => _Nokia}/ovi_sat.zmp/24.bmp    | Bin
 _Nokia/ovi_sat.zmp/GetUrlScript.txt    |   6 ++++++
 {_Ovi => _Nokia}/ovi_sat.zmp/info.txt  |   0
 _Nokia/ovi_sat.zmp/params.txt          |  27 +++++++++++++++++++++++++
 _Ovi/ovi_hyb.zmp/GetUrlScript.txt      |   3 ---
 _Ovi/ovi_hyb.zmp/params.txt            |  27 -------------------------
 _Ovi/ovi_land.zmp/GetUrlScript.txt     |   3 ---
 _Ovi/ovi_land.zmp/params.txt           |  27 -------------------------
 _Ovi/ovi_map.zmp/GetUrlScript.txt      |   3 ---
 _Ovi/ovi_map.zmp/params.txt            |  27 -------------------------
 _Ovi/ovi_sat.zmp/GetUrlScript.txt      |   3 ---
 _Ovi/ovi_sat.zmp/params.txt            |  27 -------------------------
 28 files changed, 132 insertions(+), 120 deletions(-)
 rename {_Ovi => _Nokia}/ovi_hyb.zmp/18.bmp (100%)
 rename {_Ovi => _Nokia}/ovi_hyb.zmp/24.bmp (100%)
 create mode 100644 _Nokia/ovi_hyb.zmp/GetUrlScript.txt
 rename {_Ovi => _Nokia}/ovi_hyb.zmp/info.txt (100%)
 create mode 100644 _Nokia/ovi_hyb.zmp/params.txt
 rename {_Ovi => _Nokia}/ovi_land.zmp/18.bmp (100%)
 rename {_Ovi => _Nokia}/ovi_land.zmp/24.bmp (100%)
 create mode 100644 _Nokia/ovi_land.zmp/GetUrlScript.txt
 rename {_Ovi => _Nokia}/ovi_land.zmp/info.txt (100%)
 create mode 100644 _Nokia/ovi_land.zmp/params.txt
 rename {_Ovi => _Nokia}/ovi_map.zmp/18.bmp (100%)
 rename {_Ovi => _Nokia}/ovi_map.zmp/24.bmp (100%)
 create mode 100644 _Nokia/ovi_map.zmp/GetUrlScript.txt
 rename {_Ovi => _Nokia}/ovi_map.zmp/info.txt (100%)
 create mode 100644 _Nokia/ovi_map.zmp/params.txt
 rename {_Ovi => _Nokia}/ovi_sat.zmp/18.bmp (100%)
 rename {_Ovi => _Nokia}/ovi_sat.zmp/24.bmp (100%)
 create mode 100644 _Nokia/ovi_sat.zmp/GetUrlScript.txt
 rename {_Ovi => _Nokia}/ovi_sat.zmp/info.txt (100%)
 create mode 100644 _Nokia/ovi_sat.zmp/params.txt
 delete mode 100644 _Ovi/ovi_hyb.zmp/GetUrlScript.txt
 delete mode 100644 _Ovi/ovi_hyb.zmp/params.txt
 delete mode 100644 _Ovi/ovi_land.zmp/GetUrlScript.txt
 delete mode 100644 _Ovi/ovi_land.zmp/params.txt
 delete mode 100644 _Ovi/ovi_map.zmp/GetUrlScript.txt
 delete mode 100644 _Ovi/ovi_map.zmp/params.txt
 delete mode 100644 _Ovi/ovi_sat.zmp/GetUrlScript.txt
 delete mode 100644 _Ovi/ovi_sat.zmp/params.txt

diff --git a/_Ovi/ovi_hyb.zmp/18.bmp b/_Nokia/ovi_hyb.zmp/18.bmp
similarity index 100%
rename from _Ovi/ovi_hyb.zmp/18.bmp
rename to _Nokia/ovi_hyb.zmp/18.bmp
diff --git a/_Ovi/ovi_hyb.zmp/24.bmp b/_Nokia/ovi_hyb.zmp/24.bmp
similarity index 100%
rename from _Ovi/ovi_hyb.zmp/24.bmp
rename to _Nokia/ovi_hyb.zmp/24.bmp
diff --git a/_Nokia/ovi_hyb.zmp/GetUrlScript.txt b/_Nokia/ovi_hyb.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..782b584c6
--- /dev/null
+++ b/_Nokia/ovi_hyb.zmp/GetUrlScript.txt
@@ -0,0 +1,6 @@
+var
+  maptile: string;
+begin 
+ maptile := RegExprReplaceMatchSubStr(GetURLBase, 'maptile\.lbs', inttostr( Random(3)+1 )+'.maptile'+'.lbs' );
+  ResultURL:=maptile+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/256/png8?lg=RUS&token=fee2f2a877fd4a429f17207a57658582&appId=nokiaMaps';
+end.
\ No newline at end of file
diff --git a/_Ovi/ovi_hyb.zmp/info.txt b/_Nokia/ovi_hyb.zmp/info.txt
similarity index 100%
rename from _Ovi/ovi_hyb.zmp/info.txt
rename to _Nokia/ovi_hyb.zmp/info.txt
diff --git a/_Nokia/ovi_hyb.zmp/params.txt b/_Nokia/ovi_hyb.zmp/params.txt
new file mode 100644
index 000000000..74be7095f
--- /dev/null
+++ b/_Nokia/ovi_hyb.zmp/params.txt
@@ -0,0 +1,27 @@
+[PARAMS]
+pnum=6
+GUID={D8C293B1-63AE-4902-A0D4-83A26BCE01D7}
+name=Гибрид Nokia (maps.ovi.com)
+name_en=Nokia Hybrid (maps.ovi.com)
+name_uk=Гибрид Nokia (maps.ovi.com)
+asLayer=0
+DefURLBase=http://maptile.lbs.ovi.com/maptiler/v2/maptile/newest/hybrid.day/
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+ParentSubMenu=Nokia
+ParentSubMenu_en=Nokia
+ParentSubMenu_uk=Nokia
+NameInCache=ovi_com_Hyb
+separator=0
+Ext=.png
+UseDwn=1
+Usestick=1
+UseGenPrevious=1
+Usedel=1
+Usesave=1
+UseAntiBan=0
+Sleep=10
+DefHotKey=0
+ContentType=image/png
+BanIfLen=0
\ No newline at end of file
diff --git a/_Ovi/ovi_land.zmp/18.bmp b/_Nokia/ovi_land.zmp/18.bmp
similarity index 100%
rename from _Ovi/ovi_land.zmp/18.bmp
rename to _Nokia/ovi_land.zmp/18.bmp
diff --git a/_Ovi/ovi_land.zmp/24.bmp b/_Nokia/ovi_land.zmp/24.bmp
similarity index 100%
rename from _Ovi/ovi_land.zmp/24.bmp
rename to _Nokia/ovi_land.zmp/24.bmp
diff --git a/_Nokia/ovi_land.zmp/GetUrlScript.txt b/_Nokia/ovi_land.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..782b584c6
--- /dev/null
+++ b/_Nokia/ovi_land.zmp/GetUrlScript.txt
@@ -0,0 +1,6 @@
+var
+  maptile: string;
+begin 
+ maptile := RegExprReplaceMatchSubStr(GetURLBase, 'maptile\.lbs', inttostr( Random(3)+1 )+'.maptile'+'.lbs' );
+  ResultURL:=maptile+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/256/png8?lg=RUS&token=fee2f2a877fd4a429f17207a57658582&appId=nokiaMaps';
+end.
\ No newline at end of file
diff --git a/_Ovi/ovi_land.zmp/info.txt b/_Nokia/ovi_land.zmp/info.txt
similarity index 100%
rename from _Ovi/ovi_land.zmp/info.txt
rename to _Nokia/ovi_land.zmp/info.txt
diff --git a/_Nokia/ovi_land.zmp/params.txt b/_Nokia/ovi_land.zmp/params.txt
new file mode 100644
index 000000000..3f78d8a5c
--- /dev/null
+++ b/_Nokia/ovi_land.zmp/params.txt
@@ -0,0 +1,27 @@
+[PARAMS]
+pnum=6
+GUID={D8C293B0-63AE-4902-A0D4-83A26BCE01D6}
+name=Местность Nokia (maps.ovi.com)
+name_en=Nokia terrain (maps.ovi.com)
+name_uk=Местность Nokia (maps.ovi.com)
+asLayer=0
+DefURLBase=http://maptile.lbs.ovi.com/maptiler/v2/maptile/newest/terrain.day/
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+ParentSubMenu=Nokia
+ParentSubMenu_en=Nokia
+ParentSubMenu_uk=Nokia
+NameInCache=ovi_com_Land
+separator=0
+Ext=.png
+UseDwn=1
+Usestick=1
+UseGenPrevious=1
+Usedel=1
+Usesave=1
+UseAntiBan=0
+Sleep=10
+DefHotKey=0
+ContentType=image/png
+BanIfLen=0
\ No newline at end of file
diff --git a/_Ovi/ovi_map.zmp/18.bmp b/_Nokia/ovi_map.zmp/18.bmp
similarity index 100%
rename from _Ovi/ovi_map.zmp/18.bmp
rename to _Nokia/ovi_map.zmp/18.bmp
diff --git a/_Ovi/ovi_map.zmp/24.bmp b/_Nokia/ovi_map.zmp/24.bmp
similarity index 100%
rename from _Ovi/ovi_map.zmp/24.bmp
rename to _Nokia/ovi_map.zmp/24.bmp
diff --git a/_Nokia/ovi_map.zmp/GetUrlScript.txt b/_Nokia/ovi_map.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..782b584c6
--- /dev/null
+++ b/_Nokia/ovi_map.zmp/GetUrlScript.txt
@@ -0,0 +1,6 @@
+var
+  maptile: string;
+begin 
+ maptile := RegExprReplaceMatchSubStr(GetURLBase, 'maptile\.lbs', inttostr( Random(3)+1 )+'.maptile'+'.lbs' );
+  ResultURL:=maptile+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/256/png8?lg=RUS&token=fee2f2a877fd4a429f17207a57658582&appId=nokiaMaps';
+end.
\ No newline at end of file
diff --git a/_Ovi/ovi_map.zmp/info.txt b/_Nokia/ovi_map.zmp/info.txt
similarity index 100%
rename from _Ovi/ovi_map.zmp/info.txt
rename to _Nokia/ovi_map.zmp/info.txt
diff --git a/_Nokia/ovi_map.zmp/params.txt b/_Nokia/ovi_map.zmp/params.txt
new file mode 100644
index 000000000..51810cb97
--- /dev/null
+++ b/_Nokia/ovi_map.zmp/params.txt
@@ -0,0 +1,27 @@
+[PARAMS]
+pnum=6
+GUID={70AF7E17-DE9B-4BD6-86F4-70921A74B2B6}
+name=Карта Nokia (maps.ovi.com)
+name_en=Nokia Map (maps.ovi.com)
+name_uk=Карта Nokia (maps.ovi.com)
+asLayer=0
+DefURLBase=http://maptile.lbs.ovi.com/maptiler/v2/maptile/newest/normal.day/
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+ParentSubMenu=Nokia
+ParentSubMenu_en=Nokia
+ParentSubMenu_uk=Nokia
+NameInCache=ovi_com_map
+separator=0
+Ext=.png
+UseDwn=1
+Usestick=1
+UseGenPrevious=1
+Usedel=1
+Usesave=1
+UseAntiBan=0
+Sleep=10
+DefHotKey=0
+ContentType=image/png
+BanIfLen=0
\ No newline at end of file
diff --git a/_Ovi/ovi_sat.zmp/18.bmp b/_Nokia/ovi_sat.zmp/18.bmp
similarity index 100%
rename from _Ovi/ovi_sat.zmp/18.bmp
rename to _Nokia/ovi_sat.zmp/18.bmp
diff --git a/_Ovi/ovi_sat.zmp/24.bmp b/_Nokia/ovi_sat.zmp/24.bmp
similarity index 100%
rename from _Ovi/ovi_sat.zmp/24.bmp
rename to _Nokia/ovi_sat.zmp/24.bmp
diff --git a/_Nokia/ovi_sat.zmp/GetUrlScript.txt b/_Nokia/ovi_sat.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..782b584c6
--- /dev/null
+++ b/_Nokia/ovi_sat.zmp/GetUrlScript.txt
@@ -0,0 +1,6 @@
+var
+  maptile: string;
+begin 
+ maptile := RegExprReplaceMatchSubStr(GetURLBase, 'maptile\.lbs', inttostr( Random(3)+1 )+'.maptile'+'.lbs' );
+  ResultURL:=maptile+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/256/png8?lg=RUS&token=fee2f2a877fd4a429f17207a57658582&appId=nokiaMaps';
+end.
\ No newline at end of file
diff --git a/_Ovi/ovi_sat.zmp/info.txt b/_Nokia/ovi_sat.zmp/info.txt
similarity index 100%
rename from _Ovi/ovi_sat.zmp/info.txt
rename to _Nokia/ovi_sat.zmp/info.txt
diff --git a/_Nokia/ovi_sat.zmp/params.txt b/_Nokia/ovi_sat.zmp/params.txt
new file mode 100644
index 000000000..d7397c8ff
--- /dev/null
+++ b/_Nokia/ovi_sat.zmp/params.txt
@@ -0,0 +1,27 @@
+[PARAMS]
+pnum=6
+GUID={D8C293B0-63AE-4902-A0D4-83A26BCE01D7}
+name=Спутник Nokia (maps.ovi.com)
+name_en=Nokia Sat (maps.ovi.com)
+name_uk=Супутник Nokia (maps.ovi.com)
+asLayer=0
+DefURLBase=http://maptile.lbs.ovi.com/maptiler/v2/maptile/newest/satellite.day/
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+ParentSubMenu=Nokia
+ParentSubMenu_en=Nokia
+ParentSubMenu_uk=Nokia
+NameInCache=ovi_com_Sat
+separator=0
+Ext=.png
+UseDwn=1
+Usestick=1
+UseGenPrevious=1
+Usedel=1
+Usesave=1
+UseAntiBan=0
+Sleep=10
+DefHotKey=0
+ContentType=image/png
+BanIfLen=0
\ No newline at end of file
diff --git a/_Ovi/ovi_hyb.zmp/GetUrlScript.txt b/_Ovi/ovi_hyb.zmp/GetUrlScript.txt
deleted file mode 100644
index e2d8f4ab3..000000000
--- a/_Ovi/ovi_hyb.zmp/GetUrlScript.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-begin
-  ResultURL:=GetUrlBase+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/256/png8?lg=RUS';
-end.
\ No newline at end of file
diff --git a/_Ovi/ovi_hyb.zmp/params.txt b/_Ovi/ovi_hyb.zmp/params.txt
deleted file mode 100644
index f878ac0e0..000000000
--- a/_Ovi/ovi_hyb.zmp/params.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-[PARAMS]
-pnum=6
-GUID={D8C293B1-63AE-4902-A0D4-83A26BCE01D7}
-name=Гибрид Ovi (maps.ovi.com)
-name_en=Ovi Hybrid (maps.ovi.com)
-name_uk=Гибрид Ovi (maps.ovi.com)
-asLayer=0
-DefURLBase=http://maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/hybrid.day/
-projection=1
-sradiusa=6378137
-sradiusb=6378137
-ParentSubMenu=Ovi
-ParentSubMenu_en=Ovi
-ParentSubMenu_uk=Ovi
-NameInCache=ovi_com_Hyb
-separator=0
-Ext=.png
-UseDwn=1
-Usestick=1
-UseGenPrevious=1
-Usedel=1
-Usesave=1
-UseAntiBan=0
-Sleep=10
-DefHotKey=0
-ContentType=image/png
-BanIfLen=0
\ No newline at end of file
diff --git a/_Ovi/ovi_land.zmp/GetUrlScript.txt b/_Ovi/ovi_land.zmp/GetUrlScript.txt
deleted file mode 100644
index e2d8f4ab3..000000000
--- a/_Ovi/ovi_land.zmp/GetUrlScript.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-begin
-  ResultURL:=GetUrlBase+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/256/png8?lg=RUS';
-end.
\ No newline at end of file
diff --git a/_Ovi/ovi_land.zmp/params.txt b/_Ovi/ovi_land.zmp/params.txt
deleted file mode 100644
index e6483115b..000000000
--- a/_Ovi/ovi_land.zmp/params.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-[PARAMS]
-pnum=6
-GUID={D8C293B0-63AE-4902-A0D4-83A26BCE01D6}
-name=Ландшафт Ovi (maps.ovi.com)
-name_en=Ovi Land (maps.ovi.com)
-name_uk=Ландшафт Ovi (maps.ovi.com)
-asLayer=0
-DefURLBase=http://maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/terrain.day/
-projection=1
-sradiusa=6378137
-sradiusb=6378137
-ParentSubMenu=Ovi
-ParentSubMenu_en=Ovi
-ParentSubMenu_uk=Ovi
-NameInCache=ovi_com_Land
-separator=0
-Ext=.png
-UseDwn=1
-Usestick=1
-UseGenPrevious=1
-Usedel=1
-Usesave=1
-UseAntiBan=0
-Sleep=10
-DefHotKey=0
-ContentType=image/png
-BanIfLen=0
\ No newline at end of file
diff --git a/_Ovi/ovi_map.zmp/GetUrlScript.txt b/_Ovi/ovi_map.zmp/GetUrlScript.txt
deleted file mode 100644
index e2d8f4ab3..000000000
--- a/_Ovi/ovi_map.zmp/GetUrlScript.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-begin
-  ResultURL:=GetUrlBase+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/256/png8?lg=RUS';
-end.
\ No newline at end of file
diff --git a/_Ovi/ovi_map.zmp/params.txt b/_Ovi/ovi_map.zmp/params.txt
deleted file mode 100644
index 70a1ca6a5..000000000
--- a/_Ovi/ovi_map.zmp/params.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-[PARAMS]
-pnum=6
-GUID={70AF7E17-DE9B-4BD6-86F4-70921A74B2B6}
-name=Карта Ovi (maps.ovi.com)
-name_en=Ovi Map (maps.ovi.com)
-name_uk=Карта Ovi (maps.ovi.com)
-asLayer=0
-DefURLBase=http://maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/normal.day/
-projection=1
-sradiusa=6378137
-sradiusb=6378137
-ParentSubMenu=Ovi
-ParentSubMenu_en=Ovi
-ParentSubMenu_uk=Ovi
-NameInCache=ovi_com_map
-separator=0
-Ext=.png
-UseDwn=1
-Usestick=1
-UseGenPrevious=1
-Usedel=1
-Usesave=1
-UseAntiBan=0
-Sleep=10
-DefHotKey=0
-ContentType=image/png
-BanIfLen=0
\ No newline at end of file
diff --git a/_Ovi/ovi_sat.zmp/GetUrlScript.txt b/_Ovi/ovi_sat.zmp/GetUrlScript.txt
deleted file mode 100644
index e2d8f4ab3..000000000
--- a/_Ovi/ovi_sat.zmp/GetUrlScript.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-begin
-  ResultURL:=GetUrlBase+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/256/png8?lg=RUS';
-end.
\ No newline at end of file
diff --git a/_Ovi/ovi_sat.zmp/params.txt b/_Ovi/ovi_sat.zmp/params.txt
deleted file mode 100644
index e4ed583c2..000000000
--- a/_Ovi/ovi_sat.zmp/params.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-[PARAMS]
-pnum=6
-GUID={D8C293B0-63AE-4902-A0D4-83A26BCE01D7}
-name=Спутник DG (maps.ovi.com)
-name_en=DG Sat (maps.ovi.com)
-name_uk=Супутник DG (maps.ovi.com)
-asLayer=0
-DefURLBase=http://maptile.maps.svc.ovi.com/maptiler/v2/maptile/newest/satellite.day/
-projection=1
-sradiusa=6378137
-sradiusb=6378137
-ParentSubMenu=Ovi
-ParentSubMenu_en=Ovi
-ParentSubMenu_uk=Ovi
-NameInCache=ovi_com_Sat
-separator=0
-Ext=.png
-UseDwn=1
-Usestick=1
-UseGenPrevious=1
-Usedel=1
-Usesave=1
-UseAntiBan=0
-Sleep=10
-DefHotKey=0
-ContentType=image/png
-BanIfLen=0
\ No newline at end of file