diff --git a/Yandex/YaHyb.zmp/GetUrlScript.txt b/Yandex/YaHyb.zmp/GetUrlScript.txt deleted file mode 100644 index c5c9d8df..00000000 --- a/Yandex/YaHyb.zmp/GetUrlScript.txt +++ /dev/null @@ -1,6 +0,0 @@ -var - vec: string; -begin - vec := RegExprReplaceMatchSubStr(GetURLBase, 'vec(\d+)\.', 'vec0'+inttostr(1 + Random(3)) + '.' ); - ResultURL := vec +inttostr(GetX)+'&y='+inttostr(GetY)+'&z='+inttostr(GetZ-1); -end. diff --git a/Yandex/YaHyb.zmp/params.txt b/Yandex/YaHyb.zmp/params.txt index 6364e158..650f61e0 100644 --- a/Yandex/YaHyb.zmp/params.txt +++ b/Yandex/YaHyb.zmp/params.txt @@ -10,7 +10,7 @@ name_ru=Яндекс.Карты - Гибрид name=Yandex.Maps - Hybrid name_uk=Яндекс.Карты - Гібрид NameInCache=yahyb -DefURLBase=https://vec01.maps.yandex.net/tiles?l=skl&scale=1&lang=ru_RU&x= +DefURLBase=https://core-renderer-tiles.maps.yandex.net/tiles?l=skl&x={x}&y={y}&z={z}&scale=1&lang=ru_RU ContentType=image/png Ext=.png projection=2 diff --git a/Yandex/YaSat.zmp/GetUrlScript.txt b/Yandex/YaSat.zmp/GetUrlScript.txt deleted file mode 100644 index 8ab2a96d..00000000 --- a/Yandex/YaSat.zmp/GetUrlScript.txt +++ /dev/null @@ -1,6 +0,0 @@ -var - sat: string; -begin - sat := RegExprReplaceMatchSubStr(GetURLBase, 'sat(\d+)\.', 'sat0'+inttostr(1 + Random(3)) + '.' ); - ResultURL := sat +inttostr(GetX)+'&y='+inttostr(GetY)+'&z='+inttostr(GetZ-1); -end. diff --git a/Yandex/YaSat.zmp/params.txt b/Yandex/YaSat.zmp/params.txt index a68a32a7..49add156 100644 --- a/Yandex/YaSat.zmp/params.txt +++ b/Yandex/YaSat.zmp/params.txt @@ -8,7 +8,7 @@ ParentSubMenu=Satellite name_ru=Yandex - Спутник name_uk=Yandex - Спутник name=Yandex - Satellite -DefURLBase=https://sat01.maps.yandex.net/tiles?l=sat&scale=1&lang=ru_RU&x= +DefURLBase=https://core-sat.maps.yandex.net/tiles?l=sat&x={x}&y={y}&z={z}&scale=1&lang=ru_RU projection=2 sradiusa=6378137 sradiusb=6356752 diff --git a/Yandex/maps.yandex.com.Hybrid.zmp/GetUrlScript.txt b/Yandex/maps.yandex.com.Hybrid.zmp/GetUrlScript.txt deleted file mode 100644 index d4072b90..00000000 --- a/Yandex/maps.yandex.com.Hybrid.zmp/GetUrlScript.txt +++ /dev/null @@ -1,3 +0,0 @@ -begin - ResultURL:=GetURLBase+'&v='+Version+'&x='+inttostr(GetX)+'&y='+inttostr(GetY)+'&z='+inttostr(GetZ-1); -end. \ No newline at end of file diff --git a/Yandex/maps.yandex.com.Hybrid.zmp/params.txt b/Yandex/maps.yandex.com.Hybrid.zmp/params.txt index 6802248d..47da9f4e 100644 --- a/Yandex/maps.yandex.com.Hybrid.zmp/params.txt +++ b/Yandex/maps.yandex.com.Hybrid.zmp/params.txt @@ -9,7 +9,7 @@ name_ru=Яндекс.Карты - Гибрид (English) name=Yandex.Maps - Hybrid (English) name_uk=Яндекс.Карты - Гібрид (English) NameInCache=maps.yandex.com.Hybrid -DefURLBase=http://vec01.maps.yandex.net/tiles?l=skl&lang=en_US +DefURLBase=https://core-renderer-tiles.maps.yandex.net/tiles?l=skl&x={x}&y={y}&z={z}&scale=1&lang=en_US ContentType=image/png Ext=.png EPSG=3395 diff --git a/Yandex/maps.yandex.com.Map.zmp/GetUrlScript.txt b/Yandex/maps.yandex.com.Map.zmp/GetUrlScript.txt deleted file mode 100644 index d4072b90..00000000 --- a/Yandex/maps.yandex.com.Map.zmp/GetUrlScript.txt +++ /dev/null @@ -1,3 +0,0 @@ -begin - ResultURL:=GetURLBase+'&v='+Version+'&x='+inttostr(GetX)+'&y='+inttostr(GetY)+'&z='+inttostr(GetZ-1); -end. \ No newline at end of file diff --git a/Yandex/maps.yandex.com.Map.zmp/params.txt b/Yandex/maps.yandex.com.Map.zmp/params.txt index 6cd5497e..e17ea146 100644 --- a/Yandex/maps.yandex.com.Map.zmp/params.txt +++ b/Yandex/maps.yandex.com.Map.zmp/params.txt @@ -8,7 +8,7 @@ name_ru=Yandex - Карта (English) name_uk=Yandex - Карта (English) name=Yandex - Map (English) NameInCache=maps.yandex.com.Map -DefURLBase=http://vec01.maps.yandex.net/tiles?l=map&lang=en_US +DefURLBase=https://core-renderer-tiles.maps.yandex.net/tiles?l=map&x={x}&y={y}&z={z}&scale=1&lang=en_US ContentType=image/png Ext=.png EPSG=3395