Changeset 33959 for other-projects

Timestamp:

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

Author:

ak19

Message:

URIEncoding the mapData makes it unparseable by geojson.io

Location:

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

Files:

• CountryCodeCountsMapData.java (modified) (5 diffs)
• ManualURLInspection.java (modified) (1 diff)

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

@@ -116 +116 @@
     static private final String DATA_STR = "#data=data:application/json,";
     
-    // "http://geojson.io" has a URL API to programmatically access
-    /* 
+    /* "http://geojson.io" has a URL API to programmatically get it to generate
+       a map from a geojson URL parameter.
+
        See http://geojson.io/ -> Help
 
@@ -140 +141 @@
 
        http://geojson.io/#data=data:application/json,%7B%22type%22%3A%22LineString%22%2C%22coordinates%22%3A%5B%5B0%2C0%5D%2C%5B10%2C10%5D%5D%7D
+
+       The above uses JavaScript's encodeURIComponent(). Although partly different from
+       URL.encode() in Java, it's not different in our case.
+       However, using URL.encode() does end up producing a string that is not recognised by
+       geojson.io's parser. Unencoded, the string is recognised fine.
     */
     
@@ -635 +641 @@
         // https://stackoverflow.com/questions/607176/java-equivalent-to-javascripts-encodeuricomponent-that-produces-identical-outpu
         featuresGeojsonString = URLEncoder.encode(featuresGeojsonString);
-        
     }
     return featuresGeojsonString;
@@ -641 +646 @@
 
     public String getAsMapURL() {
-    boolean uriEncoded = true;
+    // geojson.io advises to call JavaScript's encodeURIComponent() on the string
+    // which for the geojson strings we're dealing with is the same as Java's URI.encode().
+    // But uriEncoding our geojson produces a string unparseable by geojson.io,
+    // whereas the unencoded string is recognised. Not sure why. Turning off uriEncoding.
+    boolean uriEncoded = false;
     String url = GEOJSON_MAP_TOOL_URL + DATA_STR + getFeaturesGeoJsonString(uriEncoded);
 
@@ -682 +691 @@
     // https://bitsofco.de/using-a-headless-browser-to-capture-page-screenshots/
     // https://developers.google.com/web/updates/2017/04/headless-chrome
+
     
     String[] cmdArgs = {

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

@@ -58 +58 @@
     public static final String POEMS_OR_SONGS = "POEMS_OR_SONGS";
     public static final String SINGLE_MRI_SENTENCE = "SINGLE_MRI_SENTENCE"; // TODO: REVIEW
-    // TODO: ADD NEW String "POS_TITLES_OR_LINK_TEXT" for work designations and link text
+    public static final String LINK_TEXT = "LINK_TEXT";
+    // TODO: ADD NEW String "POS_TITLES_OR_LINK_TEXT" for office designations and link text