Feature: Made a recurring job for the automatic creation of the geojson file that is used for index page as layer.

functions/package.json

@@ -10,8 +10,8 @@
     "deploy": "firebase deploy --only functions",
     "logs": "firebase functions:log",
     "compile": "tsc",
-    "debug": "node --inspect node_modules/.bin/functions-framework --source=build/src/ --target=index",
-    "watch": "concurrently \"npm run compile -- --watch\" \"nodemon --watch ./build/ --exec npm run debug\""
+    "debug": "node --inspect node_modules/.bin/functions-framework --source=lib/functions/src/ --target=index",
+    "watch": "concurrently \"npm run compile -- --watch\" \"nodemon --watch ./lib/ --exec npm run debug\""
   },
   "engines": {
     "node": "18"
@@ -22,7 +22,8 @@
     "@google-cloud/storage": "^7.12.1",
     "busboy": "^1.6.0",
     "firebase-admin": "^12.1.0",
-    "firebase-functions": "^5.0.0"
+    "firebase-functions": "^5.1.1",
+    "functions-framework": "^0.6.10"
   },
   "devDependencies": {
     "@types/busboy": "^1.5.4",

functions/src/constants/google-storage-constants.ts

@@ -2,4 +2,5 @@
 
 export const BUCKET_NAME = config().functions.bucket_name;
 export const SUBJECTS_COLLECTION_NAME = config().functions.subjects_collection_name;
-export const IMAGES_COLLECTION_NAME = config().functions.images_collection_name;
+export const IMAGES_COLLECTION_NAME = config().functions.images_collection_name;
+export const MAP_DATA_GEOJSON_NAME = config().functions.map_data_geojson_name;

functions/src/controllers/dataController.ts

@@ -1,5 +1,5 @@
 import {Request, Response} from "express";
-import {HttpsFunction, https} from "firebase-functions";
+import {https, HttpsFunction, pubsub} from "firebase-functions";
 import * as logger from "firebase-functions/logger";
 
 import {validateCors} from "../utils/cors-helper";
@@ -16,4 +16,26 @@ export const getGeoJson: HttpsFunction = https.onRequest(
         }
     }
 );
+
+export const createGeoJson: HttpsFunction = https.onRequest(
+    async (request: Request, response: Response): Promise<any> => {
+        response = validateCors(request, response);
+        try {
+            await dataService.createMapData();
+            response.status(204).send();
+        } catch (error) {
+            logger.error("Error retrieving file:", error);
+            response.status(500).send("Error retrieving file: " + error);
+        }
+    }
+);
+
+export const createGeoJsonJob = pubsub.topic('create-geojson-topic').onPublish(async () => {
+    try {
+        logger.log('GeoJSON creation process started.');
+        await dataService.createMapData();
+    } catch (error) {
+        logger.error("Error creating file:", error);
+    }
+});
 

functions/src/index.ts

@@ -5,8 +5,16 @@ import * as controllers from "./controllers"
  * 
  * Retrieves GeoJSON data from the database.
  * @function getGeoJson
+ * 
+ * Creates the GeoJSON data manually.
+ * @function createGeoJson
+ *
+ * Sets-up the GeoJSON data automatically via recurring job.
+ * @function createGeoJsonJob
  */
 export const getGeoJson = controllers.dataController.getGeoJson;
+export const createGeoJson = controllers.dataController.createGeoJson;
+export const createGeoJsonJob = controllers.dataController.createGeoJsonJob;
 
 
 /**

functions/src/services/dataService.ts

@@ -1,12 +1,65 @@
-import {storage} from "./externalServices";
+import * as logger from "firebase-functions/logger";
+
+import {storage} from "./externalServices";
+import {getAllImages} from "./imageService";
+import {ImageDocument} from "../../../sharedModels/interfaces";
+import {MAP_DATA_GEOJSON_NAME} from "../constants/google-storage-constants";
 
 export async function getMapData(): Promise<Buffer> {
 
     // Fetch GeoJSON data from the bucket
-    const file = storage.file("TEST-MAP.geojson");
+    const file = storage.file(MAP_DATA_GEOJSON_NAME);
 
     // Get the file's contents
     const [contents] = await file.download();
-    
+
     return contents
+}
+
+export async function createMapData(): Promise<void> {
+
+    const images: ImageDocument[] = await getAllImages()
+
+    // Construct GeoJSON structure
+    const geoJson = {
+        type: "FeatureCollection",
+        features: images
+            .filter(image => image.geopoint !== null && image.geopoint.latitude != 0 && image.geopoint.longitude != 0)
+            .map(image => ({
+                type: "Feature",
+                geometry: {
+                    type: "Point",
+                    coordinates: [
+                        image.geopoint?.longitude || 0,
+                        image.geopoint?.latitude || 0,
+                        0.0
+                    ]
+                },
+                properties: {
+                    id: image.id,
+                    imageName: image.imageName,
+                    imgURL: image.imgURL,
+                    nameOfSender: image.nameOfSender,
+                    yearOfImage: image.yearOfImage
+                }
+            }))
+    };
+
+    // Convert the GeoJSON object to a string
+    const geoJsonString = JSON.stringify(geoJson, null, 2);
+    logger.log(geoJsonString);
+
+    // Define the file name and path in the bucket
+    const fileName = MAP_DATA_GEOJSON_NAME;
+    const file = storage.file(fileName);
+
+    // Upload the GeoJSON string to Google Cloud Storage
+    try {
+        await file.save(geoJsonString, {
+            contentType: 'application/json'
+        });
+        logger.log(`GeoJSON file saved to ${fileName} in bucket ${storage.name}.`);
+    } catch (error) {
+        logger.error('Error saving GeoJSON to Google Cloud Storage:', error);
+    }
 }

functions/src/services/imageService.ts

@@ -4,7 +4,7 @@ import {storage, firestore} from "./externalServices";
 import * as Busboy from "busboy";
 import * as logger from "firebase-functions/logger";
 
-import {FileData, FileDataFields, ImageDocumentFS, MapMarker} from "../../../sharedModels/interfaces";
+import {FileData, FileDataFields, ImageDocument, ImageDocumentFS, MapMarker} from "../../../sharedModels/interfaces";
 import {extractDatesFromText, getFileExtension, removeFileExtension} from "../utils/string-helper";
 import {BUCKET_NAME, IMAGES_COLLECTION_NAME} from "../constants/google-storage-constants";
 import {subjectService} from "./";
@@ -90,3 +90,16 @@ function processImages(busboy: Busboy.Busboy, files: FileData[], subjectRef: Doc
 async function createImage(image: ImageDocumentFS): Promise<DocumentReference> {
     return await firestore.collection(IMAGES_COLLECTION_NAME).add(image);
 }
+
+export async function getAllImages(): Promise<ImageDocument[]> {
+
+    const documentRefs = await firestore
+        .collection(IMAGES_COLLECTION_NAME).get();
+
+    return documentRefs.docs.map(doc => {
+        return {
+            id: doc.id,
+            ...doc.data() as ImageDocumentFS
+        };
+    });
+}