[python] Update SMALL_MAPS in convoy_paths with newly created maps.

[web] Update npm packaqges requirements.
[web] Fix province controller parsing.

4 files changed, 62 insertions, 36 deletions

diff --git a/diplomacy/utils/convoy_paths.py b/diplomacy/utils/convoy_paths.py
index f882e25..694370f 100644
--- a/diplomacy/utils/convoy_paths.py
+++ b/diplomacy/utils/convoy_paths.py
@@ -38,7 +38,8 @@ if HOME_DIRECTORY == '~':
 __VERSION__ = '20180307_0955'
 
 # We need to cap convoy length, otherwise the problem gets exponential
-SMALL_MAPS = ['standard', 'standard_france_austria', 'standard_germany_italy', 'ancmed', 'colonial', 'modern']
+SMALL_MAPS = ['standard', 'standard_france_austria', 'standard_germany_italy', 'ancmed', 'colonial', 'modern',
+              'ancmed_age_of_empires', 'standard_age_of_empires']
 SMALL_MAPS_CONVOY_LENGTH = 25
 ALL_MAPS_CONVOY_LENGTH = 12
 CACHE_FILE_NAME = 'convoy_paths_cache.pkl'
diff --git a/diplomacy/web/package-lock.json b/diplomacy/web/package-lock.json
index bbb290a..070d7f3 100644
--- a/diplomacy/web/package-lock.json
+++ b/diplomacy/web/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@githubprimer/octicons-react": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@githubprimer/octicons-react/-/octicons-react-8.0.0.tgz",
-      "integrity": "sha512-0dBJ8Pxe94g1RzULybp0zDWiFpZISAIaRY4LP8ZZnweJgyIoLGXy/6bGycJnPHfmk5sbhcuzzNDufLLDA2vxWA==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@githubprimer/octicons-react/-/octicons-react-8.1.0.tgz",
+      "integrity": "sha512-BvUQWjXHTd6bFcibtFclmNrXd7FWnN3csvY7gZfPPr7plcHHPdgKoLNy1CwsCTVsNLL2jM4FkIvemBoFZeZn5w==",
       "requires": {
         "prop-types": "^15.6.1"
       }
@@ -3287,11 +3287,12 @@
       }
     },
     "eslint-plugin-react": {
-      "version": "7.10.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.10.0.tgz",
-      "integrity": "sha512-18rzWn4AtbSUxFKKM7aCVcj5LXOhOKdwBino3KKWy4psxfPW0YtIbE8WNRDUdyHFL50BeLb6qFd4vpvNYyp7hw==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz",
+      "integrity": "sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==",
       "dev": true,
       "requires": {
+        "array-includes": "^3.0.3",
         "doctrine": "^2.1.0",
         "has": "^1.0.3",
         "jsx-ast-utils": "^2.0.1",
@@ -8818,20 +8819,20 @@
       }
     },
     "react": {
-      "version": "16.4.2",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.4.2.tgz",
-      "integrity": "sha512-dMv7YrbxO4y2aqnvA7f/ik9ibeLSHQJTI6TrYAenPSaQ6OXfb+Oti+oJiy8WBxgRzlKatYqtCjphTgDSCEiWFg==",
+      "version": "16.6.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.6.0.tgz",
+      "integrity": "sha512-zJPnx/jKtuOEXCbQ9BKaxDMxR0001/hzxXwYxG8septeyYGfsgAei6NgfbVgOhbY1WOP2o3VPs/E9HaN+9hV3Q==",
       "requires": {
-        "fbjs": "^0.8.16",
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
-        "prop-types": "^15.6.0"
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.10.0"
       }
     },
     "react-dev-utils": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-5.0.1.tgz",
-      "integrity": "sha512-+y92rG6pmXt3cpcg/NGmG4w/W309tWNSmyyPL8hCMxuCSg2UP/hUg3npACj2UZc8UKVSXexyLrCnxowizGoAsw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-5.0.2.tgz",
+      "integrity": "sha512-d2FbKvYe4XAQx5gjHBoWG+ADqC3fGZzjb7i9vxd/Y5xfLkBGtQyX7aOb8lBRQPYUhjngiD3d49LevjY1stUR0Q==",
       "requires": {
         "address": "1.0.3",
         "babel-code-frame": "6.26.0",
@@ -8845,34 +8846,49 @@
         "inquirer": "3.3.0",
         "is-root": "1.0.0",
         "opn": "5.2.0",
-        "react-error-overlay": "^4.0.0",
+        "react-error-overlay": "^4.0.1",
         "recursive-readdir": "2.2.1",
         "shell-quote": "1.6.1",
-        "sockjs-client": "1.1.4",
+        "sockjs-client": "1.1.5",
         "strip-ansi": "3.0.1",
         "text-table": "0.2.0"
+      },
+      "dependencies": {
+        "sockjs-client": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.5.tgz",
+          "integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=",
+          "requires": {
+            "debug": "^2.6.6",
+            "eventsource": "0.1.6",
+            "faye-websocket": "~0.11.0",
+            "inherits": "^2.0.1",
+            "json3": "^3.3.2",
+            "url-parse": "^1.1.8"
+          }
+        }
       }
     },
     "react-dom": {
-      "version": "16.4.2",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.2.tgz",
-      "integrity": "sha512-Usl73nQqzvmJN+89r97zmeUpQDKDlh58eX6Hbs/ERdDHzeBzWy+ENk7fsGQ+5KxArV1iOFPT46/VneklK9zoWw==",
+      "version": "16.6.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.0.tgz",
+      "integrity": "sha512-Stm2D9dXEUUAQdvpvhvFj/DEXwC2PAL/RwEMhoN4dvvD2ikTlJegEXf97xryg88VIAU22ZAP7n842l+9BTz6+w==",
       "requires": {
-        "fbjs": "^0.8.16",
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
-        "prop-types": "^15.6.0"
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.10.0"
       }
     },
     "react-error-overlay": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-4.0.0.tgz",
