Change localised to localized

Author: PaulZC

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -1181,17 +1181,17 @@
                         </div>
 
                         <div class="form-check mt-3">
-                            <label class="form-check-label" for="useLocalisedDistribution">Localised Distribution </label>
-                            <input class="form-check-input" type="checkbox" value="" id="useLocalisedDistribution">
+                            <label class="form-check-label" for="useLocalizedDistribution">Localized Distribution </label>
+                            <input class="form-check-input" type="checkbox" value="" id="useLocalizedDistribution">
                             <span class="tt" data-bs-placement="right"
-                                title="When enabled, localised corrections for your location will be used instead of the continental corrections. Default: Disabled">
+                                title="When enabled, localized corrections for your location will be used instead of the continental corrections. Default: Disabled">
                                 <span class="icon-info-circle text-primary ms-2"></span>
                             </span>
                         </div>
 
-                        <div id="localisedDistributionTileLevelDropdown">
-                            <label for="localisedDistributionTileLevel">Localised Distribution Tile Level:</label>
-                            <select name="localisedDistributionTileLevel" id="localisedDistributionTileLevel" class="form-dropdown mb-2">
+                        <div id="localizedDistributionTileLevelDropdown">
+                            <label for="localizedDistributionTileLevel">Localized Distribution Tile Level:</label>
+                            <select name="localizedDistributionTileLevel" id="localizedDistributionTileLevel" class="form-dropdown mb-2">
                                 <option value="0">1000 x 1000km Sparse</option>
                                 <option value="1">500 x 500km Sparse</option>
                                 <option value="2">250 x 250km Sparse</option>
@@ -1200,7 +1200,7 @@
                                 <option value="5">250 x 250km High Density</option>
                             </select>
                             <span class="tt" data-bs-placement="right"
-                                title="Select the localised distribution tile level. High Density is recommended. Sparse may be deprecated. Default: 250 x 250km High Density">
+                                title="Select the localized distribution tile level. High Density is recommended. Sparse may be deprecated. Default: 250 x 250km High Density">
                                 <span class="icon-info-circle text-primary ms-2"></span>
                             </span>
                             <br>

Firmware/RTK_Everywhere/AP-Config/src/main.js

@@ -439,7 +439,7 @@ function parseIncoming(msg) {
         ge("enableARPLogging").dispatchEvent(new CustomEvent('change'));
         ge("enableAutoFirmwareUpdate").dispatchEvent(new CustomEvent('change'));
         ge("enableAutoReset").dispatchEvent(new CustomEvent('change'));
-        ge("useLocalisedDistribution").dispatchEvent(new CustomEvent('change'));
+        ge("useLocalizedDistribution").dispatchEvent(new CustomEvent('change'));
 
         updateECEFList();
         updateGeodeticList();
@@ -1389,12 +1389,12 @@ document.addEventListener("DOMContentLoaded", (event) => {
         }
     });
 
