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

---
 Here/here.com.sat_new.zmp/params.txt                |   2 +-
 _osm/Mapnik.zmp/GetUrlScript.txt                    |  10 ----------
 _osm/Mapnik.zmp/params.txt                          |   3 ++-
 .../24.bmp                                          | Bin
 .../GetUrlScript.txt                                |   0
 .../info.txt                                        |   0
 .../params.txt                                      |   0
 7 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 _osm/Mapnik.zmp/GetUrlScript.txt
 rename _osm/{Thunderforest_outdoors => Thunderforest_outdoors.zmp}/24.bmp (100%)
 rename _osm/{Thunderforest_outdoors => Thunderforest_outdoors.zmp}/GetUrlScript.txt (100%)
 rename _osm/{Thunderforest_outdoors => Thunderforest_outdoors.zmp}/info.txt (100%)
 rename _osm/{Thunderforest_outdoors => Thunderforest_outdoors.zmp}/params.txt (100%)

diff --git a/Here/here.com.sat_new.zmp/params.txt b/Here/here.com.sat_new.zmp/params.txt
index 2960c414..485d840a 100644
--- a/Here/here.com.sat_new.zmp/params.txt
+++ b/Here/here.com.sat_new.zmp/params.txt
@@ -8,7 +8,7 @@ name=Here.com - Satellite
 name_ru=Here.com - Спутник 
 name_uk=Here.com - Спутник
 ContentType=image/png
-DefURLBase=https://{s}.aerial.maps.api.here.com/maptile/2.1/maptile/newest/satellite.day/{z}/{x}/{y}/256/png8?app_id=bC4fb9WQfCCZfkxspD4z&app_code=K2Cpd_EKDzrZb1tz0zdpeQ&lg={ver}&ppi=72&pview=DEF
+DefURLBase=https://{s}.aerial.maps.api.here.com/maptile/2.1/maptile/newest/satellite.day/{z}/{x}/{y}/256/png8?app_id=xWVIueSv6JL0aJ5xqTxb&app_code=djPZyynKsbTjIUDOBcHZ2g&lg={ver}&ppi=72&pview=DEF
 ServerNames=1,2,3,4
 NameInCache=here.com.satellite.jpg
 EPSG=3785
diff --git a/_osm/Mapnik.zmp/GetUrlScript.txt b/_osm/Mapnik.zmp/GetUrlScript.txt
deleted file mode 100644
index c219a658..00000000
--- a/_osm/Mapnik.zmp/GetUrlScript.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-begin 
-  ResultURL := 
-    'https://' + Chr(Ord('a') + Random(3)) + '.tile.openstreetmap.org/' + 
-    IntToStr(GetZ-1) + '/' + IntToStr(GetX) + '/' + IntToStr(GetY) + '.png';
-  
-  RequestHead := 
-    'User-Agent: Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:67.0) Gecko/20100101 Firefox/67.0' + #13#10 +
-    'Referer: https://www.openstreetmap.org/' + #13#10 +
-    'Accept: image/webp,*/*';
-end.
diff --git a/_osm/Mapnik.zmp/params.txt b/_osm/Mapnik.zmp/params.txt
index 7e2ea61f..8854d526 100644
--- a/_osm/Mapnik.zmp/params.txt
+++ b/_osm/Mapnik.zmp/params.txt
@@ -7,7 +7,8 @@ ParentSubMenu_uk=Міські та універсальні
 ParentSubMenu=City
 Name=OSM OpenStreetMap.org - MAPNIK
 NameInCache=osmmapMapnik
-DefURLBase=
+DefURLBase=https://tile.openstreetmap.org/{z}/{x}/{y}.png
+RequestHead=Referer: https://www.openstreetmap.org/
 ContentType=image/png
 Ext=.png
 projection=1
diff --git a/_osm/Thunderforest_outdoors/24.bmp b/_osm/Thunderforest_outdoors.zmp/24.bmp
similarity index 100%
rename from _osm/Thunderforest_outdoors/24.bmp
rename to _osm/Thunderforest_outdoors.zmp/24.bmp
diff --git a/_osm/Thunderforest_outdoors/GetUrlScript.txt b/_osm/Thunderforest_outdoors.zmp/GetUrlScript.txt
similarity index 100%
rename from _osm/Thunderforest_outdoors/GetUrlScript.txt
rename to _osm/Thunderforest_outdoors.zmp/GetUrlScript.txt
diff --git a/_osm/Thunderforest_outdoors/info.txt b/_osm/Thunderforest_outdoors.zmp/info.txt
similarity index 100%
rename from _osm/Thunderforest_outdoors/info.txt
rename to _osm/Thunderforest_outdoors.zmp/info.txt
diff --git a/_osm/Thunderforest_outdoors/params.txt b/_osm/Thunderforest_outdoors.zmp/params.txt
similarity index 100%
rename from _osm/Thunderforest_outdoors/params.txt
rename to _osm/Thunderforest_outdoors.zmp/params.txt