Changeset 15991 in josm for trunk

Timestamp:

2020-03-01T23:36:13+01:00 (4 years ago)

Author:

simon04

Message:

see #18802 - MapCSSStyleIndex: reuse rule if base is the same

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleIndex.java (modified) (2 diffs)

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

@@ -5 +5 @@
 
 import java.text.MessageFormat;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -72 +74 @@
         // optimization: filter rules for different primitive types
         ruleStream.forEach(rule -> {
-            final Map<String, MapCSSRule> selectorsByBase = rule.selectors.stream()
-                    .collect(Collectors.groupingBy(Selector::getBase,
-                            Collectors.collectingAndThen(Collectors.toList(), selectors -> new MapCSSRule(selectors, rule.declaration))));
+            final Map<String, MapCSSRule> selectorsByBase;
+            final Set<String> bases = rule.selectors.stream().map(Selector::getBase).collect(Collectors.toSet());
+            if (bases.size() == 1) {
+                // reuse rule
+                selectorsByBase = Collections.singletonMap(bases.iterator().next(), rule);
+            } else {
+                selectorsByBase = rule.selectors.stream()
+                        .collect(Collectors.groupingBy(Selector::getBase,
+                                Collectors.collectingAndThen(Collectors.toList(), selectors -> new MapCSSRule(selectors, rule.declaration))));
+            }
             selectorsByBase.forEach((base, optRule) -> {
                 switch (base) {