Changeset 33796

Timestamp:

2019-12-12T15:42:19+13:00 (4 years ago)

Author:

ak19

Message:

Instead of a hack for US' count being too great that its histogram goes past the max latitude North, added more general code to widen histograms in cases where the value of count produces too great a latitude North value for histograms, as other countries like France and China also needed the same solution.

File:

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

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

@@ -88 +88 @@
     for(JsonElement obj : countryCountsJsonArray) {
         JsonObject json = obj.getAsJsonObject();
-        String countryCode = json.get("_id").getAsString();
+        String countryCode = json.get("_id").getAsString().toUpperCase();
+        // set the property back as uppercase and with property name "countrycode" instead of "_id"
+        json.remove("_id");
+        json.addProperty("countrycode", countryCode);
+        
         int count = (int)json.get("count").getAsDouble();
         
@@ -215 +219 @@
         JsonObject json = obj.getAsJsonObject();
         
-        String countryCode = json.get("_id").getAsString();
+        String countryCode = json.get("countrycode").getAsString();
         String region = json.get("region").getAsString();
         int count = json.get("count").getAsInt();
@@ -244 +248 @@
     Double lat = json.get("lat").getAsDouble();
 
-    String countryCode = json.get("_id").getAsString();
-
-    // US is a special case. Count is too high by a factor of 8.
-    // So reduce height by twice that factor, and width by twice that factor too.
-    // (A factor of 8 makes north at +125 too high for latitude,
-    // see http://www.learnz.org.nz/sites/learnz.org.nz/files/lat-long-geo-data-01_0.jpg)
-    if(countryCode.equals("US")) {
-        half_width = 16 * half_width;
-        vertical_factor = vertical_factor/16.0;
-    }
+    String countryCode = json.get("countrycode").getAsString();
+
+
+    //create the 4 corners of the rectangle
+    // West is negative, east is positive, south is negative, north is positive
+    // See http://www.learnz.org.nz/sites/learnz.org.nz/files/lat-long-geo-data-01_0.jpg
+    // But since the histograms grow vertically/northwards and we can't go past a latitude of 90,
+    // to compensate, we increase the width of the histograms by the same factor as our inability
+    // to grow northwards.
+    Double north = lat + (vertical_factor * count);
+    while (north > 90) {
+        // recalculate north after decreasing histogram's vertical growth
+        // by the same factor as we increase its width
+        vertical_factor = vertical_factor/2.0; 
+        half_width = 2 * half_width;
+        north = lat + (vertical_factor * count);
+    }
+    Double east = lng + half_width;
+    Double west = lng - half_width;
+    Double south = lat;
     
     List<List<Position>> outerList = new LinkedList<List<Position>>();
@@ -259 +273 @@
     outerList.add(points);
 
-    //create the 4 corners of the rectangle
-    // West is negative, east is positive, south is negative, north is positive
-    // See http://www.learnz.org.nz/sites/learnz.org.nz/files/lat-long-geo-data-01_0.jpg
-    Double east = lng + half_width;
-    Double west = lng - half_width;
-    Double north = lat + (vertical_factor * count);
-    Double south = lat;
+    
     points.add(new Position(west, south)); // Position(lng, lat) not Position(lat, lng)
     points.add(new Position(west, north));