Changeset 21376 in osm for applications/editors/josm/plugins/terracer

Timestamp:

2010-05-19T22:28:31+02:00 (14 years ago)

Author:

lambertus

Message:

'Fix crash when adding a single address to an odd shaped building. See also #2496'

Location:

applications/editors/josm/plugins/terracer

Files:

• build.xml (modified) (1 diff)
• src/terracer/TerracerAction.java (modified) (3 diffs)

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

@@ -32 +32 @@
 
 
-    <property name="commit.message" value="Fix the message text (and remove the now redundant message popup)" />
+    <property name="commit.message" value="Fix crash when adding a single address to an odd shaped building. See also #2496" />
     <property name="plugin.main.version" value="3210" />
 

applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java

@@ -203 +203 @@
                             + " from " + from + " to " + to + " step " + step);
         }
-                
-        // now find which is the longest side connecting the first node
-        Pair<Way, Way> interp = findFrontAndBack(outline);
-
-        final double frontLength = wayLength(interp.a);
-        final double backLength = wayLength(interp.b);
 
         // new nodes array to hold all intermediate nodes
@@ -216 +210 @@
         Collection<Way> ways = new LinkedList<Way>();
 
+                // Should this building be terraced (i.e. is there more then one section?)
                 if (nb > 1) {
                     // create intermediate nodes by interpolating.
+                    
+                    // now find which is the longest side connecting the first node
+                        Pair<Way, Way> interp = findFrontAndBack(outline);
+
+                        final double frontLength = wayLength(interp.a);
+                        final double backLength = wayLength(interp.b);
+                        
                     for (int i = 0; i <= nb; ++i) {
                         new_nodes[0][i] = interpolateAlong(interp.a, frontLength * i / nb);
@@ -254 +256 @@
                     }
                 } else {
-                        // Single building, just add the address details
+                        // Single section, just add the address details
                         Way newOutline;
                         newOutline = addressBuilding(outline, street, streetName, From);