AW-1301 Upgrade to version 9 of Angular.

AW-1301 Initial project based on FarmMapsLib.
Fix wrapping
2020-06-10 13:26:44 +02:00 · 2020-06-10 13:21:03 +02:00 · 2020-05-29 10:00:53 +02:00 · 2020-05-27 10:57:25 +02:00 · 2020-05-27 09:14:43 +02:00 · 2020-05-26 18:19:46 +02:00
57 changed files with 10279 additions and 5339 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ speed-measure-plugin.json
 *.launch
 .settings/
 *.sublime-workspace
+.vs/*

 # IDE - VSCode
 .vscode/*
@@ -44,3 +45,5 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+projects/common/node_modules/
+projects/common-map/node_modules/
--- a/.npmrc
+++ b/.npmrc
@@ -0,0 +1 @@
+@FarmMaps:registry=https://repository.akkerweb.nl/repository/npm-group/
--- a/Jenkinsfile.develop
+++ b/Jenkinsfile.develop
@@ -0,0 +1,47 @@
+pipeline {
+  agent any
+  environment {
+     PACKAGE_VERSION_PREFIX=sh(script: 'jq .version package.json |sed "s/\\"//g"', returnStdout: true).trim()
+     PACKAGE_VERSION="${PACKAGE_VERSION_PREFIX + '-prerelease.' + env.BUILD_NUMBER}"
+  }
+  stages {
+    stage('npm install'){
+      steps {
+        sh '''npm install
+        cd projects/common
+        npm install
+        cd ../common-map
+        npm install
+        '''
+      }
+    }
+    stage('build'){
+      steps {
+        sh '''ng build common
+        ng build common-map'''
+      }
+    }
+    stage('npm publish'){
+      steps {
+        sh '''cd dist/common
+        npm version ${PACKAGE_VERSION}
+        npm publish
+        cd ../common-map
+        npm version ${PACKAGE_VERSION}
+        npm publish'''
+      }
+    }
+
+  }
+  post {
+    always {
+      emailext (
+        body: '${DEFAULT_CONTENT}',
+        mimeType: 'text/html',
+        replyTo: '${DEFAULT_REPLYTO}',
+        subject: '${DEFAULT_SUBJECT}',
+        to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
+      )
+    }
+  }
+}
--- a/README.md
+++ b/README.md
@@ -1,33 +1,59 @@
-# FarmmapsLibApp
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.8.
-
-##Add a new library
-Run `ng generate library lib-name --prefix=farmmaps` to add a new library in the `farmmaps` namespace. Build the library `ng build lib-name`. 
-
-##Add a new component
-Run `ng generate component component-name --project=lib-name` to add a new component in a library. Export the new component from the library’s module. Add the new component to the entry file of the library (`public_api.ts`). Rebuild the library. Import the module in the consumer and use `<farmmaps-component-name></farmmaps-component-name>`.
-
-## Development server
-
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
-
-## Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
-
-## Build
-
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
-
-## Running unit tests
-
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+# Farmmaps viewer
+
+This is a sample FarmMaps client in Angular 7.x.
+
+
+## Quick start
+
+Use one of the two options below to get started.
+
+## Option 1, Using docker
+
+*Dependencies*  
+
+* docker desktop
+
+*Setup*
+
+```
+docker pull node:12.13.1
+docker run -t -i --entrypoint /bin/bash -p 4200:4200 node:12.13.1
+```
+
+Inside the running container 
+```
+git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
+cd FarmMapsLib
+npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
+npm install -g @angular/cli
+npm install
+ng serve --host 0.0.0.0
+```
+*Go*
+
+Point your browser to http://localhost:4200
+
+## Option 2, Using local machine
+
+*Dependencies*
+
+* npm 6.9.0
+* nodejs 10.16.0
+* git
+
+*Setup*
+
+```
+git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
+cd FarmMapsLib
+npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
+npm install -g @angular/cli
+npm install
+ng serve
+```
+*Go*
+
+Point your browser to http://localhost:4200
+
+
+
--- a/angular.json
+++ b/angular.json
@@ -13,17 +13,35 @@
        "build": {
          "builder": "@angular-devkit/build-angular:browser",
          "options": {
+            "aot": true,
            "outputPath": "dist/farmmaps-lib-app",
            "index": "src/index.html",
            "main": "src/main.ts",
            "polyfills": "src/polyfills.ts",
            "tsConfig": "src/tsconfig.app.json",
            "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "**/*",
+                "input":"src/assets/images",
+                "output":"/images"
+              },
+              {
+                "glob": "silent-refresh.html",
+                "input":"src/assets",
+                "output":"/"
+              },
+              {
+                "glob": "favicon.ico",
+                "input":"src/assets",
+                "output":"/"
+              },
+              "src/configuration.json"
            ],
            "styles": [
-              "src/styles.css"
+              "src/styles.css",
+              "node_modules/bootstrap/dist/css/bootstrap.min.css",
+              "node_modules/font-awesome/css/font-awesome.min.css",              
+              "fonts/FMIconFont/style.css"
            ],
            "scripts": [],
            "es5BrowserSupport": true
@@ -49,7 +67,11 @@
                {
                  "type": "initial",
                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumError": "7mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
                }
              ]
            }
