WIP - merge with imagery repo changes

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/app/@ansyn/imagery-submodules"]
+	path = src/app/@ansyn/imagery-submodules
+	url = https://github.com/AnSyn/imagery.git

.travis.yml

@@ -1,5 +1,8 @@
-os: linux
+#from https://github.com/zcash/zcash/issues/341
+sudo: required
 dist: trusty
+
+os: linux
 addons:
   chrome: stable
 
@@ -24,8 +27,11 @@ before_script:
   #- apt-get install graphicsmagick # for e2e screenshots
 
 script:
+  - npm run lint:submodules
   - npm run lint
+  # - npm run test:single-run:submodules
   - npm run test:single-run
+  - npm run build:submodules:libs
   - npm run build:libs
   - sh -x scripts/build.sh ansyn $TRAVIS_COMMIT $TRAVIS_TAG
 

Dockerfile

@@ -4,12 +4,19 @@ FROM node as builder
 WORKDIR /ng-app
 COPY . .
 
+RUN echo "Stage 1: Build"
+
 RUN npm set progress=false \
   && npm config set depth 0 \
   && npm cache clean --force
 
+RUN echo "RUN npm run install:submodules"
+RUN npm run install:submodules
+
+RUN echo "RUN npm install && npm run build:prod"
 RUN npm install && npm run build:prod
 
+RUN echo "Stage 2: Setup"
 # Stage 2: Setup
 FROM nginx:1.13-alpine
 

angular.json

@@ -9,8 +9,11 @@
       "projectType": "application",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-builders/custom-webpack:browser",
           "options": {
+            "customWebpackConfig": {
+              "path": "./custom-webpack.config.js"
+            },
             "aot": true,
             "outputPath": "dist",
             "index": "src/index.html",
@@ -64,7 +67,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": true,
+              "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
@@ -81,7 +84,7 @@
           }
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
             "browserTarget": "ansyn:build"
           },
@@ -101,8 +104,11 @@
           }
         },
         "test": {
-          "builder": "@angular-devkit/build-angular:karma",
+          "builder": "@angular-builders/custom-webpack:karma",
           "options": {
+            "customWebpackConfig": {
+              "path": "./custom-webpack.config.js"
+            },
             "main": "src/test.ts",
             "karmaConfig": "./karma.conf.js",
             "polyfills": "src/polyfills.ts",
@@ -472,86 +478,86 @@
         }
       }
     },
-    "@ansyn/ol": {
-      "root": "src/app/@ansyn/ol",
-      "sourceRoot": "projects/ansyn/ol/src",
+    "@ansyn/imagery-ol": {
+      "root": "src/app/@ansyn/imagery-submodules/imagery-ol",
+      "sourceRoot": "src/app/@ansyn/imagery-submodules/imagery-ol/src",
       "projectType": "library",
       "prefix": "lib",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-            "tsConfig": "src/app/@ansyn/ol/tsconfig.lib.json",
-            "project": "src/app/@ansyn/ol/ng-package.json"
+            "tsConfig": "src/app/@ansyn/imagery-submodules/imagery-ol/tsconfig.lib.json",
+            "project": "src/app/@ansyn/imagery-submodules/imagery-ol/ng-package.json"
           },
           "configurations": {
             "production": {
-              "project": "src/app/@ansyn/ol/ng-package.json"
-            ,              "tsConfig": "src/app/@ansyn/ol/tsconfig.lib.prod.json"
-}
+              "project": "src/app/@ansyn/imagery-submodules/imagery-ol/ng-package.json",
+              "tsConfig": "src/app/@ansyn/imagery-submodules/imagery-ol/tsconfig.lib.prod.json"
+            }
           }
         }
       }
     },
     "@ansyn/imagery-cesium": {
-      "root": "src/app/@ansyn/imagery-cesium",
-      "sourceRoot": "projects/ansyn/imagery-cesium/src",
+      "root": "src/app/@ansyn/imagery-submodules/imagery-cesium",
+      "sourceRoot": "src/app/@ansyn/imagery-submodules/imagery-cesium/src",
       "projectType": "library",
       "prefix": "lib",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-            "tsConfig": "src/app/@ansyn/imagery-cesium/tsconfig.lib.json",
-            "project": "src/app/@ansyn/imagery-cesium/ng-package.json"
+            "tsConfig": "src/app/@ansyn/imagery-submodules/imagery-cesium/tsconfig.lib.json",
+            "project": "src/app/@ansyn/imagery-submodules/imagery-cesium/ng-package.json"
           },
           "configurations": {
             "production": {
-              "project": "src/app/@ansyn/imagery-cesium/ng-package.json"
-            ,              "tsConfig": "src/app/@ansyn/imagery-cesium/tsconfig.lib.prod.json"
-}
+              "project": "src/app/@ansyn/imagery-submodules/imagery-cesium/ng-package.json",
+              "tsConfig": "src/app/@ansyn/imagery-submodules/imagery-cesium/tsconfig.lib.prod.json"
+            }
           }
         }
       }
     },
     "@ansyn/imagery-video": {
-      "root": "src/app/@ansyn/imagery-video",
-      "sourceRoot": "projects/ansyn/imagery-video/src",
+      "root": "src/app/@ansyn/imagery-submodules/imagery-video",
+      "sourceRoot": "src/app/@ansyn/imagery-submodules/imagery-video/src",
       "projectType": "library",
       "prefix": "lib",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-            "tsConfig": "src/app/@ansyn/imagery-video/tsconfig.lib.json",
-            "project": "src/app/@ansyn/imagery-video/ng-package.json"
+            "tsConfig": "src/app/@ansyn/imagery-submodules/imagery-video/tsconfig.lib.json",
+            "project": "src/app/@ansyn/imagery-submodules/imagery-video/ng-package.json"
           },
           "configurations": {
             "production": {
-              "project": "src/app/@ansyn/imagery-video/ng-package.json"
-            ,              "tsConfig": "src/app/@ansyn/imagery-video/tsconfig.lib.prod.json"
-}
+              "project": "src/app/@ansyn/imagery-submodules/imagery-video/ng-package.json",
+              "tsConfig": "src/app/@ansyn/imagery-submodules/imagery-video/tsconfig.lib.prod.json"
+            }
           }
         }
       }
     },
     "@ansyn/imagery": {
-      "root": "src/app/@ansyn/imagery",
-      "sourceRoot": "src/app/@ansyn/imagery",
+      "root": "src/app/@ansyn/imagery-submodules/imagery",
+      "sourceRoot": "src/app/@ansyn/imagery-submodules/imagery/src",
       "projectType": "library",
       "prefix": "lib",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
-            "tsConfig": "src/app/@ansyn/imagery/tsconfig.lib.json",
-            "project": "src/app/@ansyn/imagery/ng-package.json"
+            "tsConfig": "src/app/@ansyn/imagery-submodules/imagery/tsconfig.lib.json",
+            "project": "src/app/@ansyn/imagery-submodules/imagery/ng-package.json"
           },
           "configurations": {
             "production": {
-              "project": "src/app/@ansyn/imagery/ng-package.json"
-            ,              "tsConfig": "src/app/@ansyn/imagery/tsconfig.lib.prod.json"
-}
+              "project": "src/app/@ansyn/imagery-submodules/imagery/ng-package.json",
+              "tsConfig": "src/app/@ansyn/imagery-submodules/imagery/tsconfig.lib.prod.json"
+            }
           }
         }
       }

