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

---
 _historic/1902_kuban.zmp/GetUrlScript.txt     | 5 +----
 _historic/1902_kuban.zmp/params.txt           | 2 +-
 _historic/1918_kuban_10v.zmp/GetUrlScript.txt | 5 +----
 _historic/1918_kuban_10v.zmp/params.txt       | 2 +-
 _historic/1925_maykop.zmp/GetUrlScript.txt    | 5 +----
 _historic/1925_maykop.zmp/params.txt          | 2 +-
 _historic/1930_kuban.zmp/GetUrlScript.txt     | 5 +----
 _historic/1930_kuban.zmp/params.txt           | 2 +-
 _historic/1942_osteuropa.zmp/GetUrlScript.txt | 5 +----
 _historic/1942_osteuropa.zmp/params.txt       | 2 +-
 _historic/1v_krim.zmp/GetUrlScript.txt        | 5 +----
 _historic/1v_krim.zmp/params.txt              | 2 +-
 _historic/5v_kavk_1877.zmp/GetUrlScript.txt   | 5 +----
 _historic/5v_kavk_1877.zmp/params.txt         | 2 +-
 _historic/Strelb10_1882.zmp/GetUrlScript.txt  | 5 +----
 _historic/Strelb10_1882.zmp/params.txt        | 2 +-
 _historic/Strelb10_1919.zmp/GetUrlScript.txt  | 5 +----
 _historic/Strelb10_1919.zmp/params.txt        | 2 +-
 _historic/eng_5v_kavkaz.zmp/GetUrlScript.txt  | 5 +----
 _historic/eng_5v_kavkaz.zmp/params.txt        | 2 +-
 _historic/kuban_1v.zmp/GetUrlScript.txt       | 5 +----
 _historic/kuban_1v.zmp/params.txt             | 2 +-
 _historic/rkka_kavkaz.zmp/GetUrlScript.txt    | 5 +----
 _historic/rkka_kavkaz.zmp/params.txt          | 2 +-
 _historic/wwII-ug.zmp/GetUrlScript.txt        | 5 +----
 _historic/wwII-ug.zmp/params.txt              | 2 +-
 26 files changed, 26 insertions(+), 65 deletions(-)

diff --git a/_historic/1902_kuban.zmp/GetUrlScript.txt b/_historic/1902_kuban.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/1902_kuban.zmp/GetUrlScript.txt
+++ b/_historic/1902_kuban.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/1902_kuban.zmp/params.txt b/_historic/1902_kuban.zmp/params.txt
index 8615fd53b..a612e7d87 100644
--- a/_historic/1902_kuban.zmp/params.txt
+++ b/_historic/1902_kuban.zmp/params.txt
@@ -6,7 +6,7 @@ name=Kuban 1902
 ParentSubMenu_ru=Исторические\Кавказ
 ParentSubMenu=Historic\Kavkaz
 ParentSubMenu_uk=Історичні\Кавказ
-DefURLBase=http://91.237.82.95:8082/1902_kuban/
+DefURLBase=http://91.237.82.95:8088/pub/historic/1902_kuban/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/1918_kuban_10v.zmp/GetUrlScript.txt b/_historic/1918_kuban_10v.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/1918_kuban_10v.zmp/GetUrlScript.txt
+++ b/_historic/1918_kuban_10v.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/1918_kuban_10v.zmp/params.txt b/_historic/1918_kuban_10v.zmp/params.txt
index 8fdaa607c..f48cf07d0 100644
--- a/_historic/1918_kuban_10v.zmp/params.txt
+++ b/_historic/1918_kuban_10v.zmp/params.txt
@@ -6,7 +6,7 @@ name=Kuban 10-v (1918)
 ParentSubMenu_ru=Исторические\Кавказ
 ParentSubMenu=Historic\Kavkaz
 ParentSubMenu_uk=Історичні\Кавказ
-DefURLBase=http://91.237.82.95:8082/1918_kuban_10v/
+DefURLBase=http://91.237.82.95:8088/pub/historic/1918_kuban_10v/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/1925_maykop.zmp/GetUrlScript.txt b/_historic/1925_maykop.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/1925_maykop.zmp/GetUrlScript.txt
+++ b/_historic/1925_maykop.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/1925_maykop.zmp/params.txt b/_historic/1925_maykop.zmp/params.txt
index 50ef28267..3fc8a3295 100644
--- a/_historic/1925_maykop.zmp/params.txt
+++ b/_historic/1925_maykop.zmp/params.txt
@@ -6,7 +6,7 @@ name=Maykop 1925
 ParentSubMenu_ru=Исторические\Кавказ
 ParentSubMenu=Historic\Kavkaz
 ParentSubMenu_uk=Історичні\Кавказ
