Changeset 25845 in osm for applications/editors/josm/plugins/turnrestrictions/src/org

Timestamp:

2011-04-14T16:32:17+02:00 (14 years ago)

Author:

stoecker

Message:

fix josm bug 6206

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions

Files:

• TurnRestrictionBuilder.java (modified) (3 diffs)
• qa/IntersectionMissingAsViaError.java (modified) (4 diffs)
• qa/TurnRestrictionLegSplitRequiredError.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilder.java

@@ -139 +139 @@
      * 
      */
-    static public double interesectionAngle(Way from, Way to) throws IllegalArgumentException {
+    static public double intersectionAngle(Way from, Way to) throws IllegalArgumentException {
             Node via = getUniqueCommonNode(from, to);
             if (via == null) 
@@ -196 +196 @@
         if (isClosedAt(to, via)) return null;
         
-        double phi = interesectionAngle(from, to);      
+        double phi = intersectionAngle(from, to);       
         if (phi >=0 && phi <= Math.PI) {
                 return RelativeWayJoinOrientation.RIGHT;
@@ -250 +250 @@
         if (! isStartNode(from, cn1) && ! isEndNode(from, cn1)) {
                 /*
-                 * the now split to-way still *interesects* the from-way. We
+                 * the now split to-way still *intersects* the from-way. We
                  * can't adjust the split decisions. 
                  */

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java

@@ -22 +22 @@
     private Way from;
     private Way to;
-    private Node interesect;
+    private Node intersect;
     
     public IntersectionMissingAsViaError(IssuesModel parent, Way from, Way to, Node intersect) {
@@ -28 +28 @@
         this.from = from;
         this.to = to;
-        this.interesect = intersect;
+        this.intersect = intersect;
         actions.add(new SetVia());
         actions.add(new FixInEditorAction());
@@ -36 +36 @@
     public String getText() {       
         String msg = tr("The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the <strong>to</strong>-way <span class=\"object-name\">{1}</span> "
-               + "interesect at node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> "
+               + "intersect at node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> "
                + "It is recommended to set <span class=\"object-name\">{2}</span> as unique <strong>via</strong>-object.",
                this.from.getDisplayName(DefaultNameFormatter.getInstance()),
                this.to.getDisplayName(DefaultNameFormatter.getInstance()),
-               this.interesect.getDisplayName(DefaultNameFormatter.getInstance())
+               this.intersect.getDisplayName(DefaultNameFormatter.getInstance())
         );
         return msg;
@@ -51 +51 @@
         }
         public void actionPerformed(ActionEvent e) {
-            getIssuesModel().getEditorModel().setVias(Collections.<OsmPrimitive>singletonList(interesect));         
+            getIssuesModel().getEditorModel().setVias(Collections.<OsmPrimitive>singletonList(intersect));
         }       
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java

@@ -36 +36 @@
     
     /**
-     * <p>Creates the issue for a pair of ways {@code from} and {@code to} which interesect
+     * <p>Creates the issue for a pair of ways {@code from} and {@code to} which intersect
      * at node {@code intersect}.</p>
      *