Index: plications/editors/josm/plugins/czechaddress/log.xsl
===================================================================
--- /applications/editors/josm/plugins/czechaddress/log.xsl (revision 15583)
+++ (revision )
@@ -1,53 +1,0 @@
-
-
-
-
-
-
-
-
- | Date |
- Level |
- Message |
- Method |
- Param |
-
-
-
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
-
- |
-
-
- |
- |
-
-
-
-
-
-
-
-
-
Index: /applications/editors/josm/plugins/czechaddress/log2html.xsl
===================================================================
--- /applications/editors/josm/plugins/czechaddress/log2html.xsl (revision 15584)
+++ /applications/editors/josm/plugins/czechaddress/log2html.xsl (revision 15584)
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+ | Date |
+ Level |
+ Message |
+ Method |
+ Param |
+
+
+
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+ |
+
+
+ |
+ |
+
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java (revision 15583)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/PrimUtils.java (revision 15584)
@@ -1,7 +1,2 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package org.openstreetmap.josm.plugins.czechaddress;
@@ -10,5 +5,6 @@
/**
- *
+ * Utilities for handling {@link OsmPrimitive}s.
+ *
* @author Radomír Černoch, radomir.cernoch@gmail.com
*/
@@ -45,24 +41,11 @@
int val = o1.get(key).compareTo(o2.get(key));
- if (val != 0) {
- return val;
- }
+ if (val != 0) return val;
}
- return o1.toString().compareTo(o2.toString());
+ /*int val = o1.toString().compareTo(o2.toString());
+ if (val != 0) return val;*/
- /*LatLon pos1 = null;
- LatLon pos2 = null;
- if (o1 instanceof Node) pos1 = ((Node) o1).coor;
- if (o1 instanceof Way) pos1 = ((Way) o1).lastNode().coor;
- if (o2 instanceof Node) pos1 = ((Node) o2).coor;
- if (o2 instanceof Way) pos1 = ((Way) o2).lastNode().coor;
-
- if (pos1 != null && pos2 != null) {
- if (pos1.lat() < pos2.lat()) return -1;
- if (pos1.lat() > pos2.lat()) return 1;
- if (pos1.lon() < pos2.lon()) return -1;
- if (pos1.lon() > pos2.lon()) return 1;
- }*/
+ return o1.compareTo(o2);
}
};
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (revision 15583)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (revision 15584)
@@ -5,4 +5,5 @@
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
import org.openstreetmap.josm.plugins.czechaddress.StringUtils;
import org.openstreetmap.josm.plugins.czechaddress.intelligence.Reasoner;
@@ -61,9 +62,9 @@
public static String getName(OsmPrimitive prim) {
- String cp = prim.get("addr:alternatenumber");
- String co = prim.get("addr:housenumber");
- String street = prim.get("addr:street");
- String city = prim.get("addr:city");
- String name = prim.get("name");
+ String cp = prim.get(PrimUtils.KEY_ADDR_CP);
+ String co = prim.get(PrimUtils.KEY_ADDR_CO);
+ String street = prim.get(PrimUtils.KEY_ADDR_STREET);
+ String city = prim.get(PrimUtils.KEY_ADDR_CITY);
+ String name = prim.get(PrimUtils.KEY_NAME);
String result = "";
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java (revision 15583)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/PointManipulatorDialog.java (revision 15584)
@@ -14,4 +14,5 @@
import org.openstreetmap.josm.plugins.czechaddress.CzechAddressPlugin;
import org.openstreetmap.josm.plugins.czechaddress.NotNullList;
+import org.openstreetmap.josm.plugins.czechaddress.PrimUtils;
import org.openstreetmap.josm.plugins.czechaddress.StatusListener;
import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.AddressElement;
@@ -68,6 +69,6 @@
matchesComboBox.setRenderer(new UniversalListRenderer());
- if (primitive.get("addr:alternatenumber") != null) {
- alternateNumberEdit.setText(primitive.get("addr:alternatenumber"));
+ if (primitive.get(PrimUtils.KEY_ADDR_CP) != null) {
+ alternateNumberEdit.setText(primitive.get(PrimUtils.KEY_ADDR_CP));
updateMatches();
}
@@ -133,5 +134,5 @@
r.openTransaction();
prim.keys = null;
- prim.put("addr:alternatenumber", alternateNumberEdit.getText());
+ prim.put(PrimUtils.KEY_ADDR_CP, alternateNumberEdit.getText());
r.update(prim);
elems.addAll(r.getCandidates(prim));
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.form
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.form (revision 15584)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.form (revision 15584)
@@ -0,0 +1,121 @@
+
+
+
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java (revision 15584)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/databaseeditors/StreetEditor.java (revision 15584)
@@ -0,0 +1,143 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/*
+ * StreetEditor.java
+ *
+ * Created on 3.6.2009, 20:50:45
+ */
+
+package org.openstreetmap.josm.plugins.czechaddress.gui.databaseeditors;
+
+import javax.swing.DefaultComboBoxModel;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.plugins.czechaddress.addressdatabase.Street;
+import org.openstreetmap.josm.plugins.czechaddress.gui.utils.UniversalListRenderer;
+import org.openstreetmap.josm.plugins.czechaddress.intelligence.Reasoner;
+
+/**
+ *
+ * @author radek
+ */
+public class StreetEditor extends ExtendedDialog {
+
+ public static boolean editStreet(Street street) {
+ StreetEditor dialog = new StreetEditor(street);
+ dialog.setVisible(true);
+ if (dialog.getValue() == 1) {
+ street.setName(dialog.nameField.getText());
+ Reasoner.getInstance().update(street);
+ return true;
+ }
+ return false;
+ }
+
+ /** Creates new form StreetEditor */
+ private StreetEditor(Street street) {
+ super(Main.parent, "Upravit ulici", new String[] {"OK", "Zrušit"}, true);
+ initComponents();
+
+ if (street.getParent() != null)
+ parentField.setText(street.getParent().getName());
+
+ nameField.setText(street.getName());
+ houseList.setModel(new DefaultComboBoxModel(street.getHouses().toArray()));
+ houseList.setCellRenderer(new UniversalListRenderer());
+
+ // And finalize initializing the form.
+ setupDialog(mainPanel, new String[] {"ok.png", "cancel.png"});
+ }
+
+ /** This method is called from within the constructor to
+ * initialize the form.
+ * WARNING: Do NOT modify this code. The content of this method is
+ * always regenerated by the Form Editor.
+ */
+ @SuppressWarnings("unchecked")
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ mainPanel = new javax.swing.JPanel();
+ jLabel1 = new javax.swing.JLabel();
+ jTextField1 = new javax.swing.JTextField();
+ parentField = new javax.swing.JTextField();
+ jLabel2 = new javax.swing.JLabel();
+ nameField = new javax.swing.JTextField();
+ jLabel3 = new javax.swing.JLabel();
+ jScrollPane1 = new javax.swing.JScrollPane();
+ houseList = new javax.swing.JList();
+
+ setLayout(new java.awt.GridLayout(1, 0));
+
+ jLabel1.setText("Rodič:");
+
+ jTextField1.setText("jTextField1");
+
+ parentField.setEditable(false);
+ parentField.setText("jTextField2");
+
+ jLabel2.setText("Jméno:");
+
+ nameField.setText("jTextField3");
+
+ jLabel3.setText("Domy:");
+
+ houseList.setModel(new javax.swing.AbstractListModel() {
+ String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
+ public int getSize() { return strings.length; }
+ public Object getElementAt(int i) { return strings[i]; }
+ });
+ jScrollPane1.setViewportView(houseList);
+
+ javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel);
+ mainPanel.setLayout(mainPanelLayout);
+ mainPanelLayout.setHorizontalGroup(
+ mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(mainPanelLayout.createSequentialGroup()
+ .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(jLabel2)
+ .addComponent(jLabel3)
+ .addComponent(jLabel1))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 344, Short.MAX_VALUE)
+ .addComponent(nameField, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 344, Short.MAX_VALUE)
+ .addComponent(parentField, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 344, Short.MAX_VALUE)))
+ );
+ mainPanelLayout.setVerticalGroup(
+ mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(mainPanelLayout.createSequentialGroup()
+ .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel1)
+ .addComponent(parentField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(nameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel2))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel3)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 77, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+
+ add(mainPanel);
+ }// //GEN-END:initComponents
+
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JList houseList;
+ private javax.swing.JLabel jLabel1;
+ private javax.swing.JLabel jLabel2;
+ private javax.swing.JLabel jLabel3;
+ private javax.swing.JScrollPane jScrollPane1;
+ private javax.swing.JTextField jTextField1;
+ private javax.swing.JPanel mainPanel;
+ private javax.swing.JTextField nameField;
+ private javax.swing.JTextField parentField;
+ // End of variables declaration//GEN-END:variables
+
+}
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java (revision 15583)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/proposal/ProposalContainer.java (revision 15584)
@@ -181,21 +181,4 @@
@Override
public String toString() {
- /*if (target.keySet().contains("name"))
- return target.get("name");
-
- if ( target.keySet().contains("addr:alternatenumber")
- || target.keySet().contains("addr:housenumber")) {
-
- String cp = target.get("addr:alternatenumber");
- String co = target.get("addr:housenumber");
- String ul = target.get("addr:street");
-
- if (cp == null) cp = "?";
- if (co == null) co = "?";
- if (ul == null) ul = "" ; else ul = " " + ul;
-
- return "Dům " + String.valueOf(cp) + "/" + String.valueOf(co) + ul;
- }*/
-
return target.toString();
}