Revert Waterbody and Major City changes

[davidclaveau]

Describe the task Revert the waterbody and major city changes under "Journey Details" completed in #283. Make it so a "Closest Major City" is only required if the user adds a waterbody manually.

Purpose From user feedback, adding a waterbody and a city to a user's Previous or Destination journey doesn't always make logical sense. It might make more sense to add a "Closest Major City" if a user adds their waterbody manually to give more specific detail to the journey.

Acceptance Criteria

• [x] Waterbody is mandatory; Closest Major City is disabled. The user should be prompted to select a Previous/Destination Waterbody by default (either Previous/Destination Major Closest City is disabled. Waterbody is mandatory.
• [x] Closest Major City is mandatory; Waterbody is disabled. If the user toggles either of "Commercial Manufacturer / New Boat", "Unknown Waterbody", or "Previously Stored" / "Been Stored", then the Waterbody button is disabled and Closest Major City is enabled.
• [x] Both are mandatory if a Waterbody is added manually. If the user adds a Waterbody manually, then the Closest Major City is enabled for the user to add an additional city.

Additional context

• Might need to also remove/revert the "e.g." to the cities in the Waterbodies table, so a waterbody is closely tied to the city again

[davidclaveau]

Reverted the changes from PR #282 where we were able to add multiple cities to the Journey Details.

Previous functionality and logic was reinstated, so the user can add multiple waterbodies OR a major city for Previous or Destination. The caveat is that, if a user enters a waterbody manually, they are required to enter a Closest Major City as well for some additional clarity.

These changes required an adjustment to the Journey Details section so that the waterbodies, cities, and buttons all appear correctly and are separated by a single.Divider before the next section. The new bug introduced was when a user deleted a waterbody or city, it would show two.Dividers at the bottom of Journey Details. Adding a new Blank view instead and instead having the next section have a divider above it was the easiest solution.