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

Timestamp:

2013-01-17T12:08:28+01:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

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

Files:

• Renderer.java (modified) (7 diffs)
• Rules.java (modified) (6 diffs)
• SeaMap.java (modified) (3 diffs)

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

@@ -11 +11 @@
 
 import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Font;
 import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.awt.RenderingHints;
+import java.awt.font.TextLayout;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Path2D;
@@ -25 +29 @@
 import seamap.SeaMap;
 import seamap.SeaMap.*;
+import symbols.Areas;
 import symbols.Symbols;
 import symbols.Symbols.*;
@@ -69 +74 @@
         public static double calcArea(Feature feature) {
           if (feature.flag == Fflag.AREA) {
-                        ArrayList<Long> way = map.ways.get(feature.refs);
+                        ArrayList<Long> way;
+                        if (map.mpolys.containsKey(feature.refs)) {
+                                way = map.ways.get(map.mpolys.get(feature.refs));
+                        } else {
+                                way = map.ways.get(feature.refs);
+                        }
                         Coord coord = map.nodes.get(way.get(0));
             double llon = coord.lon;
@@ -89 +99 @@
         public static Coord findCentroid(Feature feature) {
                 Coord coord;
-                ArrayList<Long> way = map.ways.get(feature.refs);
+                ArrayList<Long> way;
+                if (map.mpolys.containsKey(feature.refs)) {
+                        way = map.ways.get(map.mpolys.get(feature.refs));
+                } else {
+                        way = map.ways.get(feature.refs);
+                }
                 switch (feature.flag) {
                 case NODE:
@@ -142 +157 @@
         public static void lineVector (Feature feature, LineStyle style) {
                 if (feature.flag != Fflag.NODE) {
-                        Long mpoly = map.outers.get(feature.refs);
                         ArrayList<Long> ways = new ArrayList<Long>();
-                        if (mpoly != null) {
-                                ways.addAll(map.mpolys.get(mpoly));
+                        if (map.outers.containsKey(feature.refs)) {
+                                ways.addAll(map.mpolys.get(map.outers.get(feature.refs)));
                         } else {
-                                ways.add(feature.refs);
+                                if (map.mpolys.containsKey(feature.refs)) {
+                                        ways.addAll(map.mpolys.get(feature.refs));
+                                } else {
+                                        ways.add(feature.refs);
+                                }
                         }
                         Path2D.Double p = new Path2D.Double();
@@ -168 +186 @@
                                         System.arraycopy(style.dash, 0, dash, 0, style.dash.length);
                                         for (int i = 0; i < style.dash.length; i++) {
-                                                dash[i] *= (float) (sScale);
+                                                dash[i] *= (float) sScale;
                                         }
                                         g2.setStroke(new BasicStroke((float) (style.width * sScale), BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 1, dash, 0));
@@ -184 +202 @@
         }
         
-        public static void labelText (Feature feature, String str, TextStyle style, Delta delta) {
+        public static void labelText (Feature feature, String str, Font font, Delta delta) {
+                Symbol label = new Symbol();
+                label.add(new Instr(Prim.FILL, Color.black));
+                label.add(new Instr(Prim.TEXT, new Caption(str, font, delta)));
+                Point2D point = helper.getPoint(findCentroid(feature));
+                Symbols.drawSymbol(g2, label, tScale, point.getX(), point.getY(), delta, null);
+        }
+        
+        public static void lineText (Feature feature, String str, Font font, double offset, double dy) {
                 
         }
-        
-        public static void lineText (Feature feature, String str, TextStyle style, double offset, Delta delta) {
-                
-        }
 }

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

@@ -103 +103 @@
         
         private static void shoreline(Feature feature) {
-                CatSLC cat = (CatSLC) Renderer.getAttVal(feature, feature.type, 0, Att.CATSLC);
                 if (zoom >= 12) {
-                        switch (cat) {
+                        switch ((CatSLC) Renderer.getAttVal(feature, feature.type, 0, Att.CATSLC)) {
                         case SLC_TWAL:
                                 WatLEV lev = (WatLEV) Renderer.getAttVal(feature, feature.type, 0, Att.WATLEV);
@@ -111 +110 @@
                                         Renderer.lineVector(feature, new LineStyle(Color.black, 10, new float[] { 40, 40 }, null));
                                         if (zoom >= 15)
-                                                Renderer.lineText(feature, "(covers)", new TextStyle(new Font("Arial", Font.PLAIN, 80)), 0.5, new Delta(Handle.TC, AffineTransform.getTranslateInstance(0, 20)));
+                                                Renderer.lineText(feature, "(covers)", new Font("Arial", Font.PLAIN, 80), 0.5, 20);
                                 } else {
                                         Renderer.lineVector(feature, new LineStyle(Color.black, 10, null, null));
                                 }
                                 if (zoom >= 15)
-                                        Renderer.lineText(feature, "Training Wall", new TextStyle(new Font("Arial", Font.PLAIN, 80)), 0.5, new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -20)));
+                                        Renderer.lineText(feature, "Training Wall", new Font("Arial", Font.PLAIN, 80), 0.5, -20);
                         }
                 }
@@ -149 +148 @@
                         AttItem name = feature.atts.get(Att.OBJNAM);
                         if ((zoom >= 10) && (name != null))
-                                Renderer.labelText(feature, (String) name.val, new TextStyle(new Font("Arial", Font.BOLD, 150)), null);
+                                Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 150), null);
                         break;
                 case TSELNE:
@@ -171 +170 @@
                         }
                         if ((zoom >= 15) && (name != null))
-                                Renderer.labelText(feature, (String) name.val, new TextStyle(new Font("Arial", Font.BOLD, 80)), new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -90)));
+                                Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 80), new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, -90)));
                         break;
                 case MARCUL:
