github/awesome-cordova-plugins
github/awesome-cordova-plugins
3
0
Fork 1
mirror of https://github.com/danielsogl/awesome-cordova-plugins.git synced 2025-03-17 00:51:07 +08:00
Code Issues Projects Releases Wiki Activity

refactor(google-maps): use es6 syntax

Browse Source
This commit is contained in:
Ibby Hadeed 2017-09-27 16:52:06 -04:00
parent 57af5c5e73
commit c3930c814a
1 changed files with 94 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
src/@ionic-native/plugins/google-maps/index.ts
View File

@ -649,27 +649,19 @@ export class BaseClass {
* *
* @return {Observable<any>} * @return {Observable<any>}
*/ */
@CordovaCheck({ observable: true }) @InstanceCheck({ observable: true })
addEventListener(eventName: string): Observable<any> { addEventListener(eventName: string): Observable<any> {
if (!this._objectInstance) {
return new Observable((observer) => {
observer.error({ error: 'plugin_not_installed' });
});
}
return new Observable((observer) => { return new Observable((observer) => {
var self = this; this._objectInstance.on(eventName, (...args: any[]) => {
this._objectInstance.on(eventName, function() { if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) {
var args = Array.prototype.slice.call(arguments, 0); if (args[args.length - 1].type === 'Map') {
if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) { args[args.length - 1] = this;
if (args[args.length - 1].type === 'Map') { } else {
args[args.length - 1] = self; args[args.length - 1] = this._objectInstance.getMap().get(args[args.length - 1].getId());
} else {
args[args.length - 1] = self._objectInstance.getMap().get(args[args.length - 1].getId());
}
} }
observer.next.call(observer, args); }
}); observer.next(args);
});
}); });
} }
@ -678,23 +670,18 @@ export class BaseClass {
* *
* @return {Promise<any>} * @return {Promise<any>}
*/ */
@CordovaCheck() @InstanceCheck()
addListenerOnce(eventName: string): Promise<any> { addListenerOnce(eventName: string): Promise<any> {
if (!this._objectInstance) {
return Promise.reject({ error: 'plugin_not_installed' });
}
var self = this;
return new Promise<any>((resolve) => { return new Promise<any>((resolve) => {
this._objectInstance.one(eventName, function() { this._objectInstance.one(eventName, (...args: any[]) => {
var args = Array.prototype.slice.call(arguments, 0); if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) {
if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) { if (args[args.length - 1].type === 'Map') {
if (args[args.length - 1].type === 'Map') { args[args.length - 1] = this;
args[args.length - 1] = self; } else {
} else { args[args.length - 1] = this._objectInstance.getMap().get(args[args.length - 1].getId());
args[args.length - 1] = self._objectInstance.getMap().get(args[args.length - 1].getId());
}
} }
resolve.call(self, args); }
resolve(args);
}); });
}); });
} }
@ -729,28 +716,20 @@ export class BaseClass {
* *
* @return {Observable<any>} * @return {Observable<any>}
*/ */
@CordovaCheck({ observable: true }) @InstanceCheck({ observable: true })
on(eventName: string): Observable<any> { on(eventName: string): Observable<any> {
if (!this._objectInstance) { return new Observable((observer) => {
return new Observable((observer) => { this._objectInstance.on(eventName, (...args: any[]) => {
observer.error({ error: 'plugin_not_installed' }); if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) {
}); if (args[args.length - 1].type === 'Map') {
} args[args.length - 1] = this;
} else {
return new Observable((observer) => { args[args.length - 1] = this._objectInstance.getMap().get(args[args.length - 1].getId());
var self = this;
this._objectInstance.on(eventName, function() {
var args = Array.prototype.slice.call(arguments, 0);
if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) {
if (args[args.length - 1].type === 'Map') {
args[args.length - 1] = self;
} else {
args[args.length - 1] = self._objectInstance.getMap().get(args[args.length - 1].getId());
}
} }
observer.next.call(observer, args); }
}); observer.next(args);
}); });
});
} }
/** /**
@ -758,23 +737,18 @@ export class BaseClass {
* *
* @return {Promise<any>} * @return {Promise<any>}
*/ */
@CordovaCheck() @InstanceCheck()
one(eventName: string): Promise<any> { one(eventName: string): Promise<any> {
if (!this._objectInstance) {
return Promise.reject({ error: 'plugin_not_installed' });
}
var self = this;
return new Promise<any>((resolve) => { return new Promise<any>((resolve) => {
this._objectInstance.one(eventName, function() { this._objectInstance.one(eventName, (...args: any[]) => {
var args = Array.prototype.slice.call(arguments, 0); if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) {
if (args[args.length - 1] instanceof GoogleMaps.getPlugin().BaseClass) { if (args[args.length - 1].type === 'Map') {
if (args[args.length - 1].type === 'Map') { args[args.length - 1] = this;
args[args.length - 1] = self; } else {
} else { args[args.length - 1] = this._objectInstance.getMap().get(args[args.length - 1].getId());
args[args.length - 1] = self._objectInstance.getMap().get(args[args.length - 1].getId());
}
} }
resolve.call(self, args); }
resolve(args);
}); });
}); });
} }
@ -1115,11 +1089,8 @@ export class Environment {
* @return {Promise<any>} * @return {Promise<any>}
*/ */
getLicenseInfo(): Promise<any> { getLicenseInfo(): Promise<any> {
var self = this; return new Promise<any>((resolve) => {
return new Promise<any>((resolve, reject) => { GoogleMaps.getPlugin().environment.getLicenseInfo((text: string) => resolve(text));
GoogleMaps.getPlugin().environment.getLicenseInfo((text: string) => {
resolve.call(self, text);
});
}); });
} }
@ -1151,7 +1122,7 @@ export class Geocoder {
geocode(request: GeocoderRequest): Promise<GeocoderResult[] | BaseArrayClass<GeocoderResult>> { geocode(request: GeocoderRequest): Promise<GeocoderResult[] | BaseArrayClass<GeocoderResult>> {
if (request.address instanceof Array || Array.isArray(request.address) || if (request.address instanceof Array || Array.isArray(request.address) ||
request.position instanceof Array || Array.isArray(request.position)) { request.position instanceof Array || Array.isArray(request.position)) {
// ------------------------- // -------------------------
// Geocoder.geocode({ // Geocoder.geocode({
// address: [ // address: [
@ -1486,16 +1457,11 @@ export class GoogleMap extends BaseClass {
*/ */
@CordovaInstance() @CordovaInstance()
remove(): Promise<any> { remove(): Promise<any> {
let self: GoogleMap = this; this.get('_overlays').forEach((overlayId: string) => this.set(overlayId, null));
self.get('_overlays').forEach((overlayId: string) => { this.get('_overlays').empty();
self.set(overlayId, null); this.set('_overlays', undefined);
}); return new Promise<any>((resolve) => {
self.get('_overlays').empty(); this._objectInstance.remove(() => resolve());
self.set('_overlays', undefined);
return new Promise<any>((resolve, reject) => {
self._objectInstance.remove(() => {
resolve();
});
}); });
} }
@ -1503,17 +1469,12 @@ export class GoogleMap extends BaseClass {
* Remove all overlays, such as marker * Remove all overlays, such as marker
* @return {Promise<any>} * @return {Promise<any>}
*/ */
@CordovaCheck() @InstanceCheck()
clear(): Promise<any> { clear(): Promise<any> {
let self: GoogleMap = this; this.get('_overlays').forEach((overlayId: string) => this.set(overlayId, null));
self.get('_overlays').forEach((overlayId: string) => { this.get('_overlays').empty();
self.set(overlayId, null); return new Promise<any>((resolve) => {
}); this._objectInstance.clear(() => resolve());
self.get('_overlays').empty();
return new Promise<any>((resolve, reject) => {
self._objectInstance.clear(() => {
resolve();
});
}); });
} }
@ -1603,13 +1564,12 @@ export class GoogleMap extends BaseClass {
*/ */
@InstanceCheck() @InstanceCheck()
addMarker(options: MarkerOptions): Promise<Marker | any> { addMarker(options: MarkerOptions): Promise<Marker | any> {
let self: GoogleMap = this;
return new Promise<Marker>((resolve, reject) => { return new Promise<Marker>((resolve, reject) => {
self._objectInstance.addMarker(options, (marker: any) => { this._objectInstance.addMarker(options, (marker: any) => {
if (marker) { if (marker) {
let overlay: Marker = new Marker(self, marker); const overlay: Marker = new Marker(this, marker);
self.get('_overlays').push(marker.getId()); this.get('_overlays').push(marker.getId());
self.set(marker.getId(), overlay); this.set(marker.getId(), overlay);
resolve(overlay); resolve(overlay);
} else { } else {
reject(); reject();
@ -1620,13 +1580,12 @@ export class GoogleMap extends BaseClass {
@InstanceCheck() @InstanceCheck()
addMarkerCluster(options: MarkerClusterOptions): Promise<MarkerCluster | any> { addMarkerCluster(options: MarkerClusterOptions): Promise<MarkerCluster | any> {
let self: GoogleMap = this;
return new Promise<MarkerCluster>((resolve, reject) => { return new Promise<MarkerCluster>((resolve, reject) => {
self._objectInstance.addMarkerCluster(options, (markerCluster: any) => { this._objectInstance.addMarkerCluster(options, (markerCluster: any) => {
if (markerCluster) { if (markerCluster) {
let overlay = new MarkerCluster(self, markerCluster); const overlay = new MarkerCluster(this, markerCluster);
self.get('_overlays').push(markerCluster.getId()); this.get('_overlays').push(markerCluster.getId());
self.set(markerCluster.getId(), overlay); this.set(markerCluster.getId(), overlay);
resolve(overlay); resolve(overlay);
} else { } else {
reject(); reject();
@ -1641,13 +1600,12 @@ export class GoogleMap extends BaseClass {
*/ */
@InstanceCheck() @InstanceCheck()
addCircle(options: CircleOptions): Promise<Circle | any> { addCircle(options: CircleOptions): Promise<Circle | any> {
let self: GoogleMap = this;
return new Promise<Circle>((resolve, reject) => { return new Promise<Circle>((resolve, reject) => {
self._objectInstance.addCircle(options, (circle: any) => { this._objectInstance.addCircle(options, (circle: any) => {
if (circle) { if (circle) {
let overlay = new Circle(self, circle); const overlay = new Circle(this, circle);
self.get('_overlays').push(circle.getId()); this.get('_overlays').push(circle.getId());
self.set(circle.getId(), overlay); this.set(circle.getId(), overlay);
resolve(overlay); resolve(overlay);
} else { } else {
reject(); reject();
@ -1662,13 +1620,12 @@ export class GoogleMap extends BaseClass {
*/ */
@InstanceCheck() @InstanceCheck()
addPolygon(options: PolygonOptions): Promise<Polygon | any> { addPolygon(options: PolygonOptions): Promise<Polygon | any> {
let self: GoogleMap = this;
return new Promise<Polygon>((resolve, reject) => { return new Promise<Polygon>((resolve, reject) => {
self._objectInstance.addPolygon(options, (polygon: any) => { this._objectInstance.addPolygon(options, (polygon: any) => {
if (polygon) { if (polygon) {
let overlay = new Polygon(self, polygon); const overlay = new Polygon(this, polygon);
self.get('_overlays').push(polygon.getId()); this.get('_overlays').push(polygon.getId());
self.set(polygon.getId(), overlay); this.set(polygon.getId(), overlay);
resolve(polygon); resolve(polygon);
} else { } else {
reject(); reject();
@ -1683,13 +1640,12 @@ export class GoogleMap extends BaseClass {
*/ */
@InstanceCheck() @InstanceCheck()
addPolyline(options: PolylineOptions): Promise<Polyline | any> { addPolyline(options: PolylineOptions): Promise<Polyline | any> {
let self: GoogleMap = this;
return new Promise<Polyline>((resolve, reject) => { return new Promise<Polyline>((resolve, reject) => {
self._objectInstance.addPolyline(options, (polyline: any) => { this._objectInstance.addPolyline(options, (polyline: any) => {
if (polyline) { if (polyline) {
let overlay = new Polyline(self, polyline); const overlay = new Polyline(this, polyline);
self.get('_overlays').push(polyline.getId()); this.get('_overlays').push(polyline.getId());
self.set(polyline.getId(), overlay); this.set(polyline.getId(), overlay);
resolve(overlay); resolve(overlay);
} else { } else {
reject(); reject();
@ -1703,13 +1659,12 @@ export class GoogleMap extends BaseClass {
*/ */
@InstanceCheck() @InstanceCheck()
addTileOverlay(options: TileOverlayOptions): Promise<TileOverlay | any> { addTileOverlay(options: TileOverlayOptions): Promise<TileOverlay | any> {
let self: GoogleMap = this;
return new Promise<TileOverlay>((resolve, reject) => { return new Promise<TileOverlay>((resolve, reject) => {
self._objectInstance.addTileOverlay(options, (tileOverlay: any) => { this._objectInstance.addTileOverlay(options, (tileOverlay: any) => {
if (tileOverlay) { if (tileOverlay) {
let overlay = new TileOverlay(self, tileOverlay); const overlay = new TileOverlay(this, tileOverlay);
self.get('_overlays').push(tileOverlay.getId()); this.get('_overlays').push(tileOverlay.getId());
self.set(tileOverlay.getId(), overlay); this.set(tileOverlay.getId(), overlay);
resolve(overlay); resolve(overlay);
} else { } else {
reject(); reject();
@ -1723,13 +1678,12 @@ export class GoogleMap extends BaseClass {
*/ */
@InstanceCheck() @InstanceCheck()
addGroundOverlay(options: GroundOverlayOptions): Promise<GroundOverlay | any> { addGroundOverlay(options: GroundOverlayOptions): Promise<GroundOverlay | any> {
let self: GoogleMap = this;
return new Promise<GroundOverlay>((resolve, reject) => { return new Promise<GroundOverlay>((resolve, reject) => {
self._objectInstance.addGroundOverlay(options, (groundOverlay: any) => { this._objectInstance.addGroundOverlay(options, (groundOverlay: any) => {
if (groundOverlay) { if (groundOverlay) {
let overlay = new GroundOverlay(self, groundOverlay); const overlay = new GroundOverlay(this, groundOverlay);
self.get('_overlays').push(groundOverlay.getId()); this.get('_overlays').push(groundOverlay.getId());
self.set(groundOverlay.getId(), overlay); this.set(groundOverlay.getId(), overlay);
resolve(overlay); resolve(overlay);
} else { } else {
reject(); reject();
@ -1892,23 +1846,23 @@ export class GroundOverlay extends BaseClass {
* @hidden * @hidden
*/ */
@Plugin({ @Plugin({
plugin: 'cordova-plugin-googlemaps', plugin: 'cordova-plugin-googlemaps',
pluginName: 'GoogleMaps', pluginName: 'GoogleMaps',
pluginRef: 'plugin.google.maps.HtmlInfoWindow', pluginRef: 'plugin.google.maps.HtmlInfoWindow',
repo: '' repo: ''
}) })
export class HtmlInfoWindow<T> extends IonicNativePlugin { export class HtmlInfoWindow<T> extends IonicNativePlugin {
private _objectInstance: any; private _objectInstance: any;
constructor(initialData?: any) { constructor(initialData?: any) {
super(); super();
if (checkAvailability(HtmlInfoWindow.getPluginRef(), null, HtmlInfoWindow.getPluginName()) === true) { if (checkAvailability(HtmlInfoWindow.getPluginRef(), null, HtmlInfoWindow.getPluginName()) === true) {
if (initialData instanceof GoogleMaps.getPlugin().HtmlInfoWindow) { if (initialData instanceof GoogleMaps.getPlugin().HtmlInfoWindow) {
this._objectInstance = initialData; this._objectInstance = initialData;
} else { } else {
this._objectInstance = new (HtmlInfoWindow.getPlugin())(); this._objectInstance = new (HtmlInfoWindow.getPlugin())();
} }
} }
} }
/** /**
@ -2185,11 +2139,11 @@ export class MarkerCluster extends BaseClass {
@CordovaInstance({ sync: true }) @CordovaInstance({ sync: true })
addMarkers(markers: MarkerOptions[]): void {} addMarkers(markers: MarkerOptions[]): void {}
@CordovaCheck() @InstanceCheck()
remove(): void { remove(): void {
this._objectInstance.getMap().get('_overlays').set(this.getId(), undefined); this._objectInstance.getMap().get('_overlays').set(this.getId(), undefined);
this._objectInstance.remove(); this._objectInstance.remove();
this.destroy(); this.destroy();
} }
/** /**
@ -2328,7 +2282,7 @@ export class Polygon extends BaseClass {
/** /**
* Remove the polygon. * Remove the polygon.
*/ */
@CordovaCheck() @InstanceCheck()
remove(): void { remove(): void {
this._objectInstance.getMap().get('_overlays').set(this.getId(), undefined); this._objectInstance.getMap().get('_overlays').set(this.getId(), undefined);
this._objectInstance.remove(); this._objectInstance.remove();
@ -2489,7 +2443,7 @@ export class Polyline extends BaseClass {
/** /**
* Remove the polyline * Remove the polyline
*/ */
@CordovaCheck() @InstanceCheck()
remove(): void { remove(): void {
this._objectInstance.getMap().get('_overlays').set(this.getId(), undefined); this._objectInstance.getMap().get('_overlays').set(this.getId(), undefined);
this._objectInstance.remove(); this._objectInstance.remove();