Massive refactor

.gitignore

@@ -1,21 +1,8 @@
-node_modules
-typings
-*.info.txt
-*.log
-*.js
-*.js.map
-!karma-test-shim.js
-!karma-test-main.js
-!karma.conf.js
-!webpack.karma.config.js
-!webpack.config.js
-.idea
-abaplan-core.iml
-/*.png
-output
-bower_components
-/assets/
-*secret.ts
-!example.*secret.ts
+/.idea/
+/.DS_STORE/
+/dist/
+/doc/
+/node_modules/
+/output/
 
-.DS_STORE
+abaplan-core.iml

.travis.yml

@@ -2,7 +2,7 @@ sudo: required
 dist: trusty
 language: node_js
 node_js:
-  - '4.2'
+  - '9.10'
 
 addons:
 apt:
@@ -21,10 +21,7 @@ before_script:
 - npm install -g typescript
 - npm install -g karma
 - npm install
-- npm install bower
-- bower install
-- grep -v '^///' < node_modules/angular-in-memory-web-api/in-memory-backend.service.d.ts > node_modules/angular-in-memory-web-api/in-memory-backend.service2.d.ts && mv node_modules/angular-in-memory-web-api/in-memory-backend.service2.d.ts node_modules/angular-in-memory-web-api/in-memory-backend.service.d.ts
-- echo "export let GOOGLE_GEOCODE_KEY = '$GOOGLE_API_KEY';" > src/app/core/secret.ts
+- echo "export let GOOGLE_GEOCODE_KEY = '$GOOGLE_API_KEY';" > src/conf/secret.ts
 - tsc
 
 script: npm test

assets/css/abaplans.css

@@ -0,0 +1,6 @@
+@media print{
+    @page {
+        margin: 0;
+        size: landscape
+    }
+}

build/webpack.config.js

@@ -0,0 +1,119 @@
+const path = require("path");
+
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+const HtmlWebpackIncludeAssetsPlugin = require('html-webpack-include-assets-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+
+// May be improved by selecting only the needed files
+const copyWebpackPluginConfig = [
+  'i18n/*.json',
+  {
+    from: 'assets/css/abaplans.css',
+    to: 'css/abaplans.css',
+  },
+];
+
+const htmlWebpackIncludeAssetsPluginConfig = {
+  assets: [
+    'css/abaplans.css',
+    '//js.arcgis.com/3.20/esri/css/esri.css',
+    '//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css',
+    '//code.jquery.com/jquery-3.3.1.min.js',
+    '//js.arcgis.com/3.20/init.js',// must be after jquery
+  ],
+  append: false
+};
+
+const HtmlWebpackPluginConfig = {
+  meta: {
+    viewport: 'width=device-width, initial-scale=1',
+  },
+  template: path.resolve(__dirname, "../src/index.html"),
+  inject: 'head',
+  chunks: [],
+};
+
+module.exports = {
+  entry: {
+    main: ["./src/app/boot.ts"],
+    vendor: [
+      // put your third party libs here
+      "@angular/common",
+      "@angular/compiler",
+      "@angular/core",
+      "@angular/http",
+      "@angular/platform-browser",
+      "@angular/platform-browser-dynamic",
+      "@angular/router",
+      "angular-in-memory-web-api",
+      "core-js",
+      "ngx-bootstrap",
+      "rxjs",
+      "zone.js"
+    ]
+  },
+  externals: [
+    function(context, request, callback) {
+      if (
+        /^dojo/.test(request) ||
+        /^dojox/.test(request) ||
+        /^dijit/.test(request) ||
+        /^esri/.test(request)
+      ) {
+        return callback(null, "amd " + request);
+      }
+      callback();
+    }
+  ],
+  module: {
+    rules: [
+      {
+        test: /\.(gif|png)$/,
+        use: {
+          loader: 'file-loader',
+          options: {
+            outputPath: "assets/",
+            publicPath: "assets/",
+          }
+        }
+      },
+      {
+        test: /\.ts$/,
+        use: [
+          {
+            loader: "ts-loader",
+            options: {
+              // disable type checker - we will use it in fork plugin
+              transpileOnly: true,
+            }
+          },
+          {
+            loader: "angular2-template-loader",
+          }
+        ],
+      },
+      {
+        test: /\.(html|css)$/,
+        loaders: "raw-loader"
+      },
+    ]
+  },
+  output: {
+    filename: "[name].bundle.js",
+    libraryTarget: "amd", // necessary for esri (arcgis)
+    path: path.resolve(__dirname, "../dist"),
+  },
+  plugins: [
+    new CopyWebpackPlugin(copyWebpackPluginConfig),
+    new ForkTsCheckerWebpackPlugin(),
+    new HtmlWebpackPlugin(HtmlWebpackPluginConfig),
+    new HtmlWebpackIncludeAssetsPlugin(htmlWebpackIncludeAssetsPluginConfig),
+  ],
+  resolve: {
+    alias: {
+      Assets: path.resolve(__dirname, "../assets"),
+    },
+    extensions: [".ts", ".tsx", ".js"]
+  }
+};

gulpfile.js

@@ -0,0 +1,10 @@
+var gulp = require('gulp');
+var cleanCompiledTypeScript = require('gulp-clean-compiled-typescript');
+
+gulp.task('clear', function () {
+	return gulp.src('./src/**/*.ts').pipe(cleanCompiledTypeScript());
+});
+
+gulp.task('default', function() {
+  console.log('No default task exists');
+});

