Google/Ghyb.zmp/params.txt

@@ -10,7 +10,7 @@ name_ru=Google - Гибрид
 name=Google - Hybrid 
 name_uk=Google - Гібрид
 NameInCache=Both
-DefURLBase=http://mt.google.com/vt/lyrs=h&hl=ru
+DefURLBase=http://mt.google.com/vt/lyrs=h@169000000&hl=ru
 ContentType=image/png
 Ext=.png
 projection=1

Google/GoogleMap.zmp/params.txt

@@ -8,7 +8,7 @@ ParentSubMenu=City
 name_ru=Google - Карта
 name=Google - Map
 name_uk=Google - Карта
-DefURLBase=https://mt.google.com/vt/lyrs=m
+DefURLBase=https://mt.google.com/vt/lyrs=m@169000000
 projection=1
 sradiusa=6378137
 sradiusb=6378137

Navionics/navionics.SonarChart.layer.zmp/GetUrlScript.txt

@@ -1,19 +1,22 @@
 //******************************************************************************
-// transparent true/false
-// ugc - garmin active captain
-// layer - 0 Seachart, 1 Sonarchart
-// du - unit  1 for depth in meters, 2 for depth in feet, 3 for fathoms
-// sd - safe depth
-// sa ?
+// LAYERS parameter: config_a_b_c
+//    a = 1 for depth in meters, 2 for depth in feet, 3 for fathoms
+//    b = 1 for 1 m safety depth (beginning of blue coloring) (unit equal to that set by a)
+//    c = 0 for pristine Navionics charts, 1 for Sonar Charts
+//
+// TRANSPARENT parameter: 
+//    FALSE for non-layer
+//    TRUE for layer
+//    
 //******************************************************************************
 
 const
-  cReqParams = 'transparent=true&ugc=true&layer=1&du=1&sd=2&sa=false';
+  cReqParams = 'LAYERS=config_1_1_1&TRANSPARENT=TRUE&theme=0';
 
 //******************************************************************************
 
 const
-  cTTL = 10*60; // 10 Minutes
+  cTTL = 24*60*60; // 24 hour
   
 function CheckTTL(const ATimeStamp: Integer): Boolean;
 begin
@@ -22,7 +25,7 @@ end;
 
 function GetNavToken: AnsiString;
 var
-  VNavTokensJson: AnsiString;
+  VNavToken: AnsiString;
   VTimeStamp: Integer; 
   VResponseCode: Cardinal;
   VResponseHeader, VResponseData: AnsiString;
@@ -33,15 +36,15 @@ begin
   Global.Lock;
   try
     if Global.Exists(0) and Global.Exists(1) then begin
-      VNavTokensJson := Global.GetVar(0);
+      VNavToken := Global.GetVar(0);
       VTimeStamp := Global.GetVar(1);
-      if (VNavTokensJson <> '') and (VTimeStamp <> 0) and CheckTTL(VTimeStamp) then begin
-        Result := VNavTokensJson;
+      if (VNavToken <> '') and (VTimeStamp <> 0) and CheckTTL(VTimeStamp) then begin
+        Result := VNavToken;
       end; 
     end;
     
-    if (Result = '') and Assigned(Downloader) then begin
-      VRequestUrl := 'https://maps.garmin.com/marine/api/getNavionicsTokens';
+    if (Result = '') and Assigned(Downloader) then begin          
+      VRequestUrl := 'https://tile1.navionics.com/tile/get_key/Navionics_webapi_04041/maps.garmin.com';
       VRequestHeader := 'Origin: https://maps.garmin.com' + #13#10 + 'Referer: https://maps.garmin.com/';
       VResponseHeader := '';
       VResponseData := ''; 
@@ -61,18 +64,11 @@ end;
 //******************************************************************************
 
 var
-  VBuf : AnsiString;
   VNavToken: AnsiString;
-  VNavBearer: AnsiString;
 begin
-  VBuf := GetNavToken;
-  VNavToken := RegExprGetMatchSubStr(VBuf, '"configuration_token":"(.*)"', 1);
-  VNavBearer := RegExprGetMatchSubStr(VBuf, '"access_token":"(.*)",', 1);
+  VNavToken := GetNavToken;
   if VNavToken <> '' then begin
