Package/depenency updates

openchargemap · Aug 29, 2017 · 5d91538 · 5d91538
1 parent 0df6ba9
commit 5d91538
Show file tree

Hide file tree

Showing 8 changed files with 4,364 additions and 2,645 deletions.
diff --git a/App/Ionic2/ocm-app/ionic.config.json b/App/Ionic2/ocm-app/ionic.config.json
@@ -1,5 +1,8 @@
 {
   "name": "ocm-app",
   "app_id": "",
-  "type": "ionic-angular"
+  "type": "ionic-angular",
+  "integrations": {
+    "cordova": {}
+  }
 }
diff --git a/App/Ionic2/ocm-app/package-lock.json b/App/Ionic2/ocm-app/package-lock.json
diff --git a/App/Ionic2/ocm-app/package.json b/App/Ionic2/ocm-app/package.json
@@ -3,8 +3,10 @@
     "scripts": {
         "build": "ionic-app-scripts build",
         "clean": "ionic-app-scripts clean",
-        "ionic:build": "ionic-app-scripts build",
-        "ionic:serve": "ionic-app-scripts serve"
+        "lint": "ionic-app-scripts lint",
+        "ionic:build": "npm run build",
+        "ionic:serve": "npm run serve",
+        "ionic:lint": "npm run lint"
     },
     "config": {},
     "dependencies": {
@@ -16,17 +18,19 @@
         "@angular/http": "4.1.3",
         "@angular/platform-browser": "4.1.3",
         "@angular/platform-browser-dynamic": "4.1.3",
-        "@ionic-native/camera": "^3.12.1",
-        "@ionic-native/core": "3.12.1",
-        "@ionic-native/keyboard": "^3.12.1",
-        "@ionic-native/splash-screen": "3.12.1",
-        "@ionic-native/status-bar": "3.12.1",
+        "@angular/tsc-wrapped": "^4.3.6",
+        "@ionic-native/camera": "^3.13.1",
+        "@ionic-native/core": "3.13.1",
+        "@ionic-native/keyboard": "^3.13.1",
+        "@ionic-native/splash-screen": "3.13.1",
+        "@ionic-native/status-bar": "3.13.1",
         "@ionic/storage": "2.0.1",
         "@ngx-translate/core": "7.0.0",
         "@ngx-translate/http-loader": "0.1.0",
         "@types/googlemaps": "3.26.14",
         "@types/leaflet": "1.0.63",
         "angular2-jwt": "0.2.3",
+        "autoprefixer": "^7.1.3",
         "buffer-shims": "^1.0.0",
         "cordova-android": "6.2.3",
         "cordova-ios": "4.4.0",
@@ -37,21 +41,19 @@
         "cordova-plugin-splashscreen": "~4.0.0",
         "cordova-plugin-statusbar": "~2.2.0",
         "cordova-plugin-whitelist": "~1.3.0",
-        "ionic-angular": "3.5.0",
+        "ionic-angular": "^3.6.0",
         "ionic-plugin-keyboard": "~2.2.1",
         "ionicons": "3.0.0",
         "leaflet": "^1.1.0",
         "linq-es5": "1.11.10",
         "node-sass": "^4.5.3",
         "rxjs": "5.4.0",
         "sw-toolbox": "3.6.0",
-        "typescript-collections": "",
+        "typescript-collections": "^1.2.3",
         "zone.js": "0.8.12"
     },
     "devDependencies": {
-        "@ionic/app-scripts": "1.3.12",
-        "@ionic/cli-plugin-cordova": "1.4.0",
-        "@ionic/cli-plugin-ionic-angular": "1.3.1",
+        "@ionic/app-scripts": "^2.1.4",
         "typescript": "2.3.4",
         "webpack-bundle-analyzer": "2.8.2"
     },
@@ -96,4 +98,4 @@
             "ionic-plugin-keyboard": {}
         }
     }
-}
+}
diff --git a/App/Ionic2/ocm-app/src/index.html b/App/Ionic2/ocm-app/src/index.html
@@ -79,8 +79,11 @@
   <!-- The polyfills js is generated during the build process -->
   <script src="build/polyfills.js"></script>
 
+    <!-- The vendor js is generated during the build process
+       and includes all files in the node_modules directory -->
+  <script src="build/vendor.js"></script>
+
   <script src="https://maps.googleapis.com/maps/api/js?libraries=places,geometry&key=AIzaSyASE98mCjV1bqG4u2AUHqftB8Vz3zr2sEg"></script>
-  <!--<script src="assets/lib/collections.js"></script>-->
 
   <!-- The bundle js is generated during the build process -->
   <script src="build/main.js"></script>

diff --git a/App/Ionic2/ocm-app/src/providers/mapping/providers/GoogleMapsNative.ts b/App/Ionic2/ocm-app/src/providers/mapping/providers/GoogleMapsNative.ts
@@ -11,7 +11,7 @@ import { Observable } from 'rxjs/Observable';
 import { Utils } from '../../../core/Utils';
 import { MappingAPI, IMapProvider, MapOptions, Mapping } from '../Mapping';
 import { Events } from 'ionic-angular';
-import * as collections from 'typescript-collections';
+import { Dictionary} from 'typescript-collections';
 
 
 declare var plugin: any;