-DefURLBase=http://91.237.82.95:8082/1925_maykop/
+DefURLBase=http://91.237.82.95:8088/pub/historic/1925_maykop/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/1930_kuban.zmp/GetUrlScript.txt b/_historic/1930_kuban.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/1930_kuban.zmp/GetUrlScript.txt
+++ b/_historic/1930_kuban.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/1930_kuban.zmp/params.txt b/_historic/1930_kuban.zmp/params.txt
index faee29a82..ee4299dc6 100644
--- a/_historic/1930_kuban.zmp/params.txt
+++ b/_historic/1930_kuban.zmp/params.txt
@@ -6,7 +6,7 @@ name=Kuban 1930
 ParentSubMenu_ru=Исторические\Кавказ
 ParentSubMenu=Historic\Kavkaz
 ParentSubMenu_uk=Історичні\Кавказ
-DefURLBase=http://91.237.82.95:8082/1930_kuban/
+DefURLBase=http://91.237.82.95:8088/pub/historic/1930_kuban/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/1942_osteuropa.zmp/GetUrlScript.txt b/_historic/1942_osteuropa.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/1942_osteuropa.zmp/GetUrlScript.txt
+++ b/_historic/1942_osteuropa.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/1942_osteuropa.zmp/params.txt b/_historic/1942_osteuropa.zmp/params.txt
index 4c5918c1c..c563ce3b7 100644
--- a/_historic/1942_osteuropa.zmp/params.txt
+++ b/_historic/1942_osteuropa.zmp/params.txt
@@ -4,7 +4,7 @@ GUID={BCE4BD85-11CE-48ED-B966-0BBB21BEF2C7}
 name_ru=Немецкий Генштаб 1942 (1:30000)
 name=German Genshtab 1942 (1:30000)
 NameInCache=1942_osteuropa
-DefURLBase=http://91.237.82.95:8082/1942_osteuropa/
+DefURLBase=http://91.237.82.95:8088/pub/historic/1942_osteuropa/
 Ext=.jpg
 projection=1
 sradiusa=6378137
diff --git a/_historic/1v_krim.zmp/GetUrlScript.txt b/_historic/1v_krim.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/1v_krim.zmp/GetUrlScript.txt
+++ b/_historic/1v_krim.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/1v_krim.zmp/params.txt b/_historic/1v_krim.zmp/params.txt
index c88bdd9e7..e92a6a5d0 100644
--- a/_historic/1v_krim.zmp/params.txt
+++ b/_historic/1v_krim.zmp/params.txt
@@ -6,7 +6,7 @@ name=1v Krim
 ParentSubMenu_ru=Исторические
 ParentSubMenu=Historic
 ParentSubMenu_uk=Історичні
-DefURLBase=http://91.237.82.95:8082/1v_krim/
+DefURLBase=http://91.237.82.95:8088/pub/historic/1v_krim/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/5v_kavk_1877.zmp/GetUrlScript.txt b/_historic/5v_kavk_1877.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/5v_kavk_1877.zmp/GetUrlScript.txt
+++ b/_historic/5v_kavk_1877.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/5v_kavk_1877.zmp/params.txt b/_historic/5v_kavk_1877.zmp/params.txt
index 1286e9bdb..c6ca17de4 100644
--- a/_historic/5v_kavk_1877.zmp/params.txt
+++ b/_historic/5v_kavk_1877.zmp/params.txt
@@ -6,7 +6,7 @@ name=5v map of Kavkaz (1877)
 ParentSubMenu_ru=Исторические\Кавказ
 ParentSubMenu=Historic\Kavkaz
 ParentSubMenu_uk=Історичні\Кавказ
-DefURLBase=http://91.237.82.95:8082/5v_kavk_1877/
+DefURLBase=http://91.237.82.95:8088/pub/historic/5v_kavk_1877/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/Strelb10_1882.zmp/GetUrlScript.txt b/_historic/Strelb10_1882.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/Strelb10_1882.zmp/GetUrlScript.txt
+++ b/_historic/Strelb10_1882.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/Strelb10_1882.zmp/params.txt b/_historic/Strelb10_1882.zmp/params.txt
index e5dba3eb0..0513658ab 100644
--- a/_historic/Strelb10_1882.zmp/params.txt
+++ b/_historic/Strelb10_1882.zmp/params.txt
@@ -6,7 +6,7 @@ name=10v Strelbitskiy
 ParentSubMenu_ru=Исторические
 ParentSubMenu=Historic
 ParentSubMenu_uk=Історичні
