Merge branch 'develop' into feature/Resurect_3D

# Conflicts: # angular.json # package-lock.json # package.json # projects/common-map/package.json
2020-09-26 12:17:58 +02:00
parent 21af6ab2c4 8e55308df9
commit b93218e165
13 changed files with 5550 additions and 7591 deletions
--- a/angular.json
+++ b/angular.json
@@ -25,18 +25,18 @@
            "assets": [
              {
                "glob": "**/*",
-                "input":"src/assets/images",
-                "output":"/images"
+                "input": "src/assets/images",
+                "output": "/images"
              },
              {
                "glob": "silent-refresh.html",
-                "input":"src/assets",
-                "output":"/"
+                "input": "src/assets",
+                "output": "/"
              },
              {
                "glob": "favicon.ico",
-                "input":"src/assets",
-                "output":"/"
+                "input": "src/assets",
+                "output": "/"
              },
              {
                "glob": "**/*",
@@ -53,8 +53,7 @@
              "node_modules/cesium/Build/Cesium/Widgets/widgets.css",
              "node_modules/ol/ol.css"
            ],
-            "scripts": [],
-            "es5BrowserSupport": true
+            "scripts": []
          },
          "configurations": {
            "production": {