Changeset 11732 in josm for trunk

Timestamp:

2017-03-14T19:27:54+01:00 (8 years ago)

Author:

Klumbumbus

Message:

• typo from r11721
• fix #14539 - allow leisure=fitness_centre as physical feature for sport tags

Location:

trunk

Files:

• data/validator/combinations.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)

trunk/data/validator/combinations.mapcss

@@ -337 +337 @@
 
 /* #9593, #11183, #12418, #12761 */
-*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink|horse_riding|fitness_station|bowling_alley)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
+*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink|horse_riding|fitness_centre|fitness_station|bowling_alley)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
     throwWarning: tr("sport without physical feature");
     group: tr("missing tag");

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1512 +1512 @@
     public static double clamp(double val, double min, double max) {
         if (min > max) {
-            throw new IllegalArgumentException(MessageFormat.format("Parameter min ({0}) cannot be greather than max ({1})", min, max));
+            throw new IllegalArgumentException(MessageFormat.format("Parameter min ({0}) cannot be greater than max ({1})", min, max));
         } else if (val < min) {
             return min;
@@ -1533 +1533 @@
     public static int clamp(int val, int min, int max) {
         if (min > max) {
-            throw new IllegalArgumentException(MessageFormat.format("Parameter min ({0}) cannot be greather than max ({1})", min, max));
+            throw new IllegalArgumentException(MessageFormat.format("Parameter min ({0}) cannot be greater than max ({1})", min, max));
         } else if (val < min) {
             return min;