-    ge("useLocalisedDistribution").addEventListener("change", function () {
-        if (ge("useLocalisedDistribution").checked) {
-            show("localisedDistributionTileLevelDropdown");
+    ge("useLocalizedDistribution").addEventListener("change", function () {
+        if (ge("useLocalizedDistribution").checked) {
+            show("localizedDistributionTileLevelDropdown");
         }
         else {
-            hide("localisedDistributionTileLevelDropdown");
+            hide("localizedDistributionTileLevelDropdown");
         }
     });
 

Firmware/RTK_Everywhere/MQTT_Client.ino

@@ -71,8 +71,8 @@ MQTT_Client.ino
 //   (ditto)
 // Initially we subscribe to the key distribution topic and the continental correction topic (if available)
 // If enabled, we also subscribe to the AssistNow MGA topic
-// If localised distribution is enabled and we have a 3D fix, we subscribe to the dict topic
-// When the dict is received, we subscribe to the nearest localised topic and unsubscribe from the continental topic
+// If localized distribution is enabled and we have a 3D fix, we subscribe to the dict topic
+// When the dict is received, we subscribe to the nearest localized topic and unsubscribe from the continental topic
 // When the AssistNow MGA data arrives, we unsubscribe and subscribe to AssistNow updates
 
 #ifdef COMPILE_MQTT_CLIENT
@@ -124,8 +124,8 @@ const char localizedPrefix[] = "pp/ip/L"; // The localized distribution topic pr
 std::vector<String> mqttSubscribeTopics; // List of MQTT topics to be subscribed to
 std::vector<String> mqttClientSubscribedTopics; // List of topics currently subscribed to
 
-String localisedDistributionDictTopic = "";
-String localisedDistributionTileTopic = "";
+String localizedDistributionDictTopic = "";
+String localizedDistributionTileTopic = "";
 
 static MqttClient *mqttClient;
 
@@ -289,7 +289,7 @@ void mqttClientPrintStatus()
 // Called when a subscribed message arrives
 void mqttClientReceiveMessage(int messageSize)
 {
-    // The Level 3 localised distribution dictionary topic can be up to 25KB
+    // The Level 3 localized distribution dictionary topic can be up to 25KB
     // The full AssistNow (MGA) topic can be ~11KB
     const uint16_t mqttLimit = 26000;
     static uint8_t *mqttData = nullptr;
@@ -327,9 +327,9 @@ void mqttClientReceiveMessage(int messageSize)
 
         if (mqttCount > 0)
         {
-            // Check for localisedDistributionDictTopic
-            if ((localisedDistributionDictTopic.length() > 0)
-                && (strcmp(topic, localisedDistributionDictTopic.c_str()) == 0))
+            // Check for localizedDistributionDictTopic
+            if ((localizedDistributionDictTopic.length() > 0)
+                && (strcmp(topic, localizedDistributionDictTopic.c_str()) == 0))
             {
                 // We should be using a JSON library to read the nodes. But JSON is
                 // heavy on RAM and the dict could be 25KB for Level 3.
@@ -381,9 +381,9 @@ void mqttClientReceiveMessage(int messageSize)
                                 minDist = distScaled;
                                 tile[12] = 0; // Convert the second quote to NULL for snprintf
                                 char tileTopic[50];
-                                snprintf(tileTopic, sizeof(tileTopic), "%s", localisedDistributionDictTopic.c_str());
+                                snprintf(tileTopic, sizeof(tileTopic), "%s", localizedDistributionDictTopic.c_str());
                                 snprintf(&tileTopic[strlen(localizedPrefix) + 13], sizeof(tileTopic) - (strlen(localizedPrefix) + 13), "%s", tile + 1); // Start after the first quote
-                                localisedDistributionTileTopic = tileTopic;
+                                localizedDistributionTileTopic = tileTopic;
                             }
                         }
                         tile = strtok_r(nullptr, ",", &preservedTile);
@@ -474,9 +474,9 @@ void mqttClientReceiveMessage(int messageSize)
                     ((strlen(settings.regionalCorrectionTopics[settings.geographicRegion]) > 0)
                     && (strcmp(topic, settings.regionalCorrectionTopics[settings.geographicRegion]) == 0))
                     ||
-                    // Or from the localised distribution tile topic
-                    ((localisedDistributionTileTopic.length() > 0)
-                    && (strcmp(topic, localisedDistributionTileTopic.c_str()) == 0))
+                    // Or from the localized distribution tile topic
+                    ((localizedDistributionTileTopic.length() > 0)
+                    && (strcmp(topic, localizedDistributionTileTopic.c_str()) == 0))
                 )
                 {
                     // SPARTN
@@ -830,8 +830,8 @@ void mqttClientUpdate()
 
         mqttSubscribeTopics.clear(); // Clear the list of MQTT topics to be subscribed to
         mqttClientSubscribedTopics.clear(); // Clear the list of topics currently subscribed to
-        localisedDistributionDictTopic = "";
-        localisedDistributionTileTopic = "";
+        localizedDistributionDictTopic = "";
+        localizedDistributionTileTopic = "";
 
         // Subscribe to AssistNow MGA if enabled
         if (settings.useAssistNow)
@@ -936,21 +936,21 @@ void mqttClientUpdate()
         if (breakOut)
             break; // Break out of this state
 
-        // Check if localised distribution is enabled
-        if ((strlen(settings.regionalCorrectionTopics[settings.geographicRegion]) > 0) && (settings.useLocalisedDistribution))
+        // Check if localized distribution is enabled
+        if ((strlen(settings.regionalCorrectionTopics[settings.geographicRegion]) > 0) && (settings.useLocalizedDistribution))
         {
             uint8_t fixType = gnssGetFixType();
             double latitude = gnssGetLatitude(); // degrees
             double longitude = gnssGetLongitude(); // degrees
             if (fixType >= 3) // If we have a 3D fix
             {
                 // If both the dict and tile topics are empty, prepare to subscribe to the dict topic
-                if ((localisedDistributionDictTopic.length() == 0) && (localisedDistributionTileTopic.length() == 0))
+                if ((localizedDistributionDictTopic.length() == 0) && (localizedDistributionTileTopic.length() == 0))
                 {
                     float tileDelta = 2.5; // 2.5 degrees (10 degrees and 5 degrees are also possible)
-                    if ((settings.localisedDistributionTileLevel == 0) || (settings.localisedDistributionTileLevel == 3))
+                    if ((settings.localizedDistributionTileLevel == 0) || (settings.localizedDistributionTileLevel == 3))
                         tileDelta = 10.0;
-                    if ((settings.localisedDistributionTileLevel == 1) || (settings.localisedDistributionTileLevel == 4))
+                    if ((settings.localizedDistributionTileLevel == 1) || (settings.localizedDistributionTileLevel == 4))
                         tileDelta = 5.0;
 
                     float lat = latitude; // Degrees
@@ -965,34 +965,34 @@ void mqttClientUpdate()
 
                     char dictTopic[50];
                     snprintf(dictTopic, sizeof(dictTopic), "%s%c%c%04d%c%05d/dict",
-                        localizedPrefix, char(0x30 + settings.localisedDistributionTileLevel),
+                        localizedPrefix, char(0x30 + settings.localizedDistributionTileLevel),
                         (lat_i < 0) ? 'S' : 'N', abs(lat_i),
                         (lon_i < 0) ? 'W' : 'E', abs(lon_i));
 
 
-                    localisedDistributionDictTopic = dictTopic;
-                    mqttSubscribeTopics.push_back(localisedDistributionDictTopic);
+                    localizedDistributionDictTopic = dictTopic;
+                    mqttSubscribeTopics.push_back(localizedDistributionDictTopic);
 
                     breakOut = true;
                 }
 
-                // localisedDistributionTileTopic is populated by mqttClientReceiveMessage
-                // If both the dict and tile topics are populated, prepare to subscribe to the localised tile topic
-                // Empty localisedDistributionDictTopic afterwardds to prevent this state being repeated
-                if ((localisedDistributionDictTopic.length() > 0) && (localisedDistributionTileTopic.length() > 0))
+                // localizedDistributionTileTopic is populated by mqttClientReceiveMessage
+                // If both the dict and tile topics are populated, prepare to subscribe to the localized tile topic
+                // Empty localizedDistributionDictTopic afterwardds to prevent this state being repeated
+                if ((localizedDistributionDictTopic.length() > 0) && (localizedDistributionTileTopic.length() > 0))
                 {
-                    // Subscribe to the localisedDistributionTileTopic
-                    mqttSubscribeTopics.push_back(localisedDistributionTileTopic);
-                    // Unsubscribe from the localisedDistributionDictTopic
-                    std::vector<String>::iterator pos = std::find(mqttSubscribeTopics.begin(), mqttSubscribeTopics.end(), localisedDistributionDictTopic);
+                    // Subscribe to the localizedDistributionTileTopic
+                    mqttSubscribeTopics.push_back(localizedDistributionTileTopic);
+                    // Unsubscribe from the localizedDistributionDictTopic
+                    std::vector<String>::iterator pos = std::find(mqttSubscribeTopics.begin(), mqttSubscribeTopics.end(), localizedDistributionDictTopic);
                     if (pos != mqttSubscribeTopics.end())
                             mqttSubscribeTopics.erase(pos);
                     // Unsubscribe from the continental corrections
                     pos = std::find(mqttSubscribeTopics.begin(), mqttSubscribeTopics.end(), String(settings.regionalCorrectionTopics[settings.geographicRegion]));
                     if (pos != mqttSubscribeTopics.end())
                             mqttSubscribeTopics.erase(pos);
 
-                    localisedDistributionDictTopic = ""; // Empty localisedDistributionDictTopic to prevent this state being repeated
+                    localizedDistributionDictTopic = ""; // Empty localizedDistributionDictTopic to prevent this state being repeated
                     breakOut = true;
                 }
 

Firmware/RTK_Everywhere/menuPP.ino

@@ -911,10 +911,10 @@ void menuPointPerfect()
         else
             systemPrintln("No keys");
 
-        if ((settings.useLocalisedDistribution) && (localisedDistributionTileTopic.length() > 0))
+        if ((settings.useLocalizedDistribution) && (localizedDistributionTileTopic.length() > 0))
         {
-            systemPrint("Most recent localised distribution topic: ");
-            systemPrintln(localisedDistributionTileTopic.c_str()); // From MQTT_Client.ino
+            systemPrint("Most recent localized distribution topic: ");
+            systemPrintln(localizedDistributionTileTopic.c_str()); // From MQTT_Client.ino
         }
 
         // How this works:
@@ -962,17 +962,17 @@ void menuPointPerfect()
                 systemPrintln("Requested");
             else
                 systemPrintln("Not requested");
-            systemPrint("4) Use localised distribution: ");
-            if (settings.useLocalisedDistribution == true)
+            systemPrint("4) Use localized distribution: ");
+            if (settings.useLocalizedDistribution == true)
                 systemPrintln("Enabled");
             else
                 systemPrintln("Disabled");
-            if (settings.useLocalisedDistribution)
+            if (settings.useLocalizedDistribution)
             {
-                systemPrint("5) Localised distribution tile level: ");
-                systemPrint(settings.localisedDistributionTileLevel);
+                systemPrint("5) Localized distribution tile level: ");
+                systemPrint(settings.localizedDistributionTileLevel);
                 systemPrint(" (");
-                systemPrint(localisedDistributionTileLevelNames[settings.localisedDistributionTileLevel]);
+                systemPrint(localizedDistributionTileLevelNames[settings.localizedDistributionTileLevel]);
                 systemPrintln(")");
             }
             if (productVariant != RTK_FACET_MOSAIC)
@@ -1018,13 +1018,13 @@ void menuPointPerfect()
         }
         else if (incoming == 4 && pointPerfectIsEnabled())
         {
-            settings.useLocalisedDistribution ^= 1;
+            settings.useLocalizedDistribution ^= 1;
         }
-        else if (incoming == 5 && pointPerfectIsEnabled() && settings.useLocalisedDistribution)
+        else if (incoming == 5 && pointPerfectIsEnabled() && settings.useLocalizedDistribution)
         {
-            settings.localisedDistributionTileLevel++;
-            if (settings.localisedDistributionTileLevel >= LOCALISED_DISTRIBUTION_TILE_LEVELS)
-                settings.localisedDistributionTileLevel = 0;
+            settings.localizedDistributionTileLevel++;
+            if (settings.localizedDistributionTileLevel >= LOCALIZED_DISTRIBUTION_TILE_LEVELS)
+                settings.localizedDistributionTileLevel = 0;
         }
         else if (incoming == 'a' && pointPerfectIsEnabled() && (productVariant != RTK_FACET_MOSAIC))
         {

Firmware/RTK_Everywhere/settings.h

@@ -1369,17 +1369,17 @@ struct Settings
 
     bool outputTipAltitude = false; // If enabled, subtract the pole length and APC from the GNSS receiver's reported altitude
 
-    // Localised distribution
-    bool useLocalisedDistribution = false;
-    uint8_t localisedDistributionTileLevel = 5;
+    // Localized distribution
+    bool useLocalizedDistribution = false;
+    uint8_t localizedDistributionTileLevel = 5;
     bool useAssistNow = false;
 
     // Add new settings to appropriate group above or create new group
     // Then also add to the same group in rtkSettingsEntries below
 } settings;
 
-const uint8_t LOCALISED_DISTRIBUTION_TILE_LEVELS = 6;
-const char *localisedDistributionTileLevelNames[LOCALISED_DISTRIBUTION_TILE_LEVELS] = {
+const uint8_t LOCALIZED_DISTRIBUTION_TILE_LEVELS = 6;
+const char *localizedDistributionTileLevelNames[LOCALIZED_DISTRIBUTION_TILE_LEVELS] = {
     "1000 x 1000km sparse",
     "500 x 500km sparse",
     "250 x 250km sparse",
@@ -1878,9 +1878,9 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
 
     { 0, 0, 1, 0, 1, 1, 1, 1, _uint32_t, 0, & settings.outputTipAltitude, "outputTipAltitude",  },
 
-    // Localised distribution
-    { 0, 1, 1, 0, 1, 1, 1, 1, _bool,     0, & settings.useLocalisedDistribution, "useLocalisedDistribution",  },
-    { 0, 1, 1, 0, 1, 1, 1, 1, _uint8_t,  0, & settings.localisedDistributionTileLevel, "localisedDistributionTileLevel",  },
+    // Localized distribution
+    { 0, 1, 1, 0, 1, 1, 1, 1, _bool,     0, & settings.useLocalizedDistribution, "useLocalizedDistribution",  },
+    { 0, 1, 1, 0, 1, 1, 1, 1, _uint8_t,  0, & settings.localizedDistributionTileLevel, "localizedDistributionTileLevel",  },
     { 0, 1, 1, 0, 1, 1, 0, 1, _bool,     0, & settings.useAssistNow, "useAssistNow",  },
 
     // Add new settings to appropriate group above or create new group