Changeset 3844 in josm for trunk

Timestamp:

2011-02-02T16:56:07+01:00 (14 years ago)

Author:

stoecker

Message:

see #5899 - support different display of closed ways and areas

Location:

trunk

Files:

• images/data/closedway.png (added)
• images/data/multipolygon.png (added)
• src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/Relation.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/RelationMember.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/Way.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -1216 +1216 @@
 
         for (Relation r : CombineWayAction.getParentRelations(selectedWays)) {
-            if (r.isDeleted() ||
-                    r.get("type") == null ||
-                    !r.get("type").equalsIgnoreCase("multipolygon")) {
+            if (r.isDeleted() || !r.isMultipolygon()) {
                 continue;
             }
@@ -1390 +1388 @@
 
         for (RelationRole r : rels) {
-            if (r.rel.get("type") != null &&
-                    r.rel.get("type").equalsIgnoreCase("multipolygon") &&
-                    r.role.equalsIgnoreCase("outer")
-            ) {
+            if (r.rel.isMultipolygon() && r.role.equalsIgnoreCase("outer")) {
                 multiouters.add(r);
                 continue;

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -560 +560 @@
     public PrimitiveId getPrimitiveId() {
         return new SimplePrimitiveId(getUniqueId(), getType());
+    }
+
+    public OsmPrimitiveType getDisplayType() {
+        return getType();
     }
 

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java

@@ -10 +10 @@
     NODE (marktr("node"), Node.class, NodeData.class),
     WAY  (marktr("way"), Way.class, WayData.class),
-    RELATION (marktr("relation"), Relation.class, RelationData.class);
+    RELATION (marktr("relation"), Relation.class, RelationData.class),
+
+    /* only for display, no real type */
+    CLOSEDWAY  (marktr("closedway"), Way.class, WayData.class),
+    MULTIPOLYGON (marktr("multipolygon"), Relation.class, RelationData.class);
 
     private final String apiTypeName;

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -371 +371 @@
     }
 
+    public OsmPrimitiveType getDisplayType() {
+        return isMultipolygon() ? OsmPrimitiveType.MULTIPOLYGON
+        : OsmPrimitiveType.RELATION;
+    }
+
+    public boolean isMultipolygon() {
+        return "multipolygon".equals(get("type"));
+    }
+
     @Override
     public BBox getBBox() {

trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java

@@ -54 +54 @@
     public boolean isWay() {
         return member instanceof Way;
+    }
+
+    /**
+     *
+     * @return type of member for icon display
+     * @since 3844
+     */
+    public OsmPrimitiveType getDisplayType() {
+        return member.getDisplayType();
     }
 

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -429 +429 @@
     }
 
+    @Override
+    public OsmPrimitiveType getDisplayType() {
+        return isClosed() ? OsmPrimitiveType.CLOSEDWAY : OsmPrimitiveType.WAY;
+    }
+
     private void checkNodes() {
         DataSet dataSet = getDataSet();

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -128 +128 @@
     public void visit(Relation r) {
         nonClosedWays.clear();
-        if ("multipolygon".equals(r.get("type"))) {
+        if (r.isMultipolygon()) {
             checkMembersAndRoles(r);
 

trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java

@@ -111 +111 @@
         if (type != null && !w.isClosed()) {
             for (OsmPrimitive parent: w.getReferrers()) {
-                if (parent instanceof Relation && "multipolygon".equals(parent.get("type")))
+                if (parent instanceof Relation && ((Relation)parent).isMultipolygon())
                     return;
             }

trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java

@@ -114 +114 @@
         multipolygonways = new LinkedList<Way>();
         for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
-            if (r.isUsable() && "multipolygon".equals(r.get("type"))) {
+            if (r.isUsable() && r.isMultipolygon()) {
                 for (RelationMember m : r.getMembers()) {
                     if (m.getMember() != null && m.getMember() instanceof Way &&

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

@@ -68 +68 @@
         if (def != null && value != null && def instanceof JLabel) {
             ((JLabel)def).setText(getComponentText(value));
-            ((JLabel)def).setIcon(ImageProvider.get(value.getType()));
+            ((JLabel)def).setIcon(ImageProvider.get(value.getDisplayType()));
             ((JLabel)def).setToolTipText(getComponentToolTipText(value));
         }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java

@@ -38 +38 @@
     public final static Color BGCOLOR_FROZEN = new Color(234,234,234);
 
-    private ImageIcon nodeIcon;
-    private ImageIcon wayIcon;
-    private ImageIcon relationIcon;
     private  Border rowNumberBorder = null;
-
-    /**
-     * Load the image icon for an OSM primitive of type node
-     *
-     * @return the icon; null, if not found
-     */
-    protected void loadIcons() {
-        nodeIcon = ImageProvider.get("data", "node");
-        wayIcon = ImageProvider.get("data", "way");
-        relationIcon = ImageProvider.get("data", "relation");
-    }
 
     /**
@@ -60 +46 @@
         setIcon(null);
         setOpaque(true);
-        loadIcons();
         rowNumberBorder = BorderFactory.createEmptyBorder(0,4,0,0);
     }
@@ -156 +141 @@
         setText(displayName);
         setToolTipText(buildToolTipText(member.getMember()));
-        if (member.isNode()) {
-            setIcon(nodeIcon);
-        } else if (member.isWay()) {
-            setIcon(wayIcon);
-        } else if (member.isRelation()) {
-            setIcon(relationIcon);
-        } else {
-            // should not happen
-            setIcon(null);
-        }
+        setIcon(ImageProvider.get(member.getDisplayType()));
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -103 +103 @@
             for (OsmPrimitive referrer : osm.getReferrers()) {
                 Relation r = (Relation) referrer;
-                if (!drawMultipolygon || !"multipolygon".equals(r.get("type"))  || !r.isUsable()) {
+                if (!drawMultipolygon || !r.isMultipolygon()  || !r.isUsable()) {
                     continue;
                 }
@@ -150 +150 @@
             for (OsmPrimitive referrer : osm.getReferrers()) {
                 Relation ref = (Relation) referrer;
-                if (!drawMultipolygon || !"multipolygon".equals(ref.get("type"))  || !ref.isUsable()) {
+                if (!drawMultipolygon || !ref.isMultipolygon() || !ref.isUsable()) {
                     continue;
                 }
@@ -184 +184 @@
         {
             Pair<StyleList, Range> p = generateStyles(osm, scale, null, true);
-            if (drawMultipolygon && "multipolygon".equals(osm.get("type"))) {
+            if (drawMultipolygon && ((Relation)osm).isMultipolygon()) {
                 if (!Utils.exists(p.a, AreaElemStyle.class)) {
                     // look at outer ways to find area style
@@ -235 +235 @@
                 addIfNotNull(sl, NodeElemStyle.create(c));
             } else if (osm instanceof Relation) {
-                if ("multipolygon".equals(osm.get("type"))) {
+                if (((Relation)osm).isMultipolygon()) {
                     addIfNotNull(sl, AreaElemStyle.create(c));
                     addIfNotNull(sl, LineElemStyle.createLine(c));

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -67 +67 @@
             while(parser.hasNext()) {
             }
-            
+
         } catch(IOException e) {
             System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
@@ -278 +278 @@
                 }
             }
-        } else if (osm instanceof Way || (osm instanceof Relation && "multipolygon".equals(osm.get("type")))) {
+        } else if (osm instanceof Way || (osm instanceof Relation && ((Relation)osm).isMultipolygon())) {
             WayPrototypesRecord p = new WayPrototypesRecord();
             get(osm, pretendWayIsClosed || !(osm instanceof Way) || ((Way) osm).isClosed(), p, (useMinMaxScale ? scale : null), mc);