-    ResultURL := TemplateToUrl(GetURLBase) + '?' + 'config=' + VNavToken + '&' + cReqParams;
-    RequestHead:= 'Referer: https://maps.garmin.com/' + #13#10 +
-                  'Origin: https://maps.garmin.com' + #13#10 +
-                  'Authorization: Bearer '+ VNavBearer;
+    ResultURL := TemplateToUrl(GetURLBase) + '?' + cReqParams + '&' + 'navtoken=' + VNavToken;
   end else begin
     ResultURL := '';
   end;

Navionics/navionics.SonarChart.layer.zmp/params.txt

@@ -5,7 +5,7 @@ ParentSubMenu_ru=Водные карты
 ParentSubMenu_uk=Водні карти
 ParentSubMenu=Water maps
 asLayer=1
-DefURLBase=https://tile{s}.navionics.com/viewer/api/v1/tile/{z}/{x}/{y}
+DefURLBase=https://tile{s}.navionics.com/tile/{z}/{x}/{y}
 ServerNames=1,2,3,4,5
 NameInCache=navionics_sonarchart_layer
 Ext=.png
@@ -14,3 +14,4 @@ projection=1
 sradiusa=6378137
 sradiusb=6378137
 IsUseDownloaderInScript=1
+RequestHead=Referer: https://maps.garmin.com/

Navionics/navionics.SonarChart.zmp/GetUrlScript.txt

@@ -1,19 +1,22 @@
 //******************************************************************************
-// transparent true/false
-// ugc - garmin active captain
-// layer - 0 Seachart, 1 Sonarchart
-// du - unit  1 for depth in meters, 2 for depth in feet, 3 for fathoms
-// sd - safe depth
-// sa ?
+// LAYERS parameter: config_a_b_c
+//    a = 1 for depth in meters, 2 for depth in feet, 3 for fathoms
+//    b = 1 for 1 m safety depth (beginning of blue coloring) (unit equal to that set by a)
+//    c = 0 for pristine Navionics charts, 1 for Sonar Charts
+//
+// TRANSPARENT parameter: 
+//    FALSE for non-layer
+//    TRUE for layer
+//    
 //******************************************************************************
 
 const
-  cReqParams = 'transparent=false&ugc=true&layer=1&du=1&sd=2&sa=false';
+  cReqParams = 'LAYERS=config_1_1_1&TRANSPARENT=FALSE&theme=0';
 
 //******************************************************************************
 
 const
-  cTTL = 10*60; // 10 Minutes
+  cTTL = 24*60*60; // 24 hour
   
 function CheckTTL(const ATimeStamp: Integer): Boolean;
 begin
@@ -22,7 +25,7 @@ end;
 
 function GetNavToken: AnsiString;
 var
-  VNavTokensJson: AnsiString;
+  VNavToken: AnsiString;
   VTimeStamp: Integer; 
   VResponseCode: Cardinal;
   VResponseHeader, VResponseData: AnsiString;
@@ -33,15 +36,15 @@ begin
   Global.Lock;
   try
     if Global.Exists(0) and Global.Exists(1) then begin
-      VNavTokensJson := Global.GetVar(0);
+      VNavToken := Global.GetVar(0);
       VTimeStamp := Global.GetVar(1);
-      if (VNavTokensJson <> '') and (VTimeStamp <> 0) and CheckTTL(VTimeStamp) then begin
-        Result := VNavTokensJson;
+      if (VNavToken <> '') and (VTimeStamp <> 0) and CheckTTL(VTimeStamp) then begin
+        Result := VNavToken;
       end; 
     end;
     
-    if (Result = '') and Assigned(Downloader) then begin
-      VRequestUrl := 'https://maps.garmin.com/marine/api/getNavionicsTokens';
+    if (Result = '') and Assigned(Downloader) then begin          
+      VRequestUrl := 'https://tile1.navionics.com/tile/get_key/Navionics_webapi_04041/maps.garmin.com';
       VRequestHeader := 'Origin: https://maps.garmin.com' + #13#10 + 'Referer: https://maps.garmin.com/';
       VResponseHeader := '';
       VResponseData := ''; 
