pds-imaging.jpl.nasa.gov/data/ -> planetarydata.jpl.nasa.gov/img/data/

README.md

@@ -80,7 +80,7 @@ pydar.displayImages(image_directory="pydar_results/CORADR_0211_V03_S01")
 ## Overview and Background
 For information on Cassini instrument specifics and acronyms refer to the [Cassini Radar User Guide](https://pds-imaging.jpl.nasa.gov/documentation/Cassini_RADAR_Users_Guide_2nd_Ed_191004_cmp_200421.pdf)
 
-The Cassini Radar data can be found at the [PDS Imaging Node](https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/). The directory is organized by [PDS standards](https://pdssbn.astro.umd.edu/howto/understand.shtml). The file format are defined in the [Small Body Node](https://pdssbn.astro.umd.edu/howto/file_types.shtml). The radar echo is stored originally as floating points in LBDR files. The SAR processors turn the LBDR files into BIDR image. The BIDR data is organized as follows:
+The Cassini Radar data can be found at the [PDS Imaging Node](https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/). The directory is organized by [PDS standards](https://pdssbn.astro.umd.edu/howto/understand.shtml). The file format are defined in the [Small Body Node](https://pdssbn.astro.umd.edu/howto/file_types.shtml). The radar echo is stored originally as floating points in LBDR files. The SAR processors turn the LBDR files into BIDR image. The BIDR data is organized as follows:
 ```
 Cassini RADAR Information (CORADR_xxxx_Vxx) where xxxx is the radar data take number and Vxx is the data version number
   |_ AAREADME.txt
@@ -238,7 +238,7 @@ Changes in the relevant URLs are checked once a month via Github Actions to keep
 
 **coradr_jpl_options.csv**
 
-Contains all the CORADR IDs and available data types from [pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter](https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter)
+Contains all the CORADR IDs and available data types from [planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/](https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/)
 
 Headers: ["CORADR ID", "Is a Titan Flyby", "Contains ABDR", "Contains ASUM", "Contains BIDR", "Contains LBDR", "Contains SBDR", "Contains STDR"]
 
@@ -248,7 +248,7 @@ View data file: [coradr_jpl_options.csv](https://github.com/unaschneck/pydar/blo
 
 Contains all the information for .LBL files within all CORADR ID pages (for each segment and resolution file)
 
-Collected from URLs matching: pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/[CORADAR_ID]/DATA/BIDR/
+Collected from URLs matching: `https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/[CORADAR_ID]/DATA/BIDR/`
 
 Headers: ["CORADR ID", "FLYBY ID", "SEGMENT NUMBER", "FILENAME", "DATE TYPE SYMBOL", "DATE TYPE", "RESOLUTION (pixels/degrees)", "TARGET_NAME", "MAXIMUM_LATITUDE (Degrees)", "MINIMUM_LATITUDE (Degrees)", "EASTERNMOST_LONGITUDE (Degrees)", "WESTERNMOST_LONGITUDE (Degrees)", "START_TIME", "STOP_TIME"]
 

pydar/extract_flyby_parameters.py

@@ -104,7 +104,7 @@ def retrieveCoradrWithoutBIDR():
 def downloadAAREADME(cordar_file_name, segment_id):
 	# Download AAREADME.txt within a CORADR directory
 	aareadme_name = "AAREADME.TXT"
-	aareadme_url = "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/{0}/{1}".format(cordar_file_name, aareadme_name)
+	aareadme_url = "https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/{0}/{1}".format(cordar_file_name, aareadme_name)
 
 	# Retrieve a list of all elements from the base URL to download AAREADME.txt
 	logger.info("Retrieving {0} {1}".format(cordar_file_name, aareadme_name))
@@ -119,7 +119,7 @@ def downloadAAREADME(cordar_file_name, segment_id):
 
 def downloadBIDRCORADRData(cordar_file_name, segment_id, resolution_px):
 	# Download BDIR files
-	base_url = "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/{0}/DATA/BIDR/".format(cordar_file_name)
+	base_url = "https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/{0}/DATA/BIDR/".format(cordar_file_name)
 	logger.info("Retrieving BIDR filenames from: {0}\n".format(base_url))
 
 	# Retrieve a list of all elements from the base URL to download
@@ -151,7 +151,7 @@ def downloadBIDRCORADRData(cordar_file_name, segment_id, resolution_px):
 
 	for i, coradr_file in enumerate(url_filenames):
 		if 'LBL' in coradr_file:
-			label_url = "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/{0}/DATA/BIDR/{1}".format(cordar_file_name, coradr_file)
+			label_url = "https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/{0}/DATA/BIDR/{1}".format(cordar_file_name, coradr_file)
 			logger.info("Retrieving [{0}/{1}]: {2}".format(i+1, len(url_filenames), label_url))
 			label_name = label_url.split("/")[-1].split(".")[0] + ".LBL"
 			label_name = os.path.join("pydar_results/{0}_{1}".format(cordar_file_name, segment_id), label_name)
@@ -163,7 +163,7 @@ def downloadBIDRCORADRData(cordar_file_name, segment_id, resolution_px):
 			else:
 				response = request.urlretrieve(label_url, label_name)
 		if 'ZIP' in coradr_file:
-			data_url = "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/{0}/DATA/BIDR/{1}".format(cordar_file_name, coradr_file)
+			data_url = "https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/{0}/DATA/BIDR/{1}".format(cordar_file_name, coradr_file)
 			logger.info("Retrieving [{0}/{1}]: {2}".format(i+1, len(url_filenames), data_url))
 			zipfile_name = data_url.split("/")[-1].split(".")[0] + ".zip"
 			zipfile_name = os.path.join("pydar_results/{0}_{1}".format(cordar_file_name, segment_id), zipfile_name)
@@ -181,7 +181,7 @@ def downloadBIDRCORADRData(cordar_file_name, segment_id, resolution_px):
 
 def downloadSBDRCORADRData(cordar_file_name, segment_id):
 	# Download SBDR files
-	base_url = "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/{0}/DATA/SBDR/".format(cordar_file_name)
+	base_url = "https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/{0}/DATA/SBDR/".format(cordar_file_name)
 	logger.info("\nRetrieving SBDR filenames from: {0}".format(base_url))
 
 	# Retrieve a SBDR file from filename at SBDR URL
@@ -206,7 +206,7 @@ def downloadSBDRCORADRData(cordar_file_name, segment_id):
 		exit()
 
 	for sbdr_file in sbdr_files:
-		sbdr_url = "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/{0}/DATA/SBDR/{1}".format(cordar_file_name, sbdr_file)
+		sbdr_url = "https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/{0}/DATA/SBDR/{1}".format(cordar_file_name, sbdr_file)
 		logger.info("Retrieving SBDR file '{0}': {1}".format(sbdr_file, sbdr_url))
 		sbdr_name = os.path.join("pydar_results/{0}_{1}".format(cordar_file_name, segment_id), sbdr_file)
 		try:
@@ -219,7 +219,7 @@ def downloadSBDRCORADRData(cordar_file_name, segment_id):
 
 def downloadAdditionalDataTypes(cordar_file_name, segment_id, additional_data_type):
 	# Download additional data types
-	additional_data_url = "https://pds-imaging.jpl.nasa.gov/data/cassini/cassini_orbiter/{0}/DATA/{1}".format(cordar_file_name, additional_data_type)
+	additional_data_url = "https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/{0}/DATA/{1}".format(cordar_file_name, additional_data_type)
 	logger.info("\n[TODO: does not currently download] '{0}': {1}".format(additional_data_type, additional_data_url))
 	# TODO: add functionality for which files should be downloaded
 	# This function does not currently have functionality in pydar

pydar/updateCsvCORADARJPLOptions.py

@@ -43,7 +43,7 @@ def updateCsvCORADRJPLOptions():
 	random_agent = random.choice(user_agents)
 
 	# BeautifulSoup web scrapping to find CASSINI data types
-	logger.info("Retrieving observation information from planetarydata.jpl.nasa.gov/data/cassini/cassini_orbital....")
+	logger.info("Retrieving observation information from planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbital....")
 	cassini_root_url = "https://planetarydata.jpl.nasa.gov/img/data/cassini/cassini_orbiter/"
 	req_with_headers = request.Request(url=cassini_root_url, headers={'User-Agent': random_agent})
 	cassini_html = request.urlopen(req_with_headers).read()