Changeset 30269 in osm for applications/editors/josm/plugins/smed2/src/render

Timestamp:

2014-02-09T19:58:46+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/render

Files:

• Renderer.java (modified) (4 diffs)
• Rules.java (modified) (4 diffs)

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

@@ -81 +81 @@
 
         public static void symbol(Feature feature, Symbol symbol) {
-                Point2D point = context.getPoint(feature.centre);
+                Point2D point = context.getPoint(feature.geom.centre);
                 Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), null, null);
         }
         public static void symbol(Feature feature, Symbol symbol, Scheme scheme) {
-                Point2D point = context.getPoint(feature.centre);
+                Point2D point = context.getPoint(feature.geom.centre);
                 Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), scheme, null);
         }
         public static void symbol(Feature feature, Symbol symbol, Delta delta) {
-                Point2D point = context.getPoint(feature.centre);
+                Point2D point = context.getPoint(feature.geom.centre);
                 Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), null, delta);
         }
         public static void symbol(Feature feature, Symbol symbol, Scheme scheme, Delta delta) {
-                Point2D point = context.getPoint(feature.centre);
+                Point2D point = context.getPoint(feature.geom.centre);
                 Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), scheme, delta);
         }
@@ -334 +334 @@
                 circle.add(new Instr(Form.STRK, new BasicStroke(style.width, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1, style.dash, 0)));
                 circle.add(new Instr(Form.ELPS, new Ellipse2D.Double(-radius,-radius,radius*2,radius*2)));
-                Point2D point = context.getPoint(feature.centre);
+                Point2D point = context.getPoint(feature.geom.centre);
                 Symbols.drawSymbol(g2, circle, 1, point.getX(), point.getY(), null, null);
         }
@@ -345 +345 @@
                 switch (feature.geom.prim) {
                 case POINT:
-                        point = context.getPoint(feature.centre);
+                        point = context.getPoint(feature.geom.centre);
                         g2.drawImage(image, new AffineTransformOp(AffineTransform.getScaleInstance(sScale, sScale), AffineTransformOp.TYPE_NEAREST_NEIGHBOR),
                                         (int)(point.getX() - (50 * sScale)), (int)(point.getY() - (50 * sScale)));
@@ -478 +478 @@
                 }
                 label.add(new Instr(Form.TEXT, new Caption(str, font, tc, new Delta(Handle.TL, AffineTransform.getTranslateInstance(tx, ty)))));
-                Point2D point = context.getPoint(feature.centre);
+                Point2D point = context.getPoint(feature.geom.centre);
                 Symbols.drawSymbol(g2, label, sScale, point.getX(), point.getY(), null, delta);
         }

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

@@ -193 +193 @@
                         break;
                 case FAIRWY:
-                        if (feature.area > 2.0) {
+                        if (feature.geom.area > 2.0) {
                                 if (Renderer.zoom < 16)
                                         Renderer.lineVector(feature, new LineStyle(Mline, 8, new float[] { 50, 50 }, new Color(0x40ffffff, true)));
@@ -208 +208 @@
                                         Renderer.symbol(feature, Areas.MarineFarm);
                                 }
-                                if ((feature.area > 0.2) || ((feature.area > 0.05) && (Renderer.zoom >= 14)) || ((feature.area > 0.005) && (Renderer.zoom >= 16))) {
+                                if ((feature.geom.area > 0.2) || ((feature.geom.area > 0.05) && (Renderer.zoom >= 14)) || ((feature.geom.area > 0.005) && (Renderer.zoom >= 16))) {
                                         Renderer.lineVector(feature, new LineStyle(Color.black, 4, new float[] { 10, 10 }));
                                 }
@@ -385 +385 @@
         
         private static void cables(Feature feature) {
-                if ((Renderer.zoom >= 16) && (feature.length < 2)) {
+                if ((Renderer.zoom >= 16) && (feature.geom.length < 2)) {
                         if (feature.type == Obj.CBLSUB) {
                                 Renderer.lineSymbols(feature, Areas.Cable, 0.0, null, null, 0, Mline);
@@ -898 +898 @@
 
         private static void pipelines(Feature feature) {
-                if ((Renderer.zoom >= 16) && (feature.length < 2)) {
+                if ((Renderer.zoom >= 16) && (feature.geom.length < 2)) {
                         if (feature.type == Obj.PIPSOL) {
                                 Renderer.lineSymbols(feature, Areas.Pipeline, 1.0, null, null, 0, Mline);
                         } else if (feature.type == Obj.PIPOHD) {
                                 Renderer.lineVector(feature, new LineStyle(Color.black, 8));
-                                AttMap atts = feature.objs.get(Obj.PIPOHD).get(0);
+                                AttMap atts = feature.atts;
                                 double verclr = 0;
                                 if (atts != null) {