Updates and bug fixes

.gitignore

@@ -1,4 +1,6 @@
 Binary/
+build/
+dist/
 Elevation_data/
 Geotiffs/
 Masks/
@@ -9,9 +11,11 @@ Previews/
 Extents/Auto
 tmp/
 Tiles/
+venv*/
 **/Ortho4XP.log
 **/__pycache__
 **/Thumbs.db
 **/*.bak
 **/*.swp
 .last_gui_params.txt
+.DS_Store

Licence/copyright.txt

@@ -56,24 +56,22 @@ http://dev.x-plane.com/cgit/cgit.cgi/xptools.git/
 
 ------------------------------------------------------------------------------
 7-Zip
-Igor Pavlov
-
+~~~~~
 License for use and distribution
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-7-Zip Copyright (C) 1999-2018 Igor Pavlov.
-
-Licenses for files are:
+7-Zip Copyright (C) 1999-2023 Igor Pavlov.
 
-  1) 7z.dll: GNU LGPL + unRAR restriction
-  2) All other files:  GNU LGPL
+The licenses for 7zz and 7zzs files are:
 
-The GNU LGPL + unRAR restriction means that you must follow both 
-GNU LGPL rules and unRAR restriction rules.
+        - The "GNU LGPL" as main license for most of the code
+        - The "GNU LGPL" with "unRAR license restriction" for some code
+        - The "BSD 3-clause License" for some code
 
+Redistributions in binary form must reproduce related license information from this file.
 
-Note: 
-  You can use 7-Zip on any computer, including a computer in a commercial 
+Note:
+  You can use 7-Zip on any computer, including a computer in a commercial
   organization. You don't need to register or pay for 7-Zip.
 
 
@@ -90,21 +88,48 @@ GNU LGPL information
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Lesser General Public License for more details.
 
-  You can receive a copy of the GNU Lesser General Public License from 
+  You can receive a copy of the GNU Lesser General Public License from
   http://www.gnu.org/
 
+BSD 3-clause License
+--------------------
+
+  The "BSD 3-clause License" is used for the code in 7z.dll that implements LZFSE data decompression.
+  That code was derived from the code in the "LZFSE compression library" developed by Apple Inc,
+  that also uses the "BSD 3-clause License":
+
+  ----
+  Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+  1.  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+  2.  Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
+      in the documentation and/or other materials provided with the distribution.
+
+  3.  Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  ----
 
-unRAR restriction
------------------
+unRAR license restriction
+-------------------------
 
-  The decompression engine for RAR archives was developed using source 
+  The decompression engine for RAR archives was developed using source
   code of unRAR program.
   All copyrights to original unRAR code are owned by Alexander Roshal.
 
   The license for original unRAR code has the following restriction:
 
-    The unRAR sources cannot be used to re-create the RAR compression algorithm, 
-    which is proprietary. Distribution of modified unRAR sources in separate form 
+    The unRAR sources cannot be used to re-create the RAR compression algorithm,
+    which is proprietary. Distribution of modified unRAR sources in separate form
     or as a part of other software is permitted, provided that it is clearly
     stated in the documentation and source comments that the code may
     not be used to develop a RAR (WinRAR) compatible archiver.

Ortho4XP.py

@@ -1,8 +1,21 @@
 #!/usr/bin/env python3
 import sys
 import os
-Ortho4XP_dir='..' if getattr(sys,'frozen',False) else '.'
-sys.path.append(os.path.join(Ortho4XP_dir,'src'))
+
+Ortho4XP_dir = '..' if getattr(sys, 'frozen', False) else '.'
+
+if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
+    _proj_data_path = os.path.join(sys._MEIPASS, "pyproj", "proj_dir", "share", "proj")
+    _lib_path = os.path.join(sys._MEIPASS, "_internal")
+    os.environ["PROJ_DATA"] = _proj_data_path
+    os.environ["DYLD_LIBRARY_PATH"] = _lib_path + ":" + os.environ.get("DYLD_LIBRARY_PATH", "")
+
+from pyproj import datadir
+
+if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
+    datadir.set_data_dir(_proj_data_path)
+
+sys.path.append(os.path.join(Ortho4XP_dir, 'src'))
 
 import O4_File_Names as FNAMES
 sys.path.append(FNAMES.Provider_dir)
