Add map-related upgraders

BeksOmega · Jul 28, 2020 · cf91272 · cf91272
1 parent c4c4355
commit cf91272
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/...or/appengine/src/com/google/appinventor/client/youngandroid/YoungAndroidFormUpgrader.java b/...or/appengine/src/com/google/appinventor/client/youngandroid/YoungAndroidFormUpgrader.java
@@ -370,6 +370,8 @@ private static void upgradeComponentProperties(Map<String, JSONValue> componentP
         srcCompVersion = upgradeRectangleProperties(componentProperties, srcCompVersion);
       } else if (componentType.equals("FeatureCollection")) {
         srcCompVersion = upgradeFeatureCollection(componentProperties, srcCompVersion);
+      } else if (componentType.equals("Navigation")) {
+        srcCompVersion = upgradeNavigationProperties(componentProperties, srcCompVersion);
       } else if (componentType.equals("YandexTranslate")) {
         srcCompVersion = upgradeYandexTranslateProperties(componentProperties, srcCompVersion);
       }
@@ -1688,6 +1690,21 @@ private static int upgradeMapProperties(Map<String, JSONValue> componentProperti
       // The ScaleUnits and ShowScale properties were added
       srcCompVersion = 5;
     }
+    if (srcCompVersion < 6) {
+      // Adds Units and MapType dropdowns.
+      srcCompVersion = 6;
+    }
+    return srcCompVersion;
+  }
+
+  private static int upgradeNavigationProperties(
+    Map<String, JSONValue> componentProperties,
+    int srcCompVersion
+  ) {
+    if (srcCompVersion < 2) {
+      // - Adds TransportMethod dropdown.
+      srcCompVersion = 2;
+    }
     return srcCompVersion;
   }
 

diff --git a/appinventor/blocklyeditor/src/versioning.js b/appinventor/blocklyeditor/src/versioning.js
@@ -2046,7 +2046,14 @@ Blockly.Versioning.AllUpgradeMaps =
 
     // AI2:
     // - The ScaleUnits and ShowScale properties were added to Map
-    5: "noUpgrade"
+    5: "noUpgrade",
+
+    // AI2:
+    // - Adds Units and MapType dropdowns.
+    6: [Blockly.Versioning.makeSetterUseDropdown(
+           'Map', 'ScaleUnits', 'Units'),
+        Blockly.Versioning.makeSetterUseDropdown(
+          'Map', 'MapType', 'MapType')]
 
   }, // End Map upgraders
 
@@ -2084,6 +2091,16 @@ Blockly.Versioning.AllUpgradeMaps =
     2: "noUpgrade"
   }, // End Rectangle upgraders
 
+  "Navigation": {
+    // This is an initial version. Placehoder for future upgrades.
+    1: "noUpgrade",
+
+    // Adds TransportMethod dropdown.
+    2: [Blockly.Versioning.makeSetterUseDropdown(
+      'Navigation', 'TransportationMethod', 'TransportMethod')]
+
+  }, // End Navigation upgraders.
+
   "NearField": {
 
     //This is initial version. Placeholder for future upgrades

diff --git a/appinventor/components/src/com/google/appinventor/components/common/YaVersion.java b/appinventor/components/src/com/google/appinventor/components/common/YaVersion.java
@@ -1015,7 +1015,9 @@ private YaVersion() {
   // For MAP_COMPONENT_VERSION 5:
   // - Added ShowScale property
   // - Added ScaleUnits property
-  public static final int MAP_COMPONENT_VERSION = 5;
+  // For MAP_COMPONENT_VERSION 6:
+  // - Adds Units and MapType dropdowns.
+  public static final int MAP_COMPONENT_VERSION = 6;
 
   // For MARKER_COMPONENT_VERSION 1:
   // - Initial Marker implementation using OpenStreetMap
@@ -1027,7 +1029,9 @@ private YaVersion() {
 
   // For NAVIGATION_COMPONENT_VERSION 1:
   // - Initial Navigation implementation
-  public static final int NAVIGATION_COMPONENT_VERSION = 1;
+  // For NAVIGATION_COMPONENT_VERSION 2:
+  // - Adds TransportMethod dropdown.
+  public static final int NAVIGATION_COMPONENT_VERSION = 2;
 
   // For NEARFIELD_COMPONENT_VERSION 1:
   public static final int NEARFIELD_COMPONENT_VERSION = 1;