Changeset 16421 in josm

Timestamp:

2020-05-16T16:38:29+02:00 (5 years ago)

Author:

simon04

Message:

Use IPrimitive.isMultipolygon

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java (modified) (5 diffs)

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

@@ -130 +130 @@
     }
 
-    private static boolean isMultipolygon(OsmPrimitive p) {
-        return p instanceof Relation && ((Relation) p).isMultipolygon();
-    }
-
     private void updateMultipolygonsReferringTo(AbstractDatasetChangedEvent event) {
         updateMultipolygonsReferringTo(event, event.getPrimitives(), event.getDataset());
@@ -149 +145 @@
         if (primitives != null) {
             for (OsmPrimitive p : primitives) {
-                if (isMultipolygon(p)) {
+                if (p.isMultipolygon()) {
                     if (maps == null) {
                         maps = getMapsFor(ds);
@@ -157 +153 @@
                 } else if (p instanceof Way && p.getDataSet() != null) {
                     for (OsmPrimitive ref : p.getReferrers()) {
-                        if (isMultipolygon(ref)) {
+                        if (ref.isMultipolygon()) {
                             if (maps == null) {
                                 maps = getMapsFor(ds);
@@ -256 +252 @@
         Collection<Map<Relation, Multipolygon>> maps = null;
         for (OsmPrimitive p : event.getPrimitives()) {
-            if (isMultipolygon(p)) {
+            if (p.isMultipolygon()) {
                 if (maps == null) {
                     maps = getMapsFor(event.getDataset());
@@ -310 +306 @@
                 }
                 for (OsmPrimitive ref : p.getReferrers()) {
-                    if (isMultipolygon(ref)) {
+                    if (ref.isMultipolygon()) {
                         if (maps == null) {
                             maps = getMapsFor(ds);