Merge pull request #34 from shred86/dev

Version 1.40.06

Providers/O4_Custom_URL.py

@@ -77,7 +77,7 @@ def get_Here_value():
         Here_value="loading"
         js_path=str(requests.get('https://wego.here.com').content).split('<script defer="defer" src="')[1][:100].split('"')[0]
         print("js_path: "+js_path)
-        Here_value=str(requests.get('https://wego.here.com'+js_path).content).split('APP_KEY:"')[1][:100].split('"')[0]
+        Here_value=str(requests.get('https://wego.here.com'+js_path).content).split('PLATFORM_API_KEY:"')[1][:100].split('"')[0]
         print("Here_value: "+Here_value)
         Here_time=time.time()
     return Here_value

README.md

@@ -41,13 +41,16 @@ The specific changes in this forked version:
 * Includes Windows Python dependency wheel files for gdal and scikit-fmm.
 * Update and pin requirements to latest working versions.
 * Adds a bash script to automate the setup process for those that prefer not to use the packaged version.
+* Removed Maxar and Mapbox image providers which are no longer publically available.
 
 #### Bug Fixes
 * If one-click symlink feature is used, added removal of symlink when "Erase cached data" "Tile (whole)" option is used.
 * Fixed zones being saved to tile configuration that were outside of the tile location.
 * Fixed a bug where symlinks weren't automatically deleted if you used the Erased cached data - Tile (whole) option.
 * Fixed a bug if you created zones on a tile then clicked "Apply" (which no longer exists as a button) before saving the tile config, it would delete your zones.
-* Fix Viewfinderpanorama elevation source for certain regions of the world.
+* Fixed Viewfinderpanorama elevation source for certain regions of the world.
+* Fixed Here (https://wego.here.com/) image provider API key.
+* Fixed issue in certain coastal regions where .dds files were being deleted with cleaning_level set to 2 or higher.
 * Corrected a few typos in setting descriptions.
 
 

src/O4_Tile_Utils.py

@@ -303,10 +303,12 @@ def remove_unwanted_textures(tile):
     for f in os.listdir(os.path.join(tile.build_dir, "terrain")):
         if f[-4:] != ".ter":
             continue
-        if f[-5] != "y":  # overlay
-            texture_list.append(f.replace(".ter", ".dds"))
-        else:
+        if f[-5] == "y":  # water overlay
             texture_list.append("_".join(f[:-4].split("_")[:-2]) + ".dds")
+        if f[-5] == "a":  # sea
+            texture_list.append("_".join(f[:-4].split("_")[:-1]) + ".dds")
+        else:
+            texture_list.append(f.replace(".ter", ".dds"))
     for f in os.listdir(os.path.join(tile.build_dir, "textures")):
         if f[-4:] != ".dds":
             continue

src/O4_Version.py

@@ -1 +1 @@
-version='1.40.05'
+version='1.40.06'