Changeset 5705 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2013-02-11T18:19:49+01:00 (11 years ago)

Author:

bastiK

Message:

mapcss: rework of eval expressions; significant performance improvement; fixes a bug w.r.t. overloading of the 'length' function.

File:

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

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

@@ -308 +308 @@
     private Color highlightColorTransparent;
     
-    private static int FLAG_NORMAL = 0;
-    private static int FLAG_DISABLED = 1;
-    private static int FLAG_MEMBER_OF_SELECTED = 2;
-    private static int FLAG_SELECTED = 4;
+    private static final int FLAG_NORMAL = 0;
+    private static final int FLAG_DISABLED = 1;
+    private static final int FLAG_MEMBER_OF_SELECTED = 2;
+    private static final int FLAG_SELECTED = 4;
 
     private static final double PHI = Math.toRadians(20);
@@ -366 +366 @@
     }
 
-    private void collectRelationStyles(DataSet data, StyleCollector sc, BBox bbox) {
-        for (Relation r: data.searchRelations(bbox)) {
-            if (r.isDrawable()) {
-                if (r.isDisabled()) {
-                    sc.add(r, FLAG_DISABLED);
-                } else if (data.isSelected(r)) {
-                    sc.add(r, FLAG_SELECTED);
-                } else {
-                    sc.add(r, FLAG_NORMAL);
-                }
-            }
-        }
-    }
-
     private void collectWayStyles(DataSet data, StyleCollector sc, BBox bbox) {
         for (final Way w : data.searchWays(bbox)) {
@@ -391 +377 @@
                 } else {
                     sc.add(w, FLAG_NORMAL);
+                }
+            }
+        }
+    }
+
+    private void collectRelationStyles(DataSet data, StyleCollector sc, BBox bbox) {
+        for (Relation r: data.searchRelations(bbox)) {
+            if (r.isDrawable()) {
+                if (r.isDisabled()) {
+                    sc.add(r, FLAG_DISABLED);
+                } else if (data.isSelected(r)) {
+                    sc.add(r, FLAG_SELECTED);
+                } else {
+                    sc.add(r, FLAG_NORMAL);
                 }
             }