ztimson/map-alliance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 1 Activity

small refactors

Browse Source
This commit is contained in:
Zakary Timson
2019-09-02 11:01:52 -04:00
parent 0814bc8b10
commit 285a9ede4d
2 changed files with 119 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/services/sync.service.ts
View File

@ -12,8 +12,6 @@ export const MAP_COLLECTION = 'Maps';
providedIn: 'root'
})
export class SyncService {
private
private location;
private locationChanged = false;
private locationDoc: AngularFirestoreDocument;
@ -72,20 +70,15 @@ export class SyncService {
delete(...symbols) {
let map = this.mapData.value;
symbols.forEach(s => {
if(map.circles) map.circles = map.circles.filter(r => !_.isEqual(s, r));
if(map.markers) map.markers = map.markers.filter(r => !_.isEqual(s, r));
if(map.measurements) map.measurements = map.measurements.filter(r => !_.isEqual(s, r));
if(map.polygons) map.polygons = map.polygons.filter(r => !_.isEqual(s, r));
if(map.polylines) map.polylines = map.polylines.filter(r => !_.isEqual(s, r));
if(map.rectangles) map.rectangles = map.rectangles.filter(r => !_.isEqual(s, r));
Object.keys(map).filter(key => Array.isArray(map[key])).forEach(key => {
symbols.forEach(s => map[key] = map[key].filter(ss => !_.isEqual(s, ss)))
});
this.mapData.next(map);
this.mapChanged = true;
}
load(mapCode: string, username: string) {
this.unload();
let ignore = this.unload();
this.mapDoc = this.db.collection(MAP_COLLECTION).doc(mapCode);
this.locationDoc = this.mapDoc.collection(LOCATION_COLLECTION).doc(username);
@ -121,11 +114,6 @@ export class SyncService {
return map;
}
removeMyLocation() {
this.location = null;
return this.locationDoc.delete();
}
save(locationOnly?) {
if(this.locationDoc && this.locationChanged) {
let ignore = this.locationDoc.set(this.location);
@ -155,8 +143,8 @@ export class SyncService {
}
if(this.locationDoc) {
this.location = null;
this.locationChanged = false;
await this.removeMyLocation();
this.locationDoc = null;
}
}