Changeset 4972 in osm for applications

Timestamp:

2007-10-13T18:02:56+02:00 (17 years ago)

Author:

gabriel

Message:

Make 0.5 compatible.
The osmarender output looks kinda strange, and <bounds> is not implemented.
Maybe someone who knows osmarender better can fix this.

Location:

applications/editors/josm/plugins/osmarender

Files:

• build.xml (modified) (2 diffs)
• src/OsmarenderPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/osmarender/build.xml

@@ -2 +2 @@
 
         <property name="josm" location="../../core/dist/josm-custom.jar" />
-        <!--<property name="osmarender" location="../../../osmarender" />-->
-        <property name="osmarender" location="../../../../rendering/osmarender" />
+        <property name="rendering" location="../../../../rendering" />
 
         <target name="compile">
@@ -14 +13 @@
 
         <target name="build"  depends="compile">
-                <copy todir="bin">
-                        <fileset dir="${osmarender}">
-                                <include name="osmarender.xsl"/>
-                                <include name="osm-map-features.xml"/>
-                        </fileset>
-                </copy>
+                <copy todir="bin" file="${rendering}/osmarender6/osmarender.xsl"/>
+                <copy tofile="bin/osm-map-features.xml"
+                        file="${rendering}/osmarender5/osm-map-features-z17.xml"/>
                 <jar destfile="dist/osmarender.jar" basedir="bin">
                         <manifest>

applications/editors/josm/plugins/osmarender/src/OsmarenderPlugin.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.AddVisitor;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
@@ -44 +44 @@
             LatLon topRight = Main.map.mapView.getLatLon(Main.map.mapView.getWidth(), 0);
             Bounds b = new Bounds(bottomLeft, topRight);
-            Collection<Node> nodes = new HashSet<Node>();
+                        CollectBackReferencesVisitor backRefsV =
+                                new CollectBackReferencesVisitor(Main.ds, true);
             DataSet fromDataSet = new DataSet();
-            AddVisitor adder = new AddVisitor(fromDataSet);
             for (Node n : Main.ds.nodes) {
                 if (n.coor.isWithin(b)) {
-                    n.visit(adder);
-                    nodes.add(n);
+                                        fromDataSet.nodes.add(n);
+                    n.visit(backRefsV);
                 }
             }
-            Collection<Segment> segments = new HashSet<Segment>();
-            for (Segment s : Main.ds.segments) {
-                if (nodes.contains(s.from) || nodes.contains(s.to)) {
-                    s.visit(adder);
-                    segments.add(s);
-                }
-            }
-            for (Way w : Main.ds.ways) {
-                for (Segment s : w.segments) {
-                    if (segments.contains(s)) {
-                        w.visit(adder);
-                        break;
-                    }
-                }
-            }
+                        for (OsmPrimitive p : new HashSet<OsmPrimitive>(backRefsV.data)) {
+                                if (p instanceof Way) {
+                                        backRefsV.data.addAll(((Way) p).nodes);
+                                }
+                        }
+                        for (OsmPrimitive p : backRefsV.data)
+                                fromDataSet.addPrimitive(p);
 
             String firefox = Main.pref.get("osmarender.firefox", "firefox");