Changeset 7378 in josm for trunk/src

Timestamp:

2014-08-12T11:36:47+02:00 (11 years ago)

Author:

bastiK

Message:

see #10363 - show place=* icons on |z11-

• special handling for instructions with keword "none" as value: always treat as null value
• print current zoom level to command line with at --trace debug level

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRenderer.java (modified) (5 diffs)
• gui/mappaint/mapcss/Instruction.java (modified) (1 diff)
• gui/mappaint/mapcss/Selector.java (modified) (1 diff)

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

@@ -70 +70 @@
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
 import org.openstreetmap.josm.gui.mappaint.TextElement;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
 import org.openstreetmap.josm.tools.CompositeList;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -1244 +1245 @@
                 Main.pref.getBoolean("mappaint.use-antialiasing", true) ?
                         RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
-
+            
         highlightLineWidth = Main.pref.getInteger("mappaint.highlight.width", 4);
         highlightPointRadius = Main.pref.getInteger("mappaint.highlight.radius", 7);
@@ -1488 +1489 @@
             List<Way> ways = data.searchWays(bbox);
             List<Relation> relations = data.searchRelations(bbox);
-    
+
             final List<StyleRecord> allStyleElems = new ArrayList<>(nodes.size()+ways.size()+relations.size());
-    
+
             ConcurrentTasksHelper helper = new ConcurrentTasksHelper(allStyleElems, data);
 
@@ -1506 +1507 @@
             }
 
-            Collections.sort(allStyleElems);
+            Collections.sort(allStyleElems); // TODO: try parallel sort when switching to Java 8
 
             for (StyleRecord r : allStyleElems) {
@@ -1517 +1518 @@
                 );
             }
-    
+
             if (Main.isTraceEnabled()) {
                 timeFinished = System.currentTimeMillis();
-                System.err.println("; phase 2 (draw): " + (timeFinished - timePhase1) + " ms; total: " + (timeFinished - timeStart) + " ms");
-            }
-    
+                System.err.println("; phase 2 (draw): " + (timeFinished - timePhase1) + " ms; total: " + (timeFinished - timeStart) + " ms" +
+                    " (scale: " + circum + " zoom level: " + Selector.GeneralSelector.scale2level(circum) + ")");
+            }
+
             drawVirtualNodes(data, bbox);
         } finally {

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

@@ -36 +36 @@
             this.key = key;
             this.isSetInstruction = isSetInstruction;
-            if (val instanceof LiteralExpression) {
+            if (val instanceof Keyword) {
+                if ("none".equals(((Keyword) val).val)) {
+                    this.val = null;
+                } else {
+                    this.val = val;
+                }
+            } else if (val instanceof LiteralExpression) {
                 Object litValue = ((LiteralExpression) val).evaluate(null);
                 if (key.equals(TEXT)) {

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

@@ -596 +596 @@
             return 2.0 * Math.PI * R / Math.pow(2.0, lvl) / 2.56;
         }
+        
+        public static int scale2level(double scale) {
+            if (scale < 0)
+                throw new IllegalArgumentException();
+            return (int) Math.floor(Math.log(2 * Math.PI * R / 2.56 / scale) / Math.log(2));
+        }
 
         @Override