Updating submodule

Author: robertkern

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "address-formatting"]
 	path = address-formatting
 	url = https://github.com/OpenCageData/address-formatting.git
+[submodule "address-formatting-templates"]
+	path = address-formatting-templates
+	url = https://github.com/predicthq/address-formatting-templates.git
+[submodule "address-formatter-templates"]
+	path = address-formatter-templates
+	url = https://github.com/predicthq/address-formatter-templates.git

address-formatter-templates

@@ -15,23 +15,9 @@
             "role": "Developer"
         }
     ],
-    "repositories": [
-        {
-            "type": "package",
-            "package": {
-                "name": "opencagedata/address-formatting",
-                "version": "dev-master",
-                "source": {
-                    "type": "git",
-                    "url": "https://github.com/OpenCageData/address-formatting.git",
-                    "reference": "e40650fe138064af224a769d2f0b4cd7454fcb7c"
-                }
-            }
-        }
-    ],
     "require": {
         "php": ">=5.6.0",
-        "opencagedata/address-formatting": "dev-master",
+        "predicthq/address-formatter-templates": "~1.0",
         "symfony/yaml": "~3.0",
         "mustache/mustache": "~2.0"
     },

address-formatting

@@ -479,13 +479,13 @@ public function loadTemplates()
          * the address-formatting templates as a separate package via our composer.json and if the address-formatting
          * templates exist at the expected location for a composer loaded package, we use that by default.
          */
-        $composerTemplatesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', '..', '..', 'opencagedata', 'address-formatting', 'conf'));
+        $composerTemplatesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', '..', 'address-formatter-templates', 'conf'));
 
         if (is_dir($composerTemplatesPath)) {
             $templatesPath = $composerTemplatesPath;
         } else {
             //Use the git submodule path
-            $templatesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', 'address-formatting', 'conf'));
+            $templatesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', 'address-formatter-templates', 'conf'));
         }
 
         if (is_dir($templatesPath)) {

composer.json

@@ -13,13 +13,13 @@ public function testCountries()
          * the address-formatting templates as a separate package via our composer.json and if the address-formatting
          * templates exist at the expected location for a composer loaded package, we use that by default.
          */
-        $composerTestCasesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', '..', '..', 'opencagedata', 'address-formatting', 'testcases'));
+        $composerTestCasesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', '..', 'address-formatter-templates', 'testcases'));
 
         if (is_dir($composerTestCasesPath)) {
             $testCasesPath = $composerTestCasesPath;
         } else {
             //Use the git submodule path
-            $testCasesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', 'address-formatting', 'testcases'));
+            $testCasesPath = implode(DIRECTORY_SEPARATOR, array(realpath(dirname(__FILE__)), '..', 'address-formatter-templates', 'testcases'));
         }
 
         //Load all countries