streetcomplete · westnordost · Oct 31, 2019 · Jun 20, 2019 · Jun 21, 2019 · Jun 22, 2019
diff --git a/app/src/androidTest/java/de/westnordost/streetcomplete/data/meta/CountryInfosTest.java b/app/src/androidTest/java/de/westnordost/streetcomplete/data/meta/CountryInfosTest.java
@@ -24,12 +24,24 @@ private void checkFirstDayOfWorkweekIsValid(CountryInfo info)
 		assertTrue(Weekdays.Companion.getWeekdayIndex(info.getFirstDayOfWorkweek()) > -1);
 	}
 
-	private void checkMeasurementUnitIsEitherMetricOrImperial(CountryInfo info)
+	private void checkLengthUnitIsEitherMeterOrFootAndInch(CountryInfo info)
 	{
-		assertNotNull(info.getMeasurementSystem());
-		assertTrue(info.getMeasurementSystem().contains("metric") || info.getMeasurementSystem().contains("imperial"));
+		assertNotNull(info.getLengthUnits());
+		assertTrue(info.getLengthUnits().contains("meter") || info.getLengthUnits().contains("foot and inch"));
 	}
 
+	private void checkSpeedUnitIsEitherMphOrKmh(CountryInfo info)
+	{
+		assertNotNull(info.getSpeedUnits());
+		assertTrue(info.getSpeedUnits().contains("kilometers per hour") || info.getSpeedUnits().contains("miles per hour"));
+	}
+
+
+	private void checkWeightLimitUnitIsEitherTonOrShortTonOrPound(CountryInfo info)
+	{
+		assertNotNull(info.getWeightLimitUnits());
+		assertTrue(info.getWeightLimitUnits().contains("ton") || info.getWeightLimitUnits().contains("short ton") || info.getWeightLimitUnits().contains("pound"));
+	}
 	private void checkAdditionalValidHousenumberRegexes(Map<String, CountryInfo> infos)
 	{
 		assertTrue("99 bis".matches(infos.get("FR").getAdditionalValidHousenumberRegex()));
@@ -52,7 +64,9 @@ private void checkStartOfWorkweekValid(CountryInfo info)
 	private void checkForEach(CountryInfo info)
 	{
 		checkFirstDayOfWorkweekIsValid(info);
-		checkMeasurementUnitIsEitherMetricOrImperial(info);
+		checkLengthUnitIsEitherMeterOrFootAndInch(info);
+		checkSpeedUnitIsEitherMphOrKmh(info);
+		checkWeightLimitUnitIsEitherTonOrShortTonOrPound(info);
 		checkRegularShoppingDaysIsBetween0And7(info);
 		checkStartOfWorkweekValid(info);
 	}

diff --git a/app/src/main/assets/country_metadata/AG.yml b/app/src/main/assets/country_metadata/AG.yml
@@ -1,7 +1,8 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 344
 officialLanguages: [en]
 orchardProduces: [guava, mango, mangosteen, tomato, pineapple, lemon, lime, banana, chilli_pepper,
   sweet_pepper]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/AI.yml b/app/src/main/assets/country_metadata/AI.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 officialLanguages: [en]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/AS.yml b/app/src/main/assets/country_metadata/AS.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 officialLanguages: [en, sm]
 orchardProduces: [coconut, banana, pineapple, tomato, cacao]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/BM.yml b/app/src/main/assets/country_metadata/BM.yml
@@ -1,5 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 officialLanguages: [en]
 orchardProduces: [banana, tomato]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/BS.yml b/app/src/main/assets/country_metadata/BS.yml
@@ -1,8 +1,9 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 364
 officialLanguages: [en]
 orchardProduces: [grapefruit, banana, tomato, orange, coconut, guava, mango, mangosteen, lemon, lime,
   avocado, papaya]
 popularSports: [tennis, basketball, baseball]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/BZ.yml b/app/src/main/assets/country_metadata/BZ.yml
@@ -1,6 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 702
 officialLanguages: [en, bzj]
 orchardProduces: [orange, banana, grapefruit, tomato, chilli_pepper, sweet_pepper, pineapple, papaya,
   coconut, cacao, coffee, guava, mango, mangosteen]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/DM.yml b/app/src/main/assets/country_metadata/DM.yml
@@ -1,7 +1,8 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 366
 officialLanguages: [en]
 orchardProduces: [banana, grapefruit, coconut, orange, guava, mango, mangosteen, lemon, lime, avocado,
   tomato, cacao, coffee, pineapple, papaya, nutmeg]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/FK.yml b/app/src/main/assets/country_metadata/FK.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 officialLanguages: [en]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/FM.yml b/app/src/main/assets/country_metadata/FM.yml
@@ -1,5 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 550
 officialLanguages: [en, chk, pon]
 orchardProduces: [coconut, banana, cacao]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/GB.yml b/app/src/main/assets/country_metadata/GB.yml
@@ -4,10 +4,11 @@ isAdvisorySpeedLimitKnown: true
 isLeftHandTraffic: true
 isLivingStreetKnown: true
 isSlowZoneKnown: true
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 mobileCountryCode: 234
 officialLanguages: [en]
 orchardProduces: [apple, strawberry, tomato, pear, chilli_pepper, sweet_pepper, raspberry, plum, cherry,
   hop, grape]
 popularReligions: [christian, muslim, jewish, hindu, sikh]
 popularSports: [soccer, tennis, bowls, cricket, golf, basketball, rugby]
+speedUnits: [miles per hour]
diff --git a/app/src/main/assets/country_metadata/GD.yml b/app/src/main/assets/country_metadata/GD.yml
@@ -1,8 +1,9 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 352
 officialLanguages: [en]
 orchardProduces: [coconut, banana, nutmeg, grapefruit, guava, mango, mangosteen, avocado, plum, orange,
   cacao, apple, tomato, lemon, lime, chilli_pepper, sweet_pepper, pineapple]
 popularSports: [cricket]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/GG.yml b/app/src/main/assets/country_metadata/GG.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 officialLanguages: [en]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/GI.yml b/app/src/main/assets/country_metadata/GI.yml
@@ -1,3 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 officialLanguages: [en]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/GS.yml b/app/src/main/assets/country_metadata/GS.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 officialLanguages: [en]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/GU.yml b/app/src/main/assets/country_metadata/GU.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 officialLanguages: [en, ch]
 orchardProduces: [coconut, banana, tomato, guava, mango, mangosteen, orange]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/GY.yml b/app/src/main/assets/country_metadata/GY.yml
@@ -1,9 +1,10 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [metric, imperial]
+lengthUnits: [meter, foot and inch]
 mobileCountryCode: 738
 officialLanguages: [en, gyn]
 orchardProduces: [coconut, papaya, chilli_pepper, sweet_pepper, tomato, pineapple, banana, guava, mango,
   mangosteen, orange, lemon, lime, cherry, grapefruit, avocado, cacao, coffee, pepper]
 popularReligions: [christian, hindu, muslim]
 popularSports: [cricket]
+speedUnits: [kilometers per hour, miles per hour]
diff --git a/app/src/main/assets/country_metadata/IM.yml b/app/src/main/assets/country_metadata/IM.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 officialLanguages: [gv, en]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/JE.yml b/app/src/main/assets/country_metadata/JE.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 officialLanguages: [en]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/KN.yml b/app/src/main/assets/country_metadata/KN.yml
@@ -1,5 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+lengthUnits: [meter, foot and inch]
 mobileCountryCode: 356
 officialLanguages: [en]
 orchardProduces: [coconut, tomato, chilli_pepper, sweet_pepper, pineapple]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/KY.yml b/app/src/main/assets/country_metadata/KY.yml
@@ -1,5 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 officialLanguages: [en]
 orchardProduces: [banana, guava, mango, mangosteen, avocado, coconut, tomato]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/LC.yml b/app/src/main/assets/country_metadata/LC.yml
@@ -1,7 +1,8 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 358
 officialLanguages: [en]
 orchardProduces: [coconut, banana, grapefruit, orange, tomato, lemon, lime, guava, mango, mangosteen,
   avocado, pepper, cacao, pineapple, nutmeg]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/LR.yml b/app/src/main/assets/country_metadata/LR.yml
@@ -1,5 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 618
 officialLanguages: [en]
 orchardProduces: [banana, rubber, pineapple, orange, cacao, coconut, tomato, coffee]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/MH.yml b/app/src/main/assets/country_metadata/MH.yml
@@ -1,5 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 551
 officialLanguages: [mh, en]
 orchardProduces: [coconut]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/MM.yml b/app/src/main/assets/country_metadata/MM.yml
@@ -1,9 +1,10 @@
 # Do not edit. Source files are in /res/country_metadata
 additionalStreetsignLanguages: [en]
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 mobileCountryCode: 414
 officialLanguages: [my]
 orchardProduces: [coconut, rubber, areca_nut, chilli_pepper, sweet_pepper, tea, coffee, cashew_nut,
   guava, mango, mangosteen]
 popularReligions: [buddhist, christian, muslim, hindu]
 popularSports: [soccer, tennis, sepak_takraw]
+speedUnits: [kilometers per hour, miles per hour]
diff --git a/app/src/main/assets/country_metadata/MP.yml b/app/src/main/assets/country_metadata/MP.yml
@@ -1,3 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 officialLanguages: [ch]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/MS.yml b/app/src/main/assets/country_metadata/MS.yml
@@ -1,5 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 officialLanguages: [en]
 orchardProduces: [tomato, banana, guava, mango, mangosteen, lemon, lime, chilli_pepper, sweet_pepper]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/PR.yml b/app/src/main/assets/country_metadata/PR.yml
@@ -1,6 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 officialLanguages: [en]
 orchardProduces: [banana, guava, mango, mangosteen, tomato, orange, papaya, pineapple, coffee, chilli_pepper,
   sweet_pepper, coconut, grapefruit, avocado, lemon, lime]
 popularSports: [basketball, tennis, baseball]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/PW.yml b/app/src/main/assets/country_metadata/PW.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 552
 officialLanguages: [en, pau]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/SH.yml b/app/src/main/assets/country_metadata/SH.yml
@@ -1,3 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
 officialLanguages: [en]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/TC.yml b/app/src/main/assets/country_metadata/TC.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [meter, foot and inch]
 officialLanguages: [en]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/US.yml b/app/src/main/assets/country_metadata/US.yml
@@ -1,10 +1,12 @@
 # Do not edit. Source files are in /res/country_metadata
 isAdvisorySpeedLimitKnown: true
 isSlowZoneKnown: false
-measurementSystem: [imperial]
+lengthUnits: [foot and inch]
 mobileCountryCode: 310
 officialLanguages: [en]
 orchardProduces: [tomato, grape, apple, orange, strawberry, almond, peach, lemon, lime, grapefruit,
   pear, walnut, cranberry, plum, pistachio, blueberry]
 popularReligions: [christian, jewish]
 popularSports: [baseball, tennis, basketball, soccer, golf, american_football]
+speedUnits: [miles per hour]
+weightLimitUnits: [short ton, pound]
diff --git a/app/src/main/assets/country_metadata/VC.yml b/app/src/main/assets/country_metadata/VC.yml
@@ -1,7 +1,8 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 360
 officialLanguages: [en]
 orchardProduces: [banana, coconut, guava, mango, mangosteen, apple, lemon, lime, orange, pear, chilli_pepper,
   sweet_pepper, grapefruit, cacao, nutmeg, coffee]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/VG.yml b/app/src/main/assets/country_metadata/VG.yml
@@ -1,5 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 officialLanguages: [en]
 orchardProduces: [banana, coconut]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/VI.yml b/app/src/main/assets/country_metadata/VI.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 officialLanguages: [en]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/WS.yml b/app/src/main/assets/country_metadata/WS.yml
@@ -1,6 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
-measurementSystem: [imperial, metric]
+lengthUnits: [foot and inch, meter]
 mobileCountryCode: 549
 officialLanguages: [sm, en]
 popularSports: [cricket]
+speedUnits: [miles per hour, kilometers per hour]
diff --git a/app/src/main/assets/country_metadata/default.yml b/app/src/main/assets/country_metadata/default.yml
@@ -4,9 +4,11 @@ isAdvisorySpeedLimitKnown: false
 isLeftHandTraffic: false
 isLivingStreetKnown: false
 isSlowZoneKnown: false
-measurementSystem: [metric]
+lengthUnits: [meter]
 officialLanguages: [en]
 orchardProduces: []
 popularReligions: []
 popularSports: []
 regularShoppingDays: 6
+speedUnits: [kilometers per hour]
+weightLimitUnits: [ton]
diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java b/app/src/main/java/de/westnordost/streetcomplete/data/meta/CountryInfo.java
@@ -14,7 +14,9 @@ public class CountryInfo implements Serializable, Cloneable
 	// i.e. US for US-TX.yml
 	String countryCode;
 
-	List<String> measurementSystem;
+	List<String> lengthUnits;
+	List<String> speedUnits;
+	List<String> weightLimitUnits;
 	List<String> popularSports;
 	List<String> popularReligions;
 	String firstDayOfWorkweek;
@@ -29,9 +31,19 @@ public class CountryInfo implements Serializable, Cloneable
 	Boolean isLeftHandTraffic;
 	Integer mobileCountryCode;
 
-	public List<String> getMeasurementSystem()
+	public List<String> getLengthUnits()
 	{
-		return measurementSystem;
+		return lengthUnits;
+	}
+
+	public List<String> getSpeedUnits()
+	{
+		return speedUnits;
+	}
+
+	public List<String> getWeightLimitUnits()
+	{
+		return weightLimitUnits;
 	}
 
 	public List<String> getPopularSports()

diff --git a/app/src/main/java/de/westnordost/streetcomplete/ktx/Double.kt b/app/src/main/java/de/westnordost/streetcomplete/ktx/Double.kt
@@ -0,0 +1,3 @@
+package de.westnordost.streetcomplete.ktx
+
+fun Double.toShortString() = if (this % 1 == 0.0) toInt().toString() else toString()