From a006931bbcd14be776e7244f88a5cd5013e11965 Mon Sep 17 00:00:00 2001 From: sasbot <> Date: Sat, 6 Jun 2020 12:00:00 +0000 Subject: [PATCH] update zmp --- Genshtab/karta_gsh.250m.zmp/GetUrlScript.txt | 5 +---- Genshtab/karta_gsh.250m.zmp/params.txt | 2 +- Genshtab/karta_gsh_10km.zmp/GetUrlScript.txt | 5 +---- Genshtab/karta_gsh_10km.zmp/params.txt | 2 +- Genshtab/karta_gsh_1km.zmp/GetUrlScript.txt | 5 +---- Genshtab/karta_gsh_1km.zmp/params.txt | 4 ++-- Genshtab/karta_gsh_250m.zmp/GetUrlScript.txt | 5 +---- Genshtab/karta_gsh_250m.zmp/params.txt | 2 +- Genshtab/karta_gsh_2km.zmp/GetUrlScript.txt | 5 +---- Genshtab/karta_gsh_2km.zmp/params.txt | 2 +- Genshtab/karta_gsh_500m.zmp/GetUrlScript.txt | 5 +---- Genshtab/karta_gsh_500m.zmp/params.txt | 2 +- Genshtab/karta_gsh_5km.zmp/GetUrlScript.txt | 5 +---- Genshtab/karta_gsh_5km.zmp/params.txt | 2 +- 14 files changed, 15 insertions(+), 36 deletions(-) diff --git a/Genshtab/karta_gsh.250m.zmp/GetUrlScript.txt b/Genshtab/karta_gsh.250m.zmp/GetUrlScript.txt index aa72f18b0..1acc47c60 100644 --- a/Genshtab/karta_gsh.250m.zmp/GetUrlScript.txt +++ b/Genshtab/karta_gsh.250m.zmp/GetUrlScript.txt @@ -1,6 +1,3 @@ -var - url : string; begin - url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8082 + Random(4)) ); - 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/Genshtab/karta_gsh.250m.zmp/params.txt b/Genshtab/karta_gsh.250m.zmp/params.txt index 71898fa4d..aa79ff6f8 100644 --- a/Genshtab/karta_gsh.250m.zmp/params.txt +++ b/Genshtab/karta_gsh.250m.zmp/params.txt @@ -5,7 +5,7 @@ name_ru= name=Genshtab 250 m name_uk=Генштаб 250 м NameInCache=genshtab.250m -DefURLBase=http://91.237.82.95:8082/genshtab.250m/ +DefURLBase=http://91.237.82.95:8088/pub/genshtab.250m/ defaultContentType=image/jpeg IgnoreContentType=1 ParentSubMenu_ru=Генштаб diff --git a/Genshtab/karta_gsh_10km.zmp/GetUrlScript.txt b/Genshtab/karta_gsh_10km.zmp/GetUrlScript.txt index aa72f18b0..1acc47c60 100644 --- a/Genshtab/karta_gsh_10km.zmp/GetUrlScript.txt +++ b/Genshtab/karta_gsh_10km.zmp/GetUrlScript.txt @@ -1,6 +1,3 @@ -var - url : string; begin - url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8082 + Random(4)) ); - 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/Genshtab/karta_gsh_10km.zmp/params.txt b/Genshtab/karta_gsh_10km.zmp/params.txt index 142e20d5f..ade8cf7c1 100644 --- a/Genshtab/karta_gsh_10km.zmp/params.txt +++ b/Genshtab/karta_gsh_10km.zmp/params.txt @@ -5,7 +5,7 @@ name_ru= name=Genshtab 10 km name_uk=Генштаб 10 км NameInCache=Genshtab10km -DefURLBase=http://91.237.82.95:8082/genshtab10km/ +DefURLBase=http://91.237.82.95:8088/pub/genshtab10km/ ParentSubMenu_ru=Генштаб ParentSubMenu=Genshtab ParentSubMenu_uk=Генштаб diff --git a/Genshtab/karta_gsh_1km.zmp/GetUrlScript.txt b/Genshtab/karta_gsh_1km.zmp/GetUrlScript.txt index aa72f18b0..1acc47c60 100644 --- a/Genshtab/karta_gsh_1km.zmp/GetUrlScript.txt +++ b/Genshtab/karta_gsh_1km.zmp/GetUrlScript.txt @@ -1,6 +1,3 @@ -var - url : string; begin - url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8082 + Random(4)) ); - 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/Genshtab/karta_gsh_1km.zmp/params.txt b/Genshtab/karta_gsh_1km.zmp/params.txt index c556a2a38..fa029b2cd 100644 --- a/Genshtab/karta_gsh_1km.zmp/params.txt +++ b/Genshtab/karta_gsh_1km.zmp/params.txt @@ -5,7 +5,7 @@ name_ru= name=Genshtab 1 km name_uk=Генштаб 1 км NameInCache=genshtab1km -DefURLBase=http://91.237.82.95:8082/genshtab1km/ +DefURLBase=http://91.237.82.95:8088/pub/genshtab1km/ defaultContentType=image/jpeg IgnoreContentType=1 ParentSubMenu_ru=Генштаб @@ -16,4 +16,4 @@ projection=1 sradiusa=6378137 sradiusb=6378137 ContentType="image/jpeg" -MaxConnectToServerCount=1 +MaxConnectToServerCount=1 \ No newline at end of file diff --git a/Genshtab/karta_gsh_250m.zmp/GetUrlScript.txt b/Genshtab/karta_gsh_250m.zmp/GetUrlScript.txt index aa72f18b0..1acc47c60 100644 --- a/Genshtab/karta_gsh_250m.zmp/GetUrlScript.txt +++ b/Genshtab/karta_gsh_250m.zmp/GetUrlScript.txt @@ -1,6 +1,3 @@ -var - url : string; begin - url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8082 + Random(4)) ); - 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/Genshtab/karta_gsh_250m.zmp/params.txt b/Genshtab/karta_gsh_250m.zmp/params.txt index 8378819c0..b1569d61f 100644 --- a/Genshtab/karta_gsh_250m.zmp/params.txt +++ b/Genshtab/karta_gsh_250m.zmp/params.txt @@ -5,7 +5,7 @@ name_ru= name=GosGisCentr 250 m name_uk=GosGisCentr 250 м NameInCache=genshtab250m -DefURLBase=http://91.237.82.95:8082/genshtab250m/ +DefURLBase=http://91.237.82.95:8088/pub/ggc250m/ defaultContentType=image/jpeg IgnoreContentType=1 ParentSubMenu_ru=Генштаб\ГГЦ diff --git a/Genshtab/karta_gsh_2km.zmp/GetUrlScript.txt b/Genshtab/karta_gsh_2km.zmp/GetUrlScript.txt index aa72f18b0..1acc47c60 100644 --- a/Genshtab/karta_gsh_2km.zmp/GetUrlScript.txt +++ b/Genshtab/karta_gsh_2km.zmp/GetUrlScript.txt @@ -1,6 +1,3 @@ -var - url : string; begin - url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8082 + Random(4)) ); - 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/Genshtab/karta_gsh_2km.zmp/params.txt b/Genshtab/karta_gsh_2km.zmp/params.txt index 26f5d364e..9ee8ba82d 100644 --- a/Genshtab/karta_gsh_2km.zmp/params.txt +++ b/Genshtab/karta_gsh_2km.zmp/params.txt @@ -5,7 +5,7 @@ name_ru= name=Genshtab 2 km name_uk=Генштаб 2 км NameInCache=Genshtab2km -DefURLBase=http://91.237.82.95:8082/genshtab2km/ +DefURLBase=http://91.237.82.95:8088/pub/genshtab2km/ ParentSubMenu_ru=Генштаб ParentSubMenu=Genshtab ParentSubMenu_uk=Генштаб diff --git a/Genshtab/karta_gsh_500m.zmp/GetUrlScript.txt b/Genshtab/karta_gsh_500m.zmp/GetUrlScript.txt index aa72f18b0..1acc47c60 100644 --- a/Genshtab/karta_gsh_500m.zmp/GetUrlScript.txt +++ b/Genshtab/karta_gsh_500m.zmp/GetUrlScript.txt @@ -1,6 +1,3 @@ -var - url : string; begin - url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8082 + Random(4)) ); - 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/Genshtab/karta_gsh_500m.zmp/params.txt b/Genshtab/karta_gsh_500m.zmp/params.txt index dbfa573d3..9bd867bff 100644 --- a/Genshtab/karta_gsh_500m.zmp/params.txt +++ b/Genshtab/karta_gsh_500m.zmp/params.txt @@ -5,7 +5,7 @@ name_ru= name=Genshtab 500 m name_uk=Генштаб 500 м NameInCache=genshtab500m -DefURLBase=http://91.237.82.95:8082/genshtab500m/ +DefURLBase=http://91.237.82.95:8088/pub/genshtab500m/ defaultContentType=image/jpeg ParentSubMenu_ru=Генштаб ParentSubMenu=Genshtab diff --git a/Genshtab/karta_gsh_5km.zmp/GetUrlScript.txt b/Genshtab/karta_gsh_5km.zmp/GetUrlScript.txt index aa72f18b0..1acc47c60 100644 --- a/Genshtab/karta_gsh_5km.zmp/GetUrlScript.txt +++ b/Genshtab/karta_gsh_5km.zmp/GetUrlScript.txt @@ -1,6 +1,3 @@ -var - url : string; begin - url := RegExprReplaceMatchSubStr( GetURLBase, '8082', inttostr(8082 + Random(4)) ); - 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/Genshtab/karta_gsh_5km.zmp/params.txt b/Genshtab/karta_gsh_5km.zmp/params.txt index 549c86f27..f4a2de8c9 100644 --- a/Genshtab/karta_gsh_5km.zmp/params.txt +++ b/Genshtab/karta_gsh_5km.zmp/params.txt @@ -5,7 +5,7 @@ name_ru= name=Genshtab 5 km name_uk=Генштаб 5 км NameInCache=Genshtab5km -DefURLBase=http://91.237.82.95:8082/genshtab5km/ +DefURLBase=http://91.237.82.95:8088/pub/genshtab5km/ ParentSubMenu_ru=Генштаб ParentSubMenu=Genshtab ParentSubMenu_uk=Генштаб