Ticket #21930: progress.diff

File progress.diff, 1.9 KB (added by riiga_92@…, 4 years ago)

Progress in existing files

  • src/org/openstreetmap/josm/data/validation/OsmValidator.java

     
    5858import org.openstreetmap.josm.data.validation.tests.NameMismatch;
    5959import org.openstreetmap.josm.data.validation.tests.OpeningHourTest;
    6060import org.openstreetmap.josm.data.validation.tests.OverlappingWays;
     61import org.openstreetmap.josm.data.validation.tests.ParkingLanesConditional;
    6162import org.openstreetmap.josm.data.validation.tests.PowerLines;
    6263import org.openstreetmap.josm.data.validation.tests.PublicTransportRouteTest;
    6364import org.openstreetmap.josm.data.validation.tests.RelationChecker;
     
    154155        SharpAngles.class, // 3800 .. 3899
    155156        ConnectivityRelations.class, // 3900 .. 3999
    156157        DirectionNodes.class, // 4000-4099
     158        ParkingLanesConditional.class // 4100-4199
    157159    };
    158160
    159161    /**
  • src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

     
    224224        final List<TestError> errors = new ArrayList<>();
    225225        final Pattern pattern = Pattern.compile(":conditional(:.*)?$");
    226226        p.visitKeys((primitive, key, value) -> {
    227             if (!pattern.matcher(key).find()) {
     227            // Exclude parking:condition since it has its own tests in ParkingLanesConditional
     228            if (key.startsWith("parking:condition") || !pattern.matcher(key).find()) {
    228229                return;
    229230            }
    230231            if (!isKeyValid(key)) {