Changeset 16346 in osm

Timestamp:

2009-07-05T19:50:37+02:00 (15 years ago)

Author:

stoecker

Message:

some more cleanups

Location:

applications/editors/josm/plugins/validator

Files:

• ignoretags.cfg (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java (modified) (2 diffs)

applications/editors/josm/plugins/validator/ignoretags.cfg

@@ -12 +12 @@
 S:au.gov.abs:
 S:qroti:
-S:is_in:
+S:is_in
 S:wikipedia
+S:source_ref:
 ;
 ; Ignore valid and semi-valid keys that equal...
@@ -26 +27 @@
 E:addr:state
 E:import_uuid
+E:image
 E:url
+E:website
 E:postal_code
+E:source:boundary
+E:hour_on
+E:hour_off
+E:tower:type
+E:rcn_ref
+E:place_name
 ;
 ; Ignore valid and semi-valid keys that end with...
@@ -40 +49 @@
 ;
 K:highway=secondary_link
+K:oneway=-1
+;
+; traffic_calming Tags
+;
+K:traffic_calming=yes
+K:traffic_calming=bump
+K:traffic_calming=chicane
+K:traffic_calming=cushion
+K:traffic_calming=hump
+K:traffic_calming=rumble_strip
+K:traffic_calming=table
+K:traffic_calming=choker
 ;
 ; Aeroway Key/Value Pairs
 ;
+K:aeroway=apron
+K:aeroway=hanger
+K:aeroway=runway
 K:aeroway=taxiway
-K:aeroway=runway
 K:aeroway=terminal
-K:aeroway=hanger
 ;
 ; Amenity Key/Value Pairs
 ;
 K:amenity=bbq
+;
+; Cycleway Tags
+;
+K:cycleway=track
+;
+; Man_made Tags
+;
+T:man_made=pipeline|type=water
+T:man_made=pipeline|type=oil
+T:man_made=pipeline|type=gas
+T:man_made=pipeline|type=sewage
+T:man_made=pipeline|location=underground
+T:man_made=pipeline|location=underwater
+T:man_made=pipeline|location=overground
+;
+; Military Tags
+;
+K:military=airfield
+K:military=bunker
+K:military=barracks
+K:military=danger_area
+K:military=range
+K:military=naval_base
 ;
 ; Surface Key/Value Pairs
@@ -59 +104 @@
 ; Religious Key/Value Pairs
 ;
+T:religion=christian|denomination=anglican
 T:religion=muslim|denomination=alaouite
 T:religion=jewish|denomination=alternative
+T:religion=christian|denomination=apostolic
 T:religion=jewish|denomination=ashkenazi
+T:religion=christian|denomination=baptist
 T:religion=christian|denomination=catholic
 T:religion=christian|denomination=christian_community
@@ -121 +169 @@
 K:shop=mall
 ;
+; Sports Tags
+;
+K:sport=boxing
+K:sport=netball
+;
 ; Type Key/Value Pairs
 ;

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

@@ -71 +71 @@
                 if( !tags.containsKey("name") && !tags.containsKey("ref") )
                 {
+                    boolean isRoundabout = false;
                     boolean hasName = false;
                     for( String key : w.keySet())
@@ -77 +78 @@
                         if( hasName )
                             break;
+                        if(key.equals("junction"))
+                        {
+                            isRoundabout = w.get("junction").equals("roundabout");
+                            break;
+                        }
                     }
 
-                    if( !hasName)
+                    if( !hasName && !isRoundabout)
                         errors.add( new TestError(this, Severity.WARNING, tr("Unnamed ways"), UNNAMED_WAY, w) );
+                    else if(isRoundabout)
+                        errors.add( new TestError(this, Severity.WARNING, tr("Unnamed Junction"), UNNAMED_WAY, w) );
                 }
             }