streetcomplete · westnordost · Aug 15, 2018 · Mar 8, 2018 · Mar 8, 2018 · Mar 8, 2018
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
@@ -20,10 +20,10 @@ private void checkFirstDayOfWorkweekIsValid(CountryInfo info)
 		assertTrue(Weekdays.getWeekdayIndex(info.getFirstDayOfWorkweek()) > -1);
 	}
 
-	private void checkSpeedUnitIsEitherKmhOrMph(CountryInfo info)
+	private void checkMeasurementUnitIsEitherMetricOrImperial(CountryInfo info)
 	{
-		assertNotNull(info.getSpeedUnits());
-		assertTrue(info.getSpeedUnits().contains("mph") || info.getSpeedUnits().contains("km/h"));
+		assertNotNull(info.getMeasurementSystem());
+		assertTrue(info.getMeasurementSystem().contains("metric") || info.getMeasurementSystem().contains("imperial"));
 	}
 
 	private void checkAdditionalValidHousenumberRegexes(Map<String, CountryInfo> infos)
@@ -48,7 +48,7 @@ private void checkStartOfWorkweekValid(CountryInfo info)
 	private void checkForEach(CountryInfo info)
 	{
 		checkFirstDayOfWorkweekIsValid(info);
-		checkSpeedUnitIsEitherKmhOrMph(info);
+		checkMeasurementUnitIsEitherMetricOrImperial(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,5 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 mobileCountryCode: 344
 officialLanguages: [en]
 orchardProduces: [guava, mango, mangosteen, lemon, lime, tomatoe, pineapple, banana, chilli_pepper,

diff --git a/app/src/main/assets/country_metadata/AI.yml b/app/src/main/assets/country_metadata/AI.yml
@@ -1,3 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
diff --git a/app/src/main/assets/country_metadata/AS.yml b/app/src/main/assets/country_metadata/AS.yml
@@ -1,4 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
+measurementSystem: [imperial, metric]
 officialLanguages: [en, sm]
 orchardProduces: [coconut, banana, tomatoe, cacao]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/BM.yml b/app/src/main/assets/country_metadata/BM.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
 orchardProduces: [banana, tomatoe]
diff --git a/app/src/main/assets/country_metadata/BS.yml b/app/src/main/assets/country_metadata/BS.yml
@@ -1,8 +1,8 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 mobileCountryCode: 364
 officialLanguages: [en]
 orchardProduces: [grapefruit, banana, coconut, lemon, lime, orange, tomatoe, guava, mango, mangosteen,
   avocado, papaya]
 popularSports: [tennis, basketball, baseball]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/BZ.yml b/app/src/main/assets/country_metadata/BZ.yml
@@ -1,6 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
+measurementSystem: [imperial, metric]
 mobileCountryCode: 702
 officialLanguages: [en, bzj]
 orchardProduces: [orange, grapefruit, banana, cacao, papaya, coconut, pineapple, cashew_nut, chilli_pepper,
   sweet_pepper, coffee, tomatoe, guava, mango, mangosteen]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/DM.yml b/app/src/main/assets/country_metadata/DM.yml
@@ -1,7 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 mobileCountryCode: 366
 officialLanguages: [en]
 orchardProduces: [banana, coconut, cacao, guava, mango, mangosteen, grapefruit, orange, coffee, lemon,
   lime, avocado, tomatoe, pineapple, nutmeg, papaya]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/FK.yml b/app/src/main/assets/country_metadata/FK.yml
@@ -1,4 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/FM.yml b/app/src/main/assets/country_metadata/FM.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
+measurementSystem: [imperial, metric]
 mobileCountryCode: 550
 officialLanguages: [en, chk, pon]
 orchardProduces: [coconut, banana, cacao]
diff --git a/app/src/main/assets/country_metadata/GB.yml b/app/src/main/assets/country_metadata/GB.yml
@@ -4,10 +4,10 @@ isAdvisorySpeedLimitKnown: true
 isLeftHandTraffic: true
 isLivingStreetKnown: true
 isSlowZoneKnown: true
+measurementSystem: [imperial, metric]
 mobileCountryCode: 234
 officialLanguages: [en]
 orchardProduces: [apple, strawberry, raspberry, pear, plum, cherry, hop, grape, tomatoe, chilli_pepper,
   sweet_pepper]
 popularReligions: [christian, muslim, jewish, hindu, sikh]
 popularSports: [soccer, tennis, bowls, cricket, golf, basketball, rugby]
-speedUnit: [mph]
diff --git a/app/src/main/assets/country_metadata/GD.yml b/app/src/main/assets/country_metadata/GD.yml
@@ -1,8 +1,8 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 mobileCountryCode: 352
 officialLanguages: [en]
 orchardProduces: [coconut, cacao, banana, nutmeg, avocado, guava, mango, mangosteen, plum, grapefruit,
   orange, apple, tomatoe, lemon, lime, chilli_pepper, sweet_pepper, pineapple]
 popularSports: [cricket]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/GG.yml b/app/src/main/assets/country_metadata/GG.yml
@@ -1,3 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
diff --git a/app/src/main/assets/country_metadata/GI.yml b/app/src/main/assets/country_metadata/GI.yml
@@ -1,2 +1,3 @@
 # Do not edit. Source files are in /res/country_metadata
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
diff --git a/app/src/main/assets/country_metadata/GS.yml b/app/src/main/assets/country_metadata/GS.yml
@@ -1,3 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
diff --git a/app/src/main/assets/country_metadata/GU.yml b/app/src/main/assets/country_metadata/GU.yml
@@ -1,4 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
+measurementSystem: [imperial, metric]
 officialLanguages: [en, ch]
 orchardProduces: [coconut, tomatoe, banana]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/GY.yml b/app/src/main/assets/country_metadata/GY.yml
@@ -1,5 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [metric, imperial]
 mobileCountryCode: 738
 officialLanguages: [en, gyn]
 orchardProduces: [coconut, tomatoe, chilli_pepper, sweet_pepper, cacao, banana, pepper, orange, pineapple,

diff --git a/app/src/main/assets/country_metadata/IM.yml b/app/src/main/assets/country_metadata/IM.yml
@@ -1,3 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [gv, en]
diff --git a/app/src/main/assets/country_metadata/JE.yml b/app/src/main/assets/country_metadata/JE.yml
@@ -1,3 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
diff --git a/app/src/main/assets/country_metadata/KY.yml b/app/src/main/assets/country_metadata/KY.yml
@@ -1,5 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
 orchardProduces: [banana, tomatoe]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/LC.yml b/app/src/main/assets/country_metadata/LC.yml
@@ -1,7 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 mobileCountryCode: 358
 officialLanguages: [en]
 orchardProduces: [coconut, banana, pepper, grapefruit, nutmeg, lemon, lime, orange, guava, mango, mangosteen,
   cacao, avocado, tomatoe, pineapple]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/LR.yml b/app/src/main/assets/country_metadata/LR.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
+measurementSystem: [imperial, metric]
 mobileCountryCode: 618
 officialLanguages: [en]
 orchardProduces: [rubber, cacao, palm_oil, banana, coffee, coconut, orange, pineapple, tomatoe]
diff --git a/app/src/main/assets/country_metadata/MH.yml b/app/src/main/assets/country_metadata/MH.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
+measurementSystem: [imperial, metric]
 mobileCountryCode: 551
 officialLanguages: [mh, en]
 orchardProduces: [coconut]
diff --git a/app/src/main/assets/country_metadata/MM.yml b/app/src/main/assets/country_metadata/MM.yml
@@ -1,9 +1,9 @@
 # Do not edit. Source files are in /res/country_metadata
 additionalStreetsignLanguages: [en]
+measurementSystem: [imperial, metric]
 mobileCountryCode: 414
 officialLanguages: [my]
 orchardProduces: [rubber, chilli_pepper, sweet_pepper, tea, areca_nut, coconut, coffee, cashew_nut,
   guava, mango, mangosteen]
 popularReligions: [buddhist, christian, muslim, hindu]
 popularSports: [soccer, tennis, sepak_takraw]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/MP.yml b/app/src/main/assets/country_metadata/MP.yml
@@ -1,3 +1,3 @@
 # Do not edit. Source files are in /res/country_metadata
+measurementSystem: [imperial, metric]
 officialLanguages: [ch]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/MS.yml b/app/src/main/assets/country_metadata/MS.yml
@@ -1,4 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
 orchardProduces: [banana, tomatoe, guava, mango, mangosteen, chilli_pepper, sweet_pepper]
diff --git a/app/src/main/assets/country_metadata/PR.yml b/app/src/main/assets/country_metadata/PR.yml
@@ -1,6 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
 orchardProduces: [coffee, banana, orange, guava, mango, mangosteen, avocado, pineapple, tomatoe, coconut,
   papaya, grapefruit, chilli_pepper, sweet_pepper, lemon, lime]
 popularSports: [basketball, tennis, baseball]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/PW.yml b/app/src/main/assets/country_metadata/PW.yml
@@ -1,3 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
+measurementSystem: [imperial, metric]
 mobileCountryCode: 552
 officialLanguages: [en, pau]
diff --git a/app/src/main/assets/country_metadata/TC.yml b/app/src/main/assets/country_metadata/TC.yml
@@ -1,4 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/US.yml b/app/src/main/assets/country_metadata/US.yml
@@ -1,10 +1,10 @@
 # Do not edit. Source files are in /res/country_metadata
 isAdvisorySpeedLimitKnown: true
 isSlowZoneKnown: false
+measurementSystem: [imperial]
 mobileCountryCode: 310
 officialLanguages: [en]
 orchardProduces: [grape, almond, tomatoe, apple, walnut, pistachio, peach, blueberry, grapefruit, plum,
   chilli_pepper, sweet_pepper, strawberry, avocado, orange, lemon, lime]
 popularReligions: [christian, jewish]
 popularSports: [baseball, tennis, basketball, soccer, golf, american_football]
-speedUnit: [mph]
diff --git a/app/src/main/assets/country_metadata/VC.yml b/app/src/main/assets/country_metadata/VC.yml
@@ -1,7 +1,7 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 mobileCountryCode: 360
 officialLanguages: [en]
 orchardProduces: [banana, cacao, coconut, coffee, nutmeg, guava, mango, mangosteen, orange, apple,
   lemon, lime, chilli_pepper, sweet_pepper, pear, grapefruit]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/VG.yml b/app/src/main/assets/country_metadata/VG.yml
@@ -1,5 +1,5 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
 orchardProduces: [banana]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/VI.yml b/app/src/main/assets/country_metadata/VI.yml
@@ -1,4 +1,4 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 officialLanguages: [en]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/WS.yml b/app/src/main/assets/country_metadata/WS.yml
@@ -1,6 +1,6 @@
 # Do not edit. Source files are in /res/country_metadata
 isLeftHandTraffic: true
+measurementSystem: [imperial, metric]
 mobileCountryCode: 549
 officialLanguages: [sm, en]
 popularSports: [cricket]
-speedUnit: [mph, km/h]
diff --git a/app/src/main/assets/country_metadata/default.yml b/app/src/main/assets/country_metadata/default.yml
@@ -4,9 +4,9 @@ isAdvisorySpeedLimitKnown: false
 isLeftHandTraffic: false
 isLivingStreetKnown: false
 isSlowZoneKnown: false
+measurementSystem: [metric]
 officialLanguages: [en]
 orchardProduces: []
 popularReligions: []
 popularSports: []
 regularShoppingDays: 6
-speedUnit: [km/h]
diff --git a/app/src/main/java/de/westnordost/streetcomplete/Prefs.java b/app/src/main/java/de/westnordost/streetcomplete/Prefs.java
@@ -1,7 +1,5 @@
 package de.westnordost.streetcomplete;
 
-import android.content.SharedPreferences;
-
 /** Constant class to have all the identifiers for shared preferences in one place */
 public class Prefs
 {

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,7 @@ public class CountryInfo implements Serializable, Cloneable
 	// i.e. US for US-TX.yml
 	String countryCode;
 
-	List<String> speedUnit;
+	List<String> measurementSystem;
 	List<String> popularSports;
 	List<String> popularReligions;
 	String firstDayOfWorkweek;
@@ -29,9 +29,9 @@ public class CountryInfo implements Serializable, Cloneable
 	Boolean isLeftHandTraffic;
 	Integer mobileCountryCode;
 
-	public List<String> getSpeedUnits()
+	public List<String> getMeasurementSystem()
 	{
-		return speedUnit;
+		return measurementSystem;
 	}
 
 	public List<String> getPopularSports()

diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/osm/SimpleOverpassQuestType.java b/app/src/main/java/de/westnordost/streetcomplete/data/osm/SimpleOverpassQuestType.java
@@ -29,7 +29,7 @@ public SimpleOverpassQuestType(OverpassMapDataDao overpassServer)
 	/** @return a query string that is accepted by Overpass and does not exceed the given bbox */
 	String getOverpassQuery(BoundingBox bbox)
 	{
-		return filter.toOverpassQLString(bbox);
+		return filter.toOverpassQLString(bbox, true);
 	}
 
 	protected abstract String getTagFilters();

diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/osm/tql/TagFilterExpression.java b/app/src/main/java/de/westnordost/streetcomplete/data/osm/tql/TagFilterExpression.java
@@ -45,7 +45,7 @@ public boolean matches(Element element)
 	}
 
 	/** @return this expression as a Overpass query string (in a short one-liner form) */
-	public String toOverpassQLString(BoundingBox bbox)
+	public String toOverpassQLString(BoundingBox bbox, boolean print)
 	{
 		StringBuilder oql = new StringBuilder();
 		if(bbox != null)
@@ -66,9 +66,12 @@ public String toOverpassQLString(BoundingBox bbox)
 		}
 		if(useUnion) oql.append(");");
 
-		/* "body" print mode (default) does not include version, but "meta" does. "geom" prints out
-		 * geometry for every way and relation */
-		oql.append("out meta geom;");
+		if (print)
+		{
+			/* "body" print mode (default) does not include version, but "meta" does. "geom" prints out
+		 	 * geometry for every way and relation */
+			oql.append("out meta geom;");
+		}
 		return oql.toString();
 	}
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestAnswerFragment.java b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractQuestAnswerFragment.java
@@ -147,6 +147,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 		questAnswerComponent.onAttach((OsmQuestAnswerListener) ctx);
 	}
 
+	/** Note: Due to Android architecture limitations, a layout inflater based on this ContextWrapper
+	 *  will not resolve any resources specified in the XML according to MCC */
 	@NonNull @Override
 	public LayoutInflater onGetLayoutInflater(@Nullable Bundle savedInstanceState)
 	{
@@ -213,7 +215,7 @@ protected final View setContentView(int resourceId)
 		{
 			content.removeAllViews();
 		}
-		return LayoutInflater.from(getContext()).inflate(resourceId, content);
+		return getLayoutInflater().inflate(resourceId, content);
 	}
 
 	protected final void setNoContentPadding()

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.java b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.java
@@ -28,6 +28,7 @@
 import de.westnordost.streetcomplete.quests.diet_type.AddVegetarian;
 import de.westnordost.streetcomplete.quests.fire_hydrant.AddFireHydrantType;
 import de.westnordost.streetcomplete.quests.internet_access.AddInternetAccess;
+import de.westnordost.streetcomplete.quests.max_height.AddMaxHeight;
 import de.westnordost.streetcomplete.quests.oneway.AddOneway;
 import de.westnordost.streetcomplete.quests.oneway.TrafficFlowSegmentsDao;
 import de.westnordost.streetcomplete.quests.oneway.WayTrafficFlowDao;
@@ -86,6 +87,7 @@ public class QuestModule
 				new AddRecyclingType(o),
 				new AddRoadSurface(o),
 				new AddMaxSpeed(o), // should best be after road surface because it excludes unpaved roads
+				new AddMaxHeight(o),
 				new AddReligionToPlaceOfWorship(o), // icon on maps are different
 				new AddPostboxCollectionTimes(o),
 				new AddOpeningHours(o),