@@ -61,18 +64,11 @@ end;
 //******************************************************************************
 
 var
-  VBuf : AnsiString;
   VNavToken: AnsiString;
-  VNavBearer: AnsiString;
 begin
-  VBuf := GetNavToken;
-  VNavToken := RegExprGetMatchSubStr(VBuf, '"configuration_token":"(.*)"', 1);
-  VNavBearer := RegExprGetMatchSubStr(VBuf, '"access_token":"(.*)",', 1);
+  VNavToken := GetNavToken;
   if VNavToken <> '' then begin
-    ResultURL := TemplateToUrl(GetURLBase) + '?' + 'config=' + VNavToken + '&' + cReqParams;
-    RequestHead:= 'Referer: https://maps.garmin.com/' + #13#10 +
-                  'Origin: https://maps.garmin.com' + #13#10 +
-                  'Authorization: Bearer '+ VNavBearer;
+    ResultURL := TemplateToUrl(GetURLBase) + '?' + cReqParams + '&' + 'navtoken=' + VNavToken;
   end else begin
     ResultURL := '';
   end;

Navionics/navionics.SonarChart.zmp/params.txt

@@ -4,7 +4,7 @@ name=Navionics SonarChart(TM)
 ParentSubMenu_ru=Водные карты
 ParentSubMenu_uk=Водні карти
 ParentSubMenu=Water maps
-DefURLBase=https://tile{s}.navionics.com/viewer/api/v1/tile/{z}/{x}/{y}
+DefURLBase=https://tile{s}.navionics.com/tile/{z}/{x}/{y}
 ServerNames=1,2,3,4,5
 NameInCache=navionics_sonarchart
 Ext=.png
@@ -13,3 +13,4 @@ projection=1
 sradiusa=6378137
 sradiusb=6378137
 IsUseDownloaderInScript=1
+RequestHead=Referer: https://maps.garmin.com/

Navionics/navionics.layer.zmp/GetUrlScript.txt

@@ -1,19 +1,22 @@
 //******************************************************************************
-// transparent true/false
-// ugc - garmin active captain
-// layer - 0 Seachart, 1 Sonarchart
-// du - unit  1 for depth in meters, 2 for depth in feet, 3 for fathoms
-// sd - safe depth
-// sa ?
+// LAYERS parameter: config_a_b_c
+//    a = 1 for depth in meters, 2 for depth in feet, 3 for fathoms
+//    b = 1 for 1 m safety depth (beginning of blue coloring) (unit equal to that set by a)
+//    c = 0 for pristine Navionics charts, 1 for Sonar Charts
+//
+// TRANSPARENT parameter: 
+//    FALSE for non-layer
+//    TRUE for layer
+//    
 //******************************************************************************
 
 const
-  cReqParams = 'transparent=true&ugc=true&layer=0&du=1&sd=2&sa=false';
+  cReqParams = 'LAYERS=config_1_1_0&TRANSPARENT=TRUE&theme=0';
 
 //******************************************************************************
 
 const
-  cTTL = 10*60; // 10 Minutes
+  cTTL = 24*60*60; // 24 hour
   
 function CheckTTL(const ATimeStamp: Integer): Boolean;
 begin
@@ -22,7 +25,7 @@ end;
 
 function GetNavToken: AnsiString;
 var
-  VNavTokensJson: AnsiString;
+  VNavToken: AnsiString;
   VTimeStamp: Integer; 
   VResponseCode: Cardinal;
   VResponseHeader, VResponseData: AnsiString;
@@ -33,15 +36,15 @@ begin
   Global.Lock;
   try
     if Global.Exists(0) and Global.Exists(1) then begin
-      VNavTokensJson := Global.GetVar(0);
+      VNavToken := Global.GetVar(0);
       VTimeStamp := Global.GetVar(1);
-      if (VNavTokensJson <> '') and (VTimeStamp <> 0) and CheckTTL(VTimeStamp) then begin
-        Result := VNavTokensJson;
+      if (VNavToken <> '') and (VTimeStamp <> 0) and CheckTTL(VTimeStamp) then begin
+        Result := VNavToken;
       end; 
     end;
     
