Changed from OpenVic2 to OpenVic

8 files changed, 822 insertions, 0 deletions

diff --git a/src/openvic/map/Building.cpp b/src/openvic/map/Building.cpp
new file mode 100644
index 0000000..ccd5ad7
--- /dev/null
+++ b/src/openvic/map/Building.cpp
@@ -0,0 +1,129 @@
+#include "Building.hpp"
+
+#include <cassert>
+
+#include "../Logger.hpp"
+#include "Province.hpp"
+
+using namespace OpenVic;
+
+Building::Building(BuildingType const& new_type) : HasIdentifier{ new_type.get_identifier() }, type{ new_type } {}
+
+bool Building::_can_expand() const {
+	return level < type.get_max_level();
+}
+
+BuildingType const& Building::get_type() const {
+	return type;
+}
+
+Building::level_t Building::get_level() const {
+	return level;
+}
+
+Building::ExpansionState Building::get_expansion_state() const {
+	return expansion_state;
+}
+
+Date const& Building::get_start_date() const {
+	return start;
+}
+
+Date const& Building::get_end_date() const {
+	return end;
+}
+
+float Building::get_expansion_progress() const {
+	return expansion_progress;
+}
+
+return_t Building::expand() {
+	if (expansion_state == ExpansionState::CanExpand) {
+		expansion_state = ExpansionState::Preparing;
+		expansion_progress = 0.0f;
+		return SUCCESS;
+	}
+	return FAILURE;
+}
+
+/* REQUIREMENTS:
+ * MAP-71, MAP-74, MAP-77
+ */
+void Building::update_state(Date const& today) {
+	switch (expansion_state) {
+		case ExpansionState::Preparing:
+			start = today;
+			end = start + type.get_build_time();
+			break;
+		case ExpansionState::Expanding:
+			expansion_progress = static_cast<double>(today - start) / static_cast<double>(end - start);
+			break;
+		default: expansion_state = _can_expand() ? ExpansionState::CanExpand : ExpansionState::CannotExpand;
+	}
+}
+
+void Building::tick(Date const& today) {
+	if (expansion_state == ExpansionState::Preparing) {
+		expansion_state = ExpansionState::Expanding;
+	}
+	if (expansion_state == ExpansionState::Expanding) {
+		if (end <= today) {
+			level++;
+			expansion_state = ExpansionState::CannotExpand;
+		}
+	}
+}
+
+BuildingType::BuildingType(std::string const& new_identifier, Building::level_t new_max_level, Timespan new_build_time) :
+	HasIdentifier{ new_identifier }, max_level{ new_max_level }, build_time{ new_build_time } {
+	assert(max_level >= 0);
+	assert(build_time >= 0);
+}
+
+Building::level_t BuildingType::get_max_level() const {
+	return max_level;
+}
+
+Timespan BuildingType::get_build_time() const {
+	return build_time;
+}
+
+BuildingManager::BuildingManager() : building_types{ "building types" } {}
+
+return_t BuildingManager::add_building_type(std::string const& identifier, Building::level_t max_level, Timespan build_time) {
+	if (identifier.empty()) {
+		Logger::error("Invalid building type identifier - empty!");
+		return FAILURE;
+	}
+	if (max_level < 0) {
+		Logger::error("Invalid building type max level: ", max_level);
+		return FAILURE;
+	}
+	if (build_time < 0) {
+		Logger::error("Invalid building type build time: ", build_time);
+		return FAILURE;
+	}
+	return building_types.add_item({ identifier, max_level, build_time });
+}
+
+void BuildingManager::lock_building_types() {
+	building_types.lock();
+}
+
+BuildingType const* BuildingManager::get_building_type_by_identifier(std::string const& identifier) const {
+	return building_types.get_item_by_identifier(identifier);
+}
+
+return_t BuildingManager::generate_province_buildings(Province& province) const {
+	province.reset_buildings();
+	if (!building_types.is_locked()) {
+		Logger::error("Cannot generate buildings until building types are locked!");
+		return FAILURE;
+	}
+	if (province.is_water()) return SUCCESS;
+	return_t ret = SUCCESS;
+	for (BuildingType const& type : building_types.get_items())
+		if (province.add_building(type) != SUCCESS) ret = FAILURE;
+	province.lock_buildings();
+	return ret;
+}
diff --git a/src/openvic/map/Building.hpp b/src/openvic/map/Building.hpp
new file mode 100644
index 0000000..ca5c196
--- /dev/null
+++ b/src/openvic/map/Building.hpp
@@ -0,0 +1,75 @@
+#pragma once
+
+#include <vector>
+
+#include "../Types.hpp"
+#include "../Date.hpp"
+
+namespace OpenVic {
+	struct Province;
+	struct BuildingType;
+
+	/* REQUIREMENTS:
+	 * MAP-11, MAP-72, MAP-73
+	 * MAP-12, MAP-75, MAP-76
+	 * MAP-13, MAP-78, MAP-79
+	 */
+	struct Building : HasIdentifier {
+		friend struct Province;
+
+		using level_t = int8_t;
+
+		enum class ExpansionState { CannotExpand, CanExpand, Preparing, Expanding };
+	private:
+		BuildingType const& type;
+		level_t level = 0;
+		ExpansionState expansion_state = ExpansionState::CannotExpand;
+		Date start, end;
+		float expansion_progress;
+
+		Building(BuildingType const& new_type);
+
+		bool _can_expand() const;
+	public:
+		Building(Building&&) = default;
+
+		BuildingType const& get_type() const;
+		level_t get_level() const;
+		ExpansionState get_expansion_state() const;
+		Date const& get_start_date() const;
+		Date const& get_end_date() const;
+		float get_expansion_progress() const;
+
+		return_t expand();
+		void update_state(Date const& today);
+		void tick(Date const& today);
+	};
+
+	struct BuildingManager;
+
+	struct BuildingType : HasIdentifier {
+		friend struct BuildingManager;
+	private:
+		const Building::level_t max_level;
+		const Timespan build_time;
+
+		BuildingType(std::string const& new_identifier, Building::level_t new_max_level, Timespan new_build_time);
+	public:
+		BuildingType(BuildingType&&) = default;
+
+		Building::level_t get_max_level() const;
+		Timespan get_build_time() const;
+	};
+
+	struct BuildingManager {
+	private:
+		IdentifierRegistry<BuildingType> building_types;
+	public:
+		BuildingManager();
+
+		return_t add_building_type(std::string const& identifier, Building::level_t max_level, Timespan build_time);
+		void lock_building_types();
+		BuildingType const* get_building_type_by_identifier(std::string const& identifier) const;
+		return_t generate_province_buildings(Province& province) const;
+	};
+}
diff --git a/src/openvic/map/Map.cpp b/src/openvic/map/Map.cpp
new file mode 100644
index 0000000..af1ea8a
--- /dev/null
+++ b/src/openvic/map/Map.cpp
@@ -0,0 +1,348 @@
+#include "Map.hpp"
+
+#include <cassert>
+#include <unordered_set>
+
+#include "../Logger.hpp"
+#include "../economy/Good.hpp"
+
+using namespace OpenVic;
+
+Mapmode::Mapmode(index_t new_index, std::string const& new_identifier, colour_func_t new_colour_func)
+	: HasIdentifier{ new_identifier }, index{ new_index }, colour_func{ new_colour_func } {
+	assert(colour_func != nullptr);
+}
+
+Mapmode::index_t Mapmode::get_index() const {
+	return index;
+}
+
+colour_t Mapmode::get_colour(Map const& map, Province const& province) const {
+	return colour_func ? colour_func(map, province) : NULL_COLOUR;
+}
+
+Map::Map() : provinces{ "provinces" }, regions{ "regions" }, mapmodes{ "mapmodes" } {}
+
+return_t Map::add_province(std::string const& identifier, colour_t colour) {
+	if (provinces.get_item_count() >= MAX_INDEX) {
+		Logger::error("The map's province list is full - there can be at most ", MAX_INDEX, " provinces");
+		return FAILURE;
+	}
+	if (identifier.empty()) {
+		Logger::error("Invalid province identifier - empty!");
+		return FAILURE;
+	}
+	if (colour == NULL_COLOUR || colour > MAX_COLOUR_RGB) {
+		Logger::error("Invalid province colour: ", Province::colour_to_hex_string(colour));
+		return FAILURE;
+	}
+	Province new_province{ static_cast<index_t>(provinces.get_item_count() + 1), identifier, colour };
+	const index_t index = get_index_from_colour(colour);
+	if (index != NULL_INDEX) {
+		Logger::error("Duplicate province colours: ", get_province_by_index(index)->to_string(), " and ", new_province.to_string());
+		return FAILURE;
+	}
+	colour_index_map[new_province.get_colour()] = new_province.get_index();
+	return provinces.add_item(std::move(new_province));
+}
+
+void Map::lock_provinces() {
+	provinces.lock();
+}
+
+return_t Map::set_water_province(std::string const& identifier) {
+	if (water_provinces_locked) {
+		Logger::error("The map's water provinces have already been locked!");
+		return FAILURE;
+	}
+	Province* province = get_province_by_identifier(identifier);
+	if (province == nullptr) {
+		Logger::error("Unrecognised water province identifier: ", identifier);
+		return FAILURE;
+	}
+	if (province->is_water()) {
+		Logger::error("Province ", identifier, " is already a water province!");
+		return FAILURE;
+	}
+	province->water = true;
+	water_province_count++;
+	return SUCCESS;
+}
+
+void Map::lock_water_provinces() {
+	water_provinces_locked = true;
+	Logger::info("Locked water provinces after registering ", water_province_count);
+}
+
+return_t Map::add_region(std::string const& identifier, std::vector<std::string> const& province_identifiers) {
+	if (identifier.empty()) {
+		Logger::error("Invalid region identifier - empty!");
+		return FAILURE;
+	}
+	Region new_region{ identifier };
+	return_t ret = SUCCESS;
+	for (std::string const& province_identifier : province_identifiers) {
+		Province* province = get_province_by_identifier(province_identifier);
+		if (province != nullptr) {
+			if (new_region.contains_province(province)) {
+				Logger::error("Duplicate province identifier ", province_identifier);
+				ret = FAILURE;
+			} else {
+				size_t other_region_index = reinterpret_cast<size_t>(province->get_region());
+				if (other_region_index != 0) {
+					other_region_index--;
+					if (other_region_index < regions.get_item_count())
+						Logger::error("Province ", province_identifier, " is already part of ", regions.get_item_by_index(other_region_index)->get_identifier());
+					else
+						Logger::error("Province ", province_identifier, " is already part of an unknown region with index ", other_region_index);
+					ret = FAILURE;
+				} else new_region.provinces.push_back(province);
+			}
+		} else {
+			Logger::error("Invalid province identifier ", province_identifier);
+			ret = FAILURE;
+		}
+	}
+	if (!new_region.get_province_count()) {
+		Logger::error("No valid provinces in region's list");
+		return FAILURE;
+	}
+
+	// Used to detect provinces listed in multiple regions, will
+	// be corrected once regions is stable (i.e. lock_regions).
+	Region* tmp_region_index = reinterpret_cast<Region*>(regions.get_item_count());
+	for (Province* province : new_region.get_provinces())
+		province->region = tmp_region_index;
+	if (regions.add_item(std::move(new_region)) != SUCCESS) ret = FAILURE;
+	return ret;
+}
+
+void Map::lock_regions() {
+	regions.lock();
+	for (Region& region : regions.get_items())
+		for (Province* province : region.get_provinces())
+			province->region = &region;
+}
+
+size_t Map::get_province_count() const {
+	return provinces.get_item_count();
+}
+
+Province* Map::get_province_by_index(index_t index) {
+	return index != NULL_INDEX ? provinces.get_item_by_index(index - 1) : nullptr;
+}
+
+Province const* Map::get_province_by_index(index_t index) const {
+	return index != NULL_INDEX ? provinces.get_item_by_index(index - 1) : nullptr;
+}
+
+Province* Map::get_province_by_identifier(std::string const& identifier) {
+	return provinces.get_item_by_identifier(identifier);
+}
+
+Province const* Map::get_province_by_identifier(std::string const& identifier) const {
+	return provinces.get_item_by_identifier(identifier);
+}
+
+index_t Map::get_index_from_colour(colour_t colour) const {
+	const colour_index_map_t::const_iterator it = colour_index_map.find(colour);
+	if (it != colour_index_map.end()) return it->second;
+	return NULL_INDEX;
+}
+
+index_t Map::get_province_index_at(size_t x, size_t y) const {
+	if (x < width && y < height) return province_shape_image[x + y * width].index;
+	return NULL_INDEX;
+}
+
+void Map::set_selected_province(index_t index) {
+	selected_province = index <= get_province_count() ? index : NULL_INDEX;
+}
+
+index_t Map::get_selected_province_index() const {
+	return selected_province;
+}
+
+Province const* Map::get_selected_province() const {
+	return get_province_by_index(get_selected_province_index());
+}
+
+Region* Map::get_region_by_identifier(std::string const& identifier) {
+	return regions.get_item_by_identifier(identifier);
+}
+
+Region const* Map::get_region_by_identifier(std::string const& identifier) const {
+	return regions.get_item_by_identifier(identifier);
+}
+
+static colour_t colour_at(uint8_t const* colour_data, int32_t idx) {
+	return (colour_data[idx * 3] << 16) | (colour_data[idx * 3 + 1] << 8) | colour_data[idx * 3 + 2];
+}
+
+return_t Map::generate_province_shape_image(size_t new_width, size_t new_height, uint8_t const* colour_data,
+	uint8_t const* terrain_data, terrain_variant_map_t const& terrain_variant_map) {
+	if (!province_shape_image.empty()) {
+		Logger::error("Province index image has already been generated!");
+		return FAILURE;
+	}
+	if (!provinces.is_locked()) {
+		Logger::error("Province index image cannot be generated until after provinces are locked!");
+		return FAILURE;
+	}
+	if (new_width < 1 || new_height < 1) {
+		Logger::error("Invalid province image dimensions: ", new_width, "x", new_height);
+		return FAILURE;
+	}
+	if (colour_data == nullptr) {
+		Logger::error("Province colour data pointer is null!");
+		return FAILURE;
+	}
+	if (terrain_data == nullptr) {
+		Logger::error("Province terrain data pointer is null!");
+		return FAILURE;
+	}
+	width = new_width;
+	height = new_height;
+	province_shape_image.resize(width * height);
+
+	std::vector<bool> province_checklist(provinces.get_item_count());
+	return_t ret = SUCCESS;
+	std::unordered_set<colour_t> unrecognised_province_colours, unrecognised_terrain_colours;
+
+	for (int32_t y = 0; y < height; ++y) {
+		for (int32_t x = 0; x < width; ++x) {
+			const int32_t idx = x + y * width;
+
+			const colour_t terrain_colour = colour_at(terrain_data, idx);
+			const terrain_variant_map_t::const_iterator it = terrain_variant_map.find(terrain_colour);
+			if (it != terrain_variant_map.end()) province_shape_image[idx].terrain = it->second;
+			else {
+				if (unrecognised_terrain_colours.find(terrain_colour) == unrecognised_terrain_colours.end()) {
+					unrecognised_terrain_colours.insert(terrain_colour);
+					Logger::error("Unrecognised terrain colour ", Province::colour_to_hex_string(terrain_colour), " at (", x, ", ", y, ")");
+					ret = FAILURE;
+				}
+				province_shape_image[idx].terrain = 0;
+			}
+
+			const colour_t province_colour = colour_at(colour_data, idx);
+			if (x > 0) {
+				const int32_t jdx = idx - 1;
+				if (colour_at(colour_data, jdx) == province_colour) {
+					province_shape_image[idx].index = province_shape_image[jdx].index;
+					continue;
+				}
+			}
+			if (y > 0) {
+				const int32_t jdx = idx - width;
+				if (colour_at(colour_data, jdx) == province_colour) {
+					province_shape_image[idx].index = province_shape_image[jdx].index;
+					continue;
+				}
+			}
+			const index_t index = get_index_from_colour(province_colour);
+			if (index != NULL_INDEX) {
+				province_checklist[index - 1] = true;
+				province_shape_image[idx].index = index;
+				continue;
+			}
+			if (unrecognised_province_colours.find(province_colour) == unrecognised_province_colours.end()) {
+				unrecognised_province_colours.insert(province_colour);
+				Logger::error("Unrecognised province colour ", Province::colour_to_hex_string(province_colour), " at (", x, ", ", y, ")");
+				ret = FAILURE;
+			}
+			province_shape_image[idx].index = NULL_INDEX;
+		}
+	}
+
+	for (size_t idx = 0; idx < province_checklist.size(); ++idx) {
+		if (!province_checklist[idx]) {
+			Logger::error("Province missing from shape image: ", provinces.get_item_by_index(idx)->to_string());
+			ret = FAILURE;
+		}
+	}
+	return ret;
+}
+
+size_t Map::get_width() const {
+	return width;
+}
+
+size_t Map::get_height() const {
+	return height;
+}
+
+std::vector<Map::shape_pixel_t> const& Map::get_province_shape_image() const {
+	return province_shape_image;
+}
+
+return_t Map::add_mapmode(std::string const& identifier, Mapmode::colour_func_t colour_func) {
+	if (identifier.empty()) {
+		Logger::error("Invalid mapmode identifier - empty!");
+		return FAILURE;
+	}
+	if (colour_func == nullptr) {
+		Logger::error("Mapmode colour function is null for identifier: ", identifier);
+		return FAILURE;
+	}
+	return mapmodes.add_item({ mapmodes.get_item_count(), identifier, colour_func });
+}
+
+void Map::lock_mapmodes() {
+	mapmodes.lock();
+}
+
+size_t Map::get_mapmode_count() const {
+	return mapmodes.get_item_count();
+}
+
+Mapmode const* Map::get_mapmode_by_index(size_t index) const {
+	return mapmodes.get_item_by_index(index);
+}
+
+Mapmode const* Map::get_mapmode_by_identifier(std::string const& identifier) const {
+	return mapmodes.get_item_by_identifier(identifier);
+}
+
+return_t Map::generate_mapmode_colours(Mapmode::index_t index, uint8_t* target) const {
+	if (target == nullptr) {
+		Logger::error("Mapmode colour target pointer is null!");
+		return FAILURE;
+	}
+	Mapmode const* mapmode = mapmodes.get_item_by_index(index);
+	if (mapmode == nullptr) {
+		Logger::error("Invalid mapmode index: ", index);
+		return FAILURE;
+	}
+	// Skip past Province::NULL_INDEX
+	for (size_t i = 0; i < MAPMODE_COLOUR_SIZE; ++i)
+		*target++ = 0;
+	for (Province const& province : provinces.get_items()) {
+		const colour_t colour = mapmode->get_colour(*this, province);
+		*target++ = (colour >> 16) & FULL_COLOUR;
+		*target++ = (colour >> 8) & FULL_COLOUR;
+		*target++ = colour & FULL_COLOUR;
+		*target++ = (colour >> 24) & FULL_COLOUR;
+	}
+	return SUCCESS;
+}
+
+return_t Map::setup(GoodManager const& good_manager, BuildingManager const& building_manager) {
+	return_t ret = SUCCESS;
+	for (Province& province : provinces.get_items()) {
+		if (!province.is_water()) // Set all land provinces to have an RGO based on their index to test them
+			province.rgo = good_manager.get_good_by_index(province.get_index() % good_manager.get_good_count());
+		if (building_manager.generate_province_buildings(province) != SUCCESS) ret = FAILURE;
+	}
+	return ret;
+}
+
+void Map::update_state(Date const& today) {
+	for (Province& province : provinces.get_items())
+		province.update_state(today);
+}
+
+void Map::tick(Date const& today) {
+	for (Province& province : provinces.get_items())
+		province.tick(today);
+}
diff --git a/src/openvic/map/Map.hpp b/src/openvic/map/Map.hpp
new file mode 100644
index 0000000..39c37c0
--- /dev/null
+++ b/src/openvic/map/Map.hpp
@@ -0,0 +1,96 @@
+#pragma once
+
+#include <functional>
+
+#include "Region.hpp"
+
+namespace OpenVic {
+
+	struct Mapmode : HasIdentifier {
+		friend struct Map;
+
+		using colour_func_t = std::function<colour_t (Map const&, Province const&)>;
+		using index_t = size_t;
+	private:
+		const index_t index;
+		const colour_func_t colour_func;
+
+		Mapmode(index_t new_index, std::string const& new_identifier, colour_func_t new_colour_func);
+	public:
+		index_t get_index() const;
+		colour_t get_colour(Map const& map, Province const& province) const;
+	};
+
+	struct GoodManager;
+
+	/* REQUIREMENTS:
+	 * MAP-4
+	 */
+	struct Map {
+		using terrain_t = uint8_t;
+		using terrain_variant_map_t = std::map<colour_t, terrain_t>;
+
+		#pragma pack(push, 1)
+		struct shape_pixel_t {
+			index_t index;
+			terrain_t terrain;
+		};
+		#pragma pack(pop)
+	private:
+		using colour_index_map_t = std::map<colour_t, index_t>;
+
+		IdentifierRegistry<Province> provinces;
+		IdentifierRegistry<Region> regions;
+		IdentifierRegistry<Mapmode> mapmodes;
+		bool water_provinces_locked = false;
+		size_t water_province_count = 0;
+
+		size_t width = 0, height = 0;
+		std::vector<shape_pixel_t> province_shape_image;
+		colour_index_map_t colour_index_map;
+		index_t selected_province = NULL_INDEX;
+
+		index_t get_index_from_colour(colour_t colour) const;
+	public:
+		Map();
+
+		return_t add_province(std::string const& identifier, colour_t colour);
+		void lock_provinces();
+		return_t set_water_province(std::string const& identifier);
+		void lock_water_provinces();
+		return_t add_region(std::string const& identifier, std::vector<std::string> const& province_identifiers);
+		void lock_regions();
+
+		size_t get_province_count() const;
+		Province* get_province_by_index(index_t index);
+		Province const* get_province_by_index(index_t index) const;
+		Province* get_province_by_identifier(std::string const& identifier);
+		Province const* get_province_by_identifier(std::string const& identifier) const;
+		index_t get_province_index_at(size_t x, size_t y) const;
+		void set_selected_province(index_t index);
+		index_t get_selected_province_index() const;
+		Province const* get_selected_province() const;
+
+		Region* get_region_by_identifier(std::string const& identifier);
+		Region const* get_region_by_identifier(std::string const& identifier) const;
+
+		return_t generate_province_shape_image(size_t new_width, size_t new_height, uint8_t const* colour_data,
+			uint8_t const* terrain_data, terrain_variant_map_t const& terrain_variant_map);
+		size_t get_width() const;
+		size_t get_height() const;
+		std::vector<shape_pixel_t> const& get_province_shape_image() const;
+
+		return_t add_mapmode(std::string const& identifier, Mapmode::colour_func_t colour_func);
+		void lock_mapmodes();
+		size_t get_mapmode_count() const;
+		Mapmode const* get_mapmode_by_index(Mapmode::index_t index) const;
+		Mapmode const* get_mapmode_by_identifier(std::string const& identifier) const;
+		static constexpr size_t MAPMODE_COLOUR_SIZE = 4;
+		return_t generate_mapmode_colours(Mapmode::index_t index, uint8_t* target) const;
+
+		return_t setup(GoodManager const& good_manager, BuildingManager const& building_manager);
+
+		void update_state(Date const& today);
+		void tick(Date const& today);
+	};
+}
diff --git a/src/openvic/map/Province.cpp b/src/openvic/map/Province.cpp
new file mode 100644
index 0000000..b169021
--- /dev/null
+++ b/src/openvic/map/Province.cpp
@@ -0,0 +1,75 @@
+#include "Province.hpp"
+
+#include <cassert>
+#include <sstream>
+#include <iomanip>
+
+using namespace OpenVic;
+
+Province::Province(index_t new_index, std::string const& new_identifier, colour_t new_colour) :
+	HasIdentifier{ new_identifier }, HasColour{ new_colour }, index{ new_index }, buildings{ "buildings" } {
+	assert(index != NULL_INDEX);
+}
+
+index_t Province::get_index() const {
+	return index;
+}
+
+Region* Province::get_region() const {
+	return region;
+}
+
+bool Province::is_water() const {
+	return water;
+}
+
+Province::life_rating_t Province::get_life_rating() const {
+	return life_rating;
+}
+
+return_t Province::add_building(BuildingType const& type) {
+	return buildings.add_item({ type });
+}
+
+void Province::lock_buildings() {
+	buildings.lock(false);
+}
+
+void Province::reset_buildings() {
+	buildings.reset();
+}
+
+Building const* Province::get_building_by_identifier(std::string const& identifier) const {
+	return buildings.get_item_by_identifier(identifier);
+}
+
+std::vector<Building> const& Province::get_buildings() const {
+	return buildings.get_items();
+}
+
+return_t Province::expand_building(std::string const& building_type_identifier) {
+	Building* building = buildings.get_item_by_identifier(building_type_identifier);
+	if (building == nullptr) return FAILURE;
+	return building->expand();
+}
+
+Good const* Province::get_rgo() const {
+	return rgo;
+}
+
+std::string Province::to_string() const {
+	std::stringstream stream;
+	stream << "(#" << std::to_string(index) << ", " << get_identifier() << ", 0x" << colour_to_hex_string() << ")";
+	return stream.str();
+}
+
+void Province::update_state(Date const& today) {
+	for (Building& building : buildings.get_items())
+		building.update_state(today);
+
+}
+
+void Province::tick(Date const& today) {
+	for (Building& building : buildings.get_items())
+		building.tick(today);
+}
diff --git a/src/openvic/map/Province.hpp b/src/openvic/map/Province.hpp
new file mode 100644
index 0000000..cc11046
--- /dev/null
+++ b/src/openvic/map/Province.hpp
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "Building.hpp"
+
+namespace OpenVic {
+	struct Map;
+	struct Region;
+	struct Good;
+
+	/* REQUIREMENTS:
+	 * MAP-5, MAP-7, MAP-8, MAP-43, MAP-47
+	 */
+	struct Province : HasIdentifier, HasColour {
+		friend struct Map;
+
+		using life_rating_t = int8_t;
+
+	private:
+		const index_t index;
+		Region* region = nullptr;
+		bool water = false;
+		life_rating_t life_rating = 0;
+		IdentifierRegistry<Building> buildings;
+		// TODO - change this into a factory-like structure
+		Good const* rgo = nullptr;
+
+		Province(index_t new_index, std::string const& new_identifier, colour_t new_colour);
+	public:
+		Province(Province&&) = default;
+
+		index_t get_index() const;
+		Region* get_region() const;
+		bool is_water() const;
+		life_rating_t get_life_rating() const;
+		return_t add_building(BuildingType const& type);
+		void lock_buildings();
+		void reset_buildings();
+		Building const* get_building_by_identifier(std::string const& identifier) const;
+		std::vector<Building> const& get_buildings() const;
+		return_t expand_building(std::string const& building_type_identifier);
+		Good const* get_rgo() const;
+		std::string to_string() const;
+
+		void update_state(Date const& today);
+		void tick(Date const& today);
+	};
+}
diff --git a/src/openvic/map/Region.cpp b/src/openvic/map/Region.cpp
new file mode 100644
index 0000000..d546ff9
--- /dev/null
+++ b/src/openvic/map/Region.cpp
@@ -0,0 +1,24 @@
+#include "Region.hpp"
+
+#include <cassert>
+
+using namespace OpenVic;
+
+size_t ProvinceSet::get_province_count() const {
+	return provinces.size();
+}
+
+bool ProvinceSet::contains_province(Province const* province) const {
+	return province && std::find(provinces.begin(), provinces.end(), province) != provinces.end();
+}
+
+std::vector<Province*> const& ProvinceSet::get_provinces() const {
+	return provinces;
+}
+
+Region::Region(std::string const& new_identifier) : HasIdentifier{ new_identifier } {}
+
+colour_t Region::get_colour() const {
+	if (provinces.empty()) return FULL_COLOUR << 16;
+	return provinces.front()->get_colour();
+}
diff --git a/src/openvic/map/Region.hpp b/src/openvic/map/Region.hpp
new file mode 100644
index 0000000..953a3cc
--- /dev/null
+++ b/src/openvic/map/Region.hpp
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "Province.hpp"
+
+namespace OpenVic {
+
+	struct ProvinceSet {
+	protected:
+		std::vector<Province*> provinces;
+	public:
+		size_t get_province_count() const;
+		bool contains_province(Province const* province) const;
+		std::vector<Province*> const& get_provinces() const;
+	};
+
+	/* REQUIREMENTS:
+	 * MAP-6, MAP-44, MAP-48
+	 */
+	struct Region : HasIdentifier, ProvinceSet {
+		friend struct Map;
+	private:
+		Region(std::string const& new_identifier);
+	public:
+		Region(Region&&) = default;
+
+		colour_t get_colour() const;
+	};
+}