Changeset 15910 in josm

Timestamp:

2020-02-23T11:54:23+01:00 (4 years ago)

Author:

simon04

Message:

MapCSSParser.zoom: parse into Range directly

Location:

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

Files:

• MapCSSParser.jj (modified) (5 diffs)
• Selector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -20 +20 @@
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.gui.mappaint.Keyword;
+import org.openstreetmap.josm.gui.mappaint.Range;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context;
@@ -42 +43 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -728 +728 @@
     Token base;
     Condition c;
-    Pair<Integer, Integer> r = null;
+    Range r = Range.ZERO_TO_INFINITY;
     List<Condition> conditions = new ArrayList<Condition>();
     Subpart sub = null;
@@ -740 +740 @@
 }
 
-Pair<Integer, Integer> zoom() :
+Range zoom() :
 {
     Integer min = 0;
@@ -755 +755 @@
             min=uint() { max = min; }
     )
-    { return new Pair<Integer, Integer>(min, max); }
+    { return GeneralSelector.fromLevel(min, max); }
 }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -32 +32 @@
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -610 +609 @@
     class GeneralSelector extends OptimizedGeneralSelector {
 
-        public GeneralSelector(String base, Pair<Integer, Integer> zoom, List<Condition> conds, Subpart subpart) {
+        public GeneralSelector(String base, Range zoom, List<Condition> conds, Subpart subpart) {
             super(base, zoom, conds, subpart);
         }
@@ -638 +637 @@
         public final Subpart subpart;
 
-        public OptimizedGeneralSelector(String base, Pair<Integer, Integer> zoom, List<Condition> conds, Subpart subpart) {
-            super(conds);
-            this.base = checkBase(base);
-            if (zoom != null) {
-                int a = zoom.a == null ? 0 : zoom.a;
-                int b = zoom.b == null ? Integer.MAX_VALUE : zoom.b;
-                if (a <= b) {
-                    range = fromLevel(a, b);
-                } else {
-                    range = Range.ZERO_TO_INFINITY;
-                }
-            } else {
-                range = Range.ZERO_TO_INFINITY;
-            }
-            this.subpart = subpart != null ? subpart : Subpart.DEFAULT_SUBPART;
-        }
-
         public OptimizedGeneralSelector(String base, Range range, List<Condition> conds, Subpart subpart) {
             super(conds);
             this.base = checkBase(base);
-            this.range = range;
+            this.range = Objects.requireNonNull(range, "range");
             this.subpart = subpart != null ? subpart : Subpart.DEFAULT_SUBPART;
         }