Changeset 33925 for other-projects

Timestamp:

2020-02-14T20:41:20+13:00 (4 years ago)

Author:

ak19

Message:

1. Bugfix: oversight, should return uri encoded URL for mapData, forgot to return modified string. Even with this correction, getting firefox screenshot of the full geojson still doesn't work with either the complex geojson or simple polygon shape, from command line or program.

Location:

other-projects/maori-lang-detection/src/org/greenstone/atea

Files:

• CountryCodeCountsMapData.java (modified) (3 diffs)
• SummaryTool.java (modified) (1 diff)

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

@@ -629 +629 @@
         // Want to return encodeURIComponent(JSON.stringify(featuresGeojsonString));
         // https://stackoverflow.com/questions/607176/java-equivalent-to-javascripts-encodeuricomponent-that-produces-identical-outpu
-        URLEncoder.encode(featuresGeojsonString);
+        featuresGeojsonString = URLEncoder.encode(featuresGeojsonString);
+        
     }
     return featuresGeojsonString;
@@ -649 +650 @@
     
     String mapURL = this.getAsMapURL();
-
-    String mapURLescapedForBash = mapURL.replace("\"", "\\\"");//.replace("[", "\\[").replace("]", "\\]");
+          ///String mapURLescapedForBash = .replace("\"", "\\\"");//.replace("[", "\\[").replace("]", "\\]");
+
+    // Testing the geojson.io URL with a simpler polygon. Also doesn't work.
+    //String mapURL = GEOJSON_MAP_TOOL_URL + DATA_STR + URLEncoder.encode("{\"type\":\"Polygon\",\"coordinates\":[[[-77,37],[-77,38],[-76,38],[-76,37],[-77,37]]]}");
+    
     
     File outputFile = new File(outputFolder + File.separator + fileNamePrefix+".png");
     String outputFilePath = Utility.getFilePath(outputFile);
 
-    
     String[] cmdArgs = {
         "firefox",
         "--screenshot",
         outputFilePath,
-        mapURLescapedForBash //"'" + mapURL + "'"
+        mapURL //mapURLescapedForBash //"'" + mapURL + "'"
     };
-    
+
+    
+    System.err.println();
     System.err.print("Running:");
     for(String arg : cmdArgs) {
@@ -673 +678 @@
     //String cmdArgs = "firefox --screenshot " + outputFilePath + " " + "'" + mapURL + "'";
     //System.err.println("Running: " + cmdArgs);
+
+    System.err.println();
     
     SafeProcess proc = new SafeProcess(cmdArgs);

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

@@ -439 +439 @@
             SafeProcess p = new SafeProcess(cmdArgs);
             int retVal = p.runProcess();
-            logger.info("Json Validation tool returned with value: " + retVal);
-            logger.info("   std out: " + p.getStdOutput());
-            logger.info("   std err: " + p.getStdError());
+            logger.info("\nJson validation tool returned with value: " + retVal);
+            if(retVal == 0) {
+            logger.info("Valid geo json.");
+            } else {
+            logger.error("   std out: " + p.getStdOutput());
+            logger.error("   std err: " + p.getStdError());
+            logger.error("INVALID geo json generated. Not attempting screenshot of map.");
+            continue;
+            }