Changeset 3844 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

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

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• ElemStyles.java (modified) (4 diffs)
• xml/XmlStyleSource.java (modified) (2 diffs)

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);