Changeset 16319 in osm for applications/editors/josm/plugins/validator/src/org

Timestamp:

2009-07-05T11:20:49+02:00 (15 years ago)

Author:

stoecker

Message:

patches by delta_foxtrot

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests

Files:

• TagChecker.java (modified) (12 diffs)
• UnconnectedWays.java (modified) (9 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java

@@ -66 +66 @@
     /** The default data files */
     public static final String DATA_FILE = "http://svn.openstreetmap.org/applications/editors/josm/plugins/validator/tagchecker.cfg";
+    public static final String IGNORE_FILE = "http://svn.openstreetmap.org/applications/editors/josm/plugins/validator/ignoretags.cfg";
     public static final String SPELL_FILE = "http://svn.openstreetmap.org/applications/utils/planet.osm/java/speller/words.cfg";
 
@@ -74 +75 @@
     /** The TagChecker data */
     protected static List<CheckerData> checkerData = new ArrayList<CheckerData>();
+    protected static ArrayList<String> ignoreDataStartsWith = new ArrayList<String>();
+    protected static ArrayList<String> ignoreDataEquals = new ArrayList<String>();
+    protected static ArrayList<String> ignoreDataEndsWith = new ArrayList<String>();
+    protected static ArrayList<IgnoreKeyPair> ignoreDataKeyPair = new ArrayList<IgnoreKeyPair>();
 
     /** The preferences prefix */
@@ -86 +91 @@
     public static final String PREF_SOURCES = PREFIX + ".sources";
     public static final String PREF_USE_DATA_FILE = PREFIX + ".usedatafile";
+    public static final String PREF_USE_IGNORE_FILE = PREFIX + ".useignorefile";
     public static final String PREF_USE_SPELL_FILE = PREFIX + ".usespellfile";
 
@@ -113 +119 @@
 
     protected JCheckBox prefUseDataFile;
+    protected JCheckBox prefUseIgnoreFile;
     protected JCheckBox prefUseSpellFile;
 
@@ -169 +176 @@
                 sources = DATA_FILE + ";" + sources;
         }
+        if(Main.pref.getBoolean(PREF_USE_IGNORE_FILE, true))
+        {
+            if( sources == null || sources.length() == 0)
+                sources = IGNORE_FILE;
+            else
+                sources = IGNORE_FILE + ";" + sources;
+        }
         if(Main.pref.getBoolean(PREF_USE_SPELL_FILE, true))
         {
@@ -198 +212 @@
                 String okValue = null;
                 Boolean tagcheckerfile = false;
+                Boolean ignorefile = false;
                 String line;
                 while((line = reader.readLine()) != null && (tagcheckerfile || line.length() != 0))
@@ -205 +220 @@
                         if(line.startsWith("# JOSM TagChecker"))
                             tagcheckerfile = true;
+                        if(line.startsWith("# JOSM IgnoreTags"))
+                            ignorefile = true;
+                        continue;
+                    }
+                    else if(ignorefile)
+                    {
+                        line = line.trim();
+                        if(line.length() < 4)
+                            continue;
+
+                        String key = line.substring(0, 2);
+                        line = line.substring(2);
+
+                        if(key.equals("S:"))
+                        {
+                            ignoreDataStartsWith.add(line);
+                        }
+                        else if(key.equals("E:"))
+                        {
+                            ignoreDataEquals.add(line);
+                        }
+                        else if(key.equals("F:"))
+                        {
+                            ignoreDataEndsWith.add(line);
+                        }
+                        else if(key.equals("K:"))
+                        {
+                            IgnoreKeyPair tmp = new IgnoreKeyPair();
+                            int mid = line.indexOf("=");
+                            tmp.key = line.substring(0, mid);
+                            tmp.value = line.substring(mid+1);
+                            ignoreDataKeyPair.add(tmp);
+                        }
+                        continue;
                     }
                     else if(tagcheckerfile)
