v0.1.65; fixed Google Earth links

eliranwong · Nov 6, 2024 · 70e4416 · 70e4416
1 parent 0b47a98
commit 70e4416
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/setup.py b/setup.py
@@ -47,7 +47,7 @@
 # https://packaging.python.org/en/latest/guides/distributing-packages-using-setuptools/
 setup(
     name=package,
-    version="0.1.64",
+    version="0.1.65",
     python_requires=">=3.8, <3.13",
     description=f"UniqueBible App is a cross-platform & offline bible application, integrated with high-quality resources and unique features. Developers: Eliran Wong and Oliver Tseng",
     long_description=long_description,

diff --git a/uniquebible/latest_changes.txt b/uniquebible/latest_changes.txt
@@ -1,9 +1,15 @@
 PIP package:
 
-0.1.60-0.1.61
+0.1.65
+
+* fixed Google Earth links in bible maps
+
+0.1.60-0.1.64
 
 * version message displayed on console only if newer version is available.
 
+* a few fixes
+
 0.1.58-0.1.59
 
 * added commands `ub`, `ubapi`, `ubhttp`, `ubssh`, `ubtelnet` and `ubterm`.  Read https://github.com/eliranwong/UniqueBible/wiki/UBA-Run-Modes

diff --git a/uniquebible/plugins/menu/Bible Locations.py b/uniquebible/plugins/menu/Bible Locations.py
@@ -309,7 +309,8 @@ def displayMap(self, browser=False, displayOnStudyWindow=False):
                     num = int(re.sub("\..*?$", "", item))
                     exlbl_entry = "BL{0}".format(num)
                     label, name, latitude, longitude = self.locationMap[exlbl_entry]
-                    googleEarthLink = "https://earth.google.com/web/search/{0},+{1}".format(str(latitude).replace(".", "%2e"), str(longitude).replace(".", "%2e"))
+                    #googleEarthLink = "https://earth.google.com/web/search/{0},+{1}".format(str(latitude).replace(".", "%2e"), str(longitude).replace(".", "%2e"))
+                    googleEarthLink = f"""https://earth.google.com/web/@{latitude},{longitude},654.97002989a,1336.11415664d,35y,0h,76.22542174t,-0r"""
                     if browser:
                         info = "<a href='https://marvel.bible/tool.php?exlbl={0}' target='_blank'>{1}</a> [<a href='{2}' target='_blank'>3D</a>]".format(exlbl_entry, name, googleEarthLink)
                     else:
@@ -318,7 +319,8 @@ def displayMap(self, browser=False, displayOnStudyWindow=False):
                 except:
                     pass
         else:
-            googleEarthLink = r"https://earth.google.com/web/search/31%2e777444,+35%2e234935"
+            #googleEarthLink = r"https://earth.google.com/web/search/31%2e777444,+35%2e234935"
+            googleEarthLink = """https://earth.google.com/web/@31.777444,35.234935,654.97002989a,1336.11415664d,35y,0h,76.22542174t,-0r"""
             if browser:
                 info = "<a href='https://marvel.bible/tool.php?exlbl=BL636' target='_blank'>Jerusalem</a> [<a href='{0}' target='_blank'>3D</a>]".format(googleEarthLink)
             else:

diff --git a/uniquebible/util/TextCommandParser.py b/uniquebible/util/TextCommandParser.py
@@ -4460,7 +4460,8 @@ def displayMap(self, selectedLocations, browser=False):
                         name = tc_location_names[exlbl_entry]
                     elif config.standardAbbreviation == "SC" and exlbl_entry in sc_location_names and sc_location_names[exlbl_entry]:
                         name = sc_location_names[exlbl_entry]
-                    googleEarthLink = "https://earth.google.com/web/search/{0},+{1}".format(str(latitude).replace(".", "%2e"), str(longitude).replace(".", "%2e"))
+                    #googleEarthLink = "https://earth.google.com/web/search/{0},+{1}".format(str(latitude).replace(".", "%2e"), str(longitude).replace(".", "%2e"))
+                    googleEarthLink = f"""https://earth.google.com/web/@{latitude},{longitude},654.97002989a,1336.11415664d,35y,0h,76.22542174t,-0r"""
                     if browser:
                         weblink = self.getWeblink(f"EXLB:::exlbl:::{exlbl_entry}", filterCommand=False)
                         info = "<a href='{0}' target='_blank'>{1}</a> [<a href='{2}' target='_blank'>3D</a>]".format(weblink, name, googleEarthLink)
@@ -4472,7 +4473,8 @@ def displayMap(self, selectedLocations, browser=False):
                 except:
                     pass
         else:
-            googleEarthLink = r"https://earth.google.com/web/search/31%2e777444,+35%2e234935"
+            #googleEarthLink = r"https://earth.google.com/web/search/31%2e777444,+35%2e234935"
+            googleEarthLink = """https://earth.google.com/web/@31.777444,35.234935,654.97002989a,1336.11415664d,35y,0h,76.22542174t,-0r"""
             if browser:
                 weblink = self.getWeblink("EXLB:::exlbl:::BL636", filterCommand=False)
                 info = "<a href='{0}' target='_blank'>Jerusalem</a> [<a href='{1}' target='_blank'>3D</a>]".format(weblink, googleEarthLink)