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

Timestamp:

2013-01-20T11:51:05+01:00 (13 years ago)

Author:

malcolmh

Message:

save

File:

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

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

@@ -100 +100 @@
                 ArrayList<Long> way;
                 if (map.mpolys.containsKey(feature.refs)) {
-                        way = map.ways.get(map.mpolys.get(feature.refs));
+                        way = map.ways.get(map.mpolys.get(feature.refs).get(0));
                 } else {
                         way = map.ways.get(feature.refs);
@@ -107 +107 @@
                 case NODE:
                         return map.nodes.get(feature.refs);
-                case WAY:
+                case LINE:
                         coord = map.nodes.get(way.get(1));
                         break;
@@ -152 +152 @@
                                 }
                                 if (item.type == Prim.SYMB) {
-                                        ssymb = (Symbol) item.params;
+                                        ssymb = ((SubSymbol)item.params).instr;
                                         break;
                                 }
@@ -293 +293 @@
         public static void labelText (Feature feature, String str, Font font, Color colour, Delta delta) {
                 Symbol label = new Symbol();
-                label.add(new Instr(Prim.TEXT, new Caption(str, font, colour
-                                , delta)));
+                label.add(new Instr(Prim.TEXT, new Caption(str, font, colour, (delta == null) ? new Delta(Handle.CC, null) : delta)));
                 Point2D point = helper.getPoint(findCentroid(feature));
-                Symbols.drawSymbol(g2, label, tScale, point.getX(), point.getY(), delta, null);
+                Symbols.drawSymbol(g2, label, tScale, point.getX(), point.getY(), null, null);
         }