@@ -391 +440 @@
                 {
                     Boolean ignore = false;
-                    for(String a : Main.pref.getCollection(PreferenceEditor.PREFIX + ".startswithkeys",
-                    Arrays.asList(new String[]{"opengeodb","openGeoDB","name:","note:"})))
+                    for(String a : ignoreDataStartsWith)
                     {
                         if(key.startsWith(a))
                             ignore = true;
                     }
-                    for(String a : Main.pref.getCollection(PreferenceEditor.PREFIX + ".endswithkeys",
-                    Arrays.asList(new String[]{":forward",":backward",":left",":right"})))
+                    for(String a : ignoreDataEquals)
+                    {
+                        if(key.equals(a))
+                            ignore = true;
+                    }
+                    for(String a : ignoreDataEndsWith)
                     {
                         if(key.endsWith(a))
@@ -413 +465 @@
                 else if(values.size() > 0 && !values.contains(prop.getValue()))
                 {
-                    String i = marktr("Value ''{0}'' for key ''{1}'' not in presets.");
-                    errors.add( new TestError(this, Severity.OTHER, tr("Presets do not contain property value"),
-                    tr(i, prop.getValue(), key), MessageFormat.format(i, prop.getValue(), key), INVALID_VALUE, p) );
-                    withErrors.add(p, "UPV");
+                    boolean ignore = false;
+                    for(IgnoreKeyPair a : ignoreDataKeyPair)
+                    {
+                        if(key.equals(a.key) && value.equals(a.value))
+                            ignore = true;
+                    }
+
+                    if(!ignore)
+                    {
+                        String i = marktr("Value ''{0}'' for key ''{1}'' not in presets.");
+                        errors.add( new TestError(this, Severity.OTHER, tr("Presets do not contain property value"),
+                        tr(i, prop.getValue(), key), MessageFormat.format(i, prop.getValue(), key), INVALID_VALUE, p) );
+                        withErrors.add(p, "UPV");
+                    }
                 }
             }
@@ -601 +663 @@
         prefUseDataFile.setToolTipText(tr("Use the default data file (recommended)."));
         testPanel.add(prefUseDataFile, GBC.eol().insets(20,0,0,0));
+
+        prefUseIgnoreFile = new JCheckBox(tr("Use default tag ignore file."), Main.pref.getBoolean(PREF_USE_IGNORE_FILE, true));
+        prefUseIgnoreFile.setToolTipText(tr("Use the default tag ignore file (recommended)."));
+        testPanel.add(prefUseIgnoreFile, GBC.eol().insets(20,0,0,0));
 
         prefUseSpellFile = new JCheckBox(tr("Use default spellcheck file."), Main.pref.getBoolean(PREF_USE_SPELL_FILE, true));
@@ -635 +701 @@
         Main.pref.put(PREF_CHECK_PAINT_BEFORE_UPLOAD, prefCheckPaintBeforeUpload.isSelected());
         Main.pref.put(PREF_USE_DATA_FILE, prefUseDataFile.isSelected());
+        Main.pref.put(PREF_USE_IGNORE_FILE, prefUseIgnoreFile.isSelected());
         Main.pref.put(PREF_USE_SPELL_FILE, prefUseSpellFile.isSelected());
         String sources = "";
@@ -709 +776 @@
 
         return false;
+    }
+
+    private static class IgnoreKeyPair {
+        public String key;
+        public String value;
     }
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.Main;
@@ -65 +66 @@
         for(Node en : endnodes_highway)
         {
+            if("turning_circle".equals(en.get("highway")) ||
+            OsmUtils.getOsmBoolean(en.get("noexit")) || en.get("barrier") != null)
+                continue;
             for(MyWaySegment s : ways)
             {
-                if(s.highway && s.nearby(en, mindist) && (a == null || a.contains(en.getCoor())))
+                if(!s.isBoundary && !s.isAbandoned && s.highway && s.nearby(en, mindist) && (a == null || a.contains(en.getCoor())))
                     map.put(en, s.w);
             }
@@ -85 +89 @@
             for(MyWaySegment s : ways)
             {
-                if(!s.highway && s.nearby(en, mindist) && !s.isArea() && (a == null || a.contains(en.getCoor())))
+                if(!s.isBoundary && !s.isAbandoned && !s.highway && s.nearby(en, mindist) && !s.isArea() && (a == null || a.contains(en.getCoor())))
                     map.put(en, s.w);
             }
@@ -93 +97 @@
             for(MyWaySegment s : ways)
             {
-                if(s.nearby(en, mindist) && !s.isArea() && (a == null || a.contains(en.getCoor())))
+                if(!s.isBoundary && !s.isAbandoned && s.nearby(en, mindist) && !s.isArea() && (a == null || a.contains(en.getCoor())))
                     map.put(en, s.w);
             }
@@ -114 +118 @@
                 for(MyWaySegment s : ways)
                 {
-                    if(s.nearby(en, minmiddledist) && (a == null || a.contains(en.getCoor())))
+                    if(!s.isBoundary && !s.isAbandoned && s.nearby(en, minmiddledist) && (a == null || a.contains(en.getCoor())))
                         map.put(en, s.w);
                 }
@@ -132 +136 @@
                 for(MyWaySegment s : ways)
                 {
-                    if(s.nearby(en, minmiddledist) && (a == null || a.contains(en.getCoor())))
+                    if(!s.isBoundary && !s.isAbandoned && s.nearby(en, minmiddledist) && (a == null || a.contains(en.getCoor())))
                         map.put(en, s.w);
                 }
@@ -154 +158 @@
         private Line2D line;
         public Way w;
+        public Boolean isAbandoned = false;
+        public Boolean isBoundary = false;
         public Boolean highway;
 
@@ -159 +165 @@
         {
             this.w = w;
-            this.highway = w.get("highway") != null || w.get("railway") != null;
+            String railway = w.get("railway");
+            this.isAbandoned = railway != null && railway.equals("abandoned");
+            this.highway = w.get("highway") != null || (railway != null && !isAbandoned);
+            this.isBoundary = w.get("boundary") != null && w.get("boundary").equals("administrative") && !this.highway;
             line = new Line2D.Double(n1.getEastNorth().east(), n1.getEastNorth().north(),
             n2.getEastNorth().east(), n2.getEastNorth().north());
@@ -169 +178 @@
             && line.ptSegDist(n.getEastNorth().east(), n.getEastNorth().north()) < dist;
         }
-        
+
         public boolean isArea() {
             return w.get("landuse") != null