-DefURLBase=http://91.237.82.95:8082/strelb_10_1882/
+DefURLBase=http://91.237.82.95:8088/pub/historic/strelb_10_1882/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/Strelb10_1919.zmp/GetUrlScript.txt b/_historic/Strelb10_1919.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/Strelb10_1919.zmp/GetUrlScript.txt
+++ b/_historic/Strelb10_1919.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/Strelb10_1919.zmp/params.txt b/_historic/Strelb10_1919.zmp/params.txt
index d7046c311..8005479a8 100644
--- a/_historic/Strelb10_1919.zmp/params.txt
+++ b/_historic/Strelb10_1919.zmp/params.txt
@@ -6,7 +6,7 @@ name=10v Strelbitskiy 1919
 ParentSubMenu_ru=Исторические
 ParentSubMenu=Historic
 ParentSubMenu_uk=Історичні
-DefURLBase=http://91.237.82.95:8082/strelb_10_1919/
+DefURLBase=http://91.237.82.95:8088/pub/historic/strelb_10_1919/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/eng_5v_kavkaz.zmp/GetUrlScript.txt b/_historic/eng_5v_kavkaz.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/eng_5v_kavkaz.zmp/GetUrlScript.txt
+++ b/_historic/eng_5v_kavkaz.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/eng_5v_kavkaz.zmp/params.txt b/_historic/eng_5v_kavkaz.zmp/params.txt
index cf644b2df..32ad73e87 100644
--- a/_historic/eng_5v_kavkaz.zmp/params.txt
+++ b/_historic/eng_5v_kavkaz.zmp/params.txt
@@ -6,7 +6,7 @@ name=Kavkaz 5v 1941-1948 (ENG)
 ParentSubMenu_ru=Исторические\Кавказ
 ParentSubMenu=Historic\Kavkaz
 ParentSubMenu_uk=Історичні\Кавказ
-DefURLBase=http://91.237.82.95:8082/eng_5v_kavkaz/
+DefURLBase=http://91.237.82.95:8088/pub/historic/eng_5v_kavkaz/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/kuban_1v.zmp/GetUrlScript.txt b/_historic/kuban_1v.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/kuban_1v.zmp/GetUrlScript.txt
+++ b/_historic/kuban_1v.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/kuban_1v.zmp/params.txt b/_historic/kuban_1v.zmp/params.txt
index 4f245ba8d..905cf4608 100644
--- a/_historic/kuban_1v.zmp/params.txt
+++ b/_historic/kuban_1v.zmp/params.txt
@@ -6,7 +6,7 @@ name=1v Geologic map of Kuban (1908-1912)
 ParentSubMenu_ru=Исторические\Кавказ
 ParentSubMenu=Historic
 ParentSubMenu_uk=Історичні
-DefURLBase=http://91.237.82.95:8082/kuban_1v/
+DefURLBase=http://91.237.82.95:8088/pub/historic/kuban_1v/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/rkka_kavkaz.zmp/GetUrlScript.txt b/_historic/rkka_kavkaz.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/rkka_kavkaz.zmp/GetUrlScript.txt
+++ b/_historic/rkka_kavkaz.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/rkka_kavkaz.zmp/params.txt b/_historic/rkka_kavkaz.zmp/params.txt
index 90362c658..349c1cbe7 100644
--- a/_historic/rkka_kavkaz.zmp/params.txt
+++ b/_historic/rkka_kavkaz.zmp/params.txt
@@ -6,7 +6,7 @@ name_ru=
 ParentSubMenu=Historic\Kavkaz
 ParentSubMenu_ru=Исторические\Кавказ
 ParentSubMenu_uk=Історичні\Кавказ
-DefURLBase=http://91.237.82.95:8082/rkka_kavkaz/
+DefURLBase=http://91.237.82.95:8088/pub/historic/rkka/
 projection=1
 sradiusa=6378137
 sradiusb=6378137
diff --git a/_historic/wwII-ug.zmp/GetUrlScript.txt b/_historic/wwII-ug.zmp/GetUrlScript.txt
index fb878791b..1acc47c60 100644
--- a/_historic/wwII-ug.zmp/GetUrlScript.txt
+++ b/_historic/wwII-ug.zmp/GetUrlScript.txt
@@ -1,6 +1,3 @@
-var
-  url : string;
 begin
-  url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8084 + Random(8)) );
-  ResultURL := URL+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.jpg';
+  ResultURL:=GetURLBase+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
 end.
diff --git a/_historic/wwII-ug.zmp/params.txt b/_historic/wwII-ug.zmp/params.txt
index c9d600aac..393c8c62d 100644
--- a/_historic/wwII-ug.zmp/params.txt
+++ b/_historic/wwII-ug.zmp/params.txt
@@ -6,7 +6,7 @@ name=German Aero-Foto
 ParentSubMenu_ru=Исторические
 ParentSubMenu=Historic
 ParentSubMenu_uk=Історичні
-DefURLBase=http://91.237.82.95:8082/wwii-ug/
+DefURLBase=http://91.237.82.95:8088/pub/historic/wwii-ug/
 projection=1
 sradiusa=6378137
 sradiusb=6378137