i18n/de.json

@@ -33,9 +33,12 @@
     "draw_polygon":"Polygon",
     "draw_traits": "Linie",
     "draw_pedestrian": "Vorübergehen Fussgänger",
-    "fill": "Textur",
+    "texture_black": "Schwarz",
+    "texture_white": "Weiss",
+    "texture_water": "Wasser",
+    "texture_vegetation": "Vegetation",
     "print": "Drucken",
-    "open" : "öffnen",
+    "open" : "Öffnen",
     "save": "Sichern",
 
 "_comment": "Map",
@@ -68,7 +71,8 @@
         "itineraryEndHelp": " Dieser Befehl aus der Mode dieser Route löscht alle Inhalte eingefügt",
 
         "readId": [
-                        { "value": "Lesung" }
+                        { "value": "Lesung" },
+                        { "value": "Plan" }
                   ],
         "readDescri": "Lesung, Voreinstellung",
         "readActive": "Weise Lesung, die aktiviert ist",
@@ -89,8 +93,8 @@
         "search_lower_left":"unten links",
         "search_lower_right":"unten rechts",
         "search_center":"im Mittelpunkt",
-        "searchKilometer":"Kilometer",
-        "searchMeter":"Meter",
+        "si_unit_km":"Kilometer",
+        "si_unit_m":"Meter",
         "searchArrived":"Sie kamen",
         "searchTo":"In",
 

i18n/en.json

@@ -33,7 +33,10 @@
     "draw_polygon":"Polygon",
     "draw_traits": "Traits",
     "draw_pedestrian": "Pedestrian pathway",
-    "fill": "Texture",
+    "texture_black": "Black",
+    "texture_white": "White",
+    "texture_water": "Water",
+    "texture_vegetation": "Vegetation",
     "print": "Print",
     "open" : "Open",
     "save": "Save",
@@ -68,7 +71,8 @@
             "itineraryEndHelp": " This command exits the route mode, which removes all the inserted contents",
 
             "readId":  [
-                           { "value": "read" }
+                           { "value": "read" },
+                           { "value": "plan" }
                        ],
             "readDescri": "Read, default mode",
             "readActive": "Read Mode",
@@ -89,8 +93,8 @@
             "search_lower_left":"at the bottom left",
             "search_lower_right":"at the bottom right",
             "search_center":"in middle",
-            "searchKilometer":"kilometer",
-            "searchMeter":"meter",
+            "si_unit_km":"kilometer",
+            "si_unit_m":"meter",
             "searchArrived":"You have arrived",
             "searchTo":"to",
 

i18n/fr.json

@@ -33,7 +33,10 @@
     "draw_polygon":"Polygone",
     "draw_traits": "Traitillés",
     "draw_pedestrian": "Passage piétons",
-    "fill": "Texture",
+    "texture_black": "Noir",
+    "texture_white": "Blanc",
+    "texture_water": "Eau",
+    "texture_vegetation": "Végétation",
     "print": "Imprimer",
     "open" : "Ouvrir",
     "save": "Sauvegarder",
@@ -68,7 +71,8 @@
         "itineraryEndHelp": " Cette commande permet de sortir du mode itinéraire cela supprime tous le contenu insérer",
 
         "readId": [
-                        { "value": "lecture" }
+                        { "value": "lecture" },
+                        { "value": "plan" }
                   ],
         "readDescri": "obtenir une adresses",
         "readActive": "Mode lecture activé",
@@ -92,8 +96,8 @@
         "search_lower_left":"en bas à gauche",
         "search_lower_right":"en bas à droite",
         "search_center":"au centre",
-        "searchKilometer":"kilomètre",
-        "searchMeter":"mètres",
+        "si_unit_km":"kilomètre",
+        "si_unit_m":"mètre",
         "searchArrived":"Vous êtes arrivé",
         "searchTo":"à",
 

i18n/it.json

@@ -33,7 +33,10 @@
     "draw_polygon": "Poligono",
     "draw_traits": "puntinato",
     "draw_pedestrian": "Passaggio pedoni",
-    "fill": "Struttura",
+    "texture_black": "Nero",
+    "texture_white": "Bianco",
+    "texture_water": "Acqua",
+    "texture_vegetation": "Vegetazione",
     "print": "Stampare",
     "open": "Aprire",
     "save": "Salvaguardare",
@@ -68,7 +71,8 @@
         "itineraryEndHelp": " Questo ordine permette di estrarre del modo itinerario ciò sopprimo tutto il contenuto inserire",
 
         "readId": [
-                        { "value": "lettura" }
+                        { "value": "lettura" },
+                        { "value": "piano" }
                   ],
        "readDescri": "ottenere un indirizzi", 
        "readActive": "Moda lettura attivata",
@@ -91,8 +95,8 @@
         "search_lower_left":"in basso a sinistra",
         "search_lower_right":"in basso a destra",
         "search_center":"al centro",
-        "searchKilometer":"chilometro",
-        "searchMeter":"metri",
+        "si_unit_km":"chilometro",
+        "si_unit_m":"metri",
         "searchArrived":"sei arrivato",
         "searchTo":"al",