@@ -131,33 +153,78 @@
        }
      }
    },
-    "material": {
-      "root": "projects/material",
-      "sourceRoot": "projects/material/src",
+    "common": {
+      "root": "projects/common",
+      "sourceRoot": "projects/common/src",
      "projectType": "library",
-      "prefix": "farmmaps",
+      "prefix": "fm",
      "architect": {
        "build": {
          "builder": "@angular-devkit/build-ng-packagr:build",
          "options": {
-            "tsConfig": "projects/material/tsconfig.lib.json",
-            "project": "projects/material/ng-package.json"
+            "tsConfig": "projects/common/tsconfig.lib.json",
+            "project": "projects/common/ng-package.json"           
          }
-        },
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "projects/common/tsconfig.lib.prod.json"
+            }
+          }
+},
        "test": {
          "builder": "@angular-devkit/build-angular:karma",
          "options": {
-            "main": "projects/material/src/test.ts",
-            "tsConfig": "projects/material/tsconfig.spec.json",
-            "karmaConfig": "projects/material/karma.conf.js"
+            "main": "projects/common/src/test.ts",
+            "tsConfig": "projects/common/tsconfig.spec.json",
+            "karmaConfig": "projects/common/karma.conf.js"
          }
        },
        "lint": {
          "builder": "@angular-devkit/build-angular:tslint",
          "options": {
            "tsConfig": [
-              "projects/material/tsconfig.lib.json",
-              "projects/material/tsconfig.spec.json"
+              "projects/common/tsconfig.lib.json",
+              "projects/common/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "common-map": {
+      "root": "projects/common-map",
+      "sourceRoot": "projects/common-map/src",
+      "projectType": "library",
+      "prefix": "fm-map",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-ng-packagr:build",
+          "options": {
+            "tsConfig": "projects/common-map/tsconfig.lib.json",
+            "project": "projects/common-map/ng-package.json"
+          }
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "projects/common-map/tsconfig.lib.prod.json"
+            }
+          }
+},
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "projects/common-map/src/test.ts",
+            "tsConfig": "projects/common-map/tsconfig.spec.json",
+            "karmaConfig": "projects/common-map/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "projects/common-map/tsconfig.lib.json",
+              "projects/common-map/tsconfig.spec.json"
            ],
            "exclude": [
              "**/node_modules/**"
--- a/src/browserslist
+++ b/src/browserslist
@@ -1,11 +1,11 @@
-# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-#
-# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
-
-> 0.5%
-last 2 versions
-Firefox ESR
-not dead
+# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+#
+# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
 not IE 9-11
--- a/fonts/FMIconFont/FMIconFont.svg
+++ b/fonts/FMIconFont/FMIconFont.svg
--- a/fonts/FMIconFont/FMIconFont.ttf
+++ b/fonts/FMIconFont/FMIconFont.ttf
--- a/fonts/FMIconFont/FMIconFont.woff
+++ b/fonts/FMIconFont/FMIconFont.woff
--- a/fonts/FMIconFont/FMIconFont.woff2
+++ b/fonts/FMIconFont/FMIconFont.woff2
--- a/fonts/FMIconFont/style.css
+++ b/fonts/FMIconFont/style.css
@@ -0,0 +1,32 @@
+/* font converted using font-converter.net. thank you! */
+
+.fm {
+  display: inline-block;
+  font-style: normal;
+  font-variant-ligatures: normal;
+  font-variant-caps: normal;
+  font-variant-numeric: normal;
+  font-variant-east-asian: normal;
+  font-weight: normal;
+  font-stretch: normal;
+  font-size: inherit;
+  line-height: 1;
+  font-family: FarmMaps;
+  text-rendering: auto;
+}
+
+.fm-farm:before {
+  content: "a";
+}
+
+.fm-potato:before {
+  content: "b";
+}
+
+@font-face {
+  font-family: "FarmMaps";
+  src: url("./FMIconFont.woff") format("woff"), /* Modern Browsers */
+  url("./FMIconFont.woff2") format("woff2"); /* Modern Browsers */
+  font-weight: normal;
+  font-style: normal;
+}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "farmmaps-lib-app",
-  "version": "0.0.0",
+  "version": "0.0.1",
  "scripts": {
    "ng": "ng",
    "start": "ng serve",
@@ -11,42 +11,56 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "~7.2.0",
-    "@angular/common": "~7.2.0",
-    "@angular/compiler": "~7.2.0",
-    "@angular/core": "~7.2.0",
-    "@angular/forms": "~7.2.0",
-    "@angular/platform-browser": "~7.2.0",
-    "@angular/platform-browser-dynamic": "~7.2.0",
-    "@angular/router": "~7.2.0",
-    "core-js": "^2.5.4",
-    "rxjs": "~6.3.3",
-    "tslib": "^1.9.0",
-    "zone.js": "~0.8.26"
+    "@angular/animations": "~9.1.10",
+    "@angular/common": "~9.1.10",
+    "@angular/compiler": "~9.1.10",
+    "@angular/core": "~9.1.10",
+    "@angular/forms": "~9.1.10",
+    "@angular/platform-browser": "~9.1.10",
+    "@angular/platform-browser-dynamic": "~9.1.10",
+    "@angular/router": "~9.1.10",
+    "@microsoft/signalr": "^3.1.3",
+    "@farmmaps/common": ">=0.0.1-prerelease.267 <0.0.1",
+    "@farmmaps/common-map": ">=0.0.1-prerelease.267 <0.0.1",
+    "@ng-bootstrap/ng-bootstrap": "^6.0",
+    "@ngrx/effects": "^9.0",
+    "@ngrx/router-store": "^9.0",
+    "@ngrx/store": "^9.0",
+    "ngx-uploadx": "^3.3.4",
+    "angular-oauth2-oidc": "^9.1",
+    "bootstrap": "^4.4.1",
+    "core-js": "^2.6.11",
+    "font-awesome": "^4.7.0",
+    "ngrx-store-localstorage": "^9.0",
+    "resumablejs": "^1.1.0",
+    "rxjs": "^6.5.4",
+    "tassign": "^1.0.0",
+    "tslib": "^1.10.0",
+    "zone.js": "~0.10.2",
+    "ngx-openlayers": "1.0.0-next.13",
+    "ol": "6.1.1"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.13.0",
-    "@angular-devkit/build-ng-packagr": "~0.13.0",
-    "@angular/cli": "~7.3.8",
-    "@angular/compiler-cli": "~7.2.0",
-    "@angular/language-service": "~7.2.0",
-    "@types/node": "~8.9.4",
+    "@angular-devkit/build-angular": "~0.901.7",
+    "@angular-devkit/build-ng-packagr": "~0.901.7",
+    "@angular/cli": "^9.1.7",
+    "@angular/compiler-cli": "~9.1.10",
+    "@angular/language-service": "~9.1.10",
    "@types/jasmine": "~2.8.8",
    "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "~4.5.0",
+    "@types/node": "^12.11.1",
+    "codelyzer": "^5.1.2",
    "jasmine-core": "~2.99.1",
    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.0.0",
+    "karma": "^5.0.2",
    "karma-chrome-launcher": "~2.2.0",
    "karma-coverage-istanbul-reporter": "~2.0.1",
    "karma-jasmine": "~1.1.2",
    "karma-jasmine-html-reporter": "^0.2.2",
-    "ng-packagr": "^4.2.0",
-    "protractor": "~5.4.0",
-    "ts-node": "~7.0.0",
-    "tsickle": ">=0.34.0",
-    "tslib": "^1.9.0",
+    "ng-packagr": "^9.0.0",
+    "protractor": "^5.4.4",
+    "ts-node": "^8.8.1",
    "tslint": "~5.11.0",
-    "typescript": "~3.2.2"
+    "typescript": "~3.8.3"
  }
 }
