Changeset 15201 in osm for applications

Timestamp:

2009-05-24T20:56:33+02:00 (15 years ago)

Author:

rcernoch

Message:

CzechAddress: Help menu, initial implementation of DB modifier

Location:

applications/editors/josm/plugins/czechaddress

Files:

• build.xml (modified) (1 diff)
• nbproject/project.xml (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/actions/HelpAction.java (added)
• src/org/openstreetmap/josm/plugins/czechaddress/actions/ModifierAction.java (added)
• src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/StringUtils.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/czechaddress/gui/DatabaseModifier.form (added)
• src/org/openstreetmap/josm/plugins/czechaddress/gui/DatabaseModifier.java (added)
• src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Capitalizator.java (added)

applications/editors/josm/plugins/czechaddress/build.xml

@@ -97 +97 @@
                 <pathelement path="${java.class.path}"/>
             </classpath>
+        <arg value="/home/radek/Desktop/Hustopeče.osm"/>
         </java>
     </target>

applications/editors/josm/plugins/czechaddress/nbproject/project.xml

@@ -5 +5 @@
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
             <name>czechaddress</name>
-            <folders>
-                <source-folder>
-                    <label>src</label>
-                    <type>java</type>
-                    <location>src</location>
-                </source-folder>
-            </folders>
-            <ide-actions>
-                <action name="build">
-                    <target>dist</target>
-                </action>
-                <action name="clean">
-                    <target>clean</target>
-                </action>
-                <action name="javadoc">
-                    <target>doc</target>
-                </action>
-                <action name="run">
-                    <target>run</target>
-                </action>
-                <action name="rebuild">
-                    <target>clean</target>
-                    <target>dist</target>
-                </action>
-            </ide-actions>
-            <view>
-                <items>
-                    <source-folder style="packages">
-                        <label>src</label>
-                        <location>src</location>
-                    </source-folder>
-                </items>
-                <context-menu>
-                    <ide-action name="build"/>
-                    <ide-action name="clean"/>
-                    <ide-action name="javadoc"/>
-                    <ide-action name="run"/>
-                    <ide-action name="rebuild"/>
-                </context-menu>
-            </view>
-            <subprojects/>
         </general-data>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
@@ -61 +20 @@
                     <type>java</type>
                     <location>src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>tests</label>
+                    <type>java</type>
+                    <location>tests</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
@@ -86 +51 @@
                 </action>
             </ide-actions>
-            <export>
-                <type>folder</type>
-                <location>dist</location>
-                <build-target>compile</build-target>
-            </export>
             <view>
                 <items>
@@ -96 +56 @@
                         <label>src</label>
                         <location>src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>tests</label>
+                        <location>tests</location>
                     </source-folder>
                     <source-file>
@@ -115 +79 @@
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">../../core/build:../../core/src</classpath>
+                <classpath mode="compile">../../core/build:../../core/src:tests/junit-4.5.jar</classpath>
                 <javadoc-built-to>doc</javadoc-built-to>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+            <compilation-unit>
+                <package-root>tests</package-root>
+                <unit-tests/>
                 <source-level>1.5</source-level>
             </compilation-unit>

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java

@@ -24 +24 @@
 import org.openstreetmap.josm.plugins.czechaddress.parser.MvcrParser;
 import org.openstreetmap.josm.plugins.czechaddress.actions.FactoryAction;
+import org.openstreetmap.josm.plugins.czechaddress.actions.HelpAction;
+import org.openstreetmap.josm.plugins.czechaddress.actions.ModifierAction;
 import org.openstreetmap.josm.plugins.czechaddress.actions.SplitAreaByEmptyWayAction;
 import org.openstreetmap.josm.plugins.czechaddress.gui.FactoryDialog;
@@ -68 +70 @@
         final MvcrParser parser = new MvcrParser();
         //parser.setFilter(null, null, null, "");
-        //parser.setFilter("BRNO", "BRNO", null, null);
+        parser.setFilter("HUSTOPEČE", "HUSTOPEČE", null, null);
         parser.setTargetDatabase(mainDatabase);
         parser.setStorageDir(pluginDir);
@@ -112 +114 @@
 
         // Move houses from list of Houses to list of AddressElements.
-        List<House> tmp1 = location.getAllHouses();
-        ArrayList<AddressElement> tmp2 = new ArrayList<AddressElement>(tmp1.size());
-        for (House h : tmp1) tmp2.add(h);
+        List<House> houses   = location.getAllHouses();
+        ArrayList<AddressElement> pool
+                = new ArrayList<AddressElement>(houses.size());
+        for (House house : houses) pool.add(house);
+
+
+        /*Capitalizator cap = new Capitalizator(Main.ds.allPrimitives(),
+                                              location.getStreets());
+        for (Street s : cap.getClassifiedItems())
+            System.out.println(s.toString() + " --> " + cap.translate(s).getName());*/
 
         // And add them to the reasoner.
-        mainReasoner = new Reasoner(tmp2);
+        mainReasoner = new Reasoner(pool);
         mainReasoner.addPrimitives(Main.ds.allPrimitives());
     }
@@ -186 +195 @@
             menuItems.add(MainMenu.add(czechMenu, new GroupManipulatorAction()));
             menuItems.add(MainMenu.add(czechMenu, new ConflictResolveAction()));
