Changeset 31095 in osm for applications

Timestamp:

2015-04-21T15:55:12+02:00 (10 years ago)

Author:

upliner

Message:

BuildingTools: Alt key to disable tags

Location:

applications/editors/josm/plugins/buildings_tools

Files:

• build.xml (modified) (1 diff)
• src/buildings_tools/Building.java (modified) (1 diff)
• src/buildings_tools/DrawBuildingAction.java (modified) (1 diff)

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

@@ -2 +2 @@
 <project name="buildings_tools" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="BuildingTools: add icon for &quot;merge address&quot; function"/>
+    <property name="commit.message" value="BuildingTools: Alt key to disable tags"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="7128"/>

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java

@@ -300 +300 @@
                 cmds.add(new AddCommand(nodes[i]));
         }
-        w.setKeys(ToolSettings.getTags());
         cmds.add(new AddCommand(w));
 

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java

@@ -309 +309 @@
         if (building.getLength() != 0) {
             Way w = building.create();
-            if (w != null && ToolSettings.isUsingAddr())
-                showAddrDialog(w);
-            if (ToolSettings.isAutoSelect()
-                 && (Main.main.getCurrentDataSet().getSelected().isEmpty() || isShiftDown)) {
-                Main.main.getCurrentDataSet().setSelected(w);
+            if (w != null) {
+                if (!isAltDown || ToolSettings.isUsingAddr())
+                    w.setKeys(ToolSettings.getTags());
+                if (ToolSettings.isUsingAddr())
+                    showAddrDialog(w);
+                if (ToolSettings.isAutoSelect()
+                        && (Main.main.getCurrentDataSet().getSelected().isEmpty() || isShiftDown)) {
+                    Main.main.getCurrentDataSet().setSelected(w);
+                }
             }
         }