--- a/projects/material/README.md
+++ b/projects/material/README.md
@@ -1,24 +0,0 @@
-# Material
-
-This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.0.
-
-## Code scaffolding
-
-Run `ng generate component component-name --project material` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project material`.
-> Note: Don't forget to add `--project material` or else it will be added to the default project in your `angular.json` file. 
-
-## Build
-
-Run `ng build material` to build the project. The build artifacts will be stored in the `dist/` directory.
-
-## Publishing
-
-After building your library with `ng build material`, go to the dist folder `cd dist/material` and run `npm publish`.
-
-## Running unit tests
-
-Run `ng test material` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
--- a/projects/material/karma.conf.js
+++ b/projects/material/karma.conf.js
@@ -1,32 +0,0 @@
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/1.0/config/configuration-file.html
-
-module.exports = function (config) {
-  config.set({
-    basePath: '',
-    frameworks: ['jasmine', '@angular-devkit/build-angular'],
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
-      require('@angular-devkit/build-angular/plugins/karma')
-    ],
-    client: {
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
-    },
-    coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, '../../coverage/material'),
-      reports: ['html', 'lcovonly'],
-      fixWebpackSourcePaths: true
-    },
-    reporters: ['progress', 'kjhtml'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: true,
-    browsers: ['Chrome'],
-    singleRun: false,
-    restartOnFileChange: true
-  });
-};
--- a/projects/material/ng-package.json
+++ b/projects/material/ng-package.json
@@ -1,7 +0,0 @@
-{
-  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../dist/material",
-  "lib": {
-    "entryFile": "src/public-api.ts"
-  }
-}
--- a/projects/material/package.json
+++ b/projects/material/package.json
@@ -1,8 +0,0 @@
-{
-  "name": "material",
-  "version": "0.0.1",
-  "peerDependencies": {
-    "@angular/common": "^7.2.0",
-    "@angular/core": "^7.2.0"
-  }
-}
--- a/projects/material/src/lib/cropfield-selector/cropfield-selector.component.css
+++ b/projects/material/src/lib/cropfield-selector/cropfield-selector.component.css
--- a/projects/material/src/lib/cropfield-selector/cropfield-selector.component.html
+++ b/projects/material/src/lib/cropfield-selector/cropfield-selector.component.html
@@ -1,3 +0,0 @@
-<p>
-  cropfield-selector works!
-</p>
--- a/projects/material/src/lib/cropfield-selector/cropfield-selector.component.ts
+++ b/projects/material/src/lib/cropfield-selector/cropfield-selector.component.ts
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'farmmaps-cropfield-selector',
-  templateUrl: './cropfield-selector.component.html',
-  styleUrls: ['./cropfield-selector.component.css']
-})
-export class CropfieldSelectorComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
--- a/projects/material/src/lib/material.component.ts
+++ b/projects/material/src/lib/material.component.ts
@@ -1,19 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'farmmaps-material',
-  template: `
-    <p>
-      material works!
-    </p>
-  `,
-  styles: []
-})
-export class MaterialComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}
--- a/projects/material/src/lib/material.module.ts
+++ b/projects/material/src/lib/material.module.ts
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { MaterialComponent } from './material.component';
-import { CropfieldSelectorComponent } from './cropfield-selector/cropfield-selector.component';
-
-@NgModule({
-  declarations: [
-    MaterialComponent,
-    CropfieldSelectorComponent
-  ],
-  imports: [
-  ],
-  exports: [
-    MaterialComponent,
-    CropfieldSelectorComponent
-  ]
-})
-export class MaterialModule { }
--- a/projects/material/src/lib/material.service.spec.ts
+++ b/projects/material/src/lib/material.service.spec.ts
@@ -1,12 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { MaterialService } from './material.service';
-
-describe('MaterialService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
-
-  it('should be created', () => {
-    const service: MaterialService = TestBed.get(MaterialService);
-    expect(service).toBeTruthy();
-  });
-});
--- a/projects/material/src/lib/material.service.ts
+++ b/projects/material/src/lib/material.service.ts
@@ -1,9 +0,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class MaterialService {
-
-  constructor() { }
-}
--- a/projects/material/src/public-api.ts
+++ b/projects/material/src/public-api.ts
@@ -1,9 +0,0 @@
-/*
- * Public API Surface of material
- */
-
-export * from './lib/material.service';
-export * from './lib/material.component';
-export * from './lib/material.module';
-
-export * from './lib/cropfield-selector/cropfield-selector.component';
--- a/projects/material/src/test.ts
+++ b/projects/material/src/test.ts
@@ -1,22 +0,0 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import 'core-js/es7/reflect';
-import 'zone.js/dist/zone';
-import 'zone.js/dist/zone-testing';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
-
-declare const require: any;
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
--- a/projects/material/tsconfig.lib.json
+++ b/projects/material/tsconfig.lib.json
@@ -1,32 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../out-tsc/lib",
-    "target": "es2015",
-    "module": "es2015",
-    "moduleResolution": "node",
-    "declaration": true,
-    "sourceMap": true,
-    "inlineSources": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "importHelpers": true,
-    "types": [],
-    "lib": [
-      "dom",
-      "es2018"
-    ]
-  },
-  "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
-    "skipTemplateCodegen": true,
-    "strictMetadataEmit": true,
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true,
-    "enableResourceInlining": true
-  },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
-}
--- a/projects/material/tsconfig.spec.json
+++ b/projects/material/tsconfig.spec.json
@@ -1,17 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../out-tsc/spec",
-    "types": [
-      "jasmine",
-      "node"
-    ]
-  },
-  "files": [
-    "src/test.ts"
-  ],
-  "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
-  ]
-}
--- a/projects/material/tslint.json
+++ b/projects/material/tslint.json
@@ -1,17 +0,0 @@
-{
-  "extends": "../../tslint.json",
-  "rules": {
-    "directive-selector": [
-      true,
-      "attribute",
-      "farmmaps",
-      "camelCase"
-    ],
-    "component-selector": [
-      true,
-      "element",
-      "farmmaps",
-      "kebab-case"
-    ]
-  }
-}
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -0,0 +1,68 @@
+import { NgModule } from '@angular/core';
+import { RouterModule ,UrlSegment} from '@angular/router';
+
+import { AuthGuard,FullScreenGuard } from '@farmmaps/common';
+import { MapComponent } from '@farmmaps/common-map';
+import { LogoComponent } from './logo/logo.component';
+import { MenuComponent } from './menu/menu.component';
+import {RegisterDeviceComponent} from './registerdevice/registerdevice.component';
+import {NotImplementedComponent} from '@farmmaps/common';
+import { NavBarGuard } from 'projects/common/src/public-api';
+
+export function urlMatcher(url: UrlSegment[]) {
+  return {consumed:url};
+}
+
+const routes = [
+  {
+    path: '',
+    component: LogoComponent,
+    outlet: 'side-panel-logo'
+  },
+  {
+    path: '',
+    component: MenuComponent,
+    outlet: 'side-panel-menu'
+  },
+  {
+    path: '',
+    redirectTo: 'map',
+    pathMatch: 'full'
+  },     
+  {
+    path:'editor/:type/item/:itemcode',
+    canActivate:[NavBarGuard],
+    component: NotImplementedComponent
+  },
+  {
+    path:'viewer/:type/item/:itemcode',
+    canActivate:[NavBarGuard],
+    component: NotImplementedComponent
+  },
+  { path: 'map', canActivateChild: [AuthGuard],canActivate:[FullScreenGuard], children: [
+    {
+        path: '',
+        component: MapComponent
+    },
+    {
+        path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState',
+        component: MapComponent       
+    },
+    {
+      path: ':queryState',
+      component: MapComponent       
+  }      
+   ]},
+   {
+     path:'registerdevice/:deviceToken',
+     canActivate:[FullScreenGuard],
+     component:RegisterDeviceComponent
+   }
+];
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes,
+    { initialNavigation: true })], // ,  enableTracing: true
+  exports: [RouterModule]
+})
+export class AppRoutingModule { }
--- a/src/app/app.component.css
+++ b/src/app/app.component.css
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,25 +0,0 @@
-<!--The content below is only a placeholder and can be replaced.-->
-<div style="text-align:center">
-  <h1>
-    Welcome to {{ title }}!
-  </h1>
-  <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
-</div>
-<h2>Material Test</h2>
-<farmmaps-material></farmmaps-material>
-<h2>Material Test Cropfield Selector</h2>
-<farmmaps-cropfield-selector></farmmaps-cropfield-selector>
-<ul>
-<h2>Here are some links to help you start: </h2>
-<ul>
-  <li>
-    <h2><a target="_blank" rel="noopener" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
-  </li>
-  <li>
-    <h2><a target="_blank" rel="noopener" href="https://angular.io/cli">CLI Documentation</a></h2>
-  </li>
-  <li>
-    <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular blog</a></h2>
-  </li>
-</ul>
-
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -1,31 +0,0 @@
-import { TestBed, async } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-
-describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  });
-
-  it(`should have as title 'farmmaps-lib-app'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('farmmaps-lib-app');
-  });
-
-  it('should render title in a h1 tag', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('Welcome to farmmaps-lib-app!');
-  });
-});
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -2,9 +2,8 @@ import { Component } from '@angular/core';

