Changeset 3269 in josm for trunk/src

Timestamp:

2010-05-22T23:22:23+02:00 (14 years ago)

Author:

stoecker

Message:

also render names when they are in the multipolygon relation itself

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• MapPaintVisitor.java (modified) (3 diffs)
• MapPainter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java

@@ -184 +184 @@
             if (fillAreas > dist)
             {
-                painter.drawArea(getPolygon(w), (data.isSelected(w) ? paintSettings.getSelectedColor() : areaStyle.color), painter.getWayName(w));
+                painter.drawArea(getPolygon(w), (data.isSelected(w) ? paintSettings.getSelectedColor() : areaStyle.color), painter.getAreaName(w));
                 if(!w.isClosed()) {
                     putError(w, tr("Area style way is not closed."), true);
@@ -203 +203 @@
                 areaStyle.getLineStyle().paintPrimitive(way, paintSettings, painter, true);
                 if(area) {
-                    painter.drawArea(getPolygon(way), (areaselected ? paintSettings.getSelectedColor() : areaStyle.color), painter.getWayName(way));
+                    painter.drawArea(getPolygon(way), (areaselected ? paintSettings.getSelectedColor() : areaStyle.color), painter.getAreaName(way));
                 }
             } else {
@@ -497 +497 @@
 
                     boolean selected = pd.selected || data.isSelected(r);
-                    painter.drawArea(p, selected ? paintSettings.getSelectedColor() : areaStyle.color, null);
+                    painter.drawArea(p, selected ? paintSettings.getSelectedColor() : areaStyle.color, painter.getAreaName(r));
                     visible = true;
                 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -396 +397 @@
 
     //TODO Not a good place for this method
-    public String getWayName(Way w) {
+    public String getAreaName(OsmPrimitive w) {
         String name = null;
         if (w.hasKeys()) {