Changeset 10875 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-08-22T21:16:36+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13413 - Clean ImproveWayAccuracyAction, add new class MapViewPath (patch by michael2402, modified) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapViewState.java (modified) (3 diffs)
• draw (added)
• draw/MapPath2D.java (added)
• draw/MapViewPath.java (added)
• draw/SymbolShape.java (added)
• draw/package-info.java (added)
• mappaint/styleelement/NodeElement.java (modified) (2 diffs)
• mappaint/styleelement/Symbol.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -10 +10 @@
 import java.awt.geom.Point2D.Double;
 import java.awt.geom.Rectangle2D;
+import java.io.Serializable;
 
 import javax.swing.JComponent;
@@ -29 +30 @@
  * @since 10343
  */
-public final class MapViewState {
+public final class MapViewState implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     /**
@@ -55 +58 @@
     public static final int OUTSIDE_RIGHT = 8;
 
-    private final Projecting projecting;
+    private final transient Projecting projecting;
 
     private final int viewWidth;

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
+import org.openstreetmap.josm.gui.draw.SymbolShape;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
@@ -24 +25 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.BoxProvider;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.SimpleBoxProvider;
-import org.openstreetmap.josm.gui.mappaint.styleelement.Symbol.SymbolShape;
 import org.openstreetmap.josm.gui.util.RotationAngle;
 import org.openstreetmap.josm.tools.CheckParameterUtil;

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/Symbol.java

@@ -5 +5 @@
 import java.awt.Shape;
 import java.awt.Stroke;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Rectangle2D;
 import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Stream;
+
+import org.openstreetmap.josm.gui.draw.SymbolShape;
 
 /**
@@ -86 +83 @@
      */
     public Shape buildShapeAround(double x, double y) {
-        int radius = size / 2;
-        Shape shape;
-        switch (symbolShape) {
-        case SQUARE:
-            // optimize for performance reasons
-            shape = new Rectangle2D.Double(x - radius, y - radius, size, size);
-            break;
-        case CIRCLE:
-            shape = new Ellipse2D.Double(x - radius, y - radius, size, size);
-            break;
-        default:
-            shape = buildPolygon(x, y, radius);
-            break;
-        }
-        return shape;
-    }
-
-    private Shape buildPolygon(double cx, double cy, int radius) {
-        GeneralPath polygon = new GeneralPath();
-        for (int i = 0; i < symbolShape.sides; i++) {
-            double angle = ((2 * Math.PI / symbolShape.sides) * i) - symbolShape.rotation;
-            double x = cx + radius * Math.cos(angle);
-            double y = cy + radius * Math.sin(angle);
-            if (i == 0) {
-                polygon.moveTo(x, y);
-            } else {
-                polygon.lineTo(x, y);
-            }
-        }
-        polygon.closePath();
-        return polygon;
-    }
-
-    /**
-     * A list of possible symbol shapes.
-     */
-    public enum SymbolShape {
-        /**
-         * A square
-         */
-        SQUARE("square", 4, Math.PI / 4),
-        /**
-         * A circle
-         */
-        CIRCLE("circle", 1, 0),
-        /**
-         * A triangle with sides of equal lengh
-         */
-        TRIANGLE("triangle", 3, Math.PI / 2),
-        /**
-         * A pentagon
-         */
-        PENTAGON("pentagon", 5, Math.PI / 2),
-        /**
-         * A hexagon
-         */
-        HEXAGON("hexagon", 6, 0),
-        /**
-         * A heptagon
-         */
-        HEPTAGON("heptagon", 7, Math.PI / 2),
-        /**
-         * An octagon
-         */
-        OCTAGON("octagon", 8, Math.PI / 8),
-        /**
-         * a nonagon
-         */
-        NONAGON("nonagon", 9, Math.PI / 2),
-        /**
-         * A decagon
-         */
-        DECAGON("decagon", 10, 0);
-
-        private final String name;
-        final int sides;
-
-        final double rotation;
-
-        SymbolShape(String name, int sides, double rotation) {
-            this.name = name;
-            this.sides = sides;
-            this.rotation = rotation;
-        }
-
-        /**
-         * Gets the number of normally straight sides this symbol has. Returns 1 for a circle.
-         * @return The sides of the symbol
-         */
-        public int getSides() {
-            return sides;
-        }
-
-        /**
-         * Gets the rotateion of the first point of this symbol.
-         * @return The roration
-         */
-        public double getRotation() {
-            return rotation;
-        }
-
-        /**
-         * Get the MapCSS name for this shape
-         * @return The name
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Get the shape with the given name
-         * @param val The name to search
-         * @return The shape as optional
-         */
-        public static Optional<SymbolShape> forName(String val) {
-            return Stream.of(values()).filter(shape -> val.equals(shape.name)).findAny();
-        }
+        return symbolShape.shapeAround(x, y, size);
     }
 }