+            menuItems.add(MainMenu.add(czechMenu, new ModifierAction()));
+            menuItems.add(MainMenu.add(czechMenu, new HelpAction()));
             return;
         }

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/StringUtils.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.czechaddress;
+
+import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
@@ -30 +32 @@
     }
 
+    public static String coordinateToString(double coor) {
+        double degrees = Math.floor(coor);
+        double minutes = Math.floor( 60*(coor-degrees) );
+        double seconds = 60*60*(coor-degrees-minutes/60);
+
+        return String.valueOf(Math.round(    degrees))     + "°" +
+               String.valueOf(Math.round(    minutes))     + "'" +
+               String.valueOf(Math.round(100*seconds)/100.0) + "\"";
+    }
+
+    public static String latLonToString(LatLon position) {
+        assert position != null;
+        //if (position == null) return "";
+
+        return "(lat: " + coordinateToString(position.lat())
+             + " lon: " + coordinateToString(position.lon()) + ")";
+    }
+
+    /**
+     * String matcher with abbreviations
+     *
+     * <p>Returns {@code true} even if s1="Nám. Svobody" and
+     * s2="Náměstí Svobody".</p>
+     */
+    public boolean matchAbbrev(String s1, String s2) {
+        String[] parts1 = s1.split(" +");
+        String[] parts2 = s2.split(" +");
+
+        if (parts1.length != parts2.length)
+            return false;
+
+        for (int i=0; i<parts1.length; i++) {
+            String part1 = parts1[i];
+            String part2 = parts2[i];
+
+            if (part1.charAt(part1.length()-1) == '.')
+                part1 = part1.substring(0, part1.length()-1);
+
+            if (part2.charAt(part2.length()-1) == '.')
+                part2 = part2.substring(0, part2.length()-1);
+
+            int minLen = Math.min(part1.length(), part2.length());
+            part1 = part1.substring(0, minLen).toUpperCase();
+            part2 = part2.substring(0, minLen).toUpperCase();
+
+            if (!part1.equals(part2))
+                return false;
+        }
+        return true;
+    }
+
 }

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/AddressElement.java

@@ -5 +5 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.czechaddress.StringUtils;
 import org.openstreetmap.josm.plugins.czechaddress.intelligence.Match;
 import org.openstreetmap.josm.plugins.czechaddress.proposal.Proposal;
@@ -275 +276 @@
         
         return 0; // <-- just to make compilers happy. We cannot get here.
-    }    
+    }
+
+
+
+    public String getIsIn() {
+        return getIsIn(null);
+    }
+
+    protected String getIsInName() {
+        return getName();
+    }
+
+    private String getIsIn(String childString) {
+
+        String result = "";
+
+        if (getIsInName() != null  &&  !getIsInName().equals(childString)) {
+            result += getIsInName() + ", ";
+        }
+
+        if (parent != null)
+            result += parent.getIsIn(getIsInName());
+        else
+            result += "CZ";
+        
+        return result;
+    }
 }

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java

@@ -171 +171 @@
                                 pr.parentStreet.getName()));
         
-        if (pr.parentViToCi != null) {
+/*        if (pr.parentViToCi != null) {
             String targetIsIn = "";
 
@@ -188 +188 @@
                                 prim.get(KEY_ADDR_CITY),
                                 pr.parentViToCi.getName()));
-
+*/
+        
+        
+        if (parent.parent != null) // For sure our parent is a ElemWithStreets
             props.add(getStringFieldDiff(KEY_IS_IN,
                                 prim.get(KEY_IS_IN),
-                                targetIsIn));
-        }
+                                parent.parent.getIsIn()));
+/*        }*/
 
         // If we have added any proposal so far, add the source info as well.

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Region.java

@@ -95 +95 @@
         return thisString;
     }
+
+    @Override
+    protected String getIsInName() {
+
+        if (nuts3name != null)
+            return nuts3name + " kraj";
+
+        if (nuts4name != null)
+            return nuts3name + " okres";
+
+        return null;
+    }
 }

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/Street.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.czechaddress.addressdatabase;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 /**
@@ -24 +26 @@
     }
 
-
-
-    /*int[] getFieldMatchList(OsmPrimitive primitive) {
+    @Override
+    protected int[] getFieldMatchList(OsmPrimitive primitive) {
         int[] result = {0};
         
@@ -33 +34 @@
         
         result[0] = matchField(name, primitive.get("name"));
-        
+
+        if (primitive.get("name") != null) {
+            String[] parts1 = primitive.get("name").split("\\.* +");
+            String[] parts2 =                  name.split("\\.* +");
+            for (String p : parts1)
+                System.out.println("X: " + p);
+            for (String p : parts2)
+                System.out.println("Y: " + p);
+        }
+
         return result;
-    }*/
+    }
 }

applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/StringUtils.java

@@ -14 +14 @@
 public class StringUtils {
 
-    public static String coordinateToString(double coor) {
-        double degrees = Math.floor(coor);
-        double minutes = Math.floor( 60*(coor-degrees) );
-        double seconds = 60*60*(coor-degrees-minutes/60);
-        
-        return String.valueOf(Math.round(    degrees))     + "°" +
-               String.valueOf(Math.round(    minutes))     + "'" +
-               String.valueOf(Math.round(100*seconds)/100.0) + "\"";
-    }
-
-    public static String latLonToString(LatLon position) {
-        if (position == null) return "";
-
-        return "(lat: " + coordinateToString(position.lat())
-             + " lon: " + coordinateToString(position.lon()) + ")";
-    }
 
 }