diff --git a/_Genshtab/gsh_belarus_vector.zmp/18.bmp b/_Genshtab/gsh_belarus_vector.zmp/18.bmp
new file mode 100644
index 000000000..94d5d9a56
Binary files /dev/null and b/_Genshtab/gsh_belarus_vector.zmp/18.bmp differ
diff --git a/_Genshtab/gsh_belarus_vector.zmp/24.bmp b/_Genshtab/gsh_belarus_vector.zmp/24.bmp
new file mode 100644
index 000000000..3e1da1d4f
Binary files /dev/null and b/_Genshtab/gsh_belarus_vector.zmp/24.bmp differ
diff --git a/_Genshtab/gsh_belarus_vector.zmp/GetUrlScript.txt b/_Genshtab/gsh_belarus_vector.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..6bfb2a4e0
--- /dev/null
+++ b/_Genshtab/gsh_belarus_vector.zmp/GetUrlScript.txt
@@ -0,0 +1,6 @@
+begin
+ ResultURL := '';
+ if (GetZ >= 5) and (GetZ <= 16) then begin
+ ResultURL := GetURLBase + IntToStr(GetZ-1) + '/' + IntToStr(GetY) + '/' + IntToStr(GetX) + '.png';
+ end;
+end.
\ No newline at end of file
diff --git a/_Genshtab/gsh_belarus_vector.zmp/info.txt b/_Genshtab/gsh_belarus_vector.zmp/info.txt
new file mode 100644
index 000000000..8c8888c39
--- /dev/null
+++ b/_Genshtab/gsh_belarus_vector.zmp/info.txt
@@ -0,0 +1 @@
+https://globus.tut.by/
\ No newline at end of file
diff --git a/_Genshtab/gsh_belarus_vector.zmp/params.txt b/_Genshtab/gsh_belarus_vector.zmp/params.txt
new file mode 100644
index 000000000..1e2875efe
--- /dev/null
+++ b/_Genshtab/gsh_belarus_vector.zmp/params.txt
@@ -0,0 +1,21 @@
+[PARAMS]
+pnum=140
+GUID={4463DAE6-03C7-4189-80E5-29D43864F093}
+name_ru=Генштаб Беларусь векторный (globus.tut.by)
+name=Genshtab Belarus vector (globus.tut.by)
+NameInCache=vbgenshtabbelarus_vector
+ParentSubMenu_ru=Генштаб
+ParentSubMenu=Genshtab
+DefURLBase=https://globus.tut.by/.tiles/ev/Z
+ContentType=image/png
+Ext=.png
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+Usestick=1
+UseGenPrevious=1
+Usedel=1
+Usesave=1
+UseAntiBan=0
+Sleep=300
+BanIfLen=0
diff --git a/_Nokia/here.com.traffic.zmp/._GetUrlScript.txt b/_Nokia/here.com.traffic.zmp/._GetUrlScript.txt
new file mode 100644
index 000000000..f4571b91f
Binary files /dev/null and b/_Nokia/here.com.traffic.zmp/._GetUrlScript.txt differ
diff --git a/_Nokia/here.com.traffic.zmp/GetUrlScript.txt b/_Nokia/here.com.traffic.zmp/GetUrlScript.txt
index b457e2034..a21b48da3 100644
--- a/_Nokia/here.com.traffic.zmp/GetUrlScript.txt
+++ b/_Nokia/here.com.traffic.zmp/GetUrlScript.txt
@@ -1,6 +1,6 @@
var
maptile: string;
begin
- maptile := RegExprReplaceMatchSubStr(GetURLBase, '1.\maps\.nlp', inttostr( Random(3)+1 )+'.maps.nlp' );
- ResultURL:=maptile+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/256/png8?tprof=PrtlHere&lg=' + Version + '&app_id=SqE1xcSngCd3m4a1zEGb&token=r0sR1DzqDkS6sDnh902FWQ&xnlp=CL_JSMv2.5.0.3,SID_34725629-4FBE-4EA5-A2AB-52EA24DEA26F';
+ maptile := RegExprReplaceMatchSubStr(GetURLBase, '{s}', inttostr( Random(3)+1 ));
+ ResultURL:=maptile+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/256/png8?app_id=xWVIueSv6JL0aJ5xqTxb&app_code=djPZyynKsbTjIUDOBcHZ2g';
end.
\ No newline at end of file
diff --git a/_Nokia/here.com.traffic.zmp/params.txt b/_Nokia/here.com.traffic.zmp/params.txt
index 9538608fc..fa3a859bc 100644
--- a/_Nokia/here.com.traffic.zmp/params.txt
+++ b/_Nokia/here.com.traffic.zmp/params.txt
@@ -6,7 +6,7 @@ name=Here.com Traffic
name_uk=Пробки Here.com
ParentSubMenu=Nokia
ContentType=image/png
-DefURLBase=http://maps.nlp.nokia.com/maptile/2.1/traffictile/newest/normal.day/
+DefURLBase=https://{s}.traffic.maps.api.here.com/maptile/2.1/traffictile/newest/normal.day/
NameInCache=here.com.traffic
EPSG=3785
Ext=.png
diff --git a/_OSM/osm_WayMarkeredTrails_Cycling.zmp/18.bmp b/_OSM/osm_WayMarkeredTrails_Cycling.zmp/18.bmp
new file mode 100644
index 000000000..a942fa46b
Binary files /dev/null and b/_OSM/osm_WayMarkeredTrails_Cycling.zmp/18.bmp differ
diff --git a/_OSM/osm_WayMarkeredTrails_Cycling.zmp/24.bmp b/_OSM/osm_WayMarkeredTrails_Cycling.zmp/24.bmp
new file mode 100644
index 000000000..da49b1710
Binary files /dev/null and b/_OSM/osm_WayMarkeredTrails_Cycling.zmp/24.bmp differ
diff --git a/_OSM/osm_WayMarkeredTrails_Cycling.zmp/GetUrlScript.txt b/_OSM/osm_WayMarkeredTrails_Cycling.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..9fb82dd0c
--- /dev/null
+++ b/_OSM/osm_WayMarkeredTrails_Cycling.zmp/GetUrlScript.txt
@@ -0,0 +1,3 @@
+begin
+ ResultURL:=GetURLBase+'/'+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.png';
+end.
\ No newline at end of file
diff --git a/_OSM/osm_WayMarkeredTrails_Cycling.zmp/info.txt b/_OSM/osm_WayMarkeredTrails_Cycling.zmp/info.txt
new file mode 100644
index 000000000..aacba62ca
--- /dev/null
+++ b/_OSM/osm_WayMarkeredTrails_Cycling.zmp/info.txt
@@ -0,0 +1,6 @@
+OpenStreetMap - это карта всего мира,
+которую может редактировать каждый,
+которая создается практически с чистого листа
+и распространяется под свободной лицензией.
+
+Первоисточник: http://www.openstreetmap.org/
diff --git a/_OSM/osm_WayMarkeredTrails_Cycling.zmp/params.txt b/_OSM/osm_WayMarkeredTrails_Cycling.zmp/params.txt
new file mode 100644
index 000000000..f5762e0b0
--- /dev/null
+++ b/_OSM/osm_WayMarkeredTrails_Cycling.zmp/params.txt
@@ -0,0 +1,15 @@
+[PARAMS]
+GUID={1123ADB1-4561-4280-9224-D4690321117E}
+asLayer=1
+name=WayMarkeredTrails Cycling
+NameInCache=waymarkedtrails_cycling
+DefURLBase=https://tile.waymarkedtrails.org/cycling
+ContentType=image/png
+Ext=.png
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+DefHotKey=16463
+PARENTSUBMENU=Tracks
+RequestHead=Referer: http://www.openstreetmap.org/
+
diff --git a/_OSM/osm_WayMarkeredTrails_Hiking.zmp/18.bmp b/_OSM/osm_WayMarkeredTrails_Hiking.zmp/18.bmp
new file mode 100644
index 000000000..a942fa46b
Binary files /dev/null and b/_OSM/osm_WayMarkeredTrails_Hiking.zmp/18.bmp differ
diff --git a/_OSM/osm_WayMarkeredTrails_Hiking.zmp/24.bmp b/_OSM/osm_WayMarkeredTrails_Hiking.zmp/24.bmp
new file mode 100644
index 000000000..da49b1710
Binary files /dev/null and b/_OSM/osm_WayMarkeredTrails_Hiking.zmp/24.bmp differ
diff --git a/_OSM/osm_WayMarkeredTrails_Hiking.zmp/GetUrlScript.txt b/_OSM/osm_WayMarkeredTrails_Hiking.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..9fb82dd0c
--- /dev/null
+++ b/_OSM/osm_WayMarkeredTrails_Hiking.zmp/GetUrlScript.txt
@@ -0,0 +1,3 @@
+begin
+ ResultURL:=GetURLBase+'/'+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.png';
+end.
\ No newline at end of file
diff --git a/_OSM/osm_WayMarkeredTrails_Hiking.zmp/info.txt b/_OSM/osm_WayMarkeredTrails_Hiking.zmp/info.txt
new file mode 100644
index 000000000..aacba62ca
--- /dev/null
+++ b/_OSM/osm_WayMarkeredTrails_Hiking.zmp/info.txt
@@ -0,0 +1,6 @@
+OpenStreetMap - это карта всего мира,
+которую может редактировать каждый,
+которая создается практически с чистого листа
+и распространяется под свободной лицензией.
+
+Первоисточник: http://www.openstreetmap.org/
diff --git a/_OSM/osm_WayMarkeredTrails_Hiking.zmp/params.txt b/_OSM/osm_WayMarkeredTrails_Hiking.zmp/params.txt
new file mode 100644
index 000000000..1146c041e
--- /dev/null
+++ b/_OSM/osm_WayMarkeredTrails_Hiking.zmp/params.txt
@@ -0,0 +1,15 @@
+[PARAMS]
+GUID={1123ADB1-4561-4280-9225-D4690321117E}
+asLayer=1
+name=WayMarkeredTrails iking
+NameInCache=waymarkedtrails_hiking
+DefURLBase=https://tile.waymarkedtrails.org/hiking
+ContentType=image/png
+Ext=.png
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+DefHotKey=16463
+PARENTSUBMENU=Tracks
+RequestHead=Referer: http://www.openstreetmap.org/
+
diff --git a/_OSM/osm_gps_tile.zmp/params.txt b/_OSM/osm_gps_tile.zmp/params.txt
index 9fa9359d0..215773892 100644
--- a/_OSM/osm_gps_tile.zmp/params.txt
+++ b/_OSM/osm_gps_tile.zmp/params.txt
@@ -12,7 +12,7 @@ projection=1
sradiusa=6378137
sradiusb=6356752
DefHotKey=16463
-PARENTSUBMENU=OSM
+PARENTSUBMENU=Tracks
IteratorSubRectSize=8,8
RequestHead=Referer: http://www.openstreetmap.org/
License=(c) OpenStreetMap contributors, CC-BY-SA
diff --git a/_OSM/osm_opensnowmap.zmp/18.bmp b/_OSM/osm_opensnowmap.zmp/18.bmp
new file mode 100644
index 000000000..a942fa46b
Binary files /dev/null and b/_OSM/osm_opensnowmap.zmp/18.bmp differ
diff --git a/_OSM/osm_opensnowmap.zmp/24.bmp b/_OSM/osm_opensnowmap.zmp/24.bmp
new file mode 100644
index 000000000..da49b1710
Binary files /dev/null and b/_OSM/osm_opensnowmap.zmp/24.bmp differ
diff --git a/_OSM/osm_opensnowmap.zmp/GetUrlScript.txt b/_OSM/osm_opensnowmap.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..adc93d1d8
--- /dev/null
+++ b/_OSM/osm_opensnowmap.zmp/GetUrlScript.txt
@@ -0,0 +1,3 @@
+begin
+ ResultURL:=GetURLBase+'/'+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.png';
+end.
\ No newline at end of file
diff --git a/_OSM/osm_opensnowmap.zmp/info.txt b/_OSM/osm_opensnowmap.zmp/info.txt
new file mode 100644
index 000000000..df53cfd8f
--- /dev/null
+++ b/_OSM/osm_opensnowmap.zmp/info.txt
@@ -0,0 +1 @@
+maps.sputnik.ru
\ No newline at end of file
diff --git a/_OSM/osm_opensnowmap.zmp/params.txt b/_OSM/osm_opensnowmap.zmp/params.txt
new file mode 100644
index 000000000..57a4c7a48
--- /dev/null
+++ b/_OSM/osm_opensnowmap.zmp/params.txt
@@ -0,0 +1,12 @@
+[PARAMS]
+GUID={D3465891-4552-4668-9232-DD569067900E}
+name=OpenSnowMap (background layer)
+NameInCache=opensnowmap
+DefURLBase=http://www.opensnowmap.org/base_snow_map
+ContentType=image/png
+Ext=.png
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+ParentSubMenu=OSM
+RequestHead=Referer: http://www.opensnowmap.org/
\ No newline at end of file
diff --git a/_OSM/osm_opensnowmap_overlay.zmp/18.bmp b/_OSM/osm_opensnowmap_overlay.zmp/18.bmp
new file mode 100644
index 000000000..a942fa46b
Binary files /dev/null and b/_OSM/osm_opensnowmap_overlay.zmp/18.bmp differ
diff --git a/_OSM/osm_opensnowmap_overlay.zmp/24.bmp b/_OSM/osm_opensnowmap_overlay.zmp/24.bmp
new file mode 100644
index 000000000..da49b1710
Binary files /dev/null and b/_OSM/osm_opensnowmap_overlay.zmp/24.bmp differ
diff --git a/_OSM/osm_opensnowmap_overlay.zmp/GetUrlScript.txt b/_OSM/osm_opensnowmap_overlay.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..9fb82dd0c
--- /dev/null
+++ b/_OSM/osm_opensnowmap_overlay.zmp/GetUrlScript.txt
@@ -0,0 +1,3 @@
+begin
+ ResultURL:=GetURLBase+'/'+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'.png';
+end.
\ No newline at end of file
diff --git a/_OSM/osm_opensnowmap_overlay.zmp/info.txt b/_OSM/osm_opensnowmap_overlay.zmp/info.txt
new file mode 100644
index 000000000..aacba62ca
--- /dev/null
+++ b/_OSM/osm_opensnowmap_overlay.zmp/info.txt
@@ -0,0 +1,6 @@
+OpenStreetMap - это карта всего мира,
+которую может редактировать каждый,
+которая создается практически с чистого листа
+и распространяется под свободной лицензией.
+
+Первоисточник: http://www.openstreetmap.org/
diff --git a/_OSM/osm_opensnowmap_overlay.zmp/params.txt b/_OSM/osm_opensnowmap_overlay.zmp/params.txt
new file mode 100644
index 000000000..4692568ef
--- /dev/null
+++ b/_OSM/osm_opensnowmap_overlay.zmp/params.txt
@@ -0,0 +1,16 @@
+[PARAMS]
+GUID={1123ADB1-4562-4280-9222-D4690321117E}
+asLayer=1
+name=OpenSnowMap (pistes layer)
+NameInCache=opensnowmap_overlay
+DefURLBase=http://www.opensnowmap.org/pistes
+ContentType=image/png
+Ext=.png
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+DefHotKey=16463
+PARENTSUBMENU=Tracks
+IteratorSubRectSize=8,8
+RequestHead=Referer: http://www.opensnowmap.org/
+
diff --git a/_OSM/osm_openwintermap.zmp/18.bmp b/_OSM/osm_openwintermap.zmp/18.bmp
new file mode 100644
index 000000000..a942fa46b
Binary files /dev/null and b/_OSM/osm_openwintermap.zmp/18.bmp differ
diff --git a/_OSM/osm_openwintermap.zmp/24.bmp b/_OSM/osm_openwintermap.zmp/24.bmp
new file mode 100644
index 000000000..da49b1710
Binary files /dev/null and b/_OSM/osm_openwintermap.zmp/24.bmp differ
diff --git a/_OSM/osm_openwintermap.zmp/GetUrlScript.txt b/_OSM/osm_openwintermap.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..eb359e4a7
--- /dev/null
+++ b/_OSM/osm_openwintermap.zmp/GetUrlScript.txt
@@ -0,0 +1,3 @@
+begin
+ ResultURL:=GetURLBase+'/'+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(GetY)+'/t.png?project=api-dev-oa';
+end.
\ No newline at end of file
diff --git a/_OSM/osm_openwintermap.zmp/info.txt b/_OSM/osm_openwintermap.zmp/info.txt
new file mode 100644
index 000000000..df53cfd8f
--- /dev/null
+++ b/_OSM/osm_openwintermap.zmp/info.txt
@@ -0,0 +1 @@
+maps.sputnik.ru
\ No newline at end of file
diff --git a/_OSM/osm_openwintermap.zmp/params.txt b/_OSM/osm_openwintermap.zmp/params.txt
new file mode 100644
index 000000000..c0f2878ad
--- /dev/null
+++ b/_OSM/osm_openwintermap.zmp/params.txt
@@ -0,0 +1,11 @@
+[PARAMS]
+GUID={D3465891-4553-4668-9223-DD569067900E}
+name=OpenWinterMap
+NameInCache=openwintermap
+DefURLBase=https://w3.outdooractive.com/map/v1/png/osm_winter
+ContentType=image/png
+Ext=.png
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+ParentSubMenu=OSM
diff --git a/_mapsurfer/mapsurfer_altitude_contour.zmp/params.txt b/_mapsurfer/mapsurfer_altitude_contour.zmp/params.txt
index ea036919b..5fbe7f795 100644
--- a/_mapsurfer/mapsurfer_altitude_contour.zmp/params.txt
+++ b/_mapsurfer/mapsurfer_altitude_contour.zmp/params.txt
@@ -11,7 +11,9 @@ Ext=.png
projection=1
sradiusa=6378137
sradiusb=6378137
-ParentSubMenu=Mapsurfer
+ParentSubMenu_ru=Рельеф и тополинии
+ParentSubMenu=Hillshade
+ParentSubMenu_uk=Рельєф і тополинии
RequestHead=User-Agent: SAS.Planet
IteratorSubRectSize=8,8
License=ASTER Global Digital Elevation Map, rendering GIScience Research Group @ University of Heidelberg
diff --git a/_tourism/slazav.map_hr_nakarte.zmp/18.bmp b/_tourism/slazav.map_hr_nakarte.zmp/18.bmp
new file mode 100644
index 000000000..47d65f276
Binary files /dev/null and b/_tourism/slazav.map_hr_nakarte.zmp/18.bmp differ
diff --git a/_tourism/slazav.map_hr_nakarte.zmp/24.bmp b/_tourism/slazav.map_hr_nakarte.zmp/24.bmp
new file mode 100644
index 000000000..595f438be
Binary files /dev/null and b/_tourism/slazav.map_hr_nakarte.zmp/24.bmp differ
diff --git a/_tourism/slazav.map_hr_nakarte.zmp/GetUrlScript.txt b/_tourism/slazav.map_hr_nakarte.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..3ae0e936c
--- /dev/null
+++ b/_tourism/slazav.map_hr_nakarte.zmp/GetUrlScript.txt
@@ -0,0 +1,8 @@
+var
+ InvertedY: integer;
+
+begin
+ InvertedY := round(intpower(2,GetZ-1)) - 1 - GetY;
+
+ ResultURL:=GetURLBase+'/'+inttostr(GetZ-1)+'/'+inttostr(GetX)+'/'+inttostr(InvertedY);
+end.
\ No newline at end of file
diff --git a/_tourism/slazav.map_hr_nakarte.zmp/info.txt b/_tourism/slazav.map_hr_nakarte.zmp/info.txt
new file mode 100644
index 000000000..53dc80a75
--- /dev/null
+++ b/_tourism/slazav.map_hr_nakarte.zmp/info.txt
@@ -0,0 +1,12 @@
+Все карты и права из раздела "Туристические" принадлежат их владельцам
+Карты рисовали: В.Завьялов, А.Тонис, А.Чупикин, Т.Алексеевский, А.Бахвалов...
+http://slazav.mccme.ru/maps/
+
+Просмотреть в браузере
+
+
+ЖЖ : http://slazav-news.livejournal.com/
+
+
+Если у Вас есть чем дополнить этот раздел - смело шлите на ящик garl@mail.ru
+
diff --git a/_tourism/slazav.map_hr_nakarte.zmp/params.txt b/_tourism/slazav.map_hr_nakarte.zmp/params.txt
new file mode 100644
index 000000000..15b1543fd
--- /dev/null
+++ b/_tourism/slazav.map_hr_nakarte.zmp/params.txt
@@ -0,0 +1,19 @@
+
+[PARAMS]
+pnum=17
+GUID={8834EDB4-532C-469D-B156-C811E0A93FB8}
+name_ru=Карты Владислава Завьялова Nakarte.me
+name=Vladislav Zavjalov map Nakarte.me
+ParentSubMenu_ru=Туристические
+ParentSubMenu=Tourism
+DefURLBase=https://tiles.nakarte.me/map_hr
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+NameInCache=slazav.map_hr
+Ext=.png
+defaultContentType=image/png
+ContentType="image/png"
+License=© Владислав Завьялов, slazav.livejournal.com
+MaxConnectToServerCount=1
+IsUseDownloaderInScript=1
diff --git a/_tourism/taganay.zmp/18.bmp b/_tourism/taganay.zmp/18.bmp
new file mode 100644
index 000000000..47d65f276
Binary files /dev/null and b/_tourism/taganay.zmp/18.bmp differ
diff --git a/_tourism/taganay.zmp/24.bmp b/_tourism/taganay.zmp/24.bmp
new file mode 100644
index 000000000..595f438be
Binary files /dev/null and b/_tourism/taganay.zmp/24.bmp differ
diff --git a/_tourism/taganay.zmp/GetUrlScript.txt b/_tourism/taganay.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..607d9e8f1
--- /dev/null
+++ b/_tourism/taganay.zmp/GetUrlScript.txt
@@ -0,0 +1,56 @@
+function GetCode(const url: AnsiString): Cardinal;
+var
+ VResponseCode: Cardinal;
+ VResponseHeader, VResponseData: AnsiString;
+begin
+ Result := 1;
+ if Assigned(Downloader) then begin
+ VResponseHeader := '';
+ VResponseData := '';
+ VResponseCode := Downloader.DoHttpRequest(url, '', '', VResponseHeader, VResponseData);
+ Result := VResponseCode;
+ end;
+end;
+
+var
+ BaseUrl: string;
+ code: Cardinal;
+ z_ok, z_no: integer;
+ r: integer;
+begin
+ ResultURL := '';
+ z_ok := StrToIntDef(GetBefore(';', ScriptBuffer), 1); // Максимальный масштаб, который точно есть
+ z_no := StrToIntDef(GetAfter(';', ScriptBuffer), 25); // Минимальный масштаб, которого точно нет
+
+ // Масштаба нет - говорить не о чем
+ if getz >= z_no then exit;
+
+ // Выбор зеркала, если не указана версия
+ if version = '' then
+ r := random(2)
+ else
+ r := StrToInt(version);
+
+ case r of
+ 0: BaseUrl := GetURLBase;
+ 1: BaseUrl := RegExprReplaceMatchSubStr(GetURLBase, 'http://91.237.82.95:8088', 'https://maps.melda.ru');
+ end;
+
+ // Проверяем наличие масштаба
+ if getz > z_ok then begin
+ code := GetCode(BaseUrl+'z'+inttostr(getz)+'/');
+
+ // Внимание! Если сервер вернёт 403 - code почему-то будет 0. Так что выбор "404 или что-то иное"
+ // Если дело дошло до проверки наличия масштаба - значит какая-то граница (z_ok / z_no) точно подвинется.
+ if code = 404 then z_no := getz else z_ok := getz;
+
+ // Сохраняем актуализированные границы для последующих вызовов
+ ScriptBuffer := inttostr(z_ok) + ';' + inttostr(z_no);
+
+ // Масштаба нет (о чём могли только что при проверке узнать) - говорить не о чем
+ if getz >= z_no then exit;
+ end;
+
+ // Ок, качаем тайлик
+ ResultURL:= BaseUrl+'z'+inttostr(getz)+'/'+inttostr(getx div 1024)+'/x'+inttostr(getx)+'/'+inttostr(gety div 1024)+'/y'+inttostr(gety)+'.jpg';
+end.
diff --git a/_tourism/taganay.zmp/info.txt b/_tourism/taganay.zmp/info.txt
new file mode 100644
index 000000000..8fc057e04
--- /dev/null
+++ b/_tourism/taganay.zmp/info.txt
@@ -0,0 +1,17 @@
+Все карты и права из раздела "Туристические" принадлежат их владельцам
+
+Если у Вас есть чем дополнить этот раздел - смело шлите на ящик garl@mail.ru
+
+
+
+По вопросу приобретения карты, а также с замечаниями и предложениями обращаться по адресу:
+355037, г. Ставрополь-37, а/я ј 1036, товарищество "Охта", тел. 4-51-48
+
+КОМИТЕТ ГЕОДЕЗИИ И КАРТОГРАФИИ СССР МОСКВА 1991
+Карта составлена и подготовлена к печати Северо-Кавказским аэрогеодезическим предприятием в 1991 г.
+1357500, г Пятигорск, просп. Горького, 4 совместно с товариществом "Охта", 355017 г. Ставрополь, пер. Зоотехнический, 13а
+Редакторы: В. И. Пилипенко, А. М. Алейник, Тех. редактор В. И. Пилипенко, Консультант Э. А. Фогилев
+Подписана к печати 29.05.91, Формат бумаги 62-97, Бумага картографическая марки "В" 85 г/м2, Тираж 14500 экз.
+
+Снятие копий без согласования с органами Государственного геодезического надзора СССР не разрешается
+(c) ГОСГЕОДЕЗИЯ СССР 1991 г.
diff --git a/_tourism/taganay.zmp/params.txt b/_tourism/taganay.zmp/params.txt
new file mode 100644
index 000000000..e782f20b6
--- /dev/null
+++ b/_tourism/taganay.zmp/params.txt
@@ -0,0 +1,18 @@
+
+[PARAMS]
+pnum=17
+GUID={EC131932-0BC8-43BD-BBE6-30D0B230793F}
+name_ru=Национальный парк Таганай 2006
+name=Taganay National Park 2006
+ParentSubMenu_ru=Туристические
+ParentSubMenu=Tourism
+DefURLBase=http://91.237.82.95:8088/pub/tourism/taganay/
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+NameInCache=taganay
+Ext=.jpg
+defaultContentType=image/jpeg
+ContentType="image/jpeg"
+MaxConnectToServerCount=1
+IsUseDownloaderInScript=1
diff --git a/_OSM/osm_openseamap.zmp/18.bmp b/_water/osm_openseamap.zmp/18.bmp
similarity index 100%
rename from _OSM/osm_openseamap.zmp/18.bmp
rename to _water/osm_openseamap.zmp/18.bmp
diff --git a/_OSM/osm_openseamap.zmp/24.bmp b/_water/osm_openseamap.zmp/24.bmp
similarity index 100%
rename from _OSM/osm_openseamap.zmp/24.bmp
rename to _water/osm_openseamap.zmp/24.bmp
diff --git a/_OSM/osm_openseamap.zmp/GetUrlScript.txt b/_water/osm_openseamap.zmp/GetUrlScript.txt
similarity index 100%
rename from _OSM/osm_openseamap.zmp/GetUrlScript.txt
rename to _water/osm_openseamap.zmp/GetUrlScript.txt
diff --git a/_OSM/osm_openseamap.zmp/info.txt b/_water/osm_openseamap.zmp/info.txt
similarity index 100%
rename from _OSM/osm_openseamap.zmp/info.txt
rename to _water/osm_openseamap.zmp/info.txt
diff --git a/_OSM/osm_openseamap.zmp/params.txt b/_water/osm_openseamap.zmp/params.txt
similarity index 82%
rename from _OSM/osm_openseamap.zmp/params.txt
rename to _water/osm_openseamap.zmp/params.txt
index 392b2b616..42176ad2f 100644
--- a/_OSM/osm_openseamap.zmp/params.txt
+++ b/_water/osm_openseamap.zmp/params.txt
@@ -1,11 +1,12 @@
-п»ї
-[PARAMS]
+п»ї[PARAMS]
pnum=118
GUID={AB8A8685-AEC6-4E16-80DA-DC4AC37E4777}
asLayer=1
name_ru=Openseamap.org
name=Openseamap.org
name_uk=Openseamap.org
+ParentSubMenu_ru=Морские карты
+ParentSubMenu=Marine maps
NameInCache=OSM_openseamap
DefURLBase=http://tiles.openseamap.org/seamark/
ContentType=image/png
diff --git a/anygis/rusOurdoor.zmp/18.bmp b/anygis/rusOurdoor.zmp/18.bmp
new file mode 100644
index 000000000..584dfd410
Binary files /dev/null and b/anygis/rusOurdoor.zmp/18.bmp differ
diff --git a/anygis/rusOurdoor.zmp/24.bmp b/anygis/rusOurdoor.zmp/24.bmp
new file mode 100644
index 000000000..13c144685
Binary files /dev/null and b/anygis/rusOurdoor.zmp/24.bmp differ
diff --git a/anygis/rusOurdoor.zmp/GetUrlScript.txt b/anygis/rusOurdoor.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..b95078492
--- /dev/null
+++ b/anygis/rusOurdoor.zmp/GetUrlScript.txt
@@ -0,0 +1,3 @@
+begin
+ ResultURL:= GetUrlBase + inttostr(GetX) + '/' + inttostr(GetY) + '/' + inttostr(GetZ - 1);
+end.
diff --git a/anygis/rusOurdoor.zmp/params.txt b/anygis/rusOurdoor.zmp/params.txt
new file mode 100644
index 000000000..54f988d2d
--- /dev/null
+++ b/anygis/rusOurdoor.zmp/params.txt
@@ -0,0 +1,15 @@
+[PARAMS]
+pnum=170
+GUID={01BDC3A9-D0C1-4B84-BFB5-94AAF9D100F7}
+name=RusOutdoor maps
+NameInCache=rusoutdoors
+DefURLBase=https://anygis.herokuapp.com/Combo_RusOutdoor/
+Ext=.jpg
+defaultContentType=image/jpeg,image/png
+ContentType=image/jpeg,image/png
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+ParentSubMenu_ru=Другие карты\AnyGIS
+ParentSubMenu=Other maps\AnyGIS
+ParentSubMenu_uk=Інші карти\AnyGIS
\ No newline at end of file
diff --git a/anygis/rusOurdoor_lite.zmp/18.bmp b/anygis/rusOurdoor_lite.zmp/18.bmp
new file mode 100644
index 000000000..584dfd410
Binary files /dev/null and b/anygis/rusOurdoor_lite.zmp/18.bmp differ
diff --git a/anygis/rusOurdoor_lite.zmp/24.bmp b/anygis/rusOurdoor_lite.zmp/24.bmp
new file mode 100644
index 000000000..13c144685
Binary files /dev/null and b/anygis/rusOurdoor_lite.zmp/24.bmp differ
diff --git a/anygis/rusOurdoor_lite.zmp/GetUrlScript.txt b/anygis/rusOurdoor_lite.zmp/GetUrlScript.txt
new file mode 100644
index 000000000..b95078492
--- /dev/null
+++ b/anygis/rusOurdoor_lite.zmp/GetUrlScript.txt
@@ -0,0 +1,3 @@
+begin
+ ResultURL:= GetUrlBase + inttostr(GetX) + '/' + inttostr(GetY) + '/' + inttostr(GetZ - 1);
+end.
diff --git a/anygis/rusOurdoor_lite.zmp/params.txt b/anygis/rusOurdoor_lite.zmp/params.txt
new file mode 100644
index 000000000..1f0e6c351
--- /dev/null
+++ b/anygis/rusOurdoor_lite.zmp/params.txt
@@ -0,0 +1,15 @@
+[PARAMS]
+pnum=170
+GUID={01BDC3A9-D0C2-4B84-BFB5-94AAF9D100F7}
+name=RusOutdoor maps (lite)
+NameInCache=rusoutdoors_lite
+DefURLBase=https://anygis.herokuapp.com/Combo_RusOutdoor_lite/
+Ext=.jpg
+defaultContentType=image/jpeg,image/png
+ContentType=image/jpeg,image/png
+projection=1
+sradiusa=6378137
+sradiusb=6378137
+ParentSubMenu_ru=Другие карты\AnyGIS
+ParentSubMenu=Other maps\AnyGIS
+ParentSubMenu_uk=Інші карти\AnyGIS
diff --git a/Contur.zmp/18.bmp b/hillshades/Contur.zmp/18.bmp
similarity index 100%
rename from Contur.zmp/18.bmp
rename to hillshades/Contur.zmp/18.bmp
diff --git a/Contur.zmp/24.bmp b/hillshades/Contur.zmp/24.bmp
similarity index 100%
rename from Contur.zmp/24.bmp
rename to hillshades/Contur.zmp/24.bmp
diff --git a/Contur.zmp/GetUrlScript.txt b/hillshades/Contur.zmp/GetUrlScript.txt
similarity index 100%
rename from Contur.zmp/GetUrlScript.txt
rename to hillshades/Contur.zmp/GetUrlScript.txt
diff --git a/Contur.zmp/info.txt b/hillshades/Contur.zmp/info.txt
similarity index 100%
rename from Contur.zmp/info.txt
rename to hillshades/Contur.zmp/info.txt
diff --git a/Contur.zmp/params.txt b/hillshades/Contur.zmp/params.txt
similarity index 77%
rename from Contur.zmp/params.txt
rename to hillshades/Contur.zmp/params.txt
index 0db5e0748..ea880fa7a 100644
--- a/Contur.zmp/params.txt
+++ b/hillshades/Contur.zmp/params.txt
@@ -4,6 +4,9 @@ GUID={4A21F0A3-D083-4FBD-8A51-749640DBD117}
asLayer=1
name_ru=Высоты (heywhatsthat.com)
name=Heights (heywhatsthat.com)
+ParentSubMenu_ru=Рельеф и тополинии
+ParentSubMenu=Hillshade
+ParentSubMenu_uk=Рельєф і тополинии
NameInCache=contur
DefURLBase=http://contour.heywhatsthat.com/api/contour_tiles_sasgis.png?src=sasgis&
ContentType=image/png
diff --git a/_OSM/osm_windy_hillshade.zmp/18.bmp b/hillshades/osm_windy_hillshade.zmp/18.bmp
similarity index 100%
rename from _OSM/osm_windy_hillshade.zmp/18.bmp
rename to hillshades/osm_windy_hillshade.zmp/18.bmp
diff --git a/_OSM/osm_windy_hillshade.zmp/24.bmp b/hillshades/osm_windy_hillshade.zmp/24.bmp
similarity index 100%
rename from _OSM/osm_windy_hillshade.zmp/24.bmp
rename to hillshades/osm_windy_hillshade.zmp/24.bmp
diff --git a/_OSM/osm_windy_hillshade.zmp/GetUrlScript.txt b/hillshades/osm_windy_hillshade.zmp/GetUrlScript.txt
similarity index 100%
rename from _OSM/osm_windy_hillshade.zmp/GetUrlScript.txt
rename to hillshades/osm_windy_hillshade.zmp/GetUrlScript.txt
diff --git a/_OSM/osm_windy_hillshade.zmp/info.txt b/hillshades/osm_windy_hillshade.zmp/info.txt
similarity index 100%
rename from _OSM/osm_windy_hillshade.zmp/info.txt
rename to hillshades/osm_windy_hillshade.zmp/info.txt
diff --git a/_OSM/osm_windy_hillshade.zmp/params.txt b/hillshades/osm_windy_hillshade.zmp/params.txt
similarity index 77%
rename from _OSM/osm_windy_hillshade.zmp/params.txt
rename to hillshades/osm_windy_hillshade.zmp/params.txt
index 202f559e2..d110d0a44 100644
--- a/_OSM/osm_windy_hillshade.zmp/params.txt
+++ b/hillshades/osm_windy_hillshade.zmp/params.txt
@@ -13,7 +13,9 @@ Ext=.png
projection=1
sradiusa=6378137
sradiusb=6378137
-PARENTSUBMENU=OSM
+ParentSubMenu_ru=Рельеф и тополинии
+ParentSubMenu=Hillshade
+ParentSubMenu_uk=Рельєф і тополинии
RequestHead=User-Agent: SAS.Planet
IteratorSubRectSize=8,8
License=Map data В© OpenStreetMap contributors, rendering GIScience Research Group @ University of Heidelberg
diff --git a/mapbox/osm_mapbox_contours.zmp/18.bmp b/mapbox/osm_mapbox_contours.zmp/18.bmp
deleted file mode 100644
index a90c7c275..000000000
Binary files a/mapbox/osm_mapbox_contours.zmp/18.bmp and /dev/null differ
diff --git a/mapbox/osm_mapbox_contours.zmp/24.bmp b/mapbox/osm_mapbox_contours.zmp/24.bmp
deleted file mode 100644
index 11f1e9e1b..000000000
Binary files a/mapbox/osm_mapbox_contours.zmp/24.bmp and /dev/null differ
diff --git a/mapbox/osm_mapbox_contours.zmp/GetUrlScript.txt b/mapbox/osm_mapbox_contours.zmp/GetUrlScript.txt
deleted file mode 100644
index 7eefb6064..000000000
--- a/mapbox/osm_mapbox_contours.zmp/GetUrlScript.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-var
- Number: integer;
- FirstPartURL: array[0..3] of String;
- SecondPartURL: array[0..3] of string;
-
-begin
- // Mapbox даёт бесплатно выкачать только 50000 тайлов в месяц.
- // В таком случае, можно зарегистрировать кучу бесплатных аккаунтов.
-
- FirstPartURL[0]:= 'https://api.mapbox.com/styles/v1/nnngrach/cjot2wu8l08d42rmyizof9alp/tiles/256/';
- FirstPartURL[1]:= 'https://api.mapbox.com/styles/v1/nnngrach2/cjot5r5xg0eho2spvrqncv59w/tiles/256/';
- FirstPartURL[2]:= 'https://api.mapbox.com/styles/v1/nnngrach3/cjot65ons55ux2sphqxqfohud/tiles/256/';
- FirstPartURL[3]:= 'https://api.mapbox.com/styles/v1/nnngrach4/cjot6d7f30kea2rqggfrfwuk0/tiles/256/';
-
- SecondPartURL[0]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2giLCJhIjoiY2pvc3lwcDhwMHQwMzNxbGh5cmIzMzR5ayJ9.uW0dUw6sZCBcrL0cg0JgLA';
- SecondPartURL[1]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2gyIiwiYSI6ImNqb3Q1bnVoazB2NHgzc25yYXNlbjZ6NXEifQ.Icvq22SoRbXWafVls1vQzw';
- SecondPartURL[2]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2gzIiwiYSI6ImNqb3Q1d3J4YzB2NXQzcWtmZjZ5ZjdzNmEifQ.JfDmgQvzdsfSKHqaH-KSow';
- SecondPartURL[3]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2g0IiwiYSI6ImNqb3Q2YTA2eDB2N2Eza285bndzbWxtbzEifQ.5oZcsK5zbp5mXCfCT-f_XQ';
-
- Number:= Random(4);
-
- ResultURL:= FirstPartURL[Number] + inttostr(GetZ-1) + '/' + inttostr(GetX) + '/' + inttostr(GetY) + SecondPartURL[Number];
-
-end.
diff --git a/mapbox/osm_mapbox_contours.zmp/info.txt b/mapbox/osm_mapbox_contours.zmp/info.txt
deleted file mode 100644
index 2c5c0d0fe..000000000
--- a/mapbox/osm_mapbox_contours.zmp/info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Контурные линии без указания высот, взятые с сайта Mapbox.com
diff --git a/mapbox/osm_mapbox_contours.zmp/params.txt b/mapbox/osm_mapbox_contours.zmp/params.txt
deleted file mode 100644
index c3fc2820c..000000000
--- a/mapbox/osm_mapbox_contours.zmp/params.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-п»ї[PARAMS]
-pnum=118
-GUID={AB8A8685-AEC6-4E16-80DA-DF5AC37E4777}
-asLayer=1
-name_ru=Mapbox.com (контуры высот)
-name=Mapbox.com (contours)
-name_uk=Mapbox.com (contours)
-NameInCache=OSM_mapbox_contours
-DefURLBase=https://api.mapbox.com/styles/v1/nnngrach/cjot2wu8l08d42rmyizof9alp/tiles/256/
-ContentType=image/png
-Ext=.png
-projection=1
-sradiusa=6378137
-sradiusb=6378137
-PARENTSUBMENU=Mapbox
-RequestHead=User-Agent: SAS.Planet
-IteratorSubRectSize=8,8
-License=Map data В© OpenStreetMap contributors, rendering GIScience Research Group @ University of Heidelberg
diff --git a/mapbox/osm_mapbox_hillshade.zmp/18.bmp b/mapbox/osm_mapbox_hillshade.zmp/18.bmp
deleted file mode 100644
index a90c7c275..000000000
Binary files a/mapbox/osm_mapbox_hillshade.zmp/18.bmp and /dev/null differ
diff --git a/mapbox/osm_mapbox_hillshade.zmp/24.bmp b/mapbox/osm_mapbox_hillshade.zmp/24.bmp
deleted file mode 100644
index 11f1e9e1b..000000000
Binary files a/mapbox/osm_mapbox_hillshade.zmp/24.bmp and /dev/null differ
diff --git a/mapbox/osm_mapbox_hillshade.zmp/GetUrlScript.txt b/mapbox/osm_mapbox_hillshade.zmp/GetUrlScript.txt
deleted file mode 100644
index f11d49257..000000000
--- a/mapbox/osm_mapbox_hillshade.zmp/GetUrlScript.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-п»їvar
-
- Number: integer;
- FirstPartURL: array[0..3] of String;
- SecondPartURL: array[0..3] of string;
-
-
-begin
- // Mapbox даёт бесплатно выкачать только 50000 тайлов в месяц.
- // В таком случае, можно зарегистрировать кучу бесплатных аккаунтов.
-
- FirstPartURL[0]:= 'https://api.mapbox.com/styles/v1/nnngrach/cjot2untt0mem2rmktww3pae0/tiles/256/';
- FirstPartURL[1]:= 'https://api.mapbox.com/styles/v1/nnngrach2/cjot5r1t34diy2roz62sp20hl/tiles/256/';
- FirstPartURL[2]:= 'https://api.mapbox.com/styles/v1/nnngrach3/cjot5xbdl4dp32rozdghb1kzh/tiles/256/';
- FirstPartURL[3]:= 'https://api.mapbox.com/styles/v1/nnngrach4/cjot6aakzev942rlmuuq33z0i/tiles/256/';
-
- SecondPartURL[0]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2giLCJhIjoiY2pvc3lwcDhwMHQwMzNxbGh5cmIzMzR5ayJ9.uW0dUw6sZCBcrL0cg0JgLA';
- SecondPartURL[1]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2gyIiwiYSI6ImNqb3Q1bnVoazB2NHgzc25yYXNlbjZ6NXEifQ.Icvq22SoRbXWafVls1vQzw';
- SecondPartURL[2]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2gzIiwiYSI6ImNqb3Q1d3J4YzB2NXQzcWtmZjZ5ZjdzNmEifQ.JfDmgQvzdsfSKHqaH-KSow';
- SecondPartURL[3]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2g0IiwiYSI6ImNqb3Q2YTA2eDB2N2Eza285bndzbWxtbzEifQ.5oZcsK5zbp5mXCfCT-f_XQ';
-
- Number:= Random(4);
-
- ResultURL:= FirstPartURL[Number] + inttostr(GetZ-1) + '/' + inttostr(GetX) + '/' + inttostr(GetY) + SecondPartURL[Number];
-
-end.
-
diff --git a/mapbox/osm_mapbox_hillshade.zmp/info.txt b/mapbox/osm_mapbox_hillshade.zmp/info.txt
deleted file mode 100644
index 1b2171ded..000000000
--- a/mapbox/osm_mapbox_hillshade.zmp/info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Слой рельефа, взятый с сайта Mapbox.com
diff --git a/mapbox/osm_mapbox_hillshade.zmp/params.txt b/mapbox/osm_mapbox_hillshade.zmp/params.txt
deleted file mode 100644
index 919dae8b2..000000000
--- a/mapbox/osm_mapbox_hillshade.zmp/params.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-п»ї
-[PARAMS]
-pnum=118
-GUID={AB8A8685-AEC6-4E16-80DA-DF6AC37E4777}
-asLayer=1
-name_ru=Mapbox.com (рельеф)
-name=Mapbox.com (hillshade)
-name_uk=Mapbox.com (рельєф)
-NameInCache=OSM_mapbox_hillshade
-DefURLBase=https://api.mapbox.com/styles/v1/nnngrach/cjot2untt0mem2rmktww3pae0/tiles/256/
-ContentType=image/png
-Ext=.png
-projection=1
-sradiusa=6378137
-sradiusb=6378137
-PARENTSUBMENU=Mapbox
-RequestHead=User-Agent: SAS.Planet
-IteratorSubRectSize=8,8
-License=Map data В© OpenStreetMap contributors, rendering GIScience Research Group @ University of Heidelberg
diff --git a/mapbox/osm_mapbox_mapnik_layer.zmp/GetUrlScript.txt b/mapbox/osm_mapbox_mapnik_layer.zmp/GetUrlScript.txt
index c83fac2c2..c59972464 100644
--- a/mapbox/osm_mapbox_mapnik_layer.zmp/GetUrlScript.txt
+++ b/mapbox/osm_mapbox_mapnik_layer.zmp/GetUrlScript.txt
@@ -1,28 +1,5 @@
-var
-
- Number: integer;
- FirstPartURL: array[0..3] of String;
- SecondPartURL: array[0..3] of string;
-
-
begin
- // Mapbox даёт бесплатно выкачать только 50000 тайлов в месяц.
- // В таком случае, можно зарегистрировать кучу бесплатных аккаунтов.
-
- FirstPartURL[0]:= 'https://api.mapbox.com/styles/v1/nnngrach/cjot3z99v0i5e2rqg319j4dxg/tiles/256/';
- FirstPartURL[1]:= 'https://api.mapbox.com/styles/v1/nnngrach2/cjot5o6fq38dq2snohos5m1ws/tiles/256/';
- FirstPartURL[2]:= 'https://api.mapbox.com/styles/v1/nnngrach3/cjot5ygtc3avq2ro4q9mcozbk/tiles/256/';
- FirstPartURL[3]:= 'https://api.mapbox.com/styles/v1/nnngrach4/cjot6btfv89k52rp6oy8zkgju/tiles/256/';
-
- SecondPartURL[0]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2giLCJhIjoiY2pvc3lwcDhwMHQwMzNxbGh5cmIzMzR5ayJ9.uW0dUw6sZCBcrL0cg0JgLA';
- SecondPartURL[1]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2gyIiwiYSI6ImNqb3Q1bnVoazB2NHgzc25yYXNlbjZ6NXEifQ.Icvq22SoRbXWafVls1vQzw';
- SecondPartURL[2]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2gzIiwiYSI6ImNqb3Q1d3J4YzB2NXQzcWtmZjZ5ZjdzNmEifQ.JfDmgQvzdsfSKHqaH-KSow';
- SecondPartURL[3]:= '@2x?access_token=pk.eyJ1Ijoibm5uZ3JhY2g0IiwiYSI6ImNqb3Q2YTA2eDB2N2Eza285bndzbWxtbzEifQ.5oZcsK5zbp5mXCfCT-f_XQ';
-
- Number:= Random(4);
-
- ResultURL:= FirstPartURL[Number] + inttostr(GetZ-1) + '/' + inttostr(GetX) + '/' + inttostr(GetY) + SecondPartURL[Number];
-
+ ResultURL:= GetUrlBase + inttostr(GetX) + '/' + inttostr(GetY) + '/' + inttostr(GetZ - 1);
end.
diff --git a/mapbox/osm_mapbox_mapnik_layer.zmp/info.txt b/mapbox/osm_mapbox_mapnik_layer.zmp/info.txt
index 9299ca3c7..4754eee74 100644
--- a/mapbox/osm_mapbox_mapnik_layer.zmp/info.txt
+++ b/mapbox/osm_mapbox_mapnik_layer.zmp/info.txt
@@ -4,3 +4,4 @@
чтобы не затруднять чтение тропинок и мелких надписей.
В качестве источника использовался сайт Mapbox.com
+
diff --git a/mapbox/osm_mapbox_mapnik_layer.zmp/params.txt b/mapbox/osm_mapbox_mapnik_layer.zmp/params.txt
index ae08896b7..632e58d6c 100644
--- a/mapbox/osm_mapbox_mapnik_layer.zmp/params.txt
+++ b/mapbox/osm_mapbox_mapnik_layer.zmp/params.txt
@@ -1,19 +1,20 @@
-п»ї
-[PARAMS]
+п»ї[PARAMS]
pnum=118
GUID={AB8A8685-AEC6-4E16-80DA-DF4AC37E4777}
asLayer=1
name_ru=Mapbox.com (mapnik layer)
name=Mapbox.com (mapnik layer)
name_uk=Mapbox.com (mapnik layer)
+ParentSubMenu_ru=Рельеф и тополинии
+ParentSubMenu=Hillshade
+ParentSubMenu_uk=Рельєф і тополинии
NameInCache=OSM_mapbox_mapnik
-DefURLBase=https://api.mapbox.com/styles/v1/nnngrach/cjot3z99v0i5e2rqg319j4dxg/tiles/256/
+DefURLBase=https://anygis.herokuapp.com/Osm_Mapnik_Mapbox_Hillshades/
ContentType=image/png
Ext=.png
projection=1
sradiusa=6378137
sradiusb=6378137
-PARENTSUBMENU=Mapbox
RequestHead=User-Agent: SAS.Planet
IteratorSubRectSize=8,8
License=Map data В© OpenStreetMap contributors, rendering GIScience Research Group @ University of Heidelberg