1 files changed, 51 insertions, 3 deletions

diff --git a/src/openvic-simulation/map/Province.cpp b/src/openvic-simulation/map/Province.cpp
index f53de3a..db7e784 100644
--- a/src/openvic-simulation/map/Province.cpp
+++ b/src/openvic-simulation/map/Province.cpp
@@ -1,14 +1,16 @@
 #include "Province.hpp"
 
 #include <cassert>
+#include <cstddef>
 #include <iomanip>
+#include <iterator>
 #include <sstream>
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 
 Province::Province(const std::string_view new_identifier, colour_t new_colour, index_t new_index)
-	: HasIdentifierAndColour { new_identifier, new_colour, false },
+	: HasIdentifierAndColour { new_identifier, new_colour, false, false },
 	  index { new_index },
 	  buildings { "buildings", false } {
 	assert(index != NULL_INDEX);
@@ -22,7 +24,11 @@ Region* Province::get_region() const {
 	return region;
 }
 
-bool Province::is_water() const {
+bool Province::get_has_region() const {
+	return has_region;
+}
+
+bool Province::get_water() const {
 	return water;
 }
 
@@ -30,6 +36,12 @@ Province::life_rating_t Province::get_life_rating() const {
 	return life_rating;
 }
 
+bool Province::load_positions(BuildingManager const& building_manager, ast::NodeCPtr root) {
+	// TODO - implement province position loading
+	// (root is the dictionary after the province identifier)
+	return true;
+}
+
 bool Province::add_building(Building&& building) {
 	return buildings.add_item(std::move(building));
 }
@@ -64,7 +76,7 @@ bool Province::load_pop_list(PopManager const& pop_manager, ast::NodeCPtr root)
 }
 
 bool Province::add_pop(Pop&& pop) {
-	if (!is_water()) {
+	if (!get_water()) {
 		pops.push_back(std::move(pop));
 		return true;
 	} else {
@@ -127,3 +139,39 @@ void Province::tick(Date const& today) {
 	for (Building& building : buildings.get_items())
 		building.tick(today);
 }
+
+Province::adjacency_t::adjacency_t(Province const* province, distance_t distance, flags_t flags) 
+	: province { province }, distance { distance }, flags { flags } {
+	assert(province != nullptr);
+}
+
+Province::distance_t Province::adjacency_t::get_distance() const {
+	return distance;
+}
+
+Province::flags_t Province::adjacency_t::get_flags() {
+	return flags;
+}
+
+bool Province::is_adjacent_to(Province const* province) {
+	for (adjacency_t adj : adjacencies)
+		if (adj.province == province)
+			return true;
+	return false;
+}
+
+bool Province::add_adjacency(Province const* province, distance_t distance, flags_t flags) {
+	if (province == nullptr) {
+		Logger::error("Tried to create null adjacency province for province ", get_identifier(), "!");
+		return false;
+	}
+
+	if (is_adjacent_to(province))
+		return false;
+	adjacencies.push_back({ province, distance, flags });
+	return true;
+}
+
+std::vector<Province::adjacency_t> const& Province::get_adjacencies() const {
+	return adjacencies;
+}
\ No newline at end of file