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

Timestamp:

2013-01-08T21:26:40+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• Renderer.java (modified) (4 diffs)
• Rules.java (modified) (2 diffs)
• SeaMap.java (modified) (9 diffs)

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

@@ -14 +14 @@
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
-import java.util.EnumMap;
 import java.util.HashMap;
 
@@ -43 +42 @@
                         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
                         g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_GASP);
-                        Rules.MainRules(map, zoom);
+                        Rules.rules(map, zoom);
                 }
         }
         
-        public static EnumMap<Att, AttItem> getAtts(Feature feature, Obj obj, int idx) {
-                HashMap<Integer, EnumMap<Att, AttItem>> objs = feature.objs.get(obj);
+        public static AttMap getAtts(Feature feature, Obj obj, int idx) {
+                HashMap<Integer, AttMap> objs = feature.objs.get(obj);
                 if (objs == null) return null;
                 else return objs.get(idx);
@@ -54 +53 @@
         
         public static Object getAttVal(Feature feature, Obj obj, int idx, Att att) {
-                EnumMap<Att, AttItem> atts = getAtts(feature, obj, idx);
+                AttMap atts = getAtts(feature, obj, idx);
                 if (atts == null) return  S57val.nullVal(att);
                 else {
@@ -62 +61 @@
                 }
         }
+
+        public static Coord findCentroid(Feature feature) {
+    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;
+                }
+                for (long node : way) {
+      double lon = map.nodes.get(node).lon;
+      double lat = map.nodes.get(node).lat;
+      double arc = Math.sqrt(Math.pow((lon-llon), 2) + Math.pow((lat-llat), 2));
+      slon += (lon * arc);
+      slat += (lat * arc);
+      sarc += arc;
+      llon = lon;
+      llat = lat;
+                }
+                return map.new Coord((sarc > 0.0 ? slat/sarc : 0.0), (sarc > 0.0 ? slon/sarc : 0.0));
+        }
         
         public static void symbol(Feature feature, ArrayList<Instr> symbol, Obj obj) {
-                Point2D point = helper.getPoint(map.nodes.get(feature.refs));
+                Point2D point = helper.getPoint(findCentroid(feature));
                 ArrayList<ColCOL> colours = (ArrayList<ColCOL>) getAttVal(feature, obj, 0, Att.COLOUR);
                 ArrayList<ColPAT> pattern = (ArrayList<ColPAT>) getAttVal(feature, obj, 0, Att.COLPAT);

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

@@ -28 +28 @@
         static int zoom;
         
-        public static void MainRules (SeaMap m, int z) {
+        public static void rules (SeaMap m, int z) {
                 map = m;
                 zoom = z;
@@ -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;
                         Renderer.symbol(feature, catSym, feature.type);
                         Renderer.symbol(feature, fncSym, feature.type);

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

@@ -15 +15 @@
 
 import s57.S57att;
-import s57.S57att.*;
+import s57.S57att.Att;
 import s57.S57obj;
 import s57.S57obj.*;
@@ -37 +37 @@
         }
 
+        public class AttMap extends EnumMap<Att, AttItem> {
+                private static final long serialVersionUID = 1L;
+                public AttMap() {
+                        super(Att.class);
+                }
+        }
+        
+        public class ObjTab extends HashMap<Integer, AttMap> {
+                private static final long serialVersionUID = 1L;
+                public ObjTab() {
+                        super();
+                }
+        }
+        
+        public class ObjMap extends EnumMap<Obj, ObjTab> {
+                private static final long serialVersionUID = 1L;
+                public ObjMap() {
+                        super(Obj.class);
+                }
+        }
+        
+        public class NodeTab extends HashMap<Long, Coord> {
+                private static final long serialVersionUID = 1L;
+                public NodeTab() {
+                        super();
+                }
+        }
+        
+        public class WayTab extends HashMap<Long, ArrayList<Long>> {
+                private static final long serialVersionUID = 1L;
+                public WayTab() {
+                        super();
+                }
+        }
+        
+        public class FtrMap extends EnumMap<Obj, ArrayList<Feature>> {
+                private static final long serialVersionUID = 1L;
+                public FtrMap() {
+                        super(Obj.class);
+                }
+        }
+        
+        public class FtrTab extends HashMap<Long, Feature> {
+                private static final long serialVersionUID = 1L;
+                public FtrTab() {
+                        super();
+                }
+        }
+        
         public class Feature {
                 public Fflag flag;
                 public long refs;
                 public Obj type;
-                public EnumMap<Att, AttItem> atts;
-                public EnumMap<Obj, HashMap<Integer, EnumMap<Att, AttItem>>> objs;
+                public AttMap atts;
+                public ObjMap objs;
 
                 Feature() {
@@ -48 +97 @@
                         refs = 0;
                         type = Obj.UNKOBJ;
-                        atts = new EnumMap<Att, AttItem>(Att.class);
-                        objs = new EnumMap<Obj, HashMap<Integer, EnumMap<Att, AttItem>>>(Obj.class);
+                        atts = new AttMap();
+                        objs = new ObjMap();
                 }
         }
@@ -57 +106 @@
                 public double lon;
 
-                Coord(double ilat, double ilon) {
+                public Coord(double ilat, double ilon) {
                         lat = ilat;
                         lon = ilon;
@@ -63 +112 @@
         }
 
-        public HashMap<Long, Coord> nodes;
-        public HashMap<Long, ArrayList<Long>> ways;
-        public HashMap<Long, ArrayList<Long>> mpolys;
-        public EnumMap<Obj, ArrayList<Feature>> features;
+        public NodeTab nodes;
+        public WayTab ways;
+        public WayTab mpolys;
+        public FtrMap features;
+        public FtrTab index;
 
         private Feature feature;
@@ -72 +122 @@
 
         public SeaMap() {
-                nodes = new HashMap<Long, Coord>();
-                ways = new HashMap<Long, ArrayList<Long>>();
-                mpolys = new HashMap<Long, ArrayList<Long>>();
+                nodes = new NodeTab();
+                ways = new WayTab();
+                mpolys = new WayTab();
                 feature = new Feature();
-                features = new EnumMap<Obj, ArrayList<Feature>>(Obj.class);
+                features = new FtrMap();
+                index = new FtrTab();
         }
 
@@ -84 +135 @@
                 feature.refs = id;
                 feature.flag = Fflag.NODE;
+        }
+
+        public void moveNode(long id, double lat, double lon) {
+                nodes.put(id, new Coord(lat, lon));
         }
 
@@ -110 +165 @@
         }
 
-        public void tagsDone() {
-                if (feature.type != Obj.UNKOBJ) {
-                        if ((feature.flag == Fflag.WAY) && (list.size() > 0) && (list.get(0) == list.get(list.size() - 1))) {
+        public void tagsDone(long id) {
+                if ((feature.type != Obj.UNKOBJ) && !((feature.flag == Fflag.WAY) && (list.size() < 2))) {
+                        index.put(id, feature);
+                        if ((feature.flag == Fflag.WAY) && (list.size() > 0) && (list.get(0).equals(list.get(list.size() - 1)))) {
                                 feature.flag = Fflag.AREA;
                         }
@@ -137 +193 @@
                                         att = S57att.enumAttribute(subkeys[2], obj);
                                 }
-                                HashMap<Integer, EnumMap<Att, AttItem>> items = feature.objs.get(obj);
+                                ObjTab items = feature.objs.get(obj);
                                 if (items == null) {
-                                        items = new HashMap<Integer, EnumMap<Att, AttItem>>();
+                                        items = new ObjTab();
                                         feature.objs.put(obj, items);
                                 }
-                                EnumMap<Att, AttItem> atts = items.get(idx);
+                                AttMap atts = items.get(idx);
                                 if (atts == null) {
-                                        atts = new EnumMap<Att, AttItem>(Att.class);
+                                        atts = new AttMap();
                                         items.put(idx, atts);
                                 }