@@ -14,53 +27,51 @@
 import O4_GUI_Utils as GUI
 import O4_Config_Utils as CFG  # CFG imported last because it can modify other modules variables
 
-
-cmd_line="USAGE: Ortho4XP.py lat lon imagery zl (won't read a tile config)\n  OR:  Ortho4XP.py lat lon (with existing tile config file)"
+cmd_line = "USAGE: Ortho4XP.py lat lon imagery zl (won't read a tile config)\n  OR:  Ortho4XP.py lat lon (with existing tile config file)"
 
 if __name__ == '__main__':
     if not os.path.isdir(FNAMES.Utils_dir):
-        print("Missing ",FNAMES.Utils_dir,"directory, check your install. Exiting.")
-        sys.exit()   
+        print("Missing ", FNAMES.Utils_dir, "directory, check your install. Exiting.")
+        sys.exit()
     for directory in (FNAMES.Preview_dir, FNAMES.Provider_dir, FNAMES.Extent_dir, FNAMES.Filter_dir, FNAMES.OSM_dir,
-                      FNAMES.Mask_dir,FNAMES.Imagery_dir,FNAMES.Elevation_dir,FNAMES.Geotiff_dir,FNAMES.Patch_dir,
-                      FNAMES.Tile_dir,FNAMES.Tmp_dir):
+                      FNAMES.Mask_dir, FNAMES.Imagery_dir, FNAMES.Elevation_dir, FNAMES.Geotiff_dir, FNAMES.Patch_dir,
+                      FNAMES.Tile_dir, FNAMES.Tmp_dir):
         if not os.path.isdir(directory):
-            try: 
+            try:
                 os.makedirs(directory)
-                print("Creating missing directory",directory)
-            except: 
-                print("Could not create required directory",directory,". Exit.")
+                print("Creating missing directory", directory)
+            except:
+                print("Could not create required directory", directory, ". Exit.")
                 sys.exit()
     IMG.initialize_extents_dict()
     IMG.initialize_color_filters_dict()
     IMG.initialize_providers_dict()
     IMG.initialize_combined_providers_dict()
-    if len(sys.argv)==1: # switch to the graphical interface
+    if len(sys.argv) == 1:  # switch to the graphical interface
         Ortho4XP = GUI.Ortho4XP_GUI()
-
-        Ortho4XP.mainloop()	    
+        Ortho4XP.mainloop()
         print("Bon vol!")
-    else: # sequel is only concerned with command line 
-        if len(sys.argv)<3:
+    else:  # sequel is only concerned with command line
+        if len(sys.argv) < 3:
             print(cmd_line); sys.exit()
         try:
-            lat=int(sys.argv[1])
-            lon=int(sys.argv[2])
+            lat = int(sys.argv[1])
+            lon = int(sys.argv[2])
         except:
             print(cmd_line); sys.exit()
-        if len(sys.argv)==3:
+        if len(sys.argv) == 3:
             try:
-                tile=CFG.Tile(lat,lon,'')
+                tile = CFG.Tile(lat, lon, '')
             except Exception as e:
                 print(e)
                 print("ERROR: could not read tile config file."); sys.exit()
         else:
             try:
-                provider_code=sys.argv[3]
-                zoomlevel=int(sys.argv[4])
-                tile=CFG.Tile(lat,lon,'')
-                tile.default_website=provider_code
-                tile.default_zl=zoomlevel
+                provider_code = sys.argv[3]
+                zoomlevel = int(sys.argv[4])
+                tile = CFG.Tile(lat, lon, '')
+                tile.default_website = provider_code
+                tile.default_zl = zoomlevel
             except:
                 print(cmd_line); sys.exit()
         try:
@@ -70,6 +81,4 @@
             TILE.build_tile(tile)
             print("Bon vol!")
         except:
-            print("Crash!")
-
-
+            print("Crash!")