Changeset 3814 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-01-24T13:40:19+01:00 (14 years ago)

Author:

bastiK

Message:

fixed #5873 - Custom styles are not used. If more than 1 rule applies with the same priority, use the last and not the first rule. This has worked before r3803 because it did not take the priority into account when the rules are in different files.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (modified) (6 diffs)

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

@@ -44 +44 @@
             IconElemStyle style;
             if ((style = icons.get("n" + key + "=" + val)) != null) {
-                if (icon == null || style.priority > icon.priority) {
+                if (icon == null || style.priority >= icon.priority) {
                     icon = style;
                 }
             }
             if ((style = icons.get("b" + key + "=" + OsmUtils.getNamedOsmBoolean(val))) != null) {
-                if (icon == null || style.priority > icon.priority) {
+                if (icon == null || style.priority >= icon.priority) {
                     icon = style;
                 }
             }
             if ((style = icons.get("x" + key)) != null) {
-                if (icon == null || style.priority > icon.priority) {
+                if (icon == null || style.priority >= icon.priority) {
                     icon = style;
                 }
@@ -60 +60 @@
         }
         for (IconElemStyle s : iconsList) {
-            if ((icon == null || s.priority > icon.priority) && s.check(primitive)) {
+            if ((icon == null || s.priority >= icon.priority) && s.check(primitive)) {
                 icon = s;
             }
@@ -75 +75 @@
             LineElemStyle styleLine;
             String idx = "n" + key + "=" + val;
-            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority > area.priority) && (!noclosed || !styleArea.closed)) {
+            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority >= area.priority) && (!noclosed || !styleArea.closed)) {
                 area = styleArea;
             }
-            if ((styleLine = lines.get(idx)) != null && (line == null || styleLine.priority > line.priority)) {
+            if ((styleLine = lines.get(idx)) != null && (line == null || styleLine.priority >= line.priority)) {
                 line = styleLine;
                 lineIdx = idx;
@@ -86 +86 @@
             }
             idx = "b" + key + "=" + OsmUtils.getNamedOsmBoolean(val);
-            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority > area.priority) && (!noclosed || !styleArea.closed)) {
+            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority >= area.priority) && (!noclosed || !styleArea.closed)) {
                 area = styleArea;
             }
-            if ((styleLine = lines.get(idx)) != null && (line == null || styleLine.priority > line.priority)) {
+            if ((styleLine = lines.get(idx)) != null && (line == null || styleLine.priority >= line.priority)) {
                 line = styleLine;
                 lineIdx = idx;
@@ -97 +97 @@
             }
             idx = "x" + key;
-            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority > area.priority) && (!noclosed || !styleArea.closed)) {
+            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority >= area.priority) && (!noclosed || !styleArea.closed)) {
                 area = styleArea;
             }
-            if ((styleLine = lines.get(idx)) != null && (line == null || styleLine.priority > line.priority)) {
+            if ((styleLine = lines.get(idx)) != null && (line == null || styleLine.priority >= line.priority)) {
                 line = styleLine;
                 lineIdx = idx;
@@ -109 +109 @@
         }
         for (AreaElemStyle s : areasList) {
-            if ((area == null || s.priority > area.priority) && (!noclosed || !s.closed) && s.check(primitive)) {
+            if ((area == null || s.priority >= area.priority) && (!noclosed || !s.closed) && s.check(primitive)) {
                 area = s;
             }
         }
         for (LineElemStyle s : linesList) {
-            if ((line == null || s.priority > line.priority) && s.check(primitive)) {
+            if ((line == null || s.priority >= line.priority) && s.check(primitive)) {
                 line = s;
             }