Changeset 29198 in osm for applications/editors/josm/plugins/smed2/src/seamap/Renderer.java

Timestamp:

2013-01-14T19:11:27+01:00 (13 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/seamap/Renderer.java (modified) (5 diffs)

applications/editors/josm/plugins/smed2/src/seamap/Renderer.java

@@ -18 +18 @@
 import s57.S57att.Att;
 import s57.S57obj.Obj;
-import s57.S57val.ColCOL;
 import s57.S57val.*;
 import s57.S57val;
@@ -66 +65 @@
                         ArrayList<Long> way = map.ways.get(feature.refs);
                         Coord coord = map.nodes.get(way.get(0));
-            double llon = Math.toRadians(coord.lon);
-            double llat = Math.toRadians(coord.lat);
+            double llon = coord.lon;
+            double llat = coord.lat;
             double sigma = 0.0;
                         for (long node : way) {
                                 coord = map.nodes.get(node);
-                                double lat = Math.toRadians(coord.lat);
-                                double lon = Math.toRadians(coord.lon);
+                                double lat = coord.lat;
+                                double lon = coord.lon;
                                 sigma += (lon * Math.sin(llat)) - (llon * Math.sin(lat));
                                 llon = lon;
                                 llat = lat;
             }
-            return Math.abs(sigma) / 2.0 * 3444 * 3444;
+            return Math.abs(sigma) * 3444 * 3444 / 2.0;
           }
           return 0.0;
@@ -83 +82 @@
 
         public static Coord findCentroid(Feature feature) {
-                double tst = calcArea(feature);
                 Coord coord;
                 ArrayList<Long> way = map.ways.get(feature.refs);
@@ -105 +103 @@
       double lon = coord.lon;
       double lat = coord.lat;
-      double arc = (Math.acos(Math.cos(Math.toRadians(lon-llon)) * Math.cos(Math.toRadians(lat-llat))));
+      double arc = (Math.acos(Math.cos(lon-llon) * Math.cos(lat-llat)));
       slat += (lat * arc);
       slon += (lon * arc);
@@ -122 +120 @@
         }
         
+        public static void lineSymbols(Feature feature, Symbol prisymb, double space, Symbol secsymb, int ratio) {
+                if (feature.flag != Fflag.NODE) {
+                        ArrayList<Long> way = map.ways.get(feature.refs);
+                        for (long node : way) {
+                                Point2D point = helper.getPoint(map.nodes.get(node));
+                                
+                        }
+                }
+        }
+        
+        public static void lineVector (Feature feature, LineStyle style) {
+                
+        }
+        
+        public static void labelText (Feature feature, String str, TextStyle style, Delta delta) {
+                
+        }
+        
+        public static void lineText (Feature feature, String str, TextStyle style, double offset, Delta delta) {
+                
+        }
 }