Updated 'core'.

[city.git] / application / city / main / city_daemon / class_BaseCityDaemon.php

diff --git a/application/city/main/city_daemon/class_BaseCityDaemon.php b/application/city/main/city_daemon/class_BaseCityDaemon.php
index 661c6138b631840a5061c4592a5272620766e83e..8584bebd2ac0ce840de6d382b2585e94f53ab6c7 100644 (file)
--- a/application/city/main/city_daemon/class_BaseCityDaemon.php
+++ b/application/city/main/city_daemon/class_BaseCityDaemon.php
@@ -25,6 +25,7 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter
        /**
         * City types
         */
+       const CITY_TYPE_DEFAULT = 'default';
        const CITY_TYPE_TESTING = 'testing';
 
        /**
@@ -171,19 +172,19 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter
         * @param       $responseInstance       A Responseable class
         * @return      void
         */
-       public function activateCity (Requestable $requestInstance, Responseable $responseInstance) {
+       public function activateCityDaemon (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the controller here
                $controllerInstance = Registry::getRegistry()->getInstance('controller');
 
                // Run all filters for the City activation
                $controllerInstance->executeActivationFilters($requestInstance, $responseInstance);
 
-               // Make sure the city's state is 'virigin'
-               $this->getStateInstance()->validateCityStateIsVirgin();
+               // Make sure the city's state is 'init'
+               $this->getStateInstance()->validateCityStateIsInit();
 
                // ----------------------- Last step from here ------------------------
-               // Activate the City. This is ALWAYS the last step in this method
-               /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CITY[' . __METHOD__ . ':' . __LINE__ . ']: state=' . $this->getStateInstance()->__toString());
+               // Activate the city daemon. This is ALWAYS the last step in this method
+               /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CITY[' . __METHOD__ . ':' . __LINE__ . ']: state=' . $this->getStateInstance()->__toString() . ' - Activating ...');
                $this->getStateInstance()->citySimulationIsActivated();
                // ---------------------- Last step until here ------------------------
        }
@@ -243,12 +244,36 @@ class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriter
         * Initializes the city daemon
         *
         * @return      void
+        * @todo        0% done
         */
        public function bootstrapInitCityDaemon () {
                $this->partialStub('Please add something here.');
+       }
+
+       /**
+        * Checks whether at least one map requires expansion
+        *
+        * @return      $requiresExpansion      Whether a map requires expansion
+        */
+       public function isMapPendingExpansion () {
+               // Get sections manager
+               $sectionsInstance = ManagerFactory::createManagerByType('city_sections');
+
+               // Call it's method and return value
+               return $sectionsInstance->isMapPendingExpansion();
+       }
+
+       /**
+        * Expands any found map that requires expansion
+        *
+        * @return      void
+        */
+       public function expandMaps () {
+               // Get sections manager
+               $sectionsInstance = ManagerFactory::createManagerByType('city_sections');
 
-               // Daemon has been fully initialized, so change state to 'virgin'
-               $this->getStateInstance()->daemonHasInitialized();
+               // Call it's method and return value
+               $sectionsInstance->expandMaps();
        }
 }