-      "integrity": "sha512-FlsPxavEyMuR6TjVbSSywovXSEyOg6ZDj5+Z8nbsRl9EkOzAhEIcS+GLoQDC5fz/t9suhUXWmUrOBrgeUvrMxw=="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-4.0.1.tgz",
+      "integrity": "sha512-xXUbDAZkU08aAkjtUvldqbvI04ogv+a1XdHxvYuHPYKIVk/42BIOD0zSKTHAWV4+gDy3yGm283z2072rA2gdtw=="
     },
     "react-inlinesvg": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/react-inlinesvg/-/react-inlinesvg-0.8.1.tgz",
-      "integrity": "sha512-rdeqawsT17tKvY3B9rfHsNUpZ9RpDP7URNLCrv4NifWcIoPcBxAc7Vel1pK7hyAYKgv6DDMaf8x9PB3jyWjW4A==",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/react-inlinesvg/-/react-inlinesvg-0.8.2.tgz",
+      "integrity": "sha512-UmnL0awbBN2J1UHYI5TyI3PzuDDqQLFmTLs9W0fT893jqxIUi7r3Re7LfIay2YVmIXLAA66BGfeHSDyByuIERw==",
       "requires": {
         "httpplease": "^0.16.4",
         "once": "^1.4.0"
@@ -9596,6 +9612,15 @@
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
+    "scheduler": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.10.0.tgz",
+      "integrity": "sha512-+TSTVTCBAA3h8Anei3haDc1IRwMeDmtI/y/o3iBe3Mjl2vwYF9DtPDt929HyRmV/e7au7CLu8sc4C4W0VOs29w==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
+      }
+    },
     "schema-utils": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
diff --git a/diplomacy/web/package.json b/diplomacy/web/package.json
index 43d6617..e40b2d3 100644
--- a/diplomacy/web/package.json
+++ b/diplomacy/web/package.json
@@ -3,15 +3,15 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@githubprimer/octicons-react": "^8.0.0",
+    "@githubprimer/octicons-react": "^8.1.0",
     "bootstrap": "^4.1.3",
     "fancybox": "^3.0.1",
     "jquery": "^3.3.1",
     "popper.js": "^1.14.4",
     "prop-types": "^15.6.2",
-    "react": "^16.4.2",
-    "react-dom": "^16.4.2",
-    "react-inlinesvg": "^0.8.1",
+    "react": "^16.6.0",
+    "react-dom": "^16.6.0",
+    "react-inlinesvg": "^0.8.2",
     "react-scripts": "1.1.4",
     "react-scrollchor": "^6.0.0",
     "react-shortcut": "^1.0.6"
@@ -24,6 +24,6 @@
   },
   "devDependencies": {
     "eslint": "^4.19.1",
-    "eslint-plugin-react": "^7.10.0"
+    "eslint-plugin-react": "^7.11.1"
   }
 }
diff --git a/diplomacy/web/src/gui/diplomacy/utils/province.js b/diplomacy/web/src/gui/diplomacy/utils/province.js
index fc48ac7..fe54a82 100644
--- a/diplomacy/web/src/gui/diplomacy/utils/province.js
+++ b/diplomacy/web/src/gui/diplomacy/utils/province.js
@@ -52,11 +52,11 @@ export class Province {
     setController(controller, controlType) {
         if (!['C', 'I', 'U'].includes(controlType))
             throw new Error(`Invalid province control type (${controlType}), expected 'C', 'I' or 'U'.`);
-        if (this.controller) {
+        if (this.controller && this.controller !== controller) {
             const controlTypeComparison = this.compareControlType(controlType, this.controlType);
             if (controlTypeComparison === 0)
-                throw new Error(`Found 2 powers trying to control same province (${this.name}) with same ` +
-                    `control type (${controlType} VS ${this.controlType}).`);
+                throw new Error(`Found 2 powers (${this.controller}, ${controller}) trying to control same province ` +
+                    `(${this.name}) with same control type (${controlType} VS ${this.controlType}).`);
             if (controlTypeComparison > 0)
                 this.__set_controller(controller, controlType);
         } else