Merge pull request #928 from dhis2/fix/reorder-basemaps

fix: Analytics tab - put the internal maps before the external, and remove Google options
dhis2 · Jan 7, 2022 · cbdbcc7 · cbdbcc7
2 parents 6a97db4 + 0b36509
commit cbdbcc7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2021-12-21T13:28:29.175Z\n"
-"PO-Revision-Date: 2021-12-21T13:28:29.175Z\n"
+"POT-Creation-Date: 2022-01-07T14:50:03.382Z\n"
+"PO-Revision-Date: 2022-01-07T14:50:03.382Z\n"
 
 msgid "Failed to load: {{error}}"
 msgstr "Failed to load: {{error}}"
@@ -554,12 +554,6 @@ msgstr "OSM Light"
 msgid "OSM Detailed"
 msgstr "OSM Detailed"
 
-msgid "Google Streets"
-msgstr "Google Streets"
-
-msgid "Google Hybrid"
-msgstr "Google Hybrid"
-
 msgid "Bing Road"
 msgstr "Bing Road"
 

diff --git a/src/settingsFields.component.js b/src/settingsFields.component.js
@@ -132,7 +132,7 @@ function getMenuItems(mapping) {
             displayName,
         })
     )
-    return sourceMenuItems.concat(optionsMenuItems)
+    return optionsMenuItems.concat(sourceMenuItems)
 }
 
 class SettingsFields extends React.Component {

diff --git a/src/settingsKeyMapping.js b/src/settingsKeyMapping.js
@@ -281,8 +281,6 @@ const settingsKeyMapping = {
         options: {
             osmLight: i18n.t('OSM Light'),
             openStreetMap: i18n.t('OSM Detailed'),
-            googleStreets: i18n.t('Google Streets'),
-            googleHybrid: i18n.t('Google Hybrid'),
             bingLight: i18n.t('Bing Road'),
             bingDark: i18n.t('Bing Dark'),
             bingAerial: i18n.t('Bing Aerial'),