-    if (Result = '') and Assigned(Downloader) then begin
-      VRequestUrl := 'https://maps.garmin.com/marine/api/getNavionicsTokens';
+    if (Result = '') and Assigned(Downloader) then begin          
+      VRequestUrl := 'https://tile1.navionics.com/tile/get_key/Navionics_webapi_04041/maps.garmin.com';
       VRequestHeader := 'Origin: https://maps.garmin.com' + #13#10 + 'Referer: https://maps.garmin.com/';
       VResponseHeader := '';
       VResponseData := ''; 
@@ -61,18 +64,11 @@ end;
 //******************************************************************************
 
 var
-  VBuf : AnsiString;
   VNavToken: AnsiString;
-  VNavBearer: AnsiString;
 begin
-  VBuf := GetNavToken;
-  VNavToken := RegExprGetMatchSubStr(VBuf, '"configuration_token":"(.*)"', 1);
-  VNavBearer := RegExprGetMatchSubStr(VBuf, '"access_token":"(.*)",', 1);
+  VNavToken := GetNavToken;
   if VNavToken <> '' then begin
-    ResultURL := TemplateToUrl(GetURLBase) + '?' + 'config=' + VNavToken + '&' + cReqParams;
-    RequestHead:= 'Referer: https://maps.garmin.com/' + #13#10 +
-                  'Origin: https://maps.garmin.com' + #13#10 +
-                  'Authorization: Bearer '+ VNavBearer;
+    ResultURL := TemplateToUrl(GetURLBase) + '?' + cReqParams + '&' + 'navtoken=' + VNavToken;
   end else begin
     ResultURL := '';
   end;

Navionics/navionics.layer.zmp/params.txt

@@ -5,7 +5,7 @@ ParentSubMenu_uk=Водні карти
 ParentSubMenu=Water maps
 name=Navionics Marine Charts
 asLayer=1
-DefURLBase=https://tile{s}.navionics.com/viewer/api/v1/tile/{z}/{x}/{y}
+DefURLBase=https://tile{s}.navionics.com/tile/{z}/{x}/{y}
 ServerNames=1,2,3,4,5
 NameInCache=navionics_layer
 Ext=.png
@@ -14,3 +14,4 @@ projection=1
 sradiusa=6378137
 sradiusb=6378137
 IsUseDownloaderInScript=1
+RequestHead=Referer: https://maps.garmin.com/

Navionics/navionics.zmp/GetUrlScript.txt

@@ -1,19 +1,22 @@
 //******************************************************************************
-// transparent true/false
-// ugc - garmin active captain
-// layer - 0 Seachart, 1 Sonarchart
-// du - unit  1 for depth in meters, 2 for depth in feet, 3 for fathoms
-// sd - safe depth
-// sa ?
+// LAYERS parameter: config_a_b_c
+//    a = 1 for depth in meters, 2 for depth in feet, 3 for fathoms
+//    b = 1 for 1 m safety depth (beginning of blue coloring) (unit equal to that set by a)
+//    c = 0 for pristine Navionics charts, 1 for Sonar Charts
+//
+// TRANSPARENT parameter: 
+//    FALSE for non-layer
+//    TRUE for layer
+//    
 //******************************************************************************
 
 const
-  cReqParams = 'transparent=false&ugc=true&layer=0&du=1&sd=2&sa=false';
+  cReqParams = 'LAYERS=config_1_1_0&TRANSPARENT=FALSE&theme=0';
 
 //******************************************************************************
 
 const
-  cTTL = 10*60; // 10 Minutes
+  cTTL = 24*60*60; // 24 hour
   
 function CheckTTL(const ATimeStamp: Integer): Boolean;
 begin
@@ -22,7 +25,7 @@ end;
 
 function GetNavToken: AnsiString;
 var
-  VNavTokensJson: AnsiString;
+  VNavToken: AnsiString;
   VTimeStamp: Integer; 
   VResponseCode: Cardinal;
   VResponseHeader, VResponseData: AnsiString;
@@ -33,15 +36,15 @@ begin
   Global.Lock;
   try
     if Global.Exists(0) and Global.Exists(1) then begin
