Changeset 33978 for other-projects/maori-lang-detection/src/org/greenstone/atea/SummaryTool.java

Timestamp:

2020-02-26T19:57:05+13:00 (4 years ago)

Author:

ak19

Message:

Opens all geoJSON maps in new tabs instead of waiting for user to have processed each one in turn

File:

• other-projects/maori-lang-detection/src/org/greenstone/atea/SummaryTool.java (modified) (6 diffs)

other-projects/maori-lang-detection/src/org/greenstone/atea/SummaryTool.java

@@ -356 +356 @@
      */
     public static void main(String args[]) {
-    SafeProcess.DEBUG = 1;
-    
+    int oldDebugMode = SafeProcess.DEBUG;
+    SafeProcess.DEBUG = 0;
+
     if(args.length >= 2) {
         printUsage();
@@ -417 +418 @@
         // that GEOJSON_MAP_TOOL_URL takes as input to produce a map.
 
+        ///CountryCodeCountsMapData.openFirefox();
+        
         for(int i = 1; i < tableFileNames.length; i++) { // empty element at 0
             String tablefilename = tableFileNames[i] + ".json"; // filenames have no suffix
@@ -453 +456 @@
             // to confirm if the JSON in the provided json file parses/is valid JSON.
 
+            /*
             String[] cmdArgs = {"python", "-mjson.tool", geoJsonFilename};
             SafeProcess p = new SafeProcess(cmdArgs);
@@ -465 +469 @@
             continue;
             }
-
+            */
             
             /*boolean uriEncoded = true;
@@ -472 +476 @@
             */
             
-            logger.info("Data URL string: " + mapData.getAsMapURL());
+            //logger.info("Data URL string: " + mapData.getAsMapURL());
             logger.info("");
-            mapData.geoJsonMapScreenshot(outFolder, tablefilename);
+            //mapData.geoJsonMapScreenshot(outFolder, tablefilename);
+            mapData.getGeoJSONMapScreenshotCommand(outFolder, tablefilename);
             logger.info("---");
 
             // TODO: Remove break. For debugging: breaks after first table -> map conversion.
-            break;
+            //break;
         }
         
@@ -486 +491 @@
     } catch(Exception e) {
         logger.error(e.getMessage(), e);
-    }
+    } finally {
+        SafeProcess.DEBUG = oldDebugMode;
+    }   
     }
 }