+
-
Searching for:
-
+
@@ -29,11 +29,11 @@
-
+
-
+
diff --git a/frontend/app/gallery/gallery.component.ts b/frontend/app/gallery/gallery.component.ts
index 79837fb..283b9e3 100644
--- a/frontend/app/gallery/gallery.component.ts
+++ b/frontend/app/gallery/gallery.component.ts
@@ -35,12 +35,16 @@ export class GalleryComponent implements OnInit {
return;
}
- const dirSorter = (a: DirectoryDTO, b: DirectoryDTO) => {
- return a.name.localeCompare(b.name);
- };
+ this._galleryService.content.subscribe((content) => {
+ const dirSorter = (a: DirectoryDTO, b: DirectoryDTO) => {
+ return a.name.localeCompare(b.name);
+ };
+ const dirs =
(content.searchResult || content.directory || {directories: []}).directories;
+ this.directories = dirs.sort(dirSorter);
+ });
this._route.params
- .subscribe(async (params: Params) => {
+ .subscribe((params: Params) => {
let searchText = params['searchText'];
if (searchText && searchText != "") {
console.log("searching");
@@ -49,13 +53,11 @@ export class GalleryComponent implements OnInit {
if (typeString && typeString != "") {
console.log("with type");
let type: SearchTypes = SearchTypes[typeString];
- await this._galleryService.search(searchText, type);
- this.directories = this._galleryService.content.searchResult.directories.sort(dirSorter);
+ this._galleryService.search(searchText, type);
return;
}
- await this._galleryService.search(searchText);
- this.directories = this._galleryService.content.searchResult.directories.sort(dirSorter);
+ this._galleryService.search(searchText);
return;
}
@@ -63,8 +65,7 @@ export class GalleryComponent implements OnInit {
let directoryName = params['directory'];
directoryName = directoryName ? directoryName : "";
- await this._galleryService.getDirectory(directoryName);
- this.directories = this._galleryService.content.directory.directories.sort(dirSorter);
+ this._galleryService.getDirectory(directoryName);
});
diff --git a/frontend/app/gallery/gallery.service.ts b/frontend/app/gallery/gallery.service.ts
index e378d11..c354e9a 100644
--- a/frontend/app/gallery/gallery.service.ts
+++ b/frontend/app/gallery/gallery.service.ts
@@ -6,59 +6,64 @@ import {PhotoDTO} from "../../../common/entities/PhotoDTO";
import {DirectoryDTO} from "../../../common/entities/DirectoryDTO";
import {SearchTypes} from "../../../common/entities/AutoCompleteItem";
import {GalleryCacheService} from "./cache.gallery.service";
+import {BehaviorSubject} from "rxjs/BehaviorSubject";
@Injectable()
export class GalleryService {
- public content: ContentWrapper;
+ public content: BehaviorSubject;
private lastDirectory: DirectoryDTO;
private searchId: any;
constructor(private networkService: NetworkService, private galleryCacheService: GalleryCacheService) {
- this.content = new ContentWrapper();
+ this.content = new BehaviorSubject(new ContentWrapper());
}
lastRequest: { directory: string } = {
directory: null
};
- public getDirectory(directoryName: string): Promise> {
- this.content = new ContentWrapper();
+ public async getDirectory(directoryName: string): Promise> {
+ const content = new ContentWrapper();
- this.content.directory = this.galleryCacheService.getDirectory(directoryName);
- this.content.searchResult = null;
+ content.directory = this.galleryCacheService.getDirectory(directoryName);
+ content.searchResult = null;
+
+ this.content.next(content);
this.lastRequest.directory = directoryName;
- return this.networkService.getJson("/gallery/content/" + directoryName).then(
- (message: Message) => {
- if (!message.error && message.result) {
- this.galleryCacheService.setDirectory(message.result.directory); //save it before adding references
+ let message: Message = await this.networkService.getJson>("/gallery/content/" + directoryName);
- if (this.lastRequest.directory != directoryName) {
- return;
- }
+ if (!message.error && message.result) {
- //Add references
- let addDir = (dir: DirectoryDTO) => {
- dir.photos.forEach((photo: PhotoDTO) => {
- photo.directory = dir;
- });
+ this.galleryCacheService.setDirectory(message.result.directory); //save it before adding references
- dir.directories.forEach((directory: DirectoryDTO) => {
- addDir(directory);
- directory.parent = dir;
- });
+ if (this.lastRequest.directory != directoryName) {
+ return;
+ }
+
+ //Add references
+ let addDir = (dir: DirectoryDTO) => {
+ dir.photos.forEach((photo: PhotoDTO) => {
+ photo.directory = dir;
+ });
+
+ dir.directories.forEach((directory: DirectoryDTO) => {
+ addDir(directory);
+ directory.parent = dir;
+ });
- };
- addDir(message.result.directory);
+ };
+ addDir(message.result.directory);
- this.lastDirectory = message.result.directory;
- this.content = message.result;
- }
- return message;
- });
+ this.lastDirectory = message.result.directory;
+ this.content.next(message.result);
+ }
+
+ return message;
+
}
//TODO: cache
@@ -76,7 +81,7 @@ export class GalleryService {
return this.networkService.getJson(queryString).then(
(message: Message) => {
if (!message.error && message.result) {
- this.content = message.result;
+ this.content.next(message.result);
}
return message;
});
@@ -85,8 +90,10 @@ export class GalleryService {
//TODO: cache (together with normal search)
public instantSearch(text: string): Promise> {
if (text === null || text === '') {
- this.content.directory = this.lastDirectory;
- this.content.searchResult = null;
+ const content = new ContentWrapper();
+ content.directory = this.lastDirectory;
+ content.searchResult = null;
+ this.content.next(content);
clearTimeout(this.searchId);
return Promise.resolve(new Message(null, null));
}
@@ -103,7 +110,7 @@ export class GalleryService {
return this.networkService.getJson("/instant-search/" + text).then(
(message: Message) => {
if (!message.error && message.result) {
- this.content = message.result;
+ this.content.next(message.result);
}
return message;
});
diff --git a/frontend/app/gallery/map/map.gallery.component.html b/frontend/app/gallery/map/map.gallery.component.html
index f4017fe..7cbcd85 100644
--- a/frontend/app/gallery/map/map.gallery.component.html
+++ b/frontend/app/gallery/map/map.gallery.component.html
@@ -1,19 +1,21 @@
-
-
+
+
+
-
-
+ (click)="click()"
+ [disableDefaultUI]="true"
+ [zoomControl]="false"
+ [streetViewControl]="false"
+ [usePanning]="false"
+ [draggable]="false"
+ [zoom]="0"
+ [latitude]="mapCenter.latitude"
+ [longitude]="mapCenter.longitude">
+
+
-
\ No newline at end of file
+