@@ -196 +195 @@
                                 Renderer.lineVector(feature, new LineStyle(Color.black, 8, new float[] { 25, 25 }, null));
                         if ((zoom >= 12) && (name != null))
-                                Renderer.labelText(feature, (String) name.val, new TextStyle(new Font("Arial", Font.PLAIN, 100)), new Delta(Handle.BC, AffineTransform.getTranslateInstance(0, 0)));
+                                Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.PLAIN, 100), new Delta(Handle.CC, AffineTransform.getTranslateInstance(0, 0)));
                         break;
                 case RESARE:
@@ -210 +209 @@
                                 Renderer.lineVector(feature, new LineStyle(Color.black, 20, new float[] { 40, 40 }, null));
                                 if ((zoom >= 15) && (name != null))
-                                        Renderer.labelText(feature, (String) name.val, new TextStyle(new Font("Arial", Font.BOLD, 80)), new Delta(Handle.TC, AffineTransform.getTranslateInstance(0, 10)));
+                                        Renderer.labelText(feature, (String) name.val, new Font("Arial", Font.BOLD, 80), new Delta(Handle.TC, AffineTransform.getTranslateInstance(0, 10)));
                         }
                         break;
                 case SEAARE:
+                        switch ((CatSEA) Renderer.getAttVal(feature, feature.type, 0, Att.CATSEA)) {
+                        case SEA_RECH:
+                                break;
+                        case SEA_BAY:
+                                break;
+                        case SEA_SHOL:
+                                break;
+                        case SEA_GAT:
+                        case SEA_NRRW:
+                                break;
+                        }
                         break;
                 case SNDWAV:

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

@@ -120 +120 @@
         private Feature feature;
         private ArrayList<Long> list;
-        private long mpid;
 
         public SeaMap() {
@@ -154 +153 @@
                 list = new ArrayList<Long>();
                 mpolys.put(id, list);
-                mpid = id;
+                feature = new Feature();
+                feature.refs = id;
+                feature.flag = Fflag.AREA;
         }
 
@@ -164 +165 @@
                 if (outer) {
                         list.add(0, way);
-                        outers.put(way, mpid);
+                        outers.put(way, feature.refs);
                 } else {
                         list.add(way);