Changeset 3601 in osm for applications/editors/josm

Timestamp:

2007-07-15T17:09:07+02:00 (17 years ago)

Author:

ulf

Message:

implement a way to set both maxScale and minScale, exchanging former zoom funtionality

Location:

applications/editors/josm/plugins/mappaint/src/mappaint

Files:

• AreaElemStyle.java (modified) (1 diff)
• ElemStyle.java (modified) (1 diff)
• ElemStyleHandler.java (modified) (8 diffs)
• IconElemStyle.java (modified) (1 diff)
• LineElemStyle.java (modified) (2 diffs)
• MapPaintVisitor.java (modified) (1 diff)

applications/editors/josm/plugins/mappaint/src/mappaint/AreaElemStyle.java

@@ -6 +6 @@
         Color colour;
 
-        public AreaElemStyle (Color colour, int minZoom)
+        public AreaElemStyle (Color colour, int maxScale, int minScale)
         {
                 this.colour = colour;
-                this.minZoom = minZoom;
+                this.maxScale = maxScale;
+                this.minScale = minScale;
         }
 

applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyle.java

@@ -4 +4 @@
 {
         // zoom range to display the feature
-        protected int minZoom;
+        protected int minScale;
+        protected int maxScale;
 
-        public int getMinZoom()
+        public int getMinScale()
         {
-                return minZoom;
+                return minScale;
+        }
+        public int getMaxScale()
+        {
+                return maxScale;
         }
 }

applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java

@@ -15 +15 @@
 public class ElemStyleHandler extends DefaultHandler
 {
-    boolean inDoc, inRule, inCondition, inElemStyle, inLine, inIcon, inArea, inScaleMax;
+    boolean inDoc, inRule, inCondition, inElemStyle, inLine, inIcon, inArea, inScaleMax, inScaleMin;
     ElemStyles styles = null;
     String curKey = null;
@@ -27 +27 @@
     boolean curIconAnnotate = true;
         int curScaleMax = 1000000000;
+        int curScaleMin = 0;
 
     public ElemStyleHandler(  )
@@ -94 +95 @@
                         {
                                 inScaleMax = true;
+                        }
+                        else if (qName.equals("scale_min"))
+                        {
+                                inScaleMin = true;
                         }
             else if (qName.equals("icon"))
@@ -143 +148 @@
                         {
                 newStyle = new LineElemStyle(curLineWidth, curLineRealWidth, curLineColour, 
-                                                                                curLineDashed, curScaleMax);
+                                                                                curLineDashed, curScaleMax, curScaleMin);
                 styles.add (curKey, curValue, newStyle);
                                 curLineWidth    = 1;
@@ -152 +157 @@
                         if(curIcon != null)
                         {
-                                newStyle = new IconElemStyle(curIcon,curIconAnnotate,curScaleMax);
+                                newStyle = new IconElemStyle(curIcon, curIconAnnotate, curScaleMax, curScaleMin);
                 styles.add (curKey, curValue, newStyle);
                                 curIcon                 = null;
@@ -159 +164 @@
                         if(curAreaColour != null)
                         {
-                newStyle = new AreaElemStyle (curAreaColour,curScaleMax);
+                newStyle = new AreaElemStyle (curAreaColour, curScaleMax, curScaleMin);
                 styles.add (curKey, curValue, newStyle);
                                 curAreaColour   = null;
                         }
                         curScaleMax = 1000000000;
+                        curScaleMin = 0;
 
         }
@@ -175 +181 @@
             inArea = false;
                 else if (qName.equals("scale_max"))
-                        {
-                                inScaleMax = false;
-                        }
+                        inScaleMax = false;
+                else if (qName.equals("scale_min"))
+                        inScaleMin = false;
     }
 
@@ -187 +193 @@
                         curScaleMax = Integer.parseInt(content);
                 }
+                if(     inScaleMin == true) {
+                        String content = new String(ch, start, length);
+
+                        curScaleMin = Integer.parseInt(content);
+                }
     }
 }

applications/editors/josm/plugins/mappaint/src/mappaint/IconElemStyle.java

@@ -7 +7 @@
         boolean annotate;
 
-        public IconElemStyle (ImageIcon icon, boolean annotate, int minZoom)
+        public IconElemStyle (ImageIcon icon, boolean annotate, int maxScale, int minScale)
         {
                 this.icon=icon;
                 this.annotate=annotate;
-                this.minZoom = minZoom;
+                this.maxScale = maxScale;
+                this.minScale = minScale;
         }       
         

applications/editors/josm/plugins/mappaint/src/mappaint/LineElemStyle.java

@@ -9 +9 @@
         boolean dashed = false;
 
-        public LineElemStyle (int width, int realWidth, Color colour, boolean dashed, int minZoom)
+        public LineElemStyle (int width, int realWidth, Color colour, boolean dashed, int maxScale, int minScale)
         {
                 this.width = width;
@@ -15 +15 @@
                 this.colour = colour;
                 this.dashed = dashed;
-                this.minZoom = minZoom;
+                this.maxScale = maxScale;
+                this.minScale = minScale;
         }
 

applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java

@@ -47 +47 @@
                 }
                 
-                if(circum>=e.getMinZoom() / 70) {
+                if(circum>=e.getMaxScale() / 70 || circum<e.getMinScale() / 70) {
                         return false;
                 } else {