WIP Ionic 2 Rc 1/rollup migration

openchargemap · Oct 18, 2016 · 281987b · 281987b
1 parent c6fa651
commit 281987b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/App/Ionic2/ocm-app/package.json b/App/Ionic2/ocm-app/package.json
@@ -25,6 +25,7 @@
     "@ionic/storage": "^1.0.3",
     "@types/google-maps": "^3.1.28",
     "@types/googlemaps": "^3.25.35",
+    "@types/leaflet": "^1.0.35",
     "angular2-jwt": "^0.1.24",
     "cordova-plugin-camera": "^2.2.0",
     "cordova-plugin-file": "^4.2.0",

diff --git a/App/Ionic2/ocm-app/src/declarations.d.ts b/App/Ionic2/ocm-app/src/declarations.d.ts
@@ -13,6 +13,8 @@
 */
 
 /// <reference path="../node_modules/@types/googlemaps/index.d.ts" />
+/// <reference path="../node_modules/typescript-collections/dist/lib/index.d.ts" />
+/// <reference path="../node_modules/@types/leaflet/index.d.ts" />
 
 declare module '*';
 
diff --git a/App/Ionic2/ocm-app/src/providers/mapping/providers/GoogleMapsNative.ts b/App/Ionic2/ocm-app/src/providers/mapping/providers/GoogleMapsNative.ts
@@ -5,13 +5,13 @@ import { Logging, LogLevel } from './../../Logging';
 * @copyright Webprofusion Ltd http://webprofusion.com
 */
 
-/// <reference path="../../../../lib/typings/collections/collections.d.ts" />
 /// <reference path="../../../../lib/typings/cordova-plugin-googlemaps/cordova-plugin-googlemaps.d.ts" />
 
 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';
 
 
 declare var plugin: 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,6 +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';
 
 declare var google:any;
 

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,6 +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';
 
 declare var L: any;
 declare var google:any;