@@ -28,7 +28,7 @@ export class GoogleMapsNative implements IMapProvider {
     mapCanvasID: string;
 
     private map: any;
-    private markerList: collections.Dictionary<number, google.maps.Marker>;
+    private markerList: Dictionary<number, google.maps.Marker>;
     private maxMarkers: number = 200;
     private markerAllocCount: number = 0;
     private polylinePath: any;
@@ -39,7 +39,7 @@ export class GoogleMapsNative implements IMapProvider {
         this.mapAPIType = MappingAPI.GOOGLE_NATIVE;
         this.mapReady = false;
         this.mapCanvasID = "map-view";
-        this.markerList = new collections.Dictionary<number, any>();
+        this.markerList = new Dictionary<number, any>();
     }
 
     /**
@@ -136,7 +136,7 @@ export class GoogleMapsNative implements IMapProvider {
                 }
             }
         }
-        this.markerList = new collections.Dictionary<number, any>();
+        this.markerList = new Dictionary<number, any>();
     }
 
     renderPOIMarkers(clearMarkersOnRefresh: boolean, poiList: Array<any>) {

diff --git a/App/Ionic2/ocm-app/src/providers/mapping/providers/GoogleMapsWeb.ts b/App/Ionic2/ocm-app/src/providers/mapping/providers/GoogleMapsWeb.ts
@@ -9,7 +9,7 @@ import { Utils } from '../../../core/Utils';
 import { MappingAPI, IMapProvider, MapOptions, Mapping } from '../Mapping';
 import { Events } from 'ionic-angular';
 import { Observable } from 'rxjs/Observable';
-import * as collections from 'typescript-collections';
+import { Dictionary } from 'typescript-collections';
 
 
 
@@ -23,7 +23,7 @@ export class GoogleMapsWeb implements IMapProvider {
     mapCanvasID: string;
 
     private map: google.maps.Map;
-    private markerList: collections.Dictionary<number, google.maps.Marker>;
+    private markerList: Dictionary<number, google.maps.Marker>;
 
     private polylinePath: google.maps.Polyline;
 
@@ -32,7 +32,7 @@ export class GoogleMapsWeb implements IMapProvider {
         this.events = events;
         this.mapAPIType = MappingAPI.GOOGLE_WEB;
         this.mapReady = false;
-        this.markerList = new collections.Dictionary<number, google.maps.Marker>();
+        this.markerList = new Dictionary<number, google.maps.Marker>();
     }
 
     /**
@@ -121,7 +121,7 @@ export class GoogleMapsWeb implements IMapProvider {
                 }
             }
         }
-        this.markerList = new collections.Dictionary<number, google.maps.Marker>();
+        this.markerList = new Dictionary<number, google.maps.Marker>();
 
     }
 

diff --git a/App/Ionic2/ocm-app/src/providers/mapping/providers/LeafletMap.ts b/App/Ionic2/ocm-app/src/providers/mapping/providers/LeafletMap.ts
@@ -8,7 +8,7 @@ import { Utils } from '../../../core/Utils';
 import { MappingAPI, IMapProvider, MapOptions, Mapping } from '../Mapping';
 import { Events } from 'ionic-angular';
 import { Observable } from 'rxjs/Observable';
-import * as collections from 'typescript-collections';
+import { Dictionary}  from 'typescript-collections';
 import L from 'leaflet';
 
 /**Map Provider for Leaflet API
@@ -21,15 +21,15 @@ export class LeafletMap implements IMapProvider {
     mapCanvasID: string;
 
     private map: L.Map;
-    private markerList: collections.Dictionary<number, any>;
+    private markerList: Dictionary<number, any>;
 
 
     /** @constructor */
     constructor(private events: Events, private logging: Logging) {
         this.events = events;
         this.mapAPIType = MappingAPI.LEAFLET;
         this.mapReady = false;
-        this.markerList = new collections.Dictionary<number, google.maps.Marker>();
+        this.markerList = new Dictionary<number, google.maps.Marker>();
     }
 
     /**
@@ -102,7 +102,7 @@ export class LeafletMap implements IMapProvider {
                 }
             }
         }
-        this.markerList = new collections.Dictionary<number, any>();
+        this.markerList = new Dictionary<number, any>();
     }
     /**
     * Renders the given array of POIs as map markers

diff --git a/App/Ionic2/ocm-app/www/index.html b/App/Ionic2/ocm-app/www/index.html
@@ -1,10 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 
-<head>
-  <script data-ionic="inject">
-    (function(w){var i=w.Ionic=w.Ionic||{};i.version='3.5.0';i.angular='4.1.3';i.staticDir='build/';})(window);
-  </script>
+<head>
   <meta charset="UTF-8">
   <title>Open Charge Map</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -82,8 +79,11 @@
   <!-- The polyfills js is generated during the build process -->
   <script src="build/polyfills.js"></script>
 
+    <!-- The vendor js is generated during the build process
+       and includes all files in the node_modules directory -->
+  <script src="build/vendor.js"></script>
+
   <script src="https://maps.googleapis.com/maps/api/js?libraries=places,geometry&key=AIzaSyASE98mCjV1bqG4u2AUHqftB8Vz3zr2sEg"></script>
-  <!--<script src="assets/lib/collections.js"></script>-->
 
   <!-- The bundle js is generated during the build process -->
   <script src="build/main.js"></script>