Changeset 3836 in josm for trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

Timestamp:

2011-01-31T14:18:47+01:00 (15 years ago)

Author:

bastiK

Message:

mappaint restructuring aimed at mapcss support:

• area- and line style of multipolygon outer & inner ways are no longer determined by MapPaintVisitor, but the information is calculated in advance and cached
• cache is aware of zoom level
• z_index property to allow more fancy styles in future

Performance: when the style cache is filled, painting is the same or ~5% faster. The first painting, which includes style generation, takes ~30% longer than before. (There is potential for optimization, though.) Memory usage unchanged.

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (3 diffs)

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

@@ -300 +300 @@
      *--------*/
     public StyleCache mappaintStyle = null;
-    public int mappaintDrawnCode = 0;
 
     /* This should not be called from outside. Fixing the UI to add relevant
@@ -307 +306 @@
     public void clearCached()
     {
-        mappaintDrawnCode = 0;
         mappaintStyle = null;
     }
@@ -808 +806 @@
     public boolean isSelected() {
         return dataSet != null && dataSet.isSelected(this);
+    }
+
+    public boolean isMemberOfSelected() {
+        if (referrers == null)
+            return false;
+        if (referrers instanceof OsmPrimitive)
+            return referrers instanceof Relation && ((OsmPrimitive) referrers).isSelected();
+        for (OsmPrimitive ref : (OsmPrimitive[]) referrers) {
+            if (ref instanceof Relation && ref.isSelected())
+                return true;
+        }
+        return false;
     }