Changeset 34179 in osm for applications/editors/josm/plugins/indoorhelper/src

Timestamp:

2018-05-03T16:22:29+02:00 (7 years ago)

Author:

rebeccas95

Message:

Small changes on MapCSS, replace tag area=zone with indoor=area.

Location:

applications/editors/josm/plugins/indoorhelper/src

Files:

• controller/IndoorHelperController.java (modified) (2 diffs)
• model/PresetCounter.java (modified) (2 diffs)
• model/TagCatalog.java (modified) (3 diffs)
• views/ToolBoxView.java (modified) (3 diffs)

applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

@@ -183 +183 @@
                // collecting all tags
                List<Tag> tags = new ArrayList<>();
-               if (toolboxView.getLevelCheckBoxStatus() == false && !levelValue.equals("")) {
+               if (!toolboxView.getLevelCheckBoxStatus() && !levelValue.equals("")) {
                    tags.add(new Tag("level", levelValue));
                }
-                  if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
+               if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
                       tags.add(new Tag("level_name", toolboxView.getLevelNameText()));
-                  }
+               }
                if (!toolboxView.getNameText().isEmpty()) {
                    tags.add(new Tag("name", toolboxView.getNameText()));
@@ -196 +196 @@
                }
                if (!toolboxView.getRepeatOnText().isEmpty()) {
-                       tags.add(new Tag("repeat_on", toolboxView.getRepeatOnText()));
-                  }
-                  if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
-                      tags.add(new Tag("level_name", toolboxView.getLevelNameText()));
-                  }
+                   tags.add(new Tag("repeat_on", toolboxView.getRepeatOnText()));
+               }
+               if (!toolboxView.getLevelNameText().isEmpty() && !toolboxView.getLevelCheckBoxStatus()) {
+                   tags.add(new Tag("level_name", toolboxView.getLevelNameText()));
+               }
 
            // Tagging to OSM Data
            model.addTagsToOSM(indoorObject, tags);
 
-           // Reset ui elements
+           // Reset UI elements
            toolboxView.resetUiElements();
 

applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java

@@ -63 +63 @@
         counterList.add(new ObjectCounter(IndoorObject.TOILET_FEMALE, 0));
         counterList.add(new ObjectCounter(IndoorObject.TOILET_MALE, 0));
-        counterList.add(new ObjectCounter(IndoorObject.ZONE, 0));
+        counterList.add(new ObjectCounter(IndoorObject.AREA, 0));
         counterList.add(new ObjectCounter(IndoorObject.BENCH, 0));
     }
@@ -138 +138 @@
         }
     }
+    
+    
 }

applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java

@@ -91 +91 @@
             tagList.add(new Tag("amenity", "bench"));
             return tagList;
-        case ZONE:
-            tagList.add(new Tag("area", "zone"));
+        case AREA:
+            tagList.add(new Tag("indoor", "area"));
             return tagList;
-        case NONE:
+        case NONE :
             return tagList;
         default:
@@ -100 +100 @@
             return tagList;
         }
+        
     }
 
@@ -109 +110 @@
      */
     public enum IndoorObject {
-        CONCRETE_WALL, GLASS_WALL, ROOM, TOILET_MALE, TOILET_FEMALE, ELEVATOR, DOOR_PRIVATE, DOOR_PUBLIC, ENTRANCE,
-        ENTRANCE_EXIT_ONLY, ACCESS_PRIVATE, ACCESS_PUBLIC, STEPS, CORRIDOR, BENCH, ZONE, NONE;
+                        CONCRETE_WALL, GLASS_WALL, ROOM, TOILET_MALE, TOILET_FEMALE, ELEVATOR, DOOR_PRIVATE, DOOR_PUBLIC, ENTRANCE,
+                        ENTRANCE_EXIT_ONLY, ACCESS_PRIVATE, ACCESS_PUBLIC, STEPS, CORRIDOR, BENCH, AREA, NONE;
     }
 }

applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java

@@ -286 +286 @@
            GridBagConstraints.CENTER, GridBagConstraints.BOTH,
            new Insets(0, 0, 5, 5), 0, 0));
-
        //---- preset3 ----
        preset3.setEnabled(false);
@@ -337 +336 @@
 
        //---- applyButton ----
-       applyButton.setText("Apply");
+       applyButton.setText(tr("Apply"));
        applyButton.setToolTipText(tr("Add selected tags and/or relations to obeject."));
        applyButton.setEnabled(false);
@@ -506 +505 @@
    }
 
+   
    /**
     * Clears the text boxes and sets an empty String.
     */
    public void resetUiElements() {
-       this.nameField.setText(tr(""));
-       this.levelNameField.setText(tr(""));
-       this.refField.setText(tr(""));
-       this.repeatOnField.setText(tr(""));
-       this.levelNameField.setText(tr(""));
+       this.nameField.setText("");
+       this.levelNameField.setText("");
+       this.refField.setText("");
+       this.repeatOnField.setText("");
+       this.levelNameField.setText("");
    }