From 1bfe1359ecf32c104817108e77ddded0784b1f8b Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 31 Jan 2013 11:57:41 -0500
Subject: [PATCH] AddWayNode -> AddVertex

---
 index.html                                     |  2 +-
 .../actions/{add_way_node.js => add_vertex.js} |  2 +-
 js/id/behavior/draw_way.js                     |  4 ++--
 js/id/modes/add_area.js                        | 18 +++++++++---------
 js/id/modes/add_line.js                        | 10 +++++-----
 js/id/modes/select.js                          |  2 +-
 test/index.html                                |  2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)
 rename js/id/actions/{add_way_node.js => add_vertex.js} (80%)

diff --git a/index.html b/index.html
index 8c777292e..ede3e9a26 100644
--- a/index.html
+++ b/index.html
@@ -76,7 +76,7 @@
         <script src="js/id/actions/add_midpoint.js"></script>
         <script src='js/id/actions/add_node.js'></script>
         <script src='js/id/actions/add_way.js'></script>
-        <script src='js/id/actions/add_way_node.js'></script>
+        <script src='js/id/actions/add_vertex.js'></script>
         <script src='js/id/actions/change_entity_tags.js'></script>
         <script src='js/id/actions/delete_node.js'></script>
         <script src="js/id/actions/delete_way.js"></script>
diff --git a/js/id/actions/add_way_node.js b/js/id/actions/add_vertex.js
similarity index 80%
rename from js/id/actions/add_way_node.js
rename to js/id/actions/add_vertex.js
index 3e4fffcfc..279737c05 100644
--- a/js/id/actions/add_way_node.js
+++ b/js/id/actions/add_vertex.js
@@ -1,5 +1,5 @@
 // https://github.com/openstreetmap/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/AddNodeToWayAction.as
-iD.actions.AddWayNode = function(wayId, nodeId, index) {
+iD.actions.AddVertex = function(wayId, nodeId, index) {
     return function(graph) {
         return graph.replace(graph.entity(wayId).addNode(nodeId, index));
     };
diff --git a/js/id/behavior/draw_way.js b/js/id/behavior/draw_way.js
index c8341337c..be64ac9c2 100644
--- a/js/id/behavior/draw_way.js
+++ b/js/id/behavior/draw_way.js
@@ -14,7 +14,7 @@ iD.behavior.DrawWay = function(wayId, index, mode, baseGraph) {
 
     history[way.isDegenerate() ? 'replace' : 'perform'](
         iD.actions.AddNode(node),
-        iD.actions.AddWayNode(wayId, node.id, index));
+        iD.actions.AddVertex(wayId, node.id, index));
 
     function move(datum) {
         var loc = map.mouseCoordinates();
@@ -100,7 +100,7 @@ iD.behavior.DrawWay = function(wayId, index, mode, baseGraph) {
 
         history.perform(
             iD.actions.AddNode(newNode),
-            iD.actions.AddWayNode(way.id, newNode.id, wayIndex),
+            iD.actions.AddVertex(way.id, newNode.id, wayIndex),
             ReplaceTemporaryNode(newNode),
             annotation);
 
diff --git a/js/id/modes/add_area.js b/js/id/modes/add_area.js
index 4519c3d7e..b90ba1891 100644
--- a/js/id/modes/add_area.js
+++ b/js/id/modes/add_area.js
@@ -23,8 +23,8 @@ iD.modes.AddArea = function() {
             history.perform(
                 iD.actions.AddNode(node),
                 iD.actions.AddWay(way),
-                iD.actions.AddWayNode(way.id, node.id),
-                iD.actions.AddWayNode(way.id, node.id));
+                iD.actions.AddVertex(way.id, node.id),
+                iD.actions.AddVertex(way.id, node.id));
 
             controller.enter(iD.modes.DrawArea(way.id, graph));
         }
@@ -37,9 +37,9 @@ iD.modes.AddArea = function() {
             history.perform(
                 iD.actions.AddNode(node),
                 iD.actions.AddWay(way),
-                iD.actions.AddWayNode(way.id, node.id),
-                iD.actions.AddWayNode(way.id, node.id),
-                iD.actions.AddWayNode(other.id, node.id, index));
+                iD.actions.AddVertex(way.id, node.id),
+                iD.actions.AddVertex(way.id, node.id),
+                iD.actions.AddVertex(other.id, node.id, index));
 
             controller.enter(iD.modes.DrawArea(way.id, graph));
         }
@@ -50,8 +50,8 @@ iD.modes.AddArea = function() {
 
             history.perform(
                 iD.actions.AddWay(way),
-                iD.actions.AddWayNode(way.id, node.id),
-                iD.actions.AddWayNode(way.id, node.id));
+                iD.actions.AddVertex(way.id, node.id),
+                iD.actions.AddVertex(way.id, node.id));
 
             controller.enter(iD.modes.DrawArea(way.id, graph));
         }
@@ -64,8 +64,8 @@ iD.modes.AddArea = function() {
             history.perform(
                 iD.actions.AddMidpoint(midpoint, node),
                 iD.actions.AddWay(way),
-                iD.actions.AddWayNode(way.id, node.id),
-                iD.actions.AddWayNode(way.id, node.id));
+                iD.actions.AddVertex(way.id, node.id),
+                iD.actions.AddVertex(way.id, node.id));
 
             controller.enter(iD.modes.DrawArea(way.id, graph));
         }
