Changeset 34254 in osm for applications/editors/josm

Timestamp:

2018-06-05T13:36:42+02:00 (7 years ago)

Author:

biswesh

Message:

Add traffic_calming to double split

File:

• applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/DoubleSplitAction.java (modified) (8 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/DoubleSplitAction.java

@@ -559 +559 @@
                         if (!values.getSelectedItem().toString().equals("building_passage"))
                                 newKeys1.put("layer", "-1");
+                } else if (keys.getSelectedItem() == "traffic_calming") {
+                        newKeys1.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString());
+                        newKeys1.put("maxspeed", "30");
                 } else {
                         if (newKeys1.containsKey("bus_bay")) {
@@ -578 +581 @@
                                 if (!values.getSelectedItem().toString().equals("building_passage"))
                                         newKeys2.put("layer", "-1");
+                        } else if (keys.getSelectedItem() == "traffic_calming") {
+                                newKeys2.put(keys.getSelectedItem().toString(), values.getSelectedItem().toString());
+                                newKeys2.put("maxspeed", "30");
                         } else {
                                 if (newKeys2.containsKey("bus_bay")) {
@@ -830 +836 @@
 
                 private void setOptionsWithBusBay() {
-                        keys.setModel(new DefaultComboBoxModel<>(new String[] { "bus_bay", "bridge", "tunnel" }));
+                        keys.setModel(
+                                        new DefaultComboBoxModel<>(new String[] { "bus_bay", "bridge", "tunnel", "traffic_calming" }));
 
                         if (affected.hasTag("bus_bay", "right") || previousAffectedWay.hasTag("bus_bay", "right")) {
@@ -861 +868 @@
                                                         values.setModel(
                                                                         new DefaultComboBoxModel<>(new String[] { "yes", "culvert", "building_passage" }));
+                                        } else if ("traffic_calming".equals(keys.getSelectedItem())) {
+                                                values.setModel(new DefaultComboBoxModel<>(new String[] { "table" }));
                                         }
                                 }
@@ -867 +876 @@
 
                 private void setOptionsWithTunnel() {
-                        keys.setModel(new DefaultComboBoxModel<>(new String[] { "tunnel", "bridge", "bus_bay" }));
+                        keys.setModel(
+                                        new DefaultComboBoxModel<>(new String[] { "tunnel", "bridge", "bus_bay", "traffic_calming" }));
 
                         if (previousAffectedWay.hasKey("waterway") || affected.hasKey("waterway"))
@@ -893 +903 @@
                                         } else if ("bridge".equals(keys.getSelectedItem())) {
                                                 values.setModel(new DefaultComboBoxModel<>(new String[] { "yes" }));
+                                        } else if ("traffic_calming".equals(keys.getSelectedItem())) {
+                                                values.setModel(new DefaultComboBoxModel<>(new String[] { "table" }));
                                         }
                                 }
@@ -899 +911 @@
 
                 private void setOptionsWithBridge() {
-                        keys.setModel(new DefaultComboBoxModel<>(new String[] { "bridge", "bus_bay", "tunnel" }));
+                        keys.setModel(
+                                        new DefaultComboBoxModel<>(new String[] { "bridge", "bus_bay", "tunnel", "traffic_calming" }));
 
                         values.setModel(new DefaultComboBoxModel<>(new String[] { "yes" }));
@@ -922 +935 @@
                                         } else if ("bridge".equals(keys.getSelectedItem())) {
                                                 values.setModel(new DefaultComboBoxModel<>(new String[] { "yes" }));
+                                        } else if ("traffic_calming".equals(keys.getSelectedItem())) {
+                                                values.setModel(new DefaultComboBoxModel<>(new String[] { "table" }));
                                         }
                                 }