-      VNavTokensJson := Global.GetVar(0);
+      VNavToken := Global.GetVar(0);
       VTimeStamp := Global.GetVar(1);
-      if (VNavTokensJson <> '') and (VTimeStamp <> 0) and CheckTTL(VTimeStamp) then begin
-        Result := VNavTokensJson;
+      if (VNavToken <> '') and (VTimeStamp <> 0) and CheckTTL(VTimeStamp) then begin
+        Result := VNavToken;
       end; 
     end;
     
-    if (Result = '') and Assigned(Downloader) then begin
-      VRequestUrl := 'https://maps.garmin.com/marine/api/getNavionicsTokens';
+    if (Result = '') and Assigned(Downloader) then begin          
+      VRequestUrl := 'https://tile1.navionics.com/tile/get_key/Navionics_webapi_04041/maps.garmin.com';
       VRequestHeader := 'Origin: https://maps.garmin.com' + #13#10 + 'Referer: https://maps.garmin.com/';
       VResponseHeader := '';
       VResponseData := ''; 
@@ -61,18 +64,11 @@ end;
 //******************************************************************************
 
 var
-  VBuf : AnsiString;
   VNavToken: AnsiString;
-  VNavBearer: AnsiString;
 begin
-  VBuf := GetNavToken;
-  VNavToken := RegExprGetMatchSubStr(VBuf, '"configuration_token":"(.*)"', 1);
-  VNavBearer := RegExprGetMatchSubStr(VBuf, '"access_token":"(.*)",', 1);
+  VNavToken := GetNavToken;
   if VNavToken <> '' then begin
-    ResultURL := TemplateToUrl(GetURLBase) + '?' + 'config=' + VNavToken + '&' + cReqParams;
-    RequestHead:= 'Referer: https://maps.garmin.com/' + #13#10 +
-                  'Origin: https://maps.garmin.com' + #13#10 +
-                  'Authorization: Bearer '+ VNavBearer;
+    ResultURL := TemplateToUrl(GetURLBase) + '?' + cReqParams + '&' + 'navtoken=' + VNavToken;
   end else begin
     ResultURL := '';
   end;

Navionics/navionics.zmp/params.txt

@@ -4,7 +4,7 @@ name=Navionics Marine Charts
 ParentSubMenu_ru=Водные карты
 ParentSubMenu_uk=Водні карти
 ParentSubMenu=Water maps
-DefURLBase=https://tile{s}.navionics.com/viewer/api/v1/tile/{z}/{x}/{y}
+DefURLBase=https://tile{s}.navionics.com/tile/{z}/{x}/{y}
 ServerNames=1,2,3,4,5
 NameInCache=navionics
 Ext=.png
@@ -13,3 +13,4 @@ projection=1
 sradiusa=6378137
 sradiusb=6378137
 IsUseDownloaderInScript=1
+RequestHead=Referer: https://maps.garmin.com/

readme.md

@@ -23,10 +23,10 @@
 
 а) Предварительная настройка (выполняется один раз):
 
-  1. Скачать портативную версию git для windows: [MinGit-2.11.1.mingit.prerelease.6-32-bit.zip](https://github.com/git-for-windows/git/releases/download/v2.11.1.mingit-prerelease.6/MinGit-2.11.1.mingit.prerelease.6-32-bit.zip)
+  1. Скачать портативную версию git для windows: [MinGit-2.10.0-32-bit.zip](https://github.com/git-for-windows/git/releases/download/v2.10.0.windows.1/MinGit-2.10.0-32-bit.zip)
   2. Распаковать архив в папку `C:\git\`
-  3. Добавить в PATH путь к папке `C:\git\cmd` ([Как добавить путь в переменную среды PATH в Windows](https://remontka.pro/add-to-path-variable-windows/))
-  4. Убедиться, что git работает: откройте командную строку и выполните команду `git --version`. В ответ должно напечатать: `git version 2.11.1.mingit.prerelease.6`
+  3. Добавить в PATH путь к папке `C:\git\cmd`
+  4. Убедиться, что git работает: откройте командную строку и выполните команду `git --version`. В ответ должно напечатать: `git version 2.10.0.windows.1`
 
 б) Непосредственное обновление карт: