Changeset 2787 in osm for applications

Timestamp:

2007-05-06T18:12:25+02:00 (18 years ago)

Author:

damians

Message:

added useRealWidth function

Location:

applications/editors/josm/plugins/mappaint

Files:

• mappaint.jar (modified) ( previous)
• src/mappaint/ElemStyleHandler.java (modified) (3 diffs)
• src/mappaint/LineElemStyle.java (modified) (2 diffs)
• src/mappaint/MapPaintVisitor.java (modified) (4 diffs)
• styles/standard/elemstyles.xml (modified) (8 diffs)

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

@@ -18 +18 @@
     ElemStyle curStyle;
     ElemStyles styles;
-    String curWidth, curKey, curValue;
+    String curKey, curValue ;
+                int curWidth = 1, curRealWidth = 0;
         int curMinZoom;
     ImageIcon curIcon;
@@ -78 +79 @@
                 {
                     if(atts.getQName(count).equals("width"))
-                        curWidth = atts.getValue(count);
+                        curWidth = Integer.parseInt(atts.getValue(count));
                     else if (atts.getQName(count).equals("colour"))
                         curColour=ColorHelper.html2color(atts.getValue(count));
+                                                                                else if (atts.getQName(count).equals("realwidth"))
+                                                                                                curRealWidth=Integer.parseInt(atts.getValue(count));
                 }
             }
@@ -137 +140 @@
         {
             inLine = false;
-            curStyle = new LineElemStyle(Integer.parseInt(curWidth), curColour,
+            curStyle = new LineElemStyle(curWidth,curRealWidth, curColour,
                                                                                 curMinZoom);
+                                                curWidth=1;
+                                                curRealWidth = 0;
         }
         else if (inIcon && qName.equals("icon"))

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

@@ -5 +5 @@
 {
         int width;
+        int realWidth = 0; //the real width of this line in meter
         Color colour;
 
-        public LineElemStyle (int width, Color colour, int minZoom)
+        public LineElemStyle (int width, int realWidth, Color colour, int minZoom)
         {
                 this.width = width;
+                this.realWidth = realWidth;
                 this.colour = colour;
                 this.minZoom = minZoom;
@@ -17 +19 @@
         {
                 return width;
+        }
+
+        public int getRealWidth()
+        {
+                return realWidth;
         }
 

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

@@ -64 +64 @@
         // Altered from SimplePaintVisitor
         @Override public void visit(Way w) {
+                double circum = Main.map.mapView.getScale()*100*Main.proj.scaleFactor()*40041455; // circumference of the earth in meter
                 Color colour = getPreferencesColor("untagged",Color.GRAY);
-                int width=2;
+                int width = 2;
+                int realWidth = 0; //the real width of the element in meters 
                 boolean area=false;
                 ElemStyle wayStyle = MapPaintPlugin.elemStyles.getStyle(w);
@@ -74 +76 @@
                                 colour = ((LineElemStyle)wayStyle).getColour();
                                 width = ((LineElemStyle)wayStyle).getWidth();
+                                realWidth = ((LineElemStyle)wayStyle).getRealWidth();   
                         }
                         else if (wayStyle instanceof AreaElemStyle)
@@ -96 +99 @@
                                                 drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : colour,Main.pref.getBoolean("draw.segment.direction"), width,true);
                                         else
+                                                if (realWidth > 0 && Main.pref.getBoolean("mappaint.useRealWith",false)){
+                                                        int tmpWidth = (int) (100 /  (float) (circum / realWidth));
+                                                        if (tmpWidth > width) width = tmpWidth;
+                                                }
+
                                                 drawSegment(ls, w.selected ? getPreferencesColor("selected", Color.YELLOW) : colour,Main.pref.getBoolean("draw.segment.direction"), width,false);
                                 if (!ls.incomplete && Main.pref.getBoolean("draw.segment.order_number"))
@@ -217 +225 @@
         // Shows areas before non-areas
         public void visitAll(DataSet data) {
-
+                
                 Collection<Way> noAreaWays = new LinkedList<Way>();
 

applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml

@@ -3 +3 @@
         <rule>
                 <condition k="highway" v="footway"/>
-                <line width="1" colour="#00ff00" />
+                <line width="1" realwidth="1" colour="#00ff00" />
         </rule>
 
@@ -18 +18 @@
         <rule>
                 <condition k="highway" v="primary"/>
-                <line width="3" colour="#fb805f"/>
+                <line width="3" realwidth="8" colour="#fb805f"/>
         </rule>
 
@@ -28 +28 @@
         <rule>
                 <condition k="highway" v="secondary"/>
-                <line width="3" colour="#fdbf6f"/>
+                <line width="3" realwidth="6" colour="#fdbf6f"/>
         </rule>
 
         <rule>
                 <condition k="highway" v="motorway"/>
-                <line width="3" colour="#809bc0"/>
+                <line width="3" realwidth="8" colour="#809bc0"/>
         </rule>
 
@@ -48 +48 @@
         <rule>
                 <condition k="highway" v="cycleway"/>
-                <line width="1" colour="#ff00ff"/>
+                <line width="1" realwidth="2" colour="#ff00ff"/>
         </rule>
 
@@ -58 +58 @@
         <rule>
                 <condition k="highway" v="residential"/>
-                <line width="2" colour="#c0c0c0"/>
+                <line width="2" realwidth="5" colour="#c0c0c0"/> 
         </rule>
 
@@ -69 +69 @@
         <rule>
                 <condition k="waterway" v="river"/>
-                <line width="2" colour="#0000ff" />
+                <line realwidth="10" colour="#0000ff" />
         </rule>
 
@@ -79 +79 @@
         <rule>
                 <condition k="waterway" v="riverbank"/>
-                <line widht="1" colour="#0000ff"/>
+                <line width="1" colour="#0000ff"/>
         </rule>
 
@@ -188 +188 @@
 <rule>
 <condition k="landuse" v="cemetery"/>
-<line widht="1" colour="#bde3cb"/>
+<line width="1" colour="#bde3cb"/>
 </rule>