Index: plications/editors/josm/plugins/indoorhelper/data/indoor.mapcss =================================================================== --- /applications/editors/josm/plugins/indoorhelper/data/indoor.mapcss (revision 34014) +++ (revision ) @@ -1,192 +1,0 @@ -/* building shells and walls */ - -node|z19-[indoor:entrance=yes] -{ - icon-image: "entrance_icon.png"; - icon-width: 30; - z-index: 3; -} - - -way[indoor:area=shell] -{ - fill-color: #EEEEEE; - fill-opacity: 1.0; - - z-index: 0; -} - -way[indoor:area=wall][indoor:wall:material=concrete] -{ - width: 3; - color: #000000; - opacity: 1.0; - - fill-color: #BEBEBE; - fill-opacity: 1.0; - - z-index: 1; -} - -way[indoor:area=wall][indoor:wall:material=glass] -{ - width: 3; - color: #000000; - opacity: 1.0; - - fill-color: #00BFFF; - fill-opacity: 1.0; - - z-index: 1; -} - -/* windows and openings */ - -way|z19-[indoor:window=glass] -{ - width: 3; - color: #00BFFF; - opacity: 1.0; - z-index: 1; -} - - -/* vertical passages */ - -way|z19-[indoor:area=stairways] -{ - width: 1; - color: #000000; - opacity: 1.0; - dashes: 15, 5; - - fill-color: #a6ff96; - fill-opacity: 1.0; - - z-index: 2; -} - -way|z19-[indoor:area=elevator] -{ - width: 1; - color: #000000; - opacity: 1.0; - dashes: 5, 5; - - fill-color: #c3e5fa; - fill-opacity: 1.0; - - z-index: 2; -} - -way|z21-[indoor:area=elevator] -{ - icon-image: "elevator_icon.png"; - icon-width: 30; - z-index: 2; -} - -/* indoor highways */ - -way|z19-21[indoor:highway=service] -{ - width: 4; - color: #ffffff; - opacity: 1.0; - - casing-width: 2; - casing-color: #000000; - - z-index: 3; -} - -way|z22-[indoor:highway=service] -{ - width: 20; - color: #ffffff; - opacity: 1.0; - - casing-width: 2; - casing-color: #000000; - - z-index: 3; -} - -/* rooms */ - -node|z21-[indoor:door] -{ - icon-image: "entrance_door_icon.png"; - icon-width: 30; - z-index: 3; -} - -way|z19-[indoor:area=room] -{ - fill-color: #ffffa1; - fill-opacity: 1.0; - z-index: 1; -} - -way|z19-[ref][indoor:area=room] -{ - text: ref; - text-position: center; - font-size: 12; - text-color: #000000; - z-index: 1; -} - -way|z22-[name][indoor:area=room] -{ - text: name; - text-position: center; - font-size: 12; - text-color: #000000; - z-index: 1; -} - -/* zones */ - -way|z19-[indoor:area=zone] -{ - fill-color: #FFDAB9; - fill-opacity: 1.0; - z-index: 1; -} - - -/* toilets */ - -node|z21-[amenity=toilets][male=yes] -{ - icon-image: "toilet_man_icon.png"; - icon-width: 30; - z-index: 3; -} - -node|z21-[amenity=toilets][female=yes] -{ - icon-image: "toilet_woman_icon.png"; - icon-width: 30; - z-index: 3; -} - -node|z21-[amenity=toilets][wheelchair=yes] -{ - icon-image: "toilet_wheelchair_icon.png"; - icon-width: 30; - z-index: 3; -} - -/* charger */ -node|z20-[indoor:charger] -{ - icon-image: "charger_icon.png"; - icon-width: 30; - z-index: 3; -} - - - - Index: /applications/editors/josm/plugins/indoorhelper/data/sit.mapcss =================================================================== --- /applications/editors/josm/plugins/indoorhelper/data/sit.mapcss (revision 34015) +++ /applications/editors/josm/plugins/indoorhelper/data/sit.mapcss (revision 34015) @@ -0,0 +1,271 @@ +/* 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; +} + +way[indoor=wall][material=glass] +{ + width: 3; + color: #000000; + opacity: 1.0; + fill-color: #00BFFF; + fill-opacity: 1.0; + z-index: 5; +} + +/*entrance*/ +node[entrance=public] +{ + 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 */ +way[highway=steps] +{ + width: 1; + color: #000000; + opacity: 1.0; + dashes: 15, 5; + fill-color: #a6ff96; + fill-opacity: 1.0; + z-index: 2; +} + +way[highway=elevator] +{ + 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; +} + +way[highway=service] +{ + width: 10; + color: #ffffff; + opacity: 1.0; + casing-width: 2; + casing-color: #000000; + z-index: 2; +} + +way[highway=parking] +{ + width: 5; + color: #0000ff; + opacity: 1.0; + casing-width: 5; + casing-color: #ffffff; + z-index: 3; +} + +way[area=parkinglot] +{ + width: 1; + color: #000000; + opacity: 1.0; + fill-color: #FFFF5C; + fill-opacity: 1.0; + z-index: 2; +} + +/* rooms */ + +way[indoor=room] +{ + width: 1; + color: #2E2E2E; + fill-color: #ffffa1; + fill-opacity: 1.0; + z-index: 1; +} + +way[ref][indoor=room] +{ + text: ref; + text-position: center; + font-size: 12; + text-color: #000000; + z-index: 1; +} + +way[name][indoor=room] +{ + text: name; + text-position: center; + font-size: 12; + text-color: #000000; + z-index: 1; +} + +/* zones */ + +way[area=zone] +{ + fill-color: #FFDAB9; + fill-opacity: 1.0; + z-index: 1; +} + +way[name][area=zone] +{ + text: name; + text-position: center; + 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; +} + +/*amenity*/ + +node[amenity=toilets][male=yes] +{ + icon-image: "toilet_man_icon.png"; + icon-width: 30; + z-index: 3; +} + +node[amenity=toilets][female=yes] +{ + icon-image: "toilet_woman_icon.png"; + icon-width: 30; + z-index: 3; +} + +node[amenity=toilets][wheelchair=yes] +{ + icon-image: "toilet_wheelchair_icon.png"; + icon-width: 30; + z-index: 3; +} + +wa[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; +} Index: plications/editors/josm/plugins/indoorhelper/src/views/FittingView.java =================================================================== --- /applications/editors/josm/plugins/indoorhelper/src/views/FittingView.java (revision 34014) +++ (revision ) @@ -1,114 +1,0 @@ -/* - * Indoorhelper is a JOSM plug-in to support users when creating their own indoor maps. - * Copyright (C) 2016 Erik Gruschka - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package views; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.FlowLayout; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.event.ActionListener; - -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.border.EmptyBorder; - - -/** - * The view for the pop-up hint that tells the user, that he has to start the fitting - * of his indoor building plans. - * - * @author egru - */ -@SuppressWarnings("serial") -public class FittingView extends JFrame { - - private JPanel dialogPane; - private JPanel contentPanel; - private JLabel label1; - private JPanel buttonBar; - private JButton okButton; - - public FittingView() { - initComponents(); - } - - private void initComponents() { - dialogPane = new JPanel(); - contentPanel = new JPanel(); - label1 = new JLabel(); - buttonBar = new JPanel(); - okButton = new JButton(); - - //======== this ======== - setTitle(tr("Fitting")); - Container contentPane = getContentPane(); - contentPane.setLayout(new BorderLayout()); - - //======== dialogPane ======== - - dialogPane.setBorder(new EmptyBorder(12, 12, 12, 12)); - dialogPane.setLayout(new BorderLayout()); - - //======== contentPanel ======== - - contentPanel.setLayout(new FlowLayout()); - - //---- label1 ---- - label1.setText(tr("Please mind to start fitting your building-plans now.
" + - "To do so, use the PicLayer plug-in, which you can install
" + - "using the JOSM plug-in management.")); - contentPanel.add(label1); - - dialogPane.add(contentPanel, BorderLayout.CENTER); - - //======== buttonBar ======== - - buttonBar.setBorder(new EmptyBorder(12, 0, 0, 0)); - buttonBar.setLayout(new GridBagLayout()); - ((GridBagLayout) buttonBar.getLayout()).columnWidths = new int[] {0, 80}; - ((GridBagLayout) buttonBar.getLayout()).columnWeights = new double[] {1.0, 0.0}; - - //---- okButton ---- - okButton.setText(tr("OK")); - buttonBar.add(okButton, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, - GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(0, 0, 0, 0), 0, 0)); - - dialogPane.add(buttonBar, BorderLayout.SOUTH); - - contentPane.add(dialogPane, BorderLayout.CENTER); - pack(); - setLocationRelativeTo(getOwner()); - } - - /** - * Set the given {@link ActionListener} to the OK-Button of the {@link FittingView}. - * - * @param l the listener which should be set - */ - public void setOkButtonListener(ActionListener l) { - this.okButton.addActionListener(l); - } -}