diff --git a/js/id/modes/add_line.js b/js/id/modes/add_line.js
index 4a49e4955..f14d8ed06 100644
--- a/js/id/modes/add_line.js
+++ b/js/id/modes/add_line.js
@@ -23,7 +23,7 @@ iD.modes.AddLine = function() {
             history.perform(
                 iD.actions.AddNode(node),
                 iD.actions.AddWay(way),
-                iD.actions.AddWayNode(way.id, node.id));
+                iD.actions.AddVertex(way.id, node.id));
 
             controller.enter(iD.modes.DrawLine(way.id, 'forward', graph));
         }
@@ -36,8 +36,8 @@ iD.modes.AddLine = function() {
             history.perform(
                 iD.actions.AddNode(node),
                 iD.actions.AddWay(way),
-                iD.actions.AddWayNode(way.id, node.id),
-                iD.actions.AddWayNode(other.id, node.id, index));
+                iD.actions.AddVertex(way.id, node.id),
+                iD.actions.AddVertex(other.id, node.id, index));
 
             controller.enter(iD.modes.DrawLine(way.id, 'forward', graph));
         }
@@ -58,7 +58,7 @@ iD.modes.AddLine = function() {
 
                 history.perform(
                     iD.actions.AddWay(way),
-                    iD.actions.AddWayNode(way.id, node.id));
+                    iD.actions.AddVertex(way.id, node.id));
 
                 controller.enter(iD.modes.DrawLine(way.id, 'forward', graph));
             }
@@ -72,7 +72,7 @@ iD.modes.AddLine = function() {
             history.perform(
                 iD.actions.AddMidpoint(midpoint, node),
                 iD.actions.AddWay(way),
-                iD.actions.AddWayNode(way.id, node.id));
+                iD.actions.AddVertex(way.id, node.id));
 
             controller.enter(iD.modes.DrawLine(way.id, 'forward', graph));
         }
diff --git a/js/id/modes/select.js b/js/id/modes/select.js
index 455f94913..49bdbc37c 100644
--- a/js/id/modes/select.js
+++ b/js/id/modes/select.js
@@ -113,7 +113,7 @@ iD.modes.Select = function(entity, initial) {
 
                 history.perform(
                     iD.actions.AddNode(node),
-                    iD.actions.AddWayNode(datum.id, node.id, choice.index),
+                    iD.actions.AddVertex(datum.id, node.id, choice.index),
                     t('operations.add.annotation.vertex'));
 
                 d3.event.preventDefault();
diff --git a/test/index.html b/test/index.html
index d8d3f8f6f..57ceab240 100644
--- a/test/index.html
+++ b/test/index.html
@@ -71,7 +71,7 @@
     <script src="../js/id/actions/add_midpoint.js"></script>
     <script src='../js/id/actions/add_node.js'></script>
     <script src='../js/id/actions/add_way.js'></script>
-    <script src='../js/id/actions/add_way_node.js'></script>
+    <script src='../js/id/actions/add_vertex.js'></script>
     <script src='../js/id/actions/change_entity_tags.js'></script>
     <script src='../js/id/actions/circularize.js'></script>
     <script src="../js/id/actions/delete_node.js"></script>