@Component({
  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
+  template:'<fm-app></fm-app>'
 })
-export class AppComponent {
-  title = 'farmmaps-lib-app';
+export class AppRootComponent {
+  title = 'FarmMaps';
 }
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,18 +1,97 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-
-import { AppComponent } from './app.component';
-import { MaterialModule } from 'material';
-
-@NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule,
-    MaterialModule
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
-})
-export class AppModule { }
+import {
+  NgModule,
+  Inject,
+  APP_BOOTSTRAP_LISTENER,
+  InjectionToken, Type,
+} from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+
+import { AppCommonModule,AppCommonServiceModule,AuthConfigFactory  } from '@farmmaps/common';
+import { AppCommonMapModule} from '@farmmaps/common-map';
+
+import {AppRootComponent} from './app.component';
+
+import {StoreModule, ActionReducer,MetaReducer} from '@ngrx/store';
+import {EffectsModule, EffectSources} from '@ngrx/effects';
+import { StoreRouterConnectingModule} from '@ngrx/router-store';
+
+import {AppRoutingModule} from './app-routing.module';
+import { LogoComponent } from './logo/logo.component';
+import { MenuComponent } from './menu/menu.component';
+import {RegisterDeviceComponent} from './registerdevice/registerdevice.component';
+import { SecureOAuthStorage} from '@farmmaps/common';
+import { OAuthStorage } from 'angular-oauth2-oidc';
+import {Id4AuthconfigFactory} from './id4AuthconfigFactory';
+
+export const BOOTSTRAP_EFFECTS = new InjectionToken('Bootstrap Effects');
+
+export function bootstrapEffects(effects: Type<any>[], sources: EffectSources) {
+  return () => {
+    effects.forEach(effect => sources.addEffects(effect));
+  };
+}
+
+export function createInstances(...instances: any[]) {
+  return instances;
+}
+
+export function provideBootstrapEffects(effects: Type<any>[]) {
+  return [
+    effects,
+    {provide: BOOTSTRAP_EFFECTS, deps: effects, useFactory: createInstances},
+    {
+      provide: APP_BOOTSTRAP_LISTENER,
+      multi: true,
+      useFactory: bootstrapEffects,
+      deps: [[new Inject(BOOTSTRAP_EFFECTS)], EffectSources],
+    },
+  ];
+}
+
+// console.log all actions
+export function debug(reducer: ActionReducer<any>): ActionReducer<any> {
+  return function(state, action) {
+    console.debug('-- State', state);
+    console.debug('-- Action', action);
+ 
+    return reducer(state, action);
+  };
+}
+
+export const metaReducers: MetaReducer<any>[] = [debug];
+
+@NgModule({
+  declarations: [
+    AppRootComponent,
+    LogoComponent,
+    MenuComponent,
+    RegisterDeviceComponent
+  ],
+  imports: [
+    AppRoutingModule,
+    AppCommonModule,
+    AppCommonServiceModule.forRoot(),
+    AppCommonMapModule.forRoot(),
+    BrowserModule,
+    StoreModule.forRoot({},{metaReducers,runtimeChecks: { // TODO fix this should all be true
+			strictStateImmutability: false,
+			strictActionImmutability: false,
+			strictStateSerializability: false,
+			strictActionSerializability: false
+		}}),
+    EffectsModule.forRoot([])
+  ],
+  providers: [
+    AuthConfigFactory,
+    {
+      provide:OAuthStorage,
+      useClass:SecureOAuthStorage
+    },
+    {
+       provide:AuthConfigFactory,
+       useClass:Id4AuthconfigFactory
+     }
+   ],
+  bootstrap: [AppRootComponent]
+})
+export class AppModule { }
--- a/src/app/id4AuthconfigFactory.ts
+++ b/src/app/id4AuthconfigFactory.ts
@@ -0,0 +1,23 @@
+import { IAuthconfigFactory, AppConfig } from '@farmmaps/common';
+import { AuthConfig } from 'angular-oauth2-oidc';
+import { Injectable } from "@angular/core";
+
+@Injectable()
+export class Id4AuthconfigFactory implements IAuthconfigFactory {
+  constructor() {
+
+  }
+
+  getAuthConfig(appConfig: AppConfig): AuthConfig {
+    let authConfig: AuthConfig = new AuthConfig();
+    authConfig.issuer = appConfig.getConfig("issuer");
+    authConfig.redirectUri = window.location.origin + "/cb";
+    authConfig.clientId = appConfig.getConfig("clientId");
+    authConfig.customQueryParams = { audience: appConfig.getConfig("audience") };
+    authConfig.scope = "profile api offline_access";
+    authConfig.disableAtHashCheck = true;
+    authConfig.responseType = "code";
+    authConfig.requireHttps = appConfig.getConfig("requireHttps");
+    return authConfig;
+  }
+}
--- a/src/app/localAuthconfigFactory.ts
+++ b/src/app/localAuthconfigFactory.ts
@@ -0,0 +1,22 @@
+import {IAuthconfigFactory,AppConfig} from '@farmmaps/common';
+import {AuthConfig} from 'angular-oauth2-oidc';
+
+export class LocalAuthconfigFactory implements IAuthconfigFactory {
+    getAuthConfig(appConfig:AppConfig): AuthConfig {
+        let authConfig: AuthConfig = new AuthConfig();
+        authConfig.issuer = appConfig.getConfig("issuer");
+        authConfig.redirectUri = window.location.origin + "/cb";
+        authConfig.silentRefreshRedirectUri = window.location.origin + "/silent-refresh.html";
+        authConfig.clientId = appConfig.getConfig("clientId");
+        authConfig.customQueryParams = { audience: appConfig.getConfig("audience") };
+        authConfig.scope = "openid profile email";
+        authConfig.oidc = true;
+        authConfig.disableAtHashCheck = true;
+        authConfig.openUri = uri => {
+            window.alert("OK "+uri);
+          }
+        authConfig.requireHttps = appConfig.getConfig("requireHttps");
+        return authConfig;
+    }
+
+}
--- a/projects/material/src/lib/material.component.spec.ts
+++ b/projects/material/src/lib/material.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';

