Context Navigation

Changeset 29517 in osm for applications/viewer/jmapviewer/src/org

Timestamp:

2013-04-19T23:52:11+02:00 (12 years ago)

Author:

donvip

Message:

fix #josm8620 - Breaking changes in jmapviewer

Location:

Files:

-              r29514
+              r29517
         Layer franceLayer = treeMap.addLayer("France");
         map().addMapMarker(new MapMarkerDot(franceLayer, "La Gallerie", 48.71, -1));
+        map().addMapMarker(new MapMarkerDot(43.604, 1.444));
+        map().addMapMarker(new MapMarkerCircle(53.343, -6.267, 0.666));
+        map().addMapRectangle(new MapRectangleImpl(new Coordinate(53.343, -6.267), new Coordinate(43.604, 1.444)));
         map().addMapMarker(darmstadt);
         treeMap.addLayer(germanyWestLayer);

-              r29513
+              r29517
     STYLE markerStyle;
+    public MapMarkerCircle(Coordinate coord, double radius) {
+        this(null, null, coord, radius);
+    }
     public MapMarkerCircle(String name, Coordinate coord, double radius) {
         this(null, name, coord, radius);
 …
     public MapMarkerCircle(Layer layer, Coordinate coord, double radius) {
         this(layer, null, coord, radius);
+    }
+    public MapMarkerCircle(double lat, double lon, double radius) {
+        this(null, null, new Coordinate(lat,lon), radius);
+    }
     public MapMarkerCircle(Layer layer, double lat, double lon, double radius) {
 …
         else coord.setLon(lon);
+    }
+}

-              r29513
+              r29517
     public static final int DOT_RADIUS = 5;
+    public MapMarkerDot(Coordinate coord) {
+        this(null, null, coord);
+    }
     public MapMarkerDot(String name, Coordinate coord) {
         this(null, name, coord);
 …
     public MapMarkerDot(Layer layer, String name, Coordinate coord) {
         this(layer, name, coord, getDefaultStyle());
+    }
+    public MapMarkerDot(Color color, double lat, double lon) {
+        this(null, null, lat, lon);
+        setColor(color);
+    }
+    public MapMarkerDot(double lat, double lon) {
+        this(null, null, lat, lon);
+    }
     public MapMarkerDot(Layer layer, double lat, double lon) {

-              r29513
+              r29517
+    }
     public Style getStyleAssigned(){
         return style==null?layer.getStyle():style;
+        return style == null ? (layer == null ? null : layer.getStyle()) : style;
+    }
     public void setStyle(Style style){
 …
+    }
     public Color getColor() {
+        return getStyleAssigned().getColor();
+        Style styleAssigned = getStyleAssigned();
+        return styleAssigned == null ? null : getStyleAssigned().getColor();
+    }
     public void setColor(Color color) {
 …
     public Color getBackColor() {
+        return getStyleAssigned().getBackColor();
+        Style styleAssigned = getStyleAssigned();
+        return styleAssigned == null ? null : getStyleAssigned().getBackColor();
+    }
     public void setBackColor(Color backColor) {
 …
     public Stroke getStroke() {
+        return getStyleAssigned().getStroke();
+        Style styleAssigned = getStyleAssigned();
+        return styleAssigned == null ? null : getStyleAssigned().getStroke();
+    }
     public void setStroke(Stroke stroke) {
 …
     public Font getFont() {
+        return getStyleAssigned().getFont();
+        Style styleAssigned = getStyleAssigned();
+        return styleAssigned == null ? null : getStyleAssigned().getFont();
+    }
     public void setFont(Font font) {

-              r29516
+              r29517
     private Coordinate bottomRight;
+    public MapRectangleImpl(Coordinate topLeft, Coordinate bottomRight) {
+        this(null, null, topLeft, bottomRight);
+    }
     public MapRectangleImpl(String name, Coordinate topLeft, Coordinate bottomRight) {
         this(null, name, topLeft, bottomRight);

Note: See TracChangeset for help on using the changeset viewer.