Fix overlays, change to wait for webdriver

defSS.py

@@ -17,8 +17,6 @@ def get_adsbx_screenshot(file_path, url_params, enable_labels=False, enable_trac
     url = f"https://globe.adsbexchange.com/?{url_params}"
     browser.set_page_load_timeout(80)
     browser.get(url)
-    WebDriverWait(browser, 40).until(lambda d: d.execute_script("return jQuery.active == 0"))
-    time.sleep(5)
     remove_id_elements = ["show_trace", "credits", 'infoblock_close', 'selected_photo_link', "history_collapse"]
     for element in remove_id_elements:
         element = browser.find_element_by_id(element)
@@ -37,6 +35,8 @@ def get_adsbx_screenshot(file_path, url_params, enable_labels=False, enable_trac
         browser.find_element_by_tag_name('body').send_keys('l')
     if enable_track_labels:
         browser.find_element_by_tag_name('body').send_keys('k')
+    WebDriverWait(browser, 40).until(lambda d: d.execute_script("return jQuery.active == 0"))
+    time.sleep(5)
     browser.save_screenshot(file_path)
     browser.quit()
 def generate_adsbx_screenshot_time_params(timestamp):

planeClass.py

@@ -347,7 +347,7 @@ class Plane:
             if self.config.get('MAP', 'OPTION') == "GOOGLESTATICMAP":
                 getMap((municipality + ", "  + state + ", "  + country_code), self.map_file_name)
             elif self.config.get('MAP', 'OPTION') == "ADSBX":
-                url_params = f"icao={self.icao}&zoom=9&largeMode=2&hideButtons&hideSidebar&mapDim=0" + generate_adsbx_overlay_param(self.overlays)
+                url_params = f"icao={self.icao}&zoom=9&largeMode=2&hideButtons&hideSidebar&mapDim=0&overlays=" + self.overlays
                 get_adsbx_screenshot(self.map_file_name, url_params)
                 append_airport(self.map_file_name, nearest_airport_dict)
                 #airport_string = nearest_airport_dict['icao'] + ", " + nearest_airport_dict["name"]
@@ -394,7 +394,7 @@ class Plane:
                     if self.config.get('MAP', 'OPTION') == "GOOGLESTATICMAP":
                         getMap((municipality + ", "  + state + ", "  + country_code), self.map_file_name)
                     if self.config.get('MAP', 'OPTION') == "ADSBX":
-                        url_params = f"icao={self.icao}&zoom=9&largeMode=2&hideButtons&hideSidebar&mapDim=0" + generate_adsbx_overlay_param(self.overlays)
+                        url_params = f"icao={self.icao}&zoom=9&largeMode=2&hideButtons&hideSidebar&mapDim=0&overlays=" + self.overlays
                         get_adsbx_screenshot(self.map_file_name, url_params)
                     #Discord
                     if self.config.getboolean('DISCORD', 'ENABLE'):
@@ -410,7 +410,7 @@ class Plane:
                         if self.config.getboolean('DISCORD', 'ENABLE'):
                             dis_message =  (self.dis_title + " "  + mode + " mode enabled.")
                             if mode == "Approach":
-                                url_params = f"icao={self.icao}&zoom=9&largeMode=2&hideButtons&hideSidebar&mapDim=0" + generate_adsbx_overlay_param(self.overlays)
+                                url_params = f"icao={self.icao}&zoom=9&largeMode=2&hideButtons&hideSidebar&mapDim=0&overlays={self.overlays}"
                                 get_adsbx_screenshot(self.map_file_name, url_params)
                                 sendDis(dis_message, self.config, self.map_file_name)
                             elif mode in ["Althold", "VNAV", "LNAV"] and self.nav_altitude != None:
@@ -449,15 +449,15 @@ class Plane:
                     if bool(int(ra['acas_ra']['MTE'])):
                         ra_message += ", Multi threat"
                     from defSS import get_adsbx_screenshot, generate_adsbx_screenshot_time_params, generate_adsbx_overlay_param
-                    url_params = generate_adsbx_screenshot_time_params(ra['acas_ra']['unix_timestamp']) + f"&zoom=14&largeMode=2&hideButtons&hideSidebar&mapDim=0" + generate_adsbx_overlay_param(self.overlays)
+                    url_params = generate_adsbx_screenshot_time_params(ra['acas_ra']['unix_timestamp']) + f"&zoom=12.5&largeMode=2&hideButtons&hideSidebar&mapDim=0&overlays={self.overlays}"
                     if "threat_id_hex" in ra['acas_ra'].keys():
                         from mictronics_parse import get_aircraft_by_icao
                         threat_reg = get_aircraft_by_icao(ra['acas_ra']['threat_id_hex'])[0]
                         threat_id = threat_reg if threat_reg is not None else "ICAO: " + ra['acas_ra']['threat_id_hex']
                         ra_message += f", invader: {threat_id}"
-                        url_params += f"&icao={self.icao},{ra['acas_ra']['threat_id_hex']}"
+                        url_params += f"&icao={self.icao.lower()},{ra['acas_ra']['threat_id_hex']}"
                     else:
-                        url_params += f"&icao={self.icao}&noIsolation"
+                        url_params += f"&icao={self.icao.lower()}&noIsolation"
                     get_adsbx_screenshot(self.map_file_name, url_params, True, True)
 
                     if self.config.getboolean('DISCORD', 'ENABLE'):