diff --git a/CoastSnap_DEMO/Tide Data/SYDNEY_ASTRO_TIDE_1979_2050.mat b/CoastSnap_DEMO/Tide Data/SYDNEY_ASTRO_TIDE_1979_2050.mat new file mode 100644 index 0000000..ce45894 Binary files /dev/null and b/CoastSnap_DEMO/Tide Data/SYDNEY_ASTRO_TIDE_1979_2050.mat differ diff --git a/CoastSnap_DEMO/Tide Data/SYDNEY_ASTRO_TIDE_1979_2050_with_1930.mat b/CoastSnap_DEMO/Tide Data/SYDNEY_ASTRO_TIDE_1979_2050_with_1930.mat new file mode 100644 index 0000000..8dae2aa Binary files /dev/null and b/CoastSnap_DEMO/Tide Data/SYDNEY_ASTRO_TIDE_1979_2050_with_1930.mat differ diff --git a/CoastSnap_DEMO/Tide Data/SYDNEY_ASTRO_TIDE_2015_2025.mat b/CoastSnap_DEMO/Tide Data/SYDNEY_ASTRO_TIDE_2015_2025.mat new file mode 100644 index 0000000..f05c0ec Binary files /dev/null and b/CoastSnap_DEMO/Tide Data/SYDNEY_ASTRO_TIDE_2015_2025.mat differ diff --git a/coastsnap/spotteron_batch_download.py b/coastsnap/spotteron_batch_download.py index 85ed5e8..aae5337 100644 --- a/coastsnap/spotteron_batch_download.py +++ b/coastsnap/spotteron_batch_download.py @@ -264,8 +264,8 @@ Downloads images from Spotteron API for all beaches specified in batch_download. #all_beaches = pd.read_csv(r"C:\Users\z5079346\OneDrive - UNSW\Code\coastsnap\coastsnap\spotteron_batch_download\batch_download.csv") # Retrieve Parent Directory in batch_download.csv -parent_directory = coastsnap_sites.parent_directory[0] -print(parent_directory) +CoastSnap_directory = coastsnap_sites.parent_directory[0] +parent_directory = path.join(CoastSnap_directory, 'Images') for index, beach in coastsnap_sites.iterrows(): diff --git a/coastsnap/tag_registered.py b/coastsnap/tag_registered.py index 7ee7419..970b9b1 100644 --- a/coastsnap/tag_registered.py +++ b/coastsnap/tag_registered.py @@ -145,4 +145,11 @@ for site in os.listdir(images_dir): # Loop through SITES image2tag.create_tag() tag_image(image2tag) - + + if not site_complete: + if i == 0: + print(site + ": " + str(i) + " images tagged") + elif image2tag.tide: + print(site + ": " + str(i) + " images tagged with tide") + else: + print(site + ": " + str(i) + " images tagged no tide") diff --git a/coastsnap_sites.csv b/coastsnap_sites.csv index 6305d47..5fb576c 100644 --- a/coastsnap_sites.csv +++ b/coastsnap_sites.csv @@ -1,38 +1,4 @@ site_name,root_id,limit,type,parent_directory -alex,487451,300,CoastSnap Station,C:\Users\z5079346\OneDrive - UNSW\My files\CoastSnap -birubi,548070,300,CoastSnap Station, -blacksmiths,269988,300,CoastSnap Station, -broulee,269990,300,CoastSnap Station, -buddina,487447,300,CoastSnap Station, -burleigh,303934,300,CoastSnap Station, -byron,269991,300,CoastSnap Station, -cathieillaroo,393016,300,CoastSnap Station, -cathielagoon,392988,300,CoastSnap Station, -coogee,286418,300,DIY, -coolum,487449,300,CoastSnap Station, -cooya,275690,300,CoastSnap Station, -cowbay,275692,300,CoastSnap Station, -era,297634,300,CoastSnap Station, -fourmile,275689,300,CoastSnap Station, -frankston,425039,300,CoastSnap Station, -garie,296239,300,CoastSnap Station, -hungry,296903,300,CoastSnap Station, -kirra,270011,300,CoastSnap Station, -macsnth,257393,300,DIY, -macssth,404754,300,DIY, -manly,242186,300,CoastSnap Station, -moffat,487448,300,CoastSnap Station, -newell,275691,300,CoastSnap Station, -nthnarra,243537,300,CoastSnap Station, -queenscliff,269334,300,CoastSnap Station, -rainbow,451612,300,CoastSnap Station, -seaford,421320,300,CoastSnap Station, -shortpoint,269992,300,CoastSnap Station, -stockton1,269985,300,CoastSnap Station, -stockton2,269986,300,CoastSnap Station, -stockton3,269987,300,CoastSnap Station, -tomakin,269989,300,CoastSnap Station, -tugun,269993,300,CoastSnap Station, -wamberal,299431,300,CoastSnap Station, -wonga,268307,300,CoastSnap Station, -woolgooga,435190,300,CoastSnap Station, +blacksmiths,269988,5,CoastSnap Station,C:\Users\z5079346\OneDrive - UNSW\Projects\Coastsnap\CoastSnap_DEMO +cathieillaroo,393016,5,CoastSnap Station, +manly,242186,5,CoastSnap Station, diff --git a/coastsnap_sites_REMOVE_THIS_TEXT_AFTER_DEMO.csv b/coastsnap_sites_ALL.csv similarity index 100% rename from coastsnap_sites_REMOVE_THIS_TEXT_AFTER_DEMO.csv rename to coastsnap_sites_ALL.csv