-import { MaterialComponent } from './material.component';
+import { LogoComponent } from './logo.component';

-describe('MaterialComponent', () => {
-  let component: MaterialComponent;
-  let fixture: ComponentFixture<MaterialComponent>;
+describe('LogoComponent', () => {
+  let component: LogoComponent;
+  let fixture: ComponentFixture<LogoComponent>;

  beforeEach(async(() => {
    TestBed.configureTestingModule({
-      declarations: [ MaterialComponent ]
+      declarations: [ LogoComponent ]
    })
    .compileComponents();
  }));

  beforeEach(() => {
-    fixture = TestBed.createComponent(MaterialComponent);
+    fixture = TestBed.createComponent(LogoComponent);
    component = fixture.componentInstance;
    fixture.detectChanges();
  });
--- a/src/app/logo/logo.component.ts
+++ b/src/app/logo/logo.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-logo',
+  template: '<span><img src="/images/farmmapslogo.png" /></span>',
+  styles:['img {max-height:100%;max-width:100%;align-self:center;}']
+})
+export class LogoComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
--- a/src/app/menu/menu.component.html
+++ b/src/app/menu/menu.component.html
@@ -0,0 +1,19 @@
+<div>
+    <div class="card menu-card">
+        <div class="d-flex flex-row flex-wrap">
+          <div class="shortcut-icon" (click)="handlePredefinedQuery($event,{itemType:'vnd.farmmaps.itemtype.croppingscheme'})">
+            <div class="icon rounded-circle farm-icon"><i class="fm fm-farm" aria-hidden="true"></i></div>
+            <div class="caption" i18n>Farms</div>
+          </div>   
+          <div class="shortcut-icon" (click)="handlePredefinedQuery($event,{itemType:'vnd.farmmaps.itemtype.layer'})">
+            <div class="icon rounded-circle thematic-maps-icon"><i class="fa fa-map" aria-hidden="true"></i></div>
+            <div class="caption" i18n>Thematic maps</div>
+          </div>   
+        </div>       
+    </div>    
+    <div class="card menu-card">
+      <ul class="navbar-nav">
+        <li class="nav-item py-0" *fm-haspackage="'vnd.farmmaps.package.agriroute'"><a [routerLinkActive]="['active']" [routerLink]="['/agrirouter']" class="nav-link"><span><i class="fa fa-plug" aria-hidden="true"></i> <span i18n>agrirouter</span></span></a></li>
+      </ul>
+    </div> 
+</div>
--- a/src/app/menu/menu.component.scss
+++ b/src/app/menu/menu.component.scss
@@ -0,0 +1,39 @@
+.menu-card {
+    padding-left:7px;
+    padding-right:7px;
+    margin-bottom:7px;
+  }
+
+  .shortcut-icon {
+    display: inline-block;
+    text-align: center;
+    margin: 0.5rem;
+    cursor:pointer;
+  }
+  
+  .shortcut-icon > .icon {
+    width: 3rem;
+    height: 3rem;
+    background-color: #731e64;
+    display: inline-block;
+    text-align: center;
+    line-height: 3rem;
+    color: #ffffff;
+    font-size: 2rem;
+  }
+  
+  .shortcut-icon > .caption {
+    text-align: center;
+    width: 4rem;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: theme-color();
+  }
+  
+  .shortcut-icon > .farm-icon {
+    background-color: #731E64;
+  }
+  
+  .shortcut-icon > .trijntje-icon {
+    background-color: #FAA33F;
+  }
--- a/projects/material/src/lib/cropfield-selector/cropfield-selector.component.spec.ts
+++ b/projects/material/src/lib/cropfield-selector/cropfield-selector.component.spec.ts
@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';

-import { CropfieldSelectorComponent } from './cropfield-selector.component';
+import { MenuComponent } from './menu.component';

-describe('CropfieldSelectorComponent', () => {
-  let component: CropfieldSelectorComponent;
-  let fixture: ComponentFixture<CropfieldSelectorComponent>;
+describe('MenuComponent', () => {
+  let component: MenuComponent;
+  let fixture: ComponentFixture<MenuComponent>;

  beforeEach(async(() => {
    TestBed.configureTestingModule({
-      declarations: [ CropfieldSelectorComponent ]
+      declarations: [ MenuComponent ]
    })
    .compileComponents();
  }));

  beforeEach(() => {
-    fixture = TestBed.createComponent(CropfieldSelectorComponent);
+    fixture = TestBed.createComponent(MenuComponent);
    component = fixture.componentInstance;
    fixture.detectChanges();
  });
--- a/src/app/menu/menu.component.ts
+++ b/src/app/menu/menu.component.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import {Router} from '@angular/router';
+import {mapReducers} from '@farmmaps/common-map';
+import {StateSerializerService} from '@farmmaps/common';
+import { tassign } from 'tassign';
+
+@Component({
+  selector: 'app-menu',
+  templateUrl: './menu.component.html',
+  styleUrls: ['./menu.component.scss']
+})
+export class MenuComponent {
+  
+
+  constructor( private stateSerializerService:StateSerializerService,private router:Router ) { }
+
+  handlePredefinedQuery(event: MouseEvent, query: any) {
+    event.preventDefault();
+    var queryState = this.stateSerializerService.serialize(tassign(mapReducers.initialQueryState, query));
+    this.router.navigate(['map',queryState])
+  }
+}
--- a/src/app/registerdevice/registerdevice.component.html
+++ b/src/app/registerdevice/registerdevice.component.html
@@ -0,0 +1,5 @@
+<div class="container text-center pt-10">   
+    <img class="logo" src="/images/farmmapslogo.png" alt="FarmMaps logo"> 
+    <div class="message" i18n>To register this device<br/> download the FarmMaps app and create an account or login. <br/><br/>Next scan this QR code with the function "Register device" from the menu</div>
+    <a href="https://play.google.com/store/apps/details?id=ag.farmmaps.app"><img class="play-badge" src="/images/google-play-badge.png" alt="Get it on google play"></a>  
+</div>
--- a/src/app/registerdevice/registerdevice.component.scss
+++ b/src/app/registerdevice/registerdevice.component.scss
@@ -0,0 +1,32 @@
+.container {
+  width:100%;
+  height:100;
+  padding-top: 5em;
+}
+
+.logo {
+  max-width: 80%;
+  margin-bottom: 1.5em;
+}
+
+.play-badge {
+  margin-top: 1.5em;
+  max-width: 45%;
+}
+
+.message {
+  margin:auto;
+  font-size: 1.5em;
+  line-height: 1.5em;
+  max-width: 90%;
+}
+
+@media screen and (min-width:44rem) {
+  .logo {
+    max-width: 22rem;
+  }
+
+  .play-badge {
+    max-width: 10rem;
+  }
+}
--- a/src/app/registerdevice/registerdevice.component.ts
+++ b/src/app/registerdevice/registerdevice.component.ts
@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'registerdevice',
+  templateUrl: './registerdevice.component.html',
+  styleUrls: ['./registerdevice.component.scss']
+})
+export class RegisterDeviceComponent implements OnInit {
+  
+
+  constructor( ) { }
+
+  ngOnInit() {
+   
+  }
+}
--- a/src/assets/bootstrap.min.css
+++ b/src/assets/bootstrap.min.css
--- a/src/assets/favicon.ico
+++ b/src/assets/favicon.ico
--- a/src/assets/images/farmmapslogo.png
+++ b/src/assets/images/farmmapslogo.png
--- a/src/assets/images/google-play-badge.png
+++ b/src/assets/images/google-play-badge.png
--- a/src/assets/silent-refresh.html
+++ b/src/assets/silent-refresh.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <script>
+    parent.postMessage(location.hash, location.origin);
+  </script>
+</body>
+</html>
--- a/src/configuration.json
+++ b/src/configuration.json
@@ -0,0 +1,9 @@
+{
+    "issuer": "https://accounts.farmmaps.awtest.nl",
+    "clientId": "farmmapsdev",
+    "audience": "https://farmmaps.awtest.nl/",
+    "requireHttps": true,
+    "apiEndPoint": "https://farmmaps.awtest.nl",
+    "grantType":"code"
+}
+  
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -43,7 +43,7 @@
 *
 * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
 * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- * (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
 *
 *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
 *  with the following flag, it will bypass `zone.js` patch for IE/Edge
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@@ -4,8 +4,14 @@
    "outDir": "../out-tsc/app",
    "types": []
  },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
-  ]
+  "files": [
+    "main.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "src/**/*.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "enableIvy": false
+  }
 }
--- a/src/tsconfig.spec.json
+++ b/src/tsconfig.spec.json
@@ -1,18 +1,18 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../out-tsc/spec",
-    "types": [
-      "jasmine",
-      "node"
-    ]
-  },
-  "files": [
-    "test.ts",
-    "polyfills.ts"
-  ],
-  "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
-  ]
-}
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,15 +2,16 @@
  "compileOnSave": false,
  "compilerOptions": {
    "baseUrl": "./",
+    "downlevelIteration": true,
    "outDir": "./dist/out-tsc",
    "sourceMap": true,
    "declaration": false,
-    "module": "es2015",
+    "module": "esnext",
    "moduleResolution": "node",
    "emitDecoratorMetadata": true,
    "experimentalDecorators": true,
    "importHelpers": true,
-    "target": "es5",
+    "target": "es2015",
    "typeRoots": [
      "node_modules/@types"
    ],
@@ -19,11 +20,11 @@
      "dom"
    ],
    "paths": {
-      "material": [
-        "dist/material"
+      "common-map": [
+        "dist/common-map"
      ],
-      "material/*": [
-        "dist/material/*"
+      "common-map/*": [
+        "dist/common-map/*"
      ]
    }
  }
--- a/tslint.json
+++ b/tslint.json
@@ -1,75 +1,75 @@
-{
-  "extends": "tslint:recommended",
-  "rulesDirectory": [
-    "codelyzer"
-  ],
-  "rules": {
-    "array-type": false,
-    "arrow-parens": false,
-    "deprecation": {
-      "severity": "warn"
-    },
-    "import-blacklist": [
-      true,
-      "rxjs/Rx"
-    ],
-    "interface-name": false,
-    "max-classes-per-file": false,
-    "max-line-length": [
-      true,
-      140
-    ],
-    "member-access": false,
-    "member-ordering": [
-      true,
-      {
-        "order": [
-          "static-field",
-          "instance-field",
-          "static-method",
-          "instance-method"
-        ]
-      }
-    ],
-    "no-consecutive-blank-lines": false,
-    "no-console": [
-      true,
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
-    "no-empty": false,
-    "no-inferrable-types": [
-      true,
-      "ignore-params"
-    ],
-    "no-non-null-assertion": true,
-    "no-redundant-jsdoc": true,
-    "no-switch-case-fall-through": true,
-    "no-use-before-declare": true,
-    "no-var-requires": false,
-    "object-literal-key-quotes": [
-      true,
-      "as-needed"
-    ],
-    "object-literal-sort-keys": false,
-    "ordered-imports": false,
-    "quotemark": [
-      true,
-      "single"
-    ],
-    "trailing-comma": false,
-    "no-output-on-prefix": true,
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
-    "use-host-property-decorator": true,
-    "no-input-rename": true,
-    "no-output-rename": true,
-    "use-life-cycle-interface": true,
-    "use-pipe-transform-interface": true,
-    "component-class-suffix": true,
-    "directive-class-suffix": true
-  }
-}
+{
+  "extends": "tslint:recommended",
+  "rulesDirectory": [
+    "codelyzer"
+  ],
+  "rules": {
+    "array-type": false,
+    "arrow-parens": false,
+    "deprecation": {
+      "severity": "warn"
+    },
+    "import-blacklist": [
+      true,
+      "rxjs/Rx"
+    ],
+    "interface-name": false,
+    "max-classes-per-file": false,
+    "max-line-length": [
+      true,
+      140
+    ],
+    "member-access": false,
+    "member-ordering": [
+      true,
+      {
+        "order": [
+          "static-field",
+          "instance-field",
+          "static-method",
+          "instance-method"
+        ]
+      }
+    ],
+    "no-consecutive-blank-lines": false,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-empty": false,
+    "no-inferrable-types": [
+      true,
+      "ignore-params"
+    ],
+    "no-non-null-assertion": true,
+    "no-redundant-jsdoc": true,
+    "no-switch-case-fall-through": true,
+    "no-use-before-declare": true,
+    "no-var-requires": false,
+    "object-literal-key-quotes": [
+      true,
+      "as-needed"
+    ],
+    "object-literal-sort-keys": false,
+    "ordered-imports": false,
+    "quotemark": [
+      true,
+      "single"
+    ],
+    "trailing-comma": false,
+    "no-output-on-prefix": true,
+    "no-inputs-metadata-property": true,
+    "no-outputs-metadata-property": true,
+    "no-host-metadata-property": true,
+    "no-input-rename": true,
+    "no-output-rename": true,
+    "use-lifecycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "component-class-suffix": true,
+    "directive-class-suffix": true
+  }
+}
				`@@ -0,0 +1 @@`
				`@FarmMaps:registry=https://repository.akkerweb.nl/repository/npm-group/`