https://github.com/water-fountains/datablue/issues/39

water-fountains · Dec 14, 2019 · 569e58f · 569e58f
1 parent 697f2f3
commit 569e58f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/server/api/services/generateLocationData.service.js b/server/api/services/generateLocationData.service.js
@@ -53,7 +53,8 @@ function generateLocationData(locationName){
         .then(r => defaultCollectionEnhancement(r))
         .then(r => createUniqueIds(r))
         .then(r => {
-          l.info(`successfully processed all fountains from ${locationName}`);
+          //TODO add location size as per https://github.com/water-fountains/datablue/issues/39
+          l.info(`successfully processed all (size t.b.d.) fountains from ${locationName} `);
           resolve({
             type: 'FeatureCollection',
             features: r

diff --git a/server/api/services/processing.service.js b/server/api/services/processing.service.js
@@ -34,8 +34,13 @@ export function fillImageGalleries(fountainCollection){
 
   return new Promise((resolve, reject) => {
     let promises = [];
+    let i = 0;
+    let tot = fountainCollection.length;
+    let dbg = 'dbgUndef';
     _.forEach(fountainCollection, fountain =>{
-      promises.push(WikimediaService.fillGallery(fountain));
+      i=i+1;
+      dbg = i+'/'+tot;
+      promises.push(WikimediaService.fillGallery(fountain, dbg));
     });
 
     Promise.all(promises)

diff --git a/server/api/services/wikimedia.service.js b/server/api/services/wikimedia.service.js
@@ -25,7 +25,7 @@ const manager = ConcurrencyManager(api, MAX_CONCURRENT_REQUESTS);
 
 
 class WikimediaService {
-  fillGallery(fountain){
+  fillGallery(fountain, dbg){
     // fills gallery with images from wikidata, wikimedia commons,
     // todo: add osm as a possible source (although images shouldn't really be linked there.
     return new Promise((resolve, reject) => {
@@ -51,7 +51,7 @@ class WikimediaService {
       // if a main image is defined, get that
       if(!_.isNull(fountain.properties.featured_image_name.value)){
         // fetch info for just the one image
-        main_image_promise = this.getImageInfo('File:'+fountain.properties.featured_image_name.value)
+        main_image_promise = this.getImageInfo('File:'+fountain.properties.featured_image_name.value, dbg)
       }else{
         // If there is no main image, resolve with false
         main_image_promise = new Promise((resolve, reject)=>resolve(false));
@@ -71,14 +71,15 @@ class WikimediaService {
         gallery_image_promise = api.get(url, {timeout: 5000})
           .then(r => {
             let category_members = r.data.query['categorymembers'];
-
-
+            let cI = 0;
+            let cTot = category_members.length;
             // fetch information for each image
             _.forEach(category_members, page => {
+              cI = cI + 1;
               // only use photo media, not videos
               let ext = page.title.slice(-3).toLowerCase();
               if( ['jpg', 'png', 'gif'].indexOf(ext)>=0){
-                gallery_image_promises.push(this.getImageInfo(page.title));
+                gallery_image_promises.push(this.getImageInfo(page.title,"f-"+dbg+"_i-"+cI+"/"+cTot));
               }
             });
 
@@ -166,7 +167,7 @@ class WikimediaService {
     });
   }
 
-  getImageInfo(pageTitle){
+  getImageInfo(pageTitle, dbg){
     return new Promise((resolve, reject) =>{
       let newImage = {};
       newImage.big = this.getImageUrl(pageTitle, 1200);
@@ -194,13 +195,13 @@ class WikimediaService {
           resolve(newImage);
         }
         else{
-          l.warn(`http request when getting metadata for ${pageTitle} did not return useful data. Url: ${url}`);
+          l.warn(`http request when getting metadata for ${pageTitle} ${dbg} did not return useful data. Url: ${url}`);
           newImage.description = `Error processing image metadata from Wikimedia Commons. Request did not return relevant information. Url: ${url}`;
           newImage.url = `https://commons.wikimedia.org/wiki/${pageTitle}`;
           resolve(newImage);
         }
       }).catch(error=>{
-        l.warn(`http request when getting metadata for ${pageTitle} timed out or failed. Error message: ${error}. Url: ${url}`);
+        l.warn(`http request when getting metadata for ${pageTitle} ${dbg} timed out or failed. Error message: ${error}. Url: ${url}`);
         newImage.description = `http request when getting metadata for ${pageTitle} timed out after 2 seconds or failed. Error message: ${error}. Url: ${url}`;
         newImage.url = `https://commons.wikimedia.org/wiki/${pageTitle}`;
         resolve(newImage);