Index: /applications/editors/josm/plugins/indoorhelper/data/sit.mapcss =================================================================== --- /applications/editors/josm/plugins/indoorhelper/data/sit.mapcss (revision 34178) +++ /applications/editors/josm/plugins/indoorhelper/data/sit.mapcss (revision 34179) @@ -1,183 +1,155 @@ /* building shells and walls */ -way[indoor=corridor] -{ - width: 1; - color: #000000; - fill-color: #e3e3e3; - fill-opacity: 1.0; - z-index: 1; -} - way[indoor=wall][material=concrete] { - width: 3; - color: #000000; - opacity: 1.0; - fill-color: #BEBEBE; - fill-opacity: 1.0; - z-index: 5; + width: 1; + color: #000000; + fill-color: #a49f9f; + fill-opacity: 1.0; + + z-index: 5; } way[indoor=wall][material=glass] { - width: 3; - color: #000000; - opacity: 1.0; + width: 1; + color: #000000; fill-color: #00BFFF; fill-opacity: 1.0; - z-index: 5; -} + + z-index: 5; +} + + +/* windows and doors */ + +way[window=glass] +{ + width: 3; + color: #00BFFF; + opacity: 1.0; + + z-index: 1; +} + + +node|z21-[door], +way|z21-[door] +{ + icon-image: "entrance_door_icon.png"; + icon-width: 30; + + z-index: 4; +} + +way[door] +{ + fill-color: #7d530b; + fill-opacity: 1.0; + + z-index: 3; +} + /*entrance*/ -node[entrance=public] + +way[entrance] +{ + fill-color: #525252; + fill-opacity: 1.0; + + z-index: 3; +} + + +node|z20-[entrance], +way|z20-[entrance] { icon-image: "entrance_icon.png"; icon-width: 30; - z-index: 3; -} - -node[entrance=private] -{ - icon-image: "entrance_icon.png"; - icon-width: 30; - z-index: 3; -} - -way[entrance=public] -{ - icon-image: "entrance_icon.png"; - icon-width: 30; - z-index: 3; -} - -way[entrance=private] -{ - icon-image: "entrance_icon.png"; - icon-width: 30; - z-index: 3; -} - -node[entrance=exit] -{ - icon-image: "entrance_icon.png"; - icon-width: 30; - z-index: 3; -} - -way[entrance=exit] -{ - icon-image: "entrance_icon.png"; - icon-width: 30; - z-index: 3; -} - -node[entrance=service] -{ - icon-image: "entrance_icon.png"; - icon-width: 30; - z-index: 3; -} - -way[entrance=service] -{ - icon-image: "entrance_icon.png"; - icon-width: 30; - z-index: 3; -} - - -/* windows and doors */ - -way[window=glass] -{ - width: 3; - color: #00BFFF; - opacity: 1.0; - z-index: 1; -} - -node[door=yes] -{ - icon-image: "entrance_door_icon.png"; - icon-width: 30; - z-index: 3; -} - -way[door=yes] -{ - icon-image: "entrance_door_icon.png"; - icon-width: 30; - z-index: 3; -} - - -/* vertical passages & parking */ + + z-index: 4; +} + + +/* highways */ + way[highway=steps] { - width: 1; - color: #000000; - opacity: 1.0; - dashes: 15, 5; + width: 1; + color: #000000; + opacity: 1.0; + dashes: 15, 5; fill-color: #a6ff96; fill-opacity: 1.0; - z-index: 2; + + z-index: 2; } way[highway=elevator] { - width: 1; - color: #000000; - opacity: 1.0; - dashes: 5, 5; + width: 1; + color: #000000; + opacity: 1.0; + dashes: 5, 5; fill-color: #c3e5fa; fill-opacity: 1.0; - icon-image: "elevator_icon.png"; - icon-width: 30; - z-index: 2; + + z-index: 2; +} + +way|z20-[highway=elevator] +{ + icon-image: "elevator_icon.png"; + icon-width: 30; + + z-index: 3; } way[highway=service] { - width: 10; - color: #ffffff; - opacity: 1.0; + width: 10; + color: #ffffff; + opacity: 1.0; casing-width: 2; casing-color: #000000; - z-index: 2; + z-index: 2; } way[highway=parking] { - width: 5; - color: #0000ff; - opacity: 1.0; + width: 5; + color: #0000ff; + opacity: 1.0; casing-width: 5; casing-color: #ffffff; - z-index: 3; + + z-index: 3; } way[area=parkinglot] { - width: 1; - color: #000000; - opacity: 1.0; + width: 1; + color: #000000; + opacity: 1.0; + fill-color: #FFFF5C; fill-opacity: 1.0; - z-index: 2; + + z-index: 1; } /* rooms */ - way[indoor=room] { - width: 1; - color: #2E2E2E; + width: 1; + color: #a49f9f; fill-color: #ffffa1; fill-opacity: 1.0; - z-index: 1; -} - -way[ref][indoor=room] + + z-index: 1; +} + +way|z19-20[ref] { text: ref; @@ -185,87 +157,192 @@ font-size: 12; text-color: #000000; - z-index: 1; -} - -way[name][indoor=room] -{ - text: name; + + z-index: 3; +} +way|z21-[ref][!name] +{ + text: ref; text-position: center; - font-size: 12; + font-size: 12; text-color: #000000; - z-index: 1; -} - -/* zones */ - -way[area=zone] + + z-index: 3; +} + +way|z21-[name] +{ + text: name; + text-position: center; + font-size: 12; + text-color: #000000; + + z-index: 3; +} + +/* corridor */ + +way[indoor=corridor] +{ + width: 1; + color: #a49f9f; + + fill-color: #e3e3e3; + fill-opacity: 1.0; + + z-index: 1; +} + + +/* areas */ +way|z18-[indoor=area] { fill-color: #FFDAB9; fill-opacity: 1.0; - z-index: 1; -} - -way[name][area=zone] -{ - text: name; - text-position: center; - font-size: 12; + + z-index: 1; +} + +way[indoor=area][landuse=ground] +{ + width: 1; + color: #a49f9f; + + fill-color: #e3e3e3; + fill-opacity: 1.0; + + z-index: 1; +} + +way[indoor=area][landuse=x] +{ + width: 1; + color: #000000; + + fill-color: #8FBC8F; + fill-opacity: 1.0; + + z-index: 2; +} + +way[indoor=area][landuse=loading] +{ + width: 1; + color: #000000; + + fill-color: #A78866; + fill-opacity: 1.0; + + z-index: 2; +} + +way[indoor=area][landuse=rack] +{ + width: 1; + color: #000000; + + fill-color: #A78866; + fill-opacity: 1.0; + + z-index: 2; +} + +way[indoor=area][landuse=machine] +{ + width: 1; + color: #000000; + + fill-color: #bfbfbf; + fill-opacity: 1.0; + + z-index: 2; +} + +way[indoor=area][landuse=workspace] +{ + width: 1; + color: #000000; + + fill-color: #819FF7; + fill-opacity: 1.0; + + z-index: 2; +} + +way[indoor=area][landuse=workfield] +{ + width: 1; + color: #FFFFFF; + dashes: 15, 5; + + fill-color: #F30307; + fill-opacity: 0.3; + + z-index: 3; +} + +way[indoor=area][landuse=storage] +{ + width: 1; + color: #FFFFFF; + dashes: 15, 5; + + fill-color: #F30307; + fill-opacity: 0.3; + + z-index: 2; +} + +way[indoor=area][leisure=pitch] +{ + width: 1; + color: #000000; + fill-color: #ebba72; + fill-opacity: 1.0; + + z-index: 1; +} + +way|z19-[name][use=sports] +{ + text: name; + font-size: 12; text-color: #000000; - fill-color: #FFDAB9; - fill-opacity: 1.0; - z-index: 1; -} - -way[ref][area=zone] -{ - text: name; - text-position: center; - font-size: 12; - text-color: #000000; - fill-color: #FFDAB9; - fill-opacity: 1.0; - z-index: 1; + + z-index: 2; } /*amenity*/ - -node[amenity=toilets][male=yes] +node|z21-[amenity=toilets][male=yes] { icon-image: "toilet_man_icon.png"; icon-width: 30; - z-index: 3; -} - -node[amenity=toilets][female=yes] + + z-index: 3; +} + +node|z21-[amenity=toilets][female=yes] { icon-image: "toilet_woman_icon.png"; icon-width: 30; - z-index: 3; -} - -node[amenity=toilets][wheelchair=yes] + + z-index: 3; +} + +node|z21-[amenity=toilets][wheelchair=yes] { icon-image: "toilet_wheelchair_icon.png"; icon-width: 30; - z-index: 3; -} - -wa[amenity=bench] -{ - width: 1; - color: #000000; + + z-index: 3; +} + +/* specific objects */ +way[amenity=bench] +{ + width: 1; + color: #000000; fill-color: #a3a3a3; fill-opacity: 1.0; - z-index: 2; -} - -/*multipolygon*/ - -relation[type=multipolygon] -{ - width: 1; - color: #000000; - fill-color: #e3e3e3; - fill-opacity: 1.0; - z-index: 1; -} + + z-index: 2; +} Index: /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java (revision 34178) +++ /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java (revision 34179) @@ -183,10 +183,10 @@ // collecting all tags List 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,14 +196,14 @@ } 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(); Index: /applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java (revision 34178) +++ /applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java (revision 34179) @@ -63,5 +63,5 @@ 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,3 +138,5 @@ } } + + } Index: /applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java (revision 34178) +++ /applications/editors/josm/plugins/indoorhelper/src/model/TagCatalog.java (revision 34179) @@ -91,8 +91,8 @@ 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,4 +100,5 @@ return tagList; } + } @@ -109,6 +110,6 @@ */ 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; } } Index: /applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java (revision 34178) +++ /applications/editors/josm/plugins/indoorhelper/src/views/ToolBoxView.java (revision 34179) @@ -286,5 +286,4 @@ GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 5, 5), 0, 0)); - //---- preset3 ---- preset3.setEnabled(false); @@ -337,5 +336,5 @@ //---- applyButton ---- - applyButton.setText("Apply"); + applyButton.setText(tr("Apply")); applyButton.setToolTipText(tr("Add selected tags and/or relations to obeject.")); applyButton.setEnabled(false); @@ -506,13 +505,14 @@ } + /** * 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(""); }