From 0629a5a64c3ad497fa9f25617ee83064612444f4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 25 Jul 2015 21:19:56 +0200 Subject: [PATCH] city_map was to generic, better devide the actual map into several layers: - city_sections : Contains section information about every part of the map - city_policies : Contains policy informations - city_foo : Maybe more? Signed-off-by: Roland Haeder --- application/city/config.php | 4 +- .../{city_map => city_sections}/.htaccess | 0 .../class_CitySectionsWrapper.php} | 4 +- .../{city_map => city_sections}/.htaccess | 0 .../class_CitySectionsDatabaseWrapper.php} | 14 ++- .../database/frontend/region_map}/.htaccess | 0 .../class_RegionMapDatabaseWrapper.php | 0 .../manager/city_map/class_CityMapManager.php | 2 +- db/city_sections/.htaccess | 1 + .../mindmaps/Simple City Growth Simulation.mm | 93 ++++++++++++++----- 10 files changed, 84 insertions(+), 34 deletions(-) rename application/city/interfaces/database/frontend/{city_map => city_sections}/.htaccess (100%) rename application/city/interfaces/database/frontend/{city_map/class_CityMapWrapper.php => city_sections/class_CitySectionsWrapper.php} (89%) rename application/city/main/database/frontend/{city_map => city_sections}/.htaccess (100%) rename application/city/main/database/frontend/{city_map/class_CityMapDatabaseWrapper.php => city_sections/class_CitySectionsDatabaseWrapper.php} (74%) rename {db/city_map => application/city/main/database/frontend/region_map}/.htaccess (100%) rename application/city/main/database/frontend/{region => region_map}/class_RegionMapDatabaseWrapper.php (100%) create mode 100644 db/city_sections/.htaccess diff --git a/application/city/config.php b/application/city/config.php index 9f83710..aea8d54 100644 --- a/application/city/config.php +++ b/application/city/config.php @@ -49,8 +49,8 @@ $cfg->setConfigEntry('region_info_db_wrapper_class', 'RegionInformationDatabaseW // CFG: REGION-MAP-DB-WRAPPER-CLASS $cfg->setConfigEntry('region_map_db_wrapper_class', 'RegionMapDatabaseWrapper'); -// CFG: CITY-MAP-DB-WRAPPER-CLASS -$cfg->setConfigEntry('city_map_db_wrapper_class', 'CityMapDatabaseWrapper'); +// CFG: CITY-SECTIONS-DB-WRAPPER-CLASS +$cfg->setConfigEntry('city_sections_db_wrapper_class', 'CitySectionsDatabaseWrapper'); // CFG: CITY-INIT-STATE-CLASS $cfg->setConfigEntry('city_init_state_class', 'CityInitState'); diff --git a/application/city/interfaces/database/frontend/city_map/.htaccess b/application/city/interfaces/database/frontend/city_sections/.htaccess similarity index 100% rename from application/city/interfaces/database/frontend/city_map/.htaccess rename to application/city/interfaces/database/frontend/city_sections/.htaccess diff --git a/application/city/interfaces/database/frontend/city_map/class_CityMapWrapper.php b/application/city/interfaces/database/frontend/city_sections/class_CitySectionsWrapper.php similarity index 89% rename from application/city/interfaces/database/frontend/city_map/class_CityMapWrapper.php rename to application/city/interfaces/database/frontend/city_sections/class_CitySectionsWrapper.php index a7017dc..3d83212 100644 --- a/application/city/interfaces/database/frontend/city_map/class_CityMapWrapper.php +++ b/application/city/interfaces/database/frontend/city_sections/class_CitySectionsWrapper.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface CityMapWrapper extends DatabaseWrapper { +interface CitySectionsWrapper extends DatabaseWrapper { } // [EOF] diff --git a/application/city/main/database/frontend/city_map/.htaccess b/application/city/main/database/frontend/city_sections/.htaccess similarity index 100% rename from application/city/main/database/frontend/city_map/.htaccess rename to application/city/main/database/frontend/city_sections/.htaccess diff --git a/application/city/main/database/frontend/city_map/class_CityMapDatabaseWrapper.php b/application/city/main/database/frontend/city_sections/class_CitySectionsDatabaseWrapper.php similarity index 74% rename from application/city/main/database/frontend/city_map/class_CityMapDatabaseWrapper.php rename to application/city/main/database/frontend/city_sections/class_CitySectionsDatabaseWrapper.php index 657a86a..0ba967d 100644 --- a/application/city/main/database/frontend/city_map/class_CityMapDatabaseWrapper.php +++ b/application/city/main/database/frontend/city_sections/class_CitySectionsDatabaseWrapper.php @@ -21,9 +21,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityMapDatabaseWrapper extends BaseDatabaseWrapper implements CityMapWrapper, Registerable { +class CitySectionsDatabaseWrapper extends BaseDatabaseWrapper implements CitySectionsWrapper, Registerable { // Constants for database table names - const DB_TABLE_CITY_MAP = 'city_map'; + const DB_TABLE_CITY_SECTIONS = 'city_sections'; + + // Constants for database column names + const DB_COLUMN_SECTION_ID = 'city_section_id'; + const DB_COLUMN_CITY_ID = 'city_id'; /** * Protected constructor @@ -40,12 +44,12 @@ class CityMapDatabaseWrapper extends BaseDatabaseWrapper implements CityMapWrapp * * @return $wrapperInstance An instance of the created wrapper class */ - public static final function createCityMapDatabaseWrapper () { + public static final function createCitySectionsDatabaseWrapper () { // Get a new instance - $wrapperInstance = new CityMapDatabaseWrapper(); + $wrapperInstance = new CitySectionsDatabaseWrapper(); // Set (primary!) table name - $wrapperInstance->setTableName(self::DB_TABLE_CITY_MAP); + $wrapperInstance->setTableName(self::DB_TABLE_CITY_SECTIONS); // Return the instance return $wrapperInstance; diff --git a/db/city_map/.htaccess b/application/city/main/database/frontend/region_map/.htaccess similarity index 100% rename from db/city_map/.htaccess rename to application/city/main/database/frontend/region_map/.htaccess diff --git a/application/city/main/database/frontend/region/class_RegionMapDatabaseWrapper.php b/application/city/main/database/frontend/region_map/class_RegionMapDatabaseWrapper.php similarity index 100% rename from application/city/main/database/frontend/region/class_RegionMapDatabaseWrapper.php rename to application/city/main/database/frontend/region_map/class_RegionMapDatabaseWrapper.php diff --git a/application/city/main/manager/city_map/class_CityMapManager.php b/application/city/main/manager/city_map/class_CityMapManager.php index 576c76e..43f5438 100644 --- a/application/city/main/manager/city_map/class_CityMapManager.php +++ b/application/city/main/manager/city_map/class_CityMapManager.php @@ -42,7 +42,7 @@ class CityMapManager extends BaseFrameworkSystem implements ManageableCityMap, R $managerInstance = new CityMapManager(); // Get database wrapper - $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_map_db_wrapper_class'); + $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_sections_db_wrapper_class'); // And set it here $managerInstance->setWrapperInstance($wrapperInstance); diff --git a/db/city_sections/.htaccess b/db/city_sections/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/db/city_sections/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/docs/mindmaps/Simple City Growth Simulation.mm b/docs/mindmaps/Simple City Growth Simulation.mm index ef85a36..a9c6355 100644 --- a/docs/mindmaps/Simple City Growth Simulation.mm +++ b/docs/mindmaps/Simple City Growth Simulation.mm @@ -50,7 +50,7 @@ - + @@ -134,6 +134,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -209,8 +254,8 @@ - + @@ -252,9 +297,9 @@ - - + + @@ -262,8 +307,8 @@ - + @@ -281,8 +326,8 @@ - + @@ -305,8 +350,8 @@ - + @@ -430,8 +475,8 @@ - + @@ -621,34 +666,34 @@ - + - + - + - + - + - + @@ -1001,8 +1046,8 @@ - + @@ -1073,12 +1118,12 @@ - + - + @@ -1840,23 +1885,23 @@ - + + - - + - + @@ -1867,8 +1912,8 @@ - + @@ -1897,12 +1942,12 @@ - + - + -- 2.39.5