Merge pull request #1198 from DroidPlanner/buildingMapperFix

BuildingMapper: Renamed string
DroidPlanner · Oct 22, 2014 · d130045 · d130045
2 parents 5d9eabd + 3701505
commit d130045
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Android/res/layout/fragment_editor_detail_cylindrical_mapping.xml b/Android/res/layout/fragment_editor_detail_cylindrical_mapping.xml
@@ -49,7 +49,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="12dp"
-                android:text="Waffle Maker"
+                android:text="@string/waypointType_BuildingMapper"
                 android:textAllCaps="true" />
 
             <TextView

diff --git a/Android/res/values/strings.xml b/Android/res/values/strings.xml
@@ -184,6 +184,7 @@
     <string name="waypointType_Loiter">Loiter</string>
     <string name="waypointType_ROI">Region of Interest</string>
     <string name="waypointType_Survey">Survey Polygon</string>
+    <string name="waypointType_BuildingMapper">Landmark Mapper</string>
 
     <!-- Waypoint info -->
     <string name="waypointInfo_Land">Land vehicle at the current location. You must manually exit Auto mode to disarm motors.</string>

diff --git a/Core/src/org/droidplanner/core/mission/MissionItemType.java b/Core/src/org/droidplanner/core/mission/MissionItemType.java
@@ -16,7 +16,7 @@
 public enum MissionItemType {
 	WAYPOINT("Waypoint"), SPLINE_WAYPOINT("Spline Waypoint"), TAKEOFF("Takeoff"), RTL(
 			"Return to Launch"), LAND("Land"), CIRCLE("Circle"), ROI("Region of Interest"), SURVEY(
-			"Survey"), CYLINDRICAL_SURVEY("Building Mapper");
+			"Survey"), CYLINDRICAL_SURVEY("Landmark Mapper");
 
 	private final String name;