confd/conf.d/production.toml

@@ -38,5 +38,6 @@ keys = [
 	"/ansyn/logger/disconnection/minutes",
 	"/ansyn/airbus/baseurl",
     "/ansyn/overlay/airbus/inactive",
-    "/ansyn/overlay/imageryvideo/inactive"
+    "/ansyn/overlay/imageryvideo/inactive",
+    "/ansyn/show/one2one"
 ]

confd/templates/production.tmpl

@@ -103,7 +103,6 @@
 
 			 ]
 		   },
-		   "contextEntities": null,
 		   "overlaysManualProcessArgs": {  }
 		 }
 	   },
@@ -141,6 +140,7 @@
 	}
   },
   "mapFacadeConfig": {
+  	"showOne2One": {{ getv "/ansyn/show/one2one" "true" }},
   	"welcomeNotification": {
 		"headerText": "Welcome to AnSyn!",
 		"mainText": "To get overlays anywhere in the world, just right click on the wanted area and click the central button"
@@ -256,6 +256,9 @@
 		"tilesServerUrl": "http://marco-polo.imisight.net/mp-gw/"
 	},
   	"ESRI_4326": { },
+	"SENTINEL": {
+		"url": "http://ansyn.webiks.com:89/api/wms"
+	},
 
     "CESIUM_GEO_SERVER": { }
   },
@@ -299,9 +302,6 @@
 		}
     ]
   },
-  "contextConfig": {
-    "schema": "contexts"
-  },
   "OverlayStatusConfig": {
   	"ImageProcParams": [
 	  {
@@ -340,6 +340,10 @@
     "ShadowMouse": {
     	"activeByDefault": {{ getv "/ansyn/is/shadow/active" "false"}},
     	"forceSendShadowMousePosition": {{ getv "/ansyn/force/send/shadow/mouse/position" "false"}}
+    },
+    "exportMap": {
+    	"target": "ansyn-imageries-manager",
+    	"excludeClasses": ["ol-attribution", "sentinel-combo"]
     }
   },
   "loggerConfig": {
@@ -365,7 +369,10 @@
       "enlarge": "Expand timeline",
       "quickloop": "Next overlay from the quick loop (key: Q)"
     },
-    "filters": ["sensorName", "isGeoRegistered"],
+    "filters": {
+    	"filterNames": ["sensorName", "isGeoRegistered"],
+    	"maximumOpen": 2
+    },
     "locale": "en-GB"
   },
   "coreConfig": {

custom-webpack.config.js

@@ -0,0 +1,12 @@
+/* This file was added in order to overcome a bug with Cesium and webpack (CesiumGS/cesium#8673) - it enables custom webpack config. */
+// TODO - file should be removed in Cesium future versions.
+module.exports = {
+	node: {
+		// Resolve node module use of fs
+		fs: "empty",
+		Buffer: false,
+		http: "empty",
+		https: "empty",
+		zlib: "empty"
+	}
+};