Changeset 29185 in osm for applications/editors/josm/plugins/smed2/src/seamap

Timestamp:

2013-01-10T00:56:38+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/seamap

Files:

• Renderer.java (modified) (2 diffs)
• Rules.java (modified) (1 diff)

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

@@ -54 +54 @@
         public static Object getAttVal(Feature feature, Obj obj, int idx, Att att) {
                 AttMap atts = getAtts(feature, obj, idx);
-                if (atts == null) return  S57val.nullVal(att);
+                if (atts == null) return S57val.nullVal(att);
                 else {
                         AttItem item = atts.get(att);
@@ -62 +62 @@
         }
 
+        public static double calcArea(Feature feature) {
+          if (feature.flag == Fflag.AREA) {
+                        ArrayList<Long> way = map.ways.get(feature.refs);
+                        Coord coord = map.nodes.get(way.get(0));
+            double llat = coord.lat;
+            double llon = coord.lon;
+            double area = 0.0;
+                        for (long node : way) {
+                                coord = map.nodes.get(node);
+              area += ((llon * coord.lat) - (llat * coord.lon));
+              llat = coord.lat;
+              llon = coord.lon;
+            }
+            return Math.abs(area) / 2.0 * 60.0 * 60.0;
+          }
+          return 0.0;
+        }
+
         public static Coord findCentroid(Feature feature) {
+                Coord coord;
+                ArrayList<Long> way = map.ways.get(feature.refs);
+                switch (feature.flag) {
+                case NODE:
+                        return map.nodes.get(feature.refs);
+                case WAY:
+                        coord = map.nodes.get(way.get(1));
+                        break;
+                case AREA:
+                default:
+                        coord = map.nodes.get(way.get(0));
+                }
+    double slat = 0.0;
     double slon = 0.0;
-    double slat = 0.0;
     double sarc = 0.0;
-    double llon = 0.0;
-    double llat = 0.0;
-                if (feature.flag == Fflag.NODE) {
-                        return map.nodes.get(feature.refs);
-                }
-                ArrayList<Long> way = map.ways.get(feature.refs);
-                if (feature.flag == Fflag.WAY) {
-                        llon = map.nodes.get(way.get(1)).lon;
-                        llat = map.nodes.get(way.get(1)).lat;
-                } else {
-                        llon = map.nodes.get(way.get(0)).lon;
-                        llat = map.nodes.get(way.get(0)).lat;
-                }
+    double llat = coord.lat;
+    double llon = coord.lon;
                 for (long node : way) {
-      double lon = map.nodes.get(node).lon;
-      double lat = map.nodes.get(node).lat;
+                        coord = map.nodes.get(node);
+      double lon = coord.lon;
+      double lat = coord.lat;
       double arc = Math.sqrt(Math.pow((lon-llon), 2) + Math.pow((lat-llat), 2));
+      slat += (lat * arc);
       slon += (lon * arc);
-      slat += (lat * arc);
       sarc += arc;
+      llat = lat;
       llon = lon;
-      llat = lat;
                 }
                 return map.new Coord((sarc > 0.0 ? slat/sarc : 0.0), (sarc > 0.0 ? slon/sarc : 0.0));

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

@@ -123 +123 @@
                         ArrayList<Instr> fncSym = Landmarks.Funcs.get(fncs.get(0));
                         if ((fncs.get(0) == FncFNC.FNC_CHCH) && (cats.get(0) == CatLMK.LMK_TOWR)) catSym = Landmarks.ChurchTower;
-                        if ((cats.get(0) == CatLMK.LMK_UNKN) && (fncs.get(0) == FncFNC.FNC_UNKN)) catSym = Beacons.LightMajor;
+                        if ((cats.get(0) == CatLMK.LMK_UNKN) && (fncs.get(0) == FncFNC.FNC_UNKN) && (feature.objs.get(Obj.LIGHTS) != null)) catSym = Beacons.LightMajor;
+                        if (cats.get(0) == CatLMK.LMK_RADR) fncSym = Landmarks.RadioTV;
                         Renderer.symbol(feature, catSym, feature.type);
                         Renderer.symbol(feature, fncSym, feature.type);