add missing name tags for clone tags

and allow language suffixes
kaligrafy · Jan 30, 2024 · 64d2d2c · 64d2d2c
1 parent d891e4f
commit 64d2d2c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/dist/iD.js b/dist/iD.js
@@ -55519,11 +55519,12 @@
 	    return action;
 	}
 
-	function actionCloneRoadAttributes(selectedIds, cloneTags) {
+	function actionCloneRoadAttributes(selectedIds, cloneTags, languageSuffixes) {
 	    if ( cloneTags === void 0 ) cloneTags = [];
+	    if ( languageSuffixes === void 0 ) languageSuffixes = [];
 
 
-	    var action = function (graph) {
+	    var action = function (graph) { 
 
 	        //console.log('graph before', graph.entities);
 
@@ -55552,6 +55553,14 @@
 	              if (cloneRoadAttributesFromEntityTags[cloneTag] !== undefined) {
 	                tags[cloneTag] = cloneRoadAttributesFromEntityTags[cloneTag];
 	              }
+	              if (languageSuffixes.length > 0) {
+	                for (var k = 0, countK = languageSuffixes.length; k < countK; k++) {
+	                  var languageSuffix = languageSuffixes[k];
+	                  if (cloneRoadAttributesFromEntityTags[cloneTag + ':' + languageSuffix] !== undefined) {
+	                    tags[cloneTag + ':' + languageSuffix] = cloneRoadAttributesFromEntityTags[cloneTag + ':' + languageSuffix];
+	                  }
+	                }
+	              }
 	          }
 	          entity = entity.update({tags: tags});
 	          graph = graph.replace(entity);
@@ -78682,8 +78691,8 @@
 
 	function operationCloneName(selectedIDs, context) {
 
-	    var cloneTags = ['name', 'operator', 'name_alt', 'name:fr', 'name:en'];
-	    var action = actionCloneRoadAttributes(selectedIDs, cloneTags);
+	    var cloneTags = ['name', 'operator', 'alt_name', 'old_name', 'short_name', 'official_name', 'int_name', 'loc_name', 'name:left', 'name:right', 'nat_name', 'ref_name', 'reg_name', 'sorting_name', 'nickname'];
+	    var action = actionCloneRoadAttributes(selectedIDs, cloneTags, ['fr', 'en']);
 
 	    var operation = function () {
 	        context.perform(action, operation.annotation());
@@ -78699,7 +78708,7 @@
 	        if (selectedIDs.length >= 2) {
 	            var entity = context.entity(selectedIDs[0]);
 	            for (var i = 0, count = cloneTags.length; i < count; i++) {
-	                if (entity.tags[cloneTags[i]] !== undefined) {
+	                if (entity.tags[cloneTags[i]] !== undefined || entity.tags[cloneTags[i]+':fr'] !== undefined || entity.tags[cloneTags[i]+':en'] !== undefined) {
 	                    return true;
 	                }
 	            }

diff --git a/dist/iD.js.map b/dist/iD.js.map
diff --git a/dist/iD.min.js b/dist/iD.min.js
diff --git a/modules/actions/clone_road_attributes.js b/modules/actions/clone_road_attributes.js
@@ -1,6 +1,6 @@
-export function actionCloneRoadAttributes(selectedIds, cloneTags = []) {
+export function actionCloneRoadAttributes(selectedIds, cloneTags = [], languageSuffixes = []) {
 
-    var action = function (graph) {
+    var action = function (graph) { 
 
         //console.log('graph before', graph.entities);
 
@@ -29,6 +29,14 @@ export function actionCloneRoadAttributes(selectedIds, cloneTags = []) {
               if (cloneRoadAttributesFromEntityTags[cloneTag] !== undefined) {
                 tags[cloneTag] = cloneRoadAttributesFromEntityTags[cloneTag];
               }
+              if (languageSuffixes.length > 0) {
+                for (let k = 0, countK = languageSuffixes.length; k < countK; k++) {
+                  const languageSuffix = languageSuffixes[k];
+                  if (cloneRoadAttributesFromEntityTags[cloneTag + ':' + languageSuffix] !== undefined) {
+                    tags[cloneTag + ':' + languageSuffix] = cloneRoadAttributesFromEntityTags[cloneTag + ':' + languageSuffix];
+                  }
+                }
+              }
           }
           entity = entity.update({tags});
           graph = graph.replace(entity);

diff --git a/modules/operations/clone_name.js b/modules/operations/clone_name.js
@@ -10,8 +10,8 @@ import {
 
 export function operationCloneName(selectedIDs, context) {
 
-    const cloneTags = ['name', 'operator', 'name_alt', 'name:fr', 'name:en']
-    var action = actionCloneRoadAttributes(selectedIDs, cloneTags);
+    const cloneTags = ['name', 'operator', 'alt_name', 'old_name', 'short_name', 'official_name', 'int_name', 'loc_name', 'name:left', 'name:right', 'nat_name', 'ref_name', 'reg_name', 'sorting_name', 'nickname'];
+    var action = actionCloneRoadAttributes(selectedIDs, cloneTags, ['fr', 'en']);
 
     var operation = function () {
         context.perform(action, operation.annotation());
@@ -27,7 +27,7 @@ export function operationCloneName(selectedIDs, context) {
         if (selectedIDs.length >= 2) {
             const entity = context.entity(selectedIDs[0]);
             for (let i = 0, count = cloneTags.length; i < count; i++) {
-                if (entity.tags[cloneTags[i]] !== undefined) {
+                if (entity.tags[cloneTags[i]] !== undefined || entity.tags[cloneTags[i]+':fr'] !== undefined || entity.tags[cloneTags[i]+':en'] !== undefined) {
                     return true;
                 }
             }