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

Timestamp:

2008-07-15T12:04:07+02:00 (16 years ago)

Author:

stoecker

Message:

updated to match real world tags

Location:

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

Files:

• OverlappingWays.java (modified) (2 diffs)
• UnclosedWays.java (modified) (2 diffs)

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

@@ -74 +74 @@
                                         if (ar != null && ("true".equalsIgnoreCase(ar) || "yes".equalsIgnoreCase(ar) || "1".equals(ar)))
                                                 area++;
-                                        if (ws.way.get("landuse") != null)
+                                        if (ws.way.get("landuse") != null || ws.way.get("natural") != null
+                                        || ws.way.get("amenity") != null || ws.way.get("leisure") != null)
                                         {
                                                 area++; ways--;
@@ -92 +93 @@
                                         if(area > 0)
                                         {
-                                                if (highway == ways)
+                                                if (ways == 0 || duplicated.size() == area)
+                                                        errortype = tr("Overlapping areas");
+                                                else if (highway == ways)
                                                         errortype = tr("Overlapping highways (with area)");
                                                 else if (railway == ways)

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

@@ -55 +55 @@
                 if(test != null)
                 {
+                        if(!"coastline".equals(test))
+                                force = true;
                         type = tr("natural type {0}", tr(test));
                 }
@@ -60 +62 @@
                 if(test != null)
                 {
+                        force = true;
                         type = tr("landuse type {0}", tr(test));
+                }
+                test = w.get("amenities");
+                if(test != null)
+                {
+                        force = true;
+                        type = tr("amenities type {0}", tr(test));
+                }
+                test = w.get("sport");
+                if(test != null)
+                {
+                        force = true;
+                        type = tr("sport type {0}", tr(test));
+                }
+                test = w.get("tourism");
+                if(test != null)
+                {
+                        force = true;
+                        type = tr("tourism type {0}", tr(test));
+                }
+                test = w.get("shop");
+                if(test != null)
+                {
+                        force = true;
+                        type = tr("shop type {0}", tr(test));
+                }
+                test = w.get("leisure");
+                if(test != null)
+                {
+                        force = true;
+                        type = tr("leisure type {0}", tr(test));
+                }
+                test = w.get("waterway");
+                if(test != null && test.equals("riverbank"))
+                {
+                        force = true;
+                        type = tr("waterway type {0}", tr(test));
                 }
                 test = w.get("junction");