Changeset 33867

Timestamp:

2020-01-23T21:12:17+13:00 (4 years ago)

Author:

ak19

Message:

Moved the code handling of special case large rectangles and those that exceed one or more of the geojson.tools horizontal wrap point (at -40 longitude) into a new function called recalculateAreaIfLarge(...)

File:

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

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

@@ -358 +358 @@
     Double west = lng - half_width;
     Double south = lat;
+            
+    List<Position> pts = recalculateAreaIfLarge(count, HISTOGRAM_WIDTH, countryCode, lat, lng, north, south, east, west);
+
     /*
     System.err.println("For country " + countryCode + ":");
@@ -364 +367 @@
     System.err.println("east = " + east);
     System.err.println("west = " + west + "\n");
+    System.err.println("-------------");
     */
+        
+    List<List<Position>> outerList = new LinkedList<List<Position>>();
+    if(pts != null) {
+        outerList.add(pts);
+    } else {
+        
+        
+        List<Position> points = new LinkedList<Position>(); 
+        outerList.add(points);  
+    
+        points.add(new Position(west, south)); // Position(lng, lat) not Position(lat, lng)
+        points.add(new Position(west, north));
+        points.add(new Position(east, north));
+        points.add(new Position(east, south));
+    }
+
+    Geometry rectangle = new Polygon(outerList);
+    
+    // Coords: a List of List of Positions, see https://ngageoint.github.io/simple-features-geojson-java/docs/api/
+    // https://www.here.xyz/api/concepts/geojsonbasics/#polygon
+
+    return rectangle;
+    }
+
+    private List<Position> recalculateAreaIfLarge(final int count, final int HISTOGRAM_WIDTH, String countryCode,
+                    final Double lat, final Double lng,
+                    Double north, Double south, Double east, Double west) {
+    boolean recalculated = false;
+    
     // Check if we're dealing with very large numbers, in which case, we can have follow off the longitude edges
     // Max longitude values are -180 to 180. So a max of 360 units between them. (Max latitude is -90 to 90)
@@ -371 +404 @@
     // and the South pole has a latitude of -90°."
     if((east + Math.abs(west)) > 360 || east > 180 || west < -180) {
-        half_width = HISTOGRAM_WIDTH/2; // reset half_width
+        System.err.println("For country " + countryCode + ":");
+        System.err.println("north = " + north);
+        System.err.println("south = " + south);
+        System.err.println("east = " + east);
+        System.err.println("west = " + west + "\n");
+
+        int half_width = HISTOGRAM_WIDTH/2; // reset half_width
         
         double v_tmp_count = Math.sqrt(count);
@@ -377 +416 @@
         //v_tmp_count = Math.ceil(v_tmp_count);
         double h_tmp_count = v_tmp_count;
-
-        /*
+System.err.println("count = " + count);
+        System.err.println("v = " + v_tmp_count);
+        System.err.println("h = " + h_tmp_count);
+        System.err.println("lat = " + lat);
+        System.err.println("lng = " + lng + "\n");
+        
+        if(h_tmp_count > 90) { // 360 max width, of which each longitude
+        // is 4 units (horizontal factor = 4, and half-width is half
+        // of that). So max width/h_tmp_count allowed 90 => 360
+        // longitude on map (-180 to 180).
+        // Put the excess h_tmp_count into v_tmp_count and ensure
+        // that does not go over 90+90 = 180 max. Vertical_factor is 1.
+
+        System.err.println("Out of longitude range. Attempting to compensate...");
+        
+        double diff = h_tmp_count - 80.0; // actually 90 wraps on geojson tools, 80 doesn't
+        h_tmp_count -= diff;
+        v_tmp_count = (count/h_tmp_count);
+        
+        if(v_tmp_count > 180 || h_tmp_count > 90) {
+            System.err.println("Warning: still exceeded max latitude and/or longitude range");          
+        }
+        
+        }
+        
         System.err.println("Recalculating polygon for country with high count: " + countryCode + ".");
         System.err.println("count = " + count);
@@ -385 +447 @@
         System.err.println("lat = " + lat);
         System.err.println("lng = " + lng + "\n");      
-        */
+        
         
         north = lat + v_tmp_count;
@@ -419 +481 @@
         
         // Hopefully we don't exceed +90/-90 lat and +/-180 longitude
-        /*
-        System.err.println("north = " + north);
+
+        recalculated = true;
+
+        
+    } else if(west < -140.0) {
+        // past -140 west, the edges don't wrap well in geotools, so shift any points more west/negative than -140:
+        
+        double diff = -140.0 - west;
+        west = -140.0;
+        east += diff;
+
+        recalculated = true;
+    }
+
+    if(recalculated) {
+        System.err.println("\nnorth = " + north);
         System.err.println("south = " + south);
         System.err.println("east = " + east);
         System.err.println("west = " + west);
-        */
-    }
-    
-    List<List<Position>> outerList = new LinkedList<List<Position>>();
-    List<Position> points = new LinkedList<Position>(); 
-    outerList.add(points);
-
-    
-    points.add(new Position(west, south)); // Position(lng, lat) not Position(lat, lng)
-    points.add(new Position(west, north));
-    points.add(new Position(east, north));
-    points.add(new Position(east, south));
-
-
-    Geometry rectangle = new Polygon(outerList);
-    
-    // Coords: a List of List of Positions, see https://ngageoint.github.io/simple-features-geojson-java/docs/api/
-    // https://www.here.xyz/api/concepts/geojsonbasics/#polygon
-
-    return rectangle;
+
+        
+        List<Position> points = new LinkedList<Position>(); 
+    
+        points.add(new Position(west, south)); // Position(lng, lat) not Position(lat, lng)
+        points.add(new Position(west, north));
+        points.add(new Position(east, north));
+        points.add(new Position(east, south));
+
+        return points;
+    }
+
+    return null;
     }