From 9cd8e11c308264c82203c4bb82d7581cd407722b Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 21 Jul 2021 23:41:27 -0700
Subject: [PATCH] Geomap: add basic gazetteer support (#37082)

---
 packages/grafana-data/src/geo/layer.ts        |    6 +-
 .../testdata/components/USAQueryEditor.tsx    |   13 -
 .../app/plugins/panel/geomap/GeomapPanel.tsx  |   19 +-
 .../geomap/editor/GazetteerPathEditor.tsx     |   85 +
 .../panel/geomap/editor/LayerEditor.tsx       |   18 +
 .../panel/geomap/gazetteer/gazetteer.test.ts  |   36 +
 .../panel/geomap/gazetteer/gazetteer.ts       |   69 +
 .../panel/geomap/gazetteer/worldmap.ts        |   61 +
 .../panel/geomap/layers/basemaps/carto.ts     |    2 +-
 .../panel/geomap/layers/basemaps/esri.ts      |   24 +-
 .../panel/geomap/layers/basemaps/generic.ts   |    2 +-
 .../panel/geomap/layers/basemaps/osm.ts       |    2 +-
 .../panel/geomap/layers/data/geojsonMapper.ts |    4 +-
 .../panel/geomap/layers/data/heatMap.tsx      |    5 +-
 .../geomap/layers/data/lastPointTracker.ts    |    6 +-
 .../panel/geomap/layers/data/markersLayer.tsx |   68 +-
 .../panel/geomap/utils/location.test.ts       |    8 +-
 .../plugins/panel/geomap/utils/location.ts    |   29 +-
 .../panel/geomap/utils/regularShapes.ts       |   30 +-
 public/gazetteer/countries.json               | 1508 +++++++++++++++++
 public/gazetteer/usa-states.json              |  332 ++++
 tsconfig.json                                 |    3 +-
 22 files changed, 2228 insertions(+), 102 deletions(-)
 create mode 100644 public/app/plugins/panel/geomap/editor/GazetteerPathEditor.tsx
 create mode 100644 public/app/plugins/panel/geomap/gazetteer/gazetteer.test.ts
 create mode 100644 public/app/plugins/panel/geomap/gazetteer/gazetteer.ts
 create mode 100644 public/app/plugins/panel/geomap/gazetteer/worldmap.ts
 create mode 100644 public/gazetteer/countries.json
 create mode 100644 public/gazetteer/usa-states.json

diff --git a/packages/grafana-data/src/geo/layer.ts b/packages/grafana-data/src/geo/layer.ts
index 51d645859fd..28701e6e092 100644
--- a/packages/grafana-data/src/geo/layer.ts
+++ b/packages/grafana-data/src/geo/layer.ts
@@ -33,8 +33,8 @@ export interface FrameGeometrySource {
   wkt?: string;
   lookup?: string;
 
-  // Path to a mappings file
-  lookupSrc?: string;
+  // Path to Gazetteer
+  gazetteer?: string;
 }
 
 /**
@@ -97,7 +97,7 @@ export interface MapLayerRegistryItem<TConfig = MapLayerOptions> extends Registr
    * Function that configures transformation and returns a transformer
    * @param options
    */
-  create: (map: Map, options: MapLayerOptions<TConfig>, theme: GrafanaTheme2) => MapLayerHandler;
+  create: (map: Map, options: MapLayerOptions<TConfig>, theme: GrafanaTheme2) => Promise<MapLayerHandler>;
 
   /**
    * Show custom elements in the panel edit UI
diff --git a/public/app/plugins/datasource/testdata/components/USAQueryEditor.tsx b/public/app/plugins/datasource/testdata/components/USAQueryEditor.tsx
index e64d230bb81..d546ed8e3e6 100644
--- a/public/app/plugins/datasource/testdata/components/USAQueryEditor.tsx
+++ b/public/app/plugins/datasource/testdata/components/USAQueryEditor.tsx
@@ -22,19 +22,6 @@ export function USAQueryEditor({ query, onChange }: Props) {
             value={usaQueryModes.find((ep) => ep.value === query.mode)}
           />
         </InlineField>
-
-        <InlineField label="Fields">
-          <Select
-            options={fieldNames}
-            onChange={(vals: SelectableValue[]) => {
-              onChange({ ...query, fields: vals.map((v) => v.value) });
-            }}
-            width={28}
-            isMulti={true}
-            placeholder="all"
-            value={query.fields}
-          />
-        </InlineField>
         <InlineField label="Period">
           <Input
             value={query.period}
diff --git a/public/app/plugins/panel/geomap/GeomapPanel.tsx b/public/app/plugins/panel/geomap/GeomapPanel.tsx
index 6ec95e41018..ad0a8691565 100644
--- a/public/app/plugins/panel/geomap/GeomapPanel.tsx
+++ b/public/app/plugins/panel/geomap/GeomapPanel.tsx
@@ -97,7 +97,7 @@ export class GeomapPanel extends Component<Props> {
 
     if (options.layers !== oldOptions.layers) {
       console.log('layers changed');
-      this.initLayers(options.layers ?? []);
+      this.initLayers(options.layers ?? []); // async
       layersChanged = true;
     }
     return layersChanged;
@@ -119,7 +119,7 @@ export class GeomapPanel extends Component<Props> {
     this.overlayProps.bottomLeft = legends;
   }
 
-  initMapRef = (div: HTMLDivElement) => {
+  initMapRef = async (div: HTMLDivElement) => {
     if (this.map) {
       this.map.dispose();
     }
@@ -143,12 +143,11 @@ export class GeomapPanel extends Component<Props> {
     this.map.addInteraction(this.mouseWheelZoom);
     this.initControls(options.controls);
     this.initBasemap(options.basemap);
-    this.initLayers(options.layers);
-    this.dataChanged(this.props.data, options.controls.showLegend);
+    await this.initLayers(options.layers, options.controls?.showLegend);
     this.forceUpdate(); // first render
   };
 
-  initBasemap(cfg: MapLayerOptions) {
+  async initBasemap(cfg: MapLayerOptions) {
     if (!this.map) {
       return;
     }
@@ -157,7 +156,8 @@ export class GeomapPanel extends Component<Props> {
       cfg = DEFAULT_BASEMAP_CONFIG;
     }
     const item = geomapLayerRegistry.getIfExists(cfg.type) ?? defaultBaseLayer;
-    const layer = item.create(this.map, cfg, config.theme2).init();
+    const handler = await item.create(this.map, cfg, config.theme2);
+    const layer = handler.init();
     if (this.basemap) {
       this.map.removeLayer(this.basemap);
       this.basemap.dispose();
@@ -166,7 +166,7 @@ export class GeomapPanel extends Component<Props> {
     this.map.getLayers().insertAt(0, this.basemap);
   }
 
-  initLayers(layers: MapLayerOptions[]) {
+  async initLayers(layers: MapLayerOptions[], showLegend?: boolean) {
     // 1st remove existing layers
     for (const state of this.layers) {
       this.map!.removeLayer(state.layer);
@@ -185,7 +185,7 @@ export class GeomapPanel extends Component<Props> {
         continue; // TODO -- panel warning?
       }
 
-      const handler = item.create(this.map!, overlay, config.theme2);
+      const handler = await item.create(this.map!, overlay, config.theme2);
       const layer = handler.init();
       this.map!.addLayer(layer);
       this.layers.push({
@@ -194,6 +194,9 @@ export class GeomapPanel extends Component<Props> {
         handler,
       });
     }
+
+    // Update data after init layers
+    this.dataChanged(this.props.data);
   }
 
   initMapView(config: MapViewConfig): View {
diff --git a/public/app/plugins/panel/geomap/editor/GazetteerPathEditor.tsx b/public/app/plugins/panel/geomap/editor/GazetteerPathEditor.tsx
new file mode 100644
index 00000000000..4164d027fc0
--- /dev/null
+++ b/public/app/plugins/panel/geomap/editor/GazetteerPathEditor.tsx
@@ -0,0 +1,85 @@
+import React, { FC, useMemo, useState, useEffect } from 'react';
+import { StandardEditorProps, SelectableValue, GrafanaTheme2 } from '@grafana/data';
+import { Alert, Select, stylesFactory, useTheme2 } from '@grafana/ui';
+import { COUNTRIES_GAZETTEER_PATH, Gazetteer, getGazetteer } from '../gazetteer/gazetteer';
+import { css } from '@emotion/css';
+
+const paths: Array<SelectableValue<string>> = [
+  {
+    label: 'Countries',
+    description: 'Lookup countries by name, two letter code, or three leter code',
+    value: COUNTRIES_GAZETTEER_PATH,
+  },
+  {
+    label: 'USA States',
+    description: 'Lookup states by name or 2 ',
+    value: 'public/gazetteer/usa-states.json',
+  },
+];
+
+export const GazetteerPathEditor: FC<StandardEditorProps<string, any, any>> = ({ value, onChange, context }) => {
+  const styles = getStyles(useTheme2());
+  const [gaz, setGaz] = useState<Gazetteer>();
+
+  useEffect(() => {
+    async function fetchData() {
+      const p = await getGazetteer(value);
+      setGaz(p);
+    }
+    fetchData();
+  }, [value, setGaz]);
+
+  const { current, options } = useMemo(() => {
+    let options = [...paths];
+    let current = options.find((f) => f.value === gaz?.path);
+    if (!current && gaz) {
+      current = {
+        label: gaz.path,
+        value: gaz.path,
+      };
+      options.push(current);
+    }
+    return { options, current };
+  }, [gaz]);
+
+  return (
+    <>
+      <Select
+        value={current}
+        options={options}
+        onChange={(v) => onChange(v.value)}
+        allowCustomValue={true}
+        formatCreateLabel={(txt) => `Load from URL: ${txt}`}
+      />
+      {gaz && (
+        <>
+          {gaz.error && <Alert title={gaz.error} severity={'warning'} />}
+          {gaz.count && (
+            <div className={styles.keys}>
+              <b>({gaz.count})</b>
+              {gaz.examples(10).map((k) => (
+                <span key={k}>{k},</span>
+              ))}{' '}
+              &ellipsis;
+            </div>
+          )}
+        </>
+      )}
+    </>
+  );
+};
+
+const getStyles = stylesFactory((theme: GrafanaTheme2) => {
+  return {
+    keys: css`
+      margin-top: 4px;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+
+      > span {
+        margin-left: 4px;
+      }
+    `,
+  };
+});
diff --git a/public/app/plugins/panel/geomap/editor/LayerEditor.tsx b/public/app/plugins/panel/geomap/editor/LayerEditor.tsx
index 46fd9d776f6..c77bb87deeb 100644
--- a/public/app/plugins/panel/geomap/editor/LayerEditor.tsx
+++ b/public/app/plugins/panel/geomap/editor/LayerEditor.tsx
@@ -14,6 +14,7 @@ import { DEFAULT_BASEMAP_CONFIG, geomapLayerRegistry } from '../layers/registry'
 import { OptionsPaneCategoryDescriptor } from 'app/features/dashboard/components/PanelEditor/OptionsPaneCategoryDescriptor';
 import { setOptionImmutably } from 'app/features/dashboard/components/PanelEditor/utils';
 import { fillOptionsPaneItems } from 'app/features/dashboard/components/PanelEditor/getVizualizationOptions';
+import { GazetteerPathEditor } from './GazetteerPathEditor';
 
 export interface LayerEditorProps<TConfig = any> {
   options?: MapLayerOptions<TConfig>;
@@ -53,6 +54,7 @@ export const LayerEditor: FC<LayerEditorProps> = ({ options, onChange, data, fil
               { value: FrameGeometrySourceMode.Auto, label: 'Auto' },
               { value: FrameGeometrySourceMode.Coords, label: 'Coords' },
               { value: FrameGeometrySourceMode.Geohash, label: 'Geohash' },
+              { value: FrameGeometrySourceMode.Lookup, label: 'Lookup' },
             ],
           },
         })
@@ -84,6 +86,22 @@ export const LayerEditor: FC<LayerEditorProps> = ({ options, onChange, data, fil
           showIf: (opts: MapLayerOptions) => opts.location?.mode === FrameGeometrySourceMode.Geohash,
           // eslint-disable-next-line react/display-name
           // info: (props) => <div>HELLO</div>,
+        })
+        .addFieldNamePicker({
+          path: 'location.lookup',
+          name: 'Lookup Field',
+          settings: {
+            filter: (f: Field) => f.type === FieldType.string,
+            noFieldsMessage: 'No strings fields found',
+          },
+          showIf: (opts: MapLayerOptions) => opts.location?.mode === FrameGeometrySourceMode.Lookup,
+        })
+        .addCustomEditor({
+          id: 'gazetteer',
+          path: 'location.gazetteer',
+          name: 'Gazetteer',
+          editor: GazetteerPathEditor,
+          showIf: (opts: MapLayerOptions) => opts.location?.mode === FrameGeometrySourceMode.Lookup,
         });
     }
     if (layer.registerOptionsUI) {
diff --git a/public/app/plugins/panel/geomap/gazetteer/gazetteer.test.ts b/public/app/plugins/panel/geomap/gazetteer/gazetteer.test.ts
new file mode 100644
index 00000000000..40cb4e7f5de
--- /dev/null
+++ b/public/app/plugins/panel/geomap/gazetteer/gazetteer.test.ts
@@ -0,0 +1,36 @@
+import { getGazetteer } from './gazetteer';
+
+let backendResults: any = { hello: 'world' };
+import countriesJSON from '../../../../../gazetteer/countries.json';
+
+jest.mock('@grafana/runtime', () => ({
+  ...((jest.requireActual('@grafana/runtime') as unknown) as object),
+  getBackendSrv: () => ({
+    get: jest.fn().mockResolvedValue(backendResults),
+  }),
+}));
+
+describe('Placename lookups', () => {
+  beforeEach(() => {
+    backendResults = { hello: 'world' };
+  });
+
+  it('unified worldmap config', async () => {
+    backendResults = countriesJSON;
+    const gaz = await getGazetteer('countries');
+    expect(gaz.error).toBeUndefined();
+    expect(gaz.find('US')).toMatchInlineSnapshot(`
+      Object {
+        "coords": Array [
+          -95.712891,
+          37.09024,
+        ],
+        "props": Object {
+          "name": "United States",
+        },
+      }
+    `);
+    // Items with 'keys' should get allow looking them up
+    expect(gaz.find('US')).toEqual(gaz.find('USA'));
+  });
+});
diff --git a/public/app/plugins/panel/geomap/gazetteer/gazetteer.ts b/public/app/plugins/panel/geomap/gazetteer/gazetteer.ts
new file mode 100644
index 00000000000..92d1bcc6276
--- /dev/null
+++ b/public/app/plugins/panel/geomap/gazetteer/gazetteer.ts
@@ -0,0 +1,69 @@
+import { KeyValue } from '@grafana/data';
+import { getBackendSrv } from '@grafana/runtime';
+import { loadWorldmapPoints } from './worldmap';
+
+// http://geojson.xyz/
+
+export interface PlacenameInfo {
+  coords: [number, number]; // lon, lat (WGS84)
+  props?: Record<string, any>;
+}
+
+export interface Gazetteer {
+  path: string;
+  error?: string;
+  find: (key: string) => PlacenameInfo | undefined;
+  count?: number;
+  examples: (count: number) => string[];
+}
+
+// Without knowing the datatype pick a good lookup function
+export function loadGazetteer(path: string, data: any): Gazetteer {
+  // Check for legacy worldmap syntax
+  if (Array.isArray(data)) {
+    const first = data[0] as any;
+    if (first.latitude && first.longitude && (first.key || first.keys)) {
+      return loadWorldmapPoints(path, data);
+    }
+  }
+
+  return {
+    path,
+    error: 'Unable to parse locations',
+    find: (k) => undefined,
+    examples: (v) => [],
+  };
+}
+
+const registry: KeyValue<Gazetteer> = {};
+
+export const COUNTRIES_GAZETTEER_PATH = 'public/gazetteer/countries.json';
+
+/**
+ * Given a path to a file return a cached lookup function
+ */
+export async function getGazetteer(path?: string): Promise<Gazetteer> {
+  // When not specified, use the default path
+  if (!path) {
+    path = COUNTRIES_GAZETTEER_PATH;
+  }
+
+  let lookup = registry[path];
+  if (!lookup) {
+    try {
+      // block the async function
+      const data = await getBackendSrv().get(path!);
+      lookup = loadGazetteer(path, data);
+    } catch (err) {
+      console.warn('Error loading placename lookup', path, err);
+      lookup = {
+        path,
+        error: 'Error loading URL',
+        find: (k) => undefined,
+        examples: (v) => [],
+      };
+    }
+    registry[path] = lookup;
+  }
+  return lookup;
+}
diff --git a/public/app/plugins/panel/geomap/gazetteer/worldmap.ts b/public/app/plugins/panel/geomap/gazetteer/worldmap.ts
new file mode 100644
index 00000000000..ccf8b68e5d0
--- /dev/null
+++ b/public/app/plugins/panel/geomap/gazetteer/worldmap.ts
@@ -0,0 +1,61 @@
+import { PlacenameInfo, Gazetteer } from './gazetteer';
+
+// https://github.com/grafana/worldmap-panel/blob/master/src/data/countries.json
+export interface WorldmapPoint {
+  key?: string;
+  keys?: string[]; // new in grafana 8.1+
+  latitude: number;
+  longitude: number;
+  name?: string;
+}
+
+export function loadWorldmapPoints(path: string, data: WorldmapPoint[]): Gazetteer {
+  let count = 0;
+  const values = new Map<string, PlacenameInfo>();
+  for (const v of data) {
+    const info: PlacenameInfo = {
+      coords: [v.longitude, v.latitude],
+    };
+    if (v.name) {
+      values.set(v.name, info);
+      values.set(v.name.toUpperCase(), info);
+      info.props = { name: v.name };
+    }
+    if (v.key) {
+      values.set(v.key, info);
+      values.set(v.key.toUpperCase(), info);
+    }
+    if (v.keys) {
+      for (const key of v.keys) {
+        values.set(key, info);
+        values.set(key.toUpperCase(), info);
+      }
+    }
+    count++;
+  }
+  return {
+    path,
+    find: (k) => {
+      let v = values.get(k);
+      if (!v) {
+        v = values.get(k.toUpperCase());
+      }
+      return v;
+    },
+    count,
+    examples: (count) => {
+      const first: string[] = [];
+      if (values.size < 1) {
+        first.push('no values found');
+      } else {
+        for (const key of values.keys()) {
+          first.push(key);
+          if (first.length >= count) {
+            break;
+          }
+        }
+      }
+      return first;
+    },
+  };
+}
diff --git a/public/app/plugins/panel/geomap/layers/basemaps/carto.ts b/public/app/plugins/panel/geomap/layers/basemaps/carto.ts
index a4f0228c879..4c1a35dc940 100644
--- a/public/app/plugins/panel/geomap/layers/basemaps/carto.ts
+++ b/public/app/plugins/panel/geomap/layers/basemaps/carto.ts
@@ -31,7 +31,7 @@ export const carto: MapLayerRegistryItem<CartoConfig> = {
    * Function that configures transformation and returns a transformer
    * @param options
    */
-  create: (map: Map, options: MapLayerOptions<CartoConfig>, theme: GrafanaTheme2) => ({
+  create: async (map: Map, options: MapLayerOptions<CartoConfig>, theme: GrafanaTheme2) => ({
     init: () => {
       const cfg = { ...defaultCartoConfig, ...options.config };
       let style = cfg.theme as string;
diff --git a/public/app/plugins/panel/geomap/layers/basemaps/esri.ts b/public/app/plugins/panel/geomap/layers/basemaps/esri.ts
index e3eca09ac1a..7cf5e3bd7af 100644
--- a/public/app/plugins/panel/geomap/layers/basemaps/esri.ts
+++ b/public/app/plugins/panel/geomap/layers/basemaps/esri.ts
@@ -59,19 +59,17 @@ export const esriXYZTiles: MapLayerRegistryItem<ESRIXYZConfig> = {
   name: 'ArcGIS MapServer',
   isBaseMap: true,
 
-  create: (map: Map, options: MapLayerOptions<ESRIXYZConfig>, theme: GrafanaTheme2) => ({
-    init: () => {
-      const cfg = { ...options.config };
-      const svc = publicServiceRegistry.getIfExists(cfg.config?.server ?? DEFAULT_SERVICE)!;
-      if (svc.id !== CUSTOM_SERVICE) {
-        const base = 'https://services.arcgisonline.com/ArcGIS/rest/services/';
-        cfg.url = `${base}${svc.slug}/MapServer/tile/{z}/{y}/{x}`;
-        cfg.attribution = `Tiles © <a href="${base}${svc.slug}/MapServer">ArcGIS</a>`;
-      }
-      // reuse the standard XYZ tile logic
-      return xyzTiles.create(map, { ...options, config: cfg as XYZConfig }, theme).init();
-    },
-  }),
+  create: async (map: Map, options: MapLayerOptions<ESRIXYZConfig>, theme: GrafanaTheme2) => {
+    const cfg = { ...options.config };
+    const svc = publicServiceRegistry.getIfExists(cfg.config?.server ?? DEFAULT_SERVICE)!;
+    if (svc.id !== CUSTOM_SERVICE) {
+      const base = 'https://services.arcgisonline.com/ArcGIS/rest/services/';
+      cfg.url = `${base}${svc.slug}/MapServer/tile/{z}/{y}/{x}`;
+      cfg.attribution = `Tiles © <a href="${base}${svc.slug}/MapServer">ArcGIS</a>`;
+    }
+    const opts = { ...options, config: cfg as XYZConfig };
+    return xyzTiles.create(map, opts, theme);
+  },
 
   registerOptionsUI: (builder) => {
     builder
diff --git a/public/app/plugins/panel/geomap/layers/basemaps/generic.ts b/public/app/plugins/panel/geomap/layers/basemaps/generic.ts
index 89ab35c42b7..00677d88b65 100644
--- a/public/app/plugins/panel/geomap/layers/basemaps/generic.ts
+++ b/public/app/plugins/panel/geomap/layers/basemaps/generic.ts
@@ -21,7 +21,7 @@ export const xyzTiles: MapLayerRegistryItem<XYZConfig> = {
   name: 'XYZ Tile layer',
   isBaseMap: true,
 
-  create: (map: Map, options: MapLayerOptions<XYZConfig>, theme: GrafanaTheme2) => ({
+  create: async (map: Map, options: MapLayerOptions<XYZConfig>, theme: GrafanaTheme2) => ({
     init: () => {
       const cfg = { ...options.config };
       if (!cfg.url) {
diff --git a/public/app/plugins/panel/geomap/layers/basemaps/osm.ts b/public/app/plugins/panel/geomap/layers/basemaps/osm.ts
index f2c45cfd67e..7fcf753a660 100644
--- a/public/app/plugins/panel/geomap/layers/basemaps/osm.ts
+++ b/public/app/plugins/panel/geomap/layers/basemaps/osm.ts
@@ -12,7 +12,7 @@ export const standard: MapLayerRegistryItem = {
    * Function that configures transformation and returns a transformer
    * @param options
    */
-  create: (map: Map, options: MapLayerOptions) => ({
+  create: async (map: Map, options: MapLayerOptions) => ({
     init: () => {
       return new TileLayer({
         source: new OSM(),
diff --git a/public/app/plugins/panel/geomap/layers/data/geojsonMapper.ts b/public/app/plugins/panel/geomap/layers/data/geojsonMapper.ts
index 7e41200dbf8..3ab248de9f7 100644
--- a/public/app/plugins/panel/geomap/layers/data/geojsonMapper.ts
+++ b/public/app/plugins/panel/geomap/layers/data/geojsonMapper.ts
@@ -1,4 +1,4 @@
-import { MapLayerRegistryItem, MapLayerOptions, MapLayerHandler, PanelData, GrafanaTheme2, PluginState } from '@grafana/data';
+import { MapLayerRegistryItem, MapLayerOptions, PanelData, GrafanaTheme2, PluginState } from '@grafana/data';
 import Map from 'ol/Map';
 import VectorLayer from 'ol/layer/Vector';
 import VectorSource from 'ol/source/Vector';
@@ -30,7 +30,7 @@ export const geojsonMapper: MapLayerRegistryItem<GeoJSONMapperConfig> = {
    * Function that configures transformation and returns a transformer
    * @param options
    */
-  create: (map: Map, options: MapLayerOptions<GeoJSONMapperConfig>, theme: GrafanaTheme2): MapLayerHandler => {
+  create: async (map: Map, options: MapLayerOptions<GeoJSONMapperConfig>, theme: GrafanaTheme2) => {
     const config = { ...defaultOptions, ...options.config };
 
     const source = new VectorSource({
diff --git a/public/app/plugins/panel/geomap/layers/data/heatMap.tsx b/public/app/plugins/panel/geomap/layers/data/heatMap.tsx
index b6804bdbbf2..7f884c4a759 100644
--- a/public/app/plugins/panel/geomap/layers/data/heatMap.tsx
+++ b/public/app/plugins/panel/geomap/layers/data/heatMap.tsx
@@ -2,7 +2,6 @@ import {
   FieldType,
   getFieldColorModeForField,
   GrafanaTheme2,
-  MapLayerHandler,
   MapLayerOptions,
   MapLayerRegistryItem,
   PanelData,
@@ -47,9 +46,9 @@ export const heatmapLayer: MapLayerRegistryItem<HeatmapConfig> = {
    * Function that configures transformation and returns a transformer
    * @param options
    */
-  create: (map: Map, options: MapLayerOptions<HeatmapConfig>, theme: GrafanaTheme2): MapLayerHandler => {
+  create: async (map: Map, options: MapLayerOptions<HeatmapConfig>, theme: GrafanaTheme2) => {
     const config = { ...defaultOptions, ...options.config };
-    const matchers = getLocationMatchers(options.location);
+    const matchers = await getLocationMatchers(options.location);
 
     const vectorSource = new source.Vector();
 
diff --git a/public/app/plugins/panel/geomap/layers/data/lastPointTracker.ts b/public/app/plugins/panel/geomap/layers/data/lastPointTracker.ts
index 74d1ec706b5..d89af3740dc 100644
--- a/public/app/plugins/panel/geomap/layers/data/lastPointTracker.ts
+++ b/public/app/plugins/panel/geomap/layers/data/lastPointTracker.ts
@@ -1,4 +1,4 @@
-import { MapLayerRegistryItem, MapLayerOptions, MapLayerHandler, PanelData, GrafanaTheme2, PluginState } from '@grafana/data';
+import { MapLayerRegistryItem, MapLayerOptions, PanelData, GrafanaTheme2, PluginState } from '@grafana/data';
 import Map from 'ol/Map';
 import Feature from 'ol/Feature';
 import * as style from 'ol/style';
@@ -26,7 +26,7 @@ export const lastPointTracker: MapLayerRegistryItem<LastPointConfig> = {
    * Function that configures transformation and returns a transformer
    * @param options
    */
-  create: (map: Map, options: MapLayerOptions<LastPointConfig>, theme: GrafanaTheme2): MapLayerHandler => {
+  create: async (map: Map, options: MapLayerOptions<LastPointConfig>, theme: GrafanaTheme2) => {
     const point = new Feature({});
     const config = { ...defaultOptions, ...options.config };
 
@@ -46,7 +46,7 @@ export const lastPointTracker: MapLayerRegistryItem<LastPointConfig> = {
       source: vectorSource,
     });
 
-    const matchers = getLocationMatchers(options.location);
+    const matchers = await getLocationMatchers(options.location);
     return {
       init: () => vectorLayer,
       update: (data: PanelData) => {
diff --git a/public/app/plugins/panel/geomap/layers/data/markersLayer.tsx b/public/app/plugins/panel/geomap/layers/data/markersLayer.tsx
index bf21fa56e75..99a7112a40f 100644
--- a/public/app/plugins/panel/geomap/layers/data/markersLayer.tsx
+++ b/public/app/plugins/panel/geomap/layers/data/markersLayer.tsx
@@ -1,4 +1,4 @@
-import { MapLayerRegistryItem, MapLayerOptions, MapLayerHandler, PanelData, GrafanaTheme2, FrameGeometrySourceMode } from '@grafana/data';
+import { MapLayerRegistryItem, MapLayerOptions, PanelData, GrafanaTheme2, FrameGeometrySourceMode } from '@grafana/data';
 import Map from 'ol/Map';
 import Feature from 'ol/Feature';
 import * as layer from 'ol/layer';
@@ -11,7 +11,7 @@ import { getScaledDimension, } from '../../dims/scale';
 import { getColorDimension, } from '../../dims/color';
 import { ScaleDimensionEditor } from '../../dims/editors/ScaleDimensionEditor';
 import { ColorDimensionEditor } from '../../dims/editors/ColorDimensionEditor';
-import { markerMakers } from '../../utils/regularShapes';
+import { circleMarker, markerMakers } from '../../utils/regularShapes';
 
 // Configuration options for Circle overlays
 export interface MarkersConfig {
@@ -59,8 +59,8 @@ export const markersLayer: MapLayerRegistryItem<MarkersConfig> = {
    * Function that configures transformation and returns a transformer
    * @param options
    */
-  create: (map: Map, options: MapLayerOptions<MarkersConfig>, theme: GrafanaTheme2): MapLayerHandler => {
-    const matchers = getLocationMatchers(options.location);
+  create: async (map: Map, options: MapLayerOptions<MarkersConfig>, theme: GrafanaTheme2) => {
+    const matchers = await getLocationMatchers(options.location);
     const vectorLayer = new layer.Vector({});
     // Assert default values
     const config = {
@@ -68,47 +68,47 @@ export const markersLayer: MapLayerRegistryItem<MarkersConfig> = {
       ...options?.config,
     };
 
-    let shape = markerMakers.getIfExists(config.shape);
-    if (!shape) {
-      shape = markerMakers.get('circle');
-    }
-    
+    const shape = markerMakers.getIfExists(config.shape) ?? circleMarker;
+
     return {
       init: () => vectorLayer,
       update: (data: PanelData) => {
         if(!data.series?.length) {
           return; // ignore empty
         }
-        const frame = data.series[0];
-        const info = dataFrameToPoints(frame, matchers);
-        if(info.warning) {
-          console.log( 'WARN', info.warning);
-          return; // ???
-        }
-
-        const colorDim = getColorDimension(frame, config.color, theme);
-        const sizeDim = getScaledDimension(frame, config.size);
-        const opacity = options.config?.fillOpacity ?? defaultOptions.fillOpacity;
 
         const features: Feature[] = [];
 
-        // Map each data value into new points
-        for (let i = 0; i < frame.length; i++) {
-          // Get the circle color for a specific data value depending on color scheme
-          const color = colorDim.get(i);
-          // Set the opacity determined from user configuration
-          const fillColor = tinycolor(color).setAlpha(opacity).toRgbString();
-          // Get circle size from user configuration
-          const radius = sizeDim.get(i);
+        for(const frame of data.series) {
+          const info = dataFrameToPoints(frame, matchers);
+          if(info.warning) {
+            console.log( 'Could not find locations', info.warning);
+            continue; // ???
+          }
 
-          // Create a new Feature for each point returned from dataFrameToPoints
-          const dot = new Feature({
-              geometry: info.points[i],
-          });
+          const colorDim = getColorDimension(frame, config.color, theme);
+          const sizeDim = getScaledDimension(frame, config.size);
+          const opacity = options.config?.fillOpacity ?? defaultOptions.fillOpacity;
+
+          // Map each data value into new points
+          for (let i = 0; i < frame.length; i++) {
+            // Get the circle color for a specific data value depending on color scheme
+            const color = colorDim.get(i);
+            // Set the opacity determined from user configuration
+            const fillColor = tinycolor(color).setAlpha(opacity).toRgbString();
+            // Get circle size from user configuration
+            const radius = sizeDim.get(i);
+
+            // Create a new Feature for each point returned from dataFrameToPoints
+            const dot = new Feature({
+                geometry: info.points[i],
+            });
+
+            dot.setStyle(shape!.make(color, fillColor, radius));
+            features.push(dot);
+          };
+        }
 
-          dot.setStyle(shape!.make(color, fillColor, radius));
-          features.push(dot);
-        };
 
         // Source reads the data and provides a set of features to visualize
         const vectorSource = new source.Vector({ features });
diff --git a/public/app/plugins/panel/geomap/utils/location.test.ts b/public/app/plugins/panel/geomap/utils/location.test.ts
index e296159207e..31e8d480fcc 100644
--- a/public/app/plugins/panel/geomap/utils/location.test.ts
+++ b/public/app/plugins/panel/geomap/utils/location.test.ts
@@ -8,7 +8,7 @@ const geohash = ['9q94r', 'dr5rs'];
 const names = ['A', 'B'];
 
 describe('handle location parsing', () => {
-  it('auto should find geohash field', () => {
+  it('auto should find geohash field', async () => {
     const frame = toDataFrame({
       name: 'simple',
       fields: [
@@ -17,7 +17,7 @@ describe('handle location parsing', () => {
       ],
     });
 
-    const matchers = getLocationMatchers();
+    const matchers = await getLocationMatchers();
     const fields = getLocationFields(frame, matchers);
     expect(fields.mode).toEqual(FrameGeometrySourceMode.Geohash);
     expect(fields.geohash).toBeDefined();
@@ -38,7 +38,7 @@ describe('handle location parsing', () => {
       `);
   });
 
-  it('auto should find coordinate fields', () => {
+  it('auto should find coordinate fields', async () => {
     const frame = toDataFrame({
       name: 'simple',
       fields: [
@@ -48,7 +48,7 @@ describe('handle location parsing', () => {
       ],
     });
 
-    const matchers = getLocationMatchers();
+    const matchers = await getLocationMatchers();
     const info = dataFrameToPoints(frame, matchers);
     expect(info.points.map((p) => toLonLat(p.getCoordinates()))).toMatchInlineSnapshot(`
       Array [
diff --git a/public/app/plugins/panel/geomap/utils/location.ts b/public/app/plugins/panel/geomap/utils/location.ts
index 1f0ec51aa0b..a7e53cf171d 100644
--- a/public/app/plugins/panel/geomap/utils/location.ts
+++ b/public/app/plugins/panel/geomap/utils/location.ts
@@ -10,6 +10,7 @@ import {
 } from '@grafana/data';
 import { Point } from 'ol/geom';
 import { fromLonLat } from 'ol/proj';
+import { getGazetteer, Gazetteer } from '../gazetteer/gazetteer';
 import { decodeGeohash } from './geohash';
 
 export type FieldFinder = (frame: DataFrame) => Field | undefined;
@@ -50,6 +51,7 @@ export interface LocationFieldMatchers {
   h3: FieldFinder;
   wkt: FieldFinder;
   lookup: FieldFinder;
+  gazetteer?: Gazetteer;
 }
 
 const defaultMatchers: LocationFieldMatchers = {
@@ -62,7 +64,7 @@ const defaultMatchers: LocationFieldMatchers = {
   lookup: matchLowerNames(new Set(['lookup'])),
 };
 
-export function getLocationMatchers(src?: FrameGeometrySource): LocationFieldMatchers {
+export async function getLocationMatchers(src?: FrameGeometrySource): Promise<LocationFieldMatchers> {
   const info: LocationFieldMatchers = {
     ...defaultMatchers,
     mode: src?.mode ?? FrameGeometrySourceMode.Auto,
@@ -77,6 +79,7 @@ export function getLocationMatchers(src?: FrameGeometrySource): LocationFieldMat
       if (src?.lookup) {
         info.lookup = getFieldFinder(getFieldMatcher({ id: FieldMatcherID.byName, options: src.lookup }));
       }
+      info.gazetteer = await getGazetteer(src?.gazetteer);
       break;
     case FrameGeometrySourceMode.Coords:
       if (src?.latitude) {
@@ -172,6 +175,18 @@ export function dataFrameToPoints(frame: DataFrame, location: LocationFieldMatch
       }
       break;
 
+    case FrameGeometrySourceMode.Lookup:
+      if (fields.lookup) {
+        if (location.gazetteer) {
+          info.points = getPointsFromGazetteer(location.gazetteer, fields.lookup);
+        } else {
+          info.warning = 'Gazetteer not found';
+        }
+      } else {
+        info.warning = 'Missing lookup field';
+      }
+      break;
+
     case FrameGeometrySourceMode.Auto:
       info.warning = 'Unable to find location fields';
   }
@@ -199,3 +214,15 @@ function getPointsFromGeohash(field: Field<string>): Point[] {
   }
   return points;
 }
+
+function getPointsFromGazetteer(gaz: Gazetteer, field: Field<string>): Point[] {
+  const count = field.values.length;
+  const points = new Array<Point>(count);
+  for (let i = 0; i < count; i++) {
+    const info = gaz.find(field.values.get(i));
+    if (info?.coords) {
+      points[i] = new Point(fromLonLat(info.coords));
+    }
+  }
+  return points;
+}
diff --git a/public/app/plugins/panel/geomap/utils/regularShapes.ts b/public/app/plugins/panel/geomap/utils/regularShapes.ts
index b493e49297e..74091f93e49 100644
--- a/public/app/plugins/panel/geomap/utils/regularShapes.ts
+++ b/public/app/plugins/panel/geomap/utils/regularShapes.ts
@@ -6,21 +6,23 @@ interface MarkerMaker extends RegistryItem {
   hasFill: boolean;
 }
 
-export const markerMakers = new Registry<MarkerMaker>(() => [
-  {
-    id: 'circle',
-    name: 'Circle',
-    hasFill: true,
-    make: (color: string, fillColor: string, radius: number) => {
-      return new Style({
-        image: new Circle({
-          stroke: new Stroke({ color: color }),
-          fill: new Fill({ color: fillColor }),
-          radius: radius,
-        }),
-      });
-    },
+export const circleMarker: MarkerMaker = {
+  id: 'circle',
+  name: 'Circle',
+  hasFill: true,
+  make: (color: string, fillColor: string, radius: number) => {
+    return new Style({
+      image: new Circle({
+        stroke: new Stroke({ color: color }),
+        fill: new Fill({ color: fillColor }),
+        radius: radius,
+      }),
+    });
   },
+};
+
+export const markerMakers = new Registry<MarkerMaker>(() => [
+  circleMarker,
   {
     id: 'square',
     name: 'Square',
diff --git a/public/gazetteer/countries.json b/public/gazetteer/countries.json
new file mode 100644
index 00000000000..654baca571d
--- /dev/null
+++ b/public/gazetteer/countries.json
@@ -0,0 +1,1508 @@
+[
+  {
+    "keys": ["AD"],
+    "latitude": 42.546245,
+    "longitude": 1.601554,
+    "name": "Andorra"
+  },
+  {
+    "key": "AE",
+    "latitude": 23.424076,
+    "longitude": 53.847818,
+    "name": "United Arab Emirates"
+  },
+  {
+    "key": "AF",
+    "latitude": 33.93911,
+    "longitude": 67.709953,
+    "name": "Afghanistan"
+  },
+  {
+    "key": "AG",
+    "latitude": 17.060816,
+    "longitude": -61.796428,
+    "name": "Antigua and Barbuda"
+  },
+  {
+    "key": "AI",
+    "latitude": 18.220554,
+    "longitude": -63.068615,
+    "name": "Anguilla"
+  },
+  {
+    "keys": ["AL", "ALB"],
+    "latitude": 41.153332,
+    "longitude": 20.168331,
+    "name": "Albania"
+  },
+  {
+    "key": "AM",
+    "latitude": 40.069099,
+    "longitude": 45.038189,
+    "name": "Armenia"
+  },
+  {
+    "key": "AN",
+    "latitude": 12.226079,
+    "longitude": -69.060087,
+    "name": "Netherlands Antilles"
+  },
+  {
+    "key": "AO",
+    "latitude": -11.202692,
+    "longitude": 17.873887,
+    "name": "Angola"
+  },
+  {
+    "key": "AQ",
+    "latitude": -75.250973,
+    "longitude": -0.071389,
+    "name": "Antarctica"
+  },
+  {
+    "key": "AR",
+    "latitude": -38.416097,
+    "longitude": -63.616672,
+    "name": "Argentina"
+  },
+  {
+    "key": "AS",
+    "latitude": -14.270972,
+    "longitude": -170.132217,
+    "name": "American Samoa"
+  },
+  {
+    "key": "AT",
+    "latitude": 47.516231,
+    "longitude": 14.550072,
+    "name": "Austria"
+  },
+  {
+    "key": "AU",
+    "latitude": -25.274398,
+    "longitude": 133.775136,
+    "name": "Australia"
+  },
+  {
+    "key": "AW",
+    "latitude": 12.52111,
+    "longitude": -69.968338,
+    "name": "Aruba"
+  },
+  {
+    "key": "AX",
+    "latitude": 60.3385485,
+    "longitude": 20.2712585,
+    "name": "Åland"
+  },
+  {
+    "key": "AZ",
+    "latitude": 40.143105,
+    "longitude": 47.576927,
+    "name": "Azerbaijan"
+  },
+  {
+    "key": "BA",
+    "latitude": 43.915886,
+    "longitude": 17.679076,
+    "name": "Bosnia and Herzegovina"
+  },
+  {
+    "key": "BB",
+    "latitude": 13.193887,
+    "longitude": -59.543198,
+    "name": "Barbados"
+  },
+  {
+    "key": "BD",
+    "latitude": 23.684994,
+    "longitude": 90.356331,
+    "name": "Bangladesh"
+  },
+  {
+    "key": "BE",
+    "latitude": 50.503887,
+    "longitude": 4.469936,
+    "name": "Belgium"
+  },
+  {
+    "key": "BF",
+    "latitude": 12.238333,
+    "longitude": -1.561593,
+    "name": "Burkina Faso"
+  },
+  {
+    "key": "BG",
+    "latitude": 42.733883,
+    "longitude": 25.48583,
+    "name": "Bulgaria"
+  },
+  {
+    "key": "BH",
+    "latitude": 25.930414,
+    "longitude": 50.637772,
+    "name": "Bahrain"
+  },
+  {
+    "key": "BI",
+    "latitude": -3.373056,
+    "longitude": 29.918886,
+    "name": "Burundi"
+  },
+  {
+    "key": "BJ",
+    "latitude": 9.30769,
+    "longitude": 2.315834,
+    "name": "Benin"
+  },
+  {
+    "key": "BL",
+    "latitude": 17.9,
+    "longitude": -62.833333,
+    "name": "Saint-Barthélemy"
+  },
+  {
+    "key": "BM",
+    "latitude": 32.321384,
+    "longitude": -64.75737,
+    "name": "Bermuda"
+  },
+  {
+    "key": "BN",
+    "latitude": 4.535277,
+    "longitude": 114.727669,
+    "name": "Brunei"
+  },
+  {
+    "key": "BO",
+    "latitude": -16.290154,
+    "longitude": -63.588653,
+    "name": "Bolivia"
+  },
+  {
+    "key": "BQ",
+    "latitude": 12.1783611,
+    "longitude": -68.2385339,
+    "name": "Bonaire, Sint Eustatius, and Saba"
+  },
+  {
+    "key": "BR",
+    "latitude": -14.235004,
+    "longitude": -51.92528,
+    "name": "Brazil"
+  },
+  {
+    "key": "BS",
+    "latitude": 25.03428,
+    "longitude": -77.39628,
+    "name": "Bahamas"
+  },
+  {
+    "key": "BT",
+    "latitude": 27.514162,
+    "longitude": 90.433601,
+    "name": "Bhutan"
+  },
+  {
+    "key": "BV",
+    "latitude": -54.423199,
+    "longitude": 3.413194,
+    "name": "Bouvet Island"
+  },
+  {
+    "key": "BW",
+    "latitude": -22.328474,
+    "longitude": 24.684866,
+    "name": "Botswana"
+  },
+  {
+    "key": "BY",
+    "latitude": 53.709807,
+    "longitude": 27.953389,
+    "name": "Belarus"
+  },
+  {
+    "key": "BZ",
+    "latitude": 17.189877,
+    "longitude": -88.49765,
+    "name": "Belize"
+  },
+  {
+    "key": "CA",
+    "latitude": 56.130366,
+    "longitude": -106.346771,
+    "name": "Canada"
+  },
+  {
+    "key": "CC",
+    "latitude": -12.164165,
+    "longitude": 96.870956,
+    "name": "Cocos [Keeling] Islands"
+  },
+  {
+    "key": "CD",
+    "latitude": -4.038333,
+    "longitude": 21.758664,
+    "name": "Congo [DRC]"
+  },
+  {
+    "key": "CF",
+    "latitude": 6.611111,
+    "longitude": 20.939444,
+    "name": "Central African Republic"
+  },
+  {
+    "key": "CG",
+    "latitude": -0.228021,
+    "longitude": 15.827659,
+    "name": "Congo [Republic]"
+  },
+  {
+    "key": "CH",
+    "latitude": 46.818188,
+    "longitude": 8.227512,
+    "name": "Switzerland"
+  },
+  {
+    "key": "CI",
+    "latitude": 7.539989,
+    "longitude": -5.54708,
+    "name": "Côte d'Ivoire"
+  },
+  {
+    "key": "CK",
+    "latitude": -21.236736,
+    "longitude": -159.777671,
+    "name": "Cook Islands"
+  },
+  {
+    "key": "CL",
+    "latitude": -35.675147,
+    "longitude": -71.542969,
+    "name": "Chile"
+  },
+  {
+    "key": "CM",
+    "latitude": 7.369722,
+    "longitude": 12.354722,
+    "name": "Cameroon"
+  },
+  {
+    "key": "CN",
+    "latitude": 35.86166,
+    "longitude": 104.195397,
+    "name": "China"
+  },
+  {
+    "key": "CO",
+    "latitude": 4.570868,
+    "longitude": -74.297333,
+    "name": "Colombia"
+  },
+  {
+    "key": "CR",
+    "latitude": 9.748917,
+    "longitude": -83.753428,
+    "name": "Costa Rica"
+  },
+  {
+    "key": "CU",
+    "latitude": 21.521757,
+    "longitude": -77.781167,
+    "name": "Cuba"
+  },
+  {
+    "key": "CV",
+    "latitude": 16.002082,
+    "longitude": -24.013197,
+    "name": "Cape Verde"
+  },
+  {
+    "key": "CW",
+    "latitude": 12.16957,
+    "longitude": -68.99002,
+    "name": "Curaçao"
+  },
+  {
+    "key": "CX",
+    "latitude": -10.447525,
+    "longitude": 105.690449,
+    "name": "Christmas Island"
+  },
+  {
+    "key": "CY",
+    "latitude": 35.126413,
+    "longitude": 33.429859,
+    "name": "Cyprus"
+  },
+  {
+    "key": "CZ",
+    "latitude": 49.817492,
+    "longitude": 15.472962,
+    "name": "Czech Republic"
+  },
+  {
+    "key": "DE",
+    "latitude": 51.165691,
+    "longitude": 10.451526,
+    "name": "Germany"
+  },
+  {
+    "key": "DJ",
+    "latitude": 11.825138,
+    "longitude": 42.590275,
+    "name": "Djibouti"
+  },
+  {
+    "key": "DK",
+    "latitude": 56.26392,
+    "longitude": 9.501785,
+    "name": "Denmark"
+  },
+  {
+    "key": "DM",
+    "latitude": 15.414999,
+    "longitude": -61.370976,
+    "name": "Dominica"
+  },
+  {
+    "key": "DO",
+    "latitude": 18.735693,
+    "longitude": -70.162651,
+    "name": "Dominican Republic"
+  },
+  {
+    "keys": ["DZ", "DZA"],
+    "latitude": 28.033886,
+    "longitude": 1.659626,
+    "name": "Algeria"
+  },
+  {
+    "key": "EC",
+    "latitude": -1.831239,
+    "longitude": -78.183406,
+    "name": "Ecuador"
+  },
+  {
+    "key": "EE",
+    "latitude": 58.595272,
+    "longitude": 25.013607,
+    "name": "Estonia"
+  },
+  {
+    "key": "EG",
+    "latitude": 26.820553,
+    "longitude": 30.802498,
+    "name": "Egypt"
+  },
+  {
+    "key": "EH",
+    "latitude": 24.215527,
+    "longitude": -12.885834,
+    "name": "Western Sahara"
+  },
+  {
+    "key": "ER",
+    "latitude": 15.179384,
+    "longitude": 39.782334,
+    "name": "Eritrea"
+  },
+  {
+    "key": "ES",
+    "latitude": 40.463667,
+    "longitude": -3.74922,
+    "name": "Spain"
+  },
+  {
+    "key": "ET",
+    "latitude": 9.145,
+    "longitude": 40.489673,
+    "name": "Ethiopia"
+  },
+  {
+    "key": "FI",
+    "latitude": 61.92411,
+    "longitude": 25.748151,
+    "name": "Finland"
+  },
+  {
+    "key": "FJ",
+    "latitude": -16.578193,
+    "longitude": 179.414413,
+    "name": "Fiji"
+  },
+  {
+    "key": "FK",
+    "latitude": -51.796253,
+    "longitude": -59.523613,
+    "name": "Falkland Islands [Islas Malvinas]"
+  },
+  {
+    "key": "FM",
+    "latitude": 7.425554,
+    "longitude": 150.550812,
+    "name": "Micronesia"
+  },
+  {
+    "key": "FO",
+    "latitude": 61.892635,
+    "longitude": -6.911806,
+    "name": "Faroe Islands"
+  },
+  {
+    "key": "FR",
+    "latitude": 46.227638,
+    "longitude": 2.213749,
+    "name": "France"
+  },
+  {
+    "key": "GA",
+    "latitude": -0.803689,
+    "longitude": 11.609444,
+    "name": "Gabon"
+  },
+  {
+    "key": "GB",
+    "latitude": 55.378051,
+    "longitude": -3.435973,
+    "name": "United Kingdom"
+  },
+  {
+    "key": "GD",
+    "latitude": 12.262776,
+    "longitude": -61.604171,
+    "name": "Grenada"
+  },
+  {
+    "key": "GE",
+    "latitude": 42.315407,
+    "longitude": 43.356892,
+    "name": "Georgia"
+  },
+  {
+    "key": "GF",
+    "latitude": 3.933889,
+    "longitude": -53.125782,
+    "name": "French Guiana"
+  },
+  {
+    "key": "GG",
+    "latitude": 49.465691,
+    "longitude": -2.585278,
+    "name": "Guernsey"
+  },
+  {
+    "key": "GH",
+    "latitude": 7.946527,
+    "longitude": -1.023194,
+    "name": "Ghana"
+  },
+  {
+    "key": "GI",
+    "latitude": 36.137741,
+    "longitude": -5.345374,
+    "name": "Gibraltar"
+  },
+  {
+    "key": "GL",
+    "latitude": 71.706936,
+    "longitude": -42.604303,
+    "name": "Greenland"
+  },
+  {
+    "key": "GM",
+    "latitude": 13.443182,
+    "longitude": -15.310139,
+    "name": "Gambia"
+  },
+  {
+    "key": "GN",
+    "latitude": 9.945587,
+    "longitude": -9.696645,
+    "name": "Guinea"
+  },
+  {
+    "key": "GP",
+    "latitude": 16.995971,
+    "longitude": -62.067641,
+    "name": "Guadeloupe"
+  },
+  {
+    "key": "GQ",
+    "latitude": 1.650801,
+    "longitude": 10.267895,
+    "name": "Equatorial Guinea"
+  },
+  {
+    "key": "GR",
+    "latitude": 39.074208,
+    "longitude": 21.824312,
+    "name": "Greece"
+  },
+  {
+    "key": "GS",
+    "latitude": -54.429579,
+    "longitude": -36.587909,
+    "name": "South Georgia and the South Sandwich Islands"
+  },
+  {
+    "key": "GT",
+    "latitude": 15.783471,
+    "longitude": -90.230759,
+    "name": "Guatemala"
+  },
+  {
+    "key": "GU",
+    "latitude": 13.444304,
+    "longitude": 144.793731,
+    "name": "Guam"
+  },
+  {
+    "key": "GW",
+    "latitude": 11.803749,
+    "longitude": -15.180413,
+    "name": "Guinea-Bissau"
+  },
+  {
+    "key": "GY",
+    "latitude": 4.860416,
+    "longitude": -58.93018,
+    "name": "Guyana"
+  },
+  {
+    "key": "GZ",
+    "latitude": 31.354676,
+    "longitude": 34.308825,
+    "name": "Gaza Strip"
+  },
+  {
+    "key": "HK",
+    "latitude": 22.396428,
+    "longitude": 114.109497,
+    "name": "Hong Kong"
+  },
+  {
+    "key": "HM",
+    "latitude": -53.08181,
+    "longitude": 73.504158,
+    "name": "Heard Island and McDonald Islands"
+  },
+  {
+    "key": "HN",
+    "latitude": 15.199999,
+    "longitude": -86.241905,
+    "name": "Honduras"
+  },
+  {
+    "key": "HR",
+    "latitude": 45.1,
+    "longitude": 15.2,
+    "name": "Croatia"
+  },
+  {
+    "key": "HT",
+    "latitude": 18.971187,
+    "longitude": -72.285215,
+    "name": "Haiti"
+  },
+  {
+    "key": "HU",
+    "latitude": 47.162494,
+    "longitude": 19.503304,
+    "name": "Hungary"
+  },
+  {
+    "key": "ID",
+    "latitude": -0.789275,
+    "longitude": 113.921327,
+    "name": "Indonesia"
+  },
+  {
+    "key": "IE",
+    "latitude": 53.41291,
+    "longitude": -8.24389,
+    "name": "Ireland"
+  },
+  {
+    "key": "IL",
+    "latitude": 31.046051,
+    "longitude": 34.851612,
+    "name": "Israel"
+  },
+  {
+    "key": "IM",
+    "latitude": 54.236107,
+    "longitude": -4.548056,
+    "name": "Isle of Man"
+  },
+  {
+    "key": "IN",
+    "latitude": 20.593684,
+    "longitude": 78.96288,
+    "name": "India"
+  },
+  {
+    "key": "IO",
+    "latitude": -6.343194,
+    "longitude": 71.876519,
+    "name": "British Indian Ocean Territory"
+  },
+  {
+    "key": "IQ",
+    "latitude": 33.223191,
+    "longitude": 43.679291,
+    "name": "Iraq"
+  },
+  {
+    "key": "IR",
+    "latitude": 32.427908,
+    "longitude": 53.688046,
+    "name": "Iran"
+  },
+  {
+    "key": "IS",
+    "latitude": 64.963051,
+    "longitude": -19.020835,
+    "name": "Iceland"
+  },
+  {
+    "key": "IT",
+    "latitude": 41.87194,
+    "longitude": 12.56738,
+    "name": "Italy"
+  },
+  {
+    "key": "JE",
+    "latitude": 49.214439,
+    "longitude": -2.13125,
+    "name": "Jersey"
+  },
+  {
+    "key": "JM",
+    "latitude": 18.109581,
+    "longitude": -77.297508,
+    "name": "Jamaica"
+  },
+  {
+    "key": "JO",
+    "latitude": 30.585164,
+    "longitude": 36.238414,
+    "name": "Jordan"
+  },
+  {
+    "key": "JP",
+    "latitude": 36.204824,
+    "longitude": 138.252924,
+    "name": "Japan"
+  },
+  {
+    "key": "KE",
+    "latitude": -0.023559,
+    "longitude": 37.906193,
+    "name": "Kenya"
+  },
+  {
+    "key": "KG",
+    "latitude": 41.20438,
+    "longitude": 74.766098,
+    "name": "Kyrgyzstan"
+  },
+  {
+    "key": "KH",
+    "latitude": 12.565679,
+    "longitude": 104.990963,
+    "name": "Cambodia"
+  },
+  {
+    "key": "KI",
+    "latitude": -3.370417,
+    "longitude": -168.734039,
+    "name": "Kiribati"
+  },
+  {
+    "key": "KM",
+    "latitude": -11.875001,
+    "longitude": 43.872219,
+    "name": "Comoros"
+  },
+  {
+    "key": "KN",
+    "latitude": 17.357822,
+    "longitude": -62.782998,
+    "name": "Saint Kitts and Nevis"
+  },
+  {
+    "key": "KP",
+    "latitude": 40.339852,
+    "longitude": 127.510093,
+    "name": "North Korea"
+  },
+  {
+    "key": "KR",
+    "latitude": 35.907757,
+    "longitude": 127.766922,
+    "name": "South Korea"
+  },
+  {
+    "key": "KW",
+    "latitude": 29.31166,
+    "longitude": 47.481766,
+    "name": "Kuwait"
+  },
+  {
+    "key": "KY",
+    "latitude": 19.513469,
+    "longitude": -80.566956,
+    "name": "Cayman Islands"
+  },
+  {
+    "key": "KZ",
+    "latitude": 48.019573,
+    "longitude": 66.923684,
+    "name": "Kazakhstan"
+  },
+  {
+    "key": "LA",
+    "latitude": 19.85627,
+    "longitude": 102.495496,
+    "name": "Laos"
+  },
+  {
+    "key": "LB",
+    "latitude": 33.854721,
+    "longitude": 35.862285,
+    "name": "Lebanon"
+  },
+  {
+    "key": "LC",
+    "latitude": 13.909444,
+    "longitude": -60.978893,
+    "name": "Saint Lucia"
+  },
+  {
+    "key": "LI",
+    "latitude": 47.166,
+    "longitude": 9.555373,
+    "name": "Liechtenstein"
+  },
+  {
+    "key": "LK",
+    "latitude": 7.873054,
+    "longitude": 80.771797,
+    "name": "Sri Lanka"
+  },
+  {
+    "key": "LR",
+    "latitude": 6.428055,
+    "longitude": -9.429499,
+    "name": "Liberia"
+  },
+  {
+    "key": "LS",
+    "latitude": -29.609988,
+    "longitude": 28.233608,
+    "name": "Lesotho"
+  },
+  {
+    "key": "LT",
+    "latitude": 55.169438,
+    "longitude": 23.881275,
+    "name": "Lithuania"
+  },
+  {
+    "key": "LU",
+    "latitude": 49.815273,
+    "longitude": 6.129583,
+    "name": "Luxembourg"
+  },
+  {
+    "key": "LV",
+    "latitude": 56.879635,
+    "longitude": 24.603189,
+    "name": "Latvia"
+  },
+  {
+    "key": "LY",
+    "latitude": 26.3351,
+    "longitude": 17.228331,
+    "name": "Libya"
+  },
+  {
+    "key": "MA",
+    "latitude": 31.791702,
+    "longitude": -7.09262,
+    "name": "Morocco"
+  },
+  {
+    "key": "MC",
+    "latitude": 43.750298,
+    "longitude": 7.412841,
+    "name": "Monaco"
+  },
+  {
+    "key": "MD",
+    "latitude": 47.411631,
+    "longitude": 28.369885,
+    "name": "Moldova"
+  },
+  {
+    "key": "ME",
+    "latitude": 42.708678,
+    "longitude": 19.37439,
+    "name": "Montenegro"
+  },
+  {
+    "key": "MF",
+    "latitude": 18.08255,
+    "longitude": -63.052251,
+    "name": "Saint Martin"
+  },
+  {
+    "key": "MG",
+    "latitude": -18.766947,
+    "longitude": 46.869107,
+    "name": "Madagascar"
+  },
+  {
+    "key": "MH",
+    "latitude": 7.131474,
+    "longitude": 171.184478,
+    "name": "Marshall Islands"
+  },
+  {
+    "key": "MK",
+    "latitude": 41.608635,
+    "longitude": 21.745275,
+    "name": "Macedonia [FYROM]"
+  },
+  {
+    "key": "ML",
+    "latitude": 17.570692,
+    "longitude": -3.996166,
+    "name": "Mali"
+  },
+  {
+    "key": "MM",
+    "latitude": 21.913965,
+    "longitude": 95.956223,
+    "name": "Myanmar [Burma]"
+  },
+  {
+    "key": "MN",
+    "latitude": 46.862496,
+    "longitude": 103.846656,
+    "name": "Mongolia"
+  },
+  {
+    "key": "MO",
+    "latitude": 22.198745,
+    "longitude": 113.543873,
+    "name": "Macau"
+  },
+  {
+    "key": "MP",
+    "latitude": 17.33083,
+    "longitude": 145.38469,
+    "name": "Northern Mariana Islands"
+  },
+  {
+    "key": "MQ",
+    "latitude": 14.641528,
+    "longitude": -61.024174,
+    "name": "Martinique"
+  },
+  {
+    "key": "MR",
+    "latitude": 21.00789,
+    "longitude": -10.940835,
+    "name": "Mauritania"
+  },
+  {
+    "key": "MS",
+    "latitude": 16.742498,
+    "longitude": -62.187366,
+    "name": "Montserrat"
+  },
+  {
+    "key": "MT",
+    "latitude": 35.937496,
+    "longitude": 14.375416,
+    "name": "Malta"
+  },
+  {
+    "key": "MU",
+    "latitude": -20.348404,
+    "longitude": 57.552152,
+    "name": "Mauritius"
+  },
+  {
+    "key": "MV",
+    "latitude": 3.202778,
+    "longitude": 73.22068,
+    "name": "Maldives"
+  },
+  {
+    "key": "MW",
+    "latitude": -13.254308,
+    "longitude": 34.301525,
+    "name": "Malawi"
+  },
+  {
+    "key": "MX",
+    "latitude": 23.634501,
+    "longitude": -102.552784,
+    "name": "Mexico"
+  },
+  {
+    "key": "MY",
+    "latitude": 4.210484,
+    "longitude": 101.975766,
+    "name": "Malaysia"
+  },
+  {
+    "key": "MZ",
+    "latitude": -18.665695,
+    "longitude": 35.529562,
+    "name": "Mozambique"
+  },
+  {
+    "key": "NA",
+    "latitude": -22.95764,
+    "longitude": 18.49041,
+    "name": "Namibia"
+  },
+  {
+    "key": "NC",
+    "latitude": -20.904305,
+    "longitude": 165.618042,
+    "name": "New Caledonia"
+  },
+  {
+    "key": "NE",
+    "latitude": 17.607789,
+    "longitude": 8.081666,
+    "name": "Niger"
+  },
+  {
+    "key": "NF",
+    "latitude": -29.040835,
+    "longitude": 167.954712,
+    "name": "Norfolk Island"
+  },
+  {
+    "key": "NG",
+    "latitude": 9.081999,
+    "longitude": 8.675277,
+    "name": "Nigeria"
+  },
+  {
+    "key": "NI",
+    "latitude": 12.865416,
+    "longitude": -85.207229,
+    "name": "Nicaragua"
+  },
+  {
+    "key": "NL",
+    "latitude": 52.132633,
+    "longitude": 5.291266,
+    "name": "Netherlands"
+  },
+  {
+    "key": "NO",
+    "latitude": 60.472024,
+    "longitude": 8.468946,
+    "name": "Norway"
+  },
+  {
+    "key": "NP",
+    "latitude": 28.394857,
+    "longitude": 84.124008,
+    "name": "Nepal"
+  },
+  {
+    "key": "NR",
+    "latitude": -0.522778,
+    "longitude": 166.931503,
+    "name": "Nauru"
+  },
+  {
+    "key": "NU",
+    "latitude": -19.054445,
+    "longitude": -169.867233,
+    "name": "Niue"
+  },
+  {
+    "key": "NZ",
+    "latitude": -40.900557,
+    "longitude": 174.885971,
+    "name": "New Zealand"
+  },
+  {
+    "key": "OM",
+    "latitude": 21.512583,
+    "longitude": 55.923255,
+    "name": "Oman"
+  },
+  {
+    "key": "PA",
+    "latitude": 8.537981,
+    "longitude": -80.782127,
+    "name": "Panama"
+  },
+  {
+    "key": "PE",
+    "latitude": -9.189967,
+    "longitude": -75.015152,
+    "name": "Peru"
+  },
+  {
+    "key": "PF",
+    "latitude": -17.679742,
+    "longitude": -149.406843,
+    "name": "French Polynesia"
+  },
+  {
+    "key": "PG",
+    "latitude": -6.314993,
+    "longitude": 143.95555,
+    "name": "Papua New Guinea"
+  },
+  {
+    "key": "PH",
+    "latitude": 12.879721,
+    "longitude": 121.774017,
+    "name": "Philippines"
+  },
+  {
+    "key": "PK",
+    "latitude": 30.375321,
+    "longitude": 69.345116,
+    "name": "Pakistan"
+  },
+  {
+    "key": "PL",
+    "latitude": 51.919438,
+    "longitude": 19.145136,
+    "name": "Poland"
+  },
+  {
+    "key": "PM",
+    "latitude": 46.941936,
+    "longitude": -56.27111,
+    "name": "Saint Pierre and Miquelon"
+  },
+  {
+    "key": "PN",
+    "latitude": -24.703615,
+    "longitude": -127.439308,
+    "name": "Pitcairn Islands"
+  },
+  {
+    "key": "PR",
+    "latitude": 18.220833,
+    "longitude": -66.590149,
+    "name": "Puerto Rico"
+  },
+  {
+    "key": "PS",
+    "latitude": 31.952162,
+    "longitude": 35.233154,
+    "name": "Palestinian Territories"
+  },
+  {
+    "key": "PT",
+    "latitude": 39.399872,
+    "longitude": -8.224454,
+    "name": "Portugal"
+  },
+  {
+    "key": "PW",
+    "latitude": 7.51498,
+    "longitude": 134.58252,
+    "name": "Palau"
+  },
+  {
+    "key": "PY",
+    "latitude": -23.442503,
+    "longitude": -58.443832,
+    "name": "Paraguay"
+  },
+  {
+    "key": "QA",
+    "latitude": 25.354826,
+    "longitude": 51.183884,
+    "name": "Qatar"
+  },
+  {
+    "key": "RE",
+    "latitude": -21.115141,
+    "longitude": 55.536384,
+    "name": "Réunion"
+  },
+  {
+    "key": "RO",
+    "latitude": 45.943161,
+    "longitude": 24.96676,
+    "name": "Romania"
+  },
+  {
+    "key": "RS",
+    "latitude": 44.016521,
+    "longitude": 21.005859,
+    "name": "Serbia"
+  },
+  {
+    "key": "RU",
+    "latitude": 61.52401,
+    "longitude": 105.318756,
+    "name": "Russia"
+  },
+  {
+    "key": "RW",
+    "latitude": -1.940278,
+    "longitude": 29.873888,
+    "name": "Rwanda"
+  },
+  {
+    "key": "SA",
+    "latitude": 23.885942,
+    "longitude": 45.079162,
+    "name": "Saudi Arabia"
+  },
+  {
+    "key": "SB",
+    "latitude": -9.64571,
+    "longitude": 160.156194,
+    "name": "Solomon Islands"
+  },
+  {
+    "key": "SC",
+    "latitude": -4.679574,
+    "longitude": 55.491977,
+    "name": "Seychelles"
+  },
+  {
+    "key": "SD",
+    "latitude": 12.862807,
+    "longitude": 30.217636,
+    "name": "Sudan"
+  },
+  {
+    "key": "SE",
+    "latitude": 60.128161,
+    "longitude": 18.643501,
+    "name": "Sweden"
+  },
+  {
+    "key": "SG",
+    "latitude": 1.352083,
+    "longitude": 103.819836,
+    "name": "Singapore"
+  },
+  {
+    "key": "SH",
+    "latitude": -24.143474,
+    "longitude": -10.030696,
+    "name": "Saint Helena"
+  },
+  {
+    "key": "SI",
+    "latitude": 46.151241,
+    "longitude": 14.995463,
+    "name": "Slovenia"
+  },
+  {
+    "key": "SJ",
+    "latitude": 77.553604,
+    "longitude": 23.670272,
+    "name": "Svalbard and Jan Mayen"
+  },
+  {
+    "key": "SK",
+    "latitude": 48.669026,
+    "longitude": 19.699024,
+    "name": "Slovakia"
+  },
+  {
+    "key": "SL",
+    "latitude": 8.460555,
+    "longitude": -11.779889,
+    "name": "Sierra Leone"
+  },
+  {
+    "key": "SM",
+    "latitude": 43.94236,
+    "longitude": 12.457777,
+    "name": "San Marino"
+  },
+  {
+    "key": "SN",
+    "latitude": 14.497401,
+    "longitude": -14.452362,
+    "name": "Senegal"
+  },
+  {
+    "key": "SO",
+    "latitude": 5.152149,
+    "longitude": 46.199616,
+    "name": "Somalia"
+  },
+  {
+    "key": "SR",
+    "latitude": 3.919305,
+    "longitude": -56.027783,
+    "name": "Suriname"
+  },
+  {
+    "key": "ST",
+    "latitude": 0.18636,
+    "longitude": 6.613081,
+    "name": "São Tomé and Príncipe"
+  },
+  {
+    "key": "SV",
+    "latitude": 13.794185,
+    "longitude": -88.89653,
+    "name": "El Salvador"
+  },
+  {
+    "key": "SX",
+    "latitude": 18.030827,
+    "longitude": -63.073633,
+    "name": "Sint Maarten"
+  },
+  {
+    "key": "SY",
+    "latitude": 34.802075,
+    "longitude": 38.996815,
+    "name": "Syria"
+  },
+  {
+    "key": "SZ",
+    "latitude": -26.522503,
+    "longitude": 31.465866,
+    "name": "Swaziland"
+  },
+  {
+    "key": "TC",
+    "latitude": 21.694025,
+    "longitude": -71.797928,
+    "name": "Turks and Caicos Islands"
+  },
+  {
+    "key": "TD",
+    "latitude": 15.454166,
+    "longitude": 18.732207,
+    "name": "Chad"
+  },
+  {
+    "key": "TF",
+    "latitude": -49.280366,
+    "longitude": 69.348557,
+    "name": "French Southern Territories"
+  },
+  {
+    "key": "TG",
+    "latitude": 8.619543,
+    "longitude": 0.824782,
+    "name": "Togo"
+  },
+  {
+    "key": "TH",
+    "latitude": 15.870032,
+    "longitude": 100.992541,
+    "name": "Thailand"
+  },
+  {
+    "key": "TJ",
+    "latitude": 38.861034,
+    "longitude": 71.276093,
+    "name": "Tajikistan"
+  },
+  {
+    "key": "TK",
+    "latitude": -8.967363,
+    "longitude": -171.855881,
+    "name": "Tokelau"
+  },
+  {
+    "key": "TL",
+    "latitude": -8.874217,
+    "longitude": 125.727539,
+    "name": "Timor-Leste"
+  },
+  {
+    "key": "TM",
+    "latitude": 38.969719,
+    "longitude": 59.556278,
+    "name": "Turkmenistan"
+  },
+  {
+    "key": "TN",
+    "latitude": 33.886917,
+    "longitude": 9.537499,
+    "name": "Tunisia"
+  },
+  {
+    "key": "TO",
+    "latitude": -21.178986,
+    "longitude": -175.198242,
+    "name": "Tonga"
+  },
+  {
+    "key": "TR",
+    "latitude": 38.963745,
+    "longitude": 35.243322,
+    "name": "Turkey"
+  },
+  {
+    "key": "TT",
+    "latitude": 10.691803,
+    "longitude": -61.222503,
+    "name": "Trinidad and Tobago"
+  },
+  {
+    "key": "TV",
+    "latitude": -7.109535,
+    "longitude": 177.64933,
+    "name": "Tuvalu"
+  },
+  {
+    "key": "TW",
+    "latitude": 23.69781,
+    "longitude": 120.960515,
+    "name": "Taiwan"
+  },
+  {
+    "key": "TZ",
+    "latitude": -6.369028,
+    "longitude": 34.888822,
+    "name": "Tanzania"
+  },
+  {
+    "key": "UA",
+    "latitude": 48.379433,
+    "longitude": 31.16558,
+    "name": "Ukraine"
+  },
+  {
+    "key": "UG",
+    "latitude": 1.373333,
+    "longitude": 32.290275,
+    "name": "Uganda"
+  },
+  {
+    "key": "UM",
+    "latitude": 0,
+    "longitude": 0,
+    "name": "U.S. Minor Outlying Islands"
+  },
+  {
+    "keys": ["US", "USA"],
+    "latitude": 37.09024,
+    "longitude": -95.712891,
+    "name": "United States"
+  },
+  {
+    "key": "UY",
+    "latitude": -32.522779,
+    "longitude": -55.765835,
+    "name": "Uruguay"
+  },
+  {
+    "key": "UZ",
+    "latitude": 41.377491,
+    "longitude": 64.585262,
+    "name": "Uzbekistan"
+  },
+  {
+    "key": "VA",
+    "latitude": 41.902916,
+    "longitude": 12.453389,
+    "name": "Vatican City"
+  },
+  {
+    "key": "VC",
+    "latitude": 12.984305,
+    "longitude": -61.287228,
+    "name": "Saint Vincent and the Grenadines"
+  },
+  {
+    "key": "VE",
+    "latitude": 6.42375,
+    "longitude": -66.58973,
+    "name": "Venezuela"
+  },
+  {
+    "key": "VG",
+    "latitude": 18.420695,
+    "longitude": -64.639968,
+    "name": "British Virgin Islands"
+  },
+  {
+    "key": "VI",
+    "latitude": 18.335765,
+    "longitude": -64.896335,
+    "name": "U.S. Virgin Islands"
+  },
+  {
+    "key": "VN",
+    "latitude": 14.058324,
+    "longitude": 108.277199,
+    "name": "Vietnam"
+  },
+  {
+    "key": "VU",
+    "latitude": -15.376706,
+    "longitude": 166.959158,
+    "name": "Vanuatu"
+  },
+  {
+    "key": "WF",
+    "latitude": -13.768752,
+    "longitude": -177.156097,
+    "name": "Wallis and Futuna"
+  },
+  {
+    "key": "WS",
+    "latitude": -13.759029,
+    "longitude": -172.104629,
+    "name": "Samoa"
+  },
+  {
+    "key": "XK",
+    "latitude": 42.602636,
+    "longitude": 20.902977,
+    "name": "Kosovo"
+  },
+  {
+    "key": "YE",
+    "latitude": 15.552727,
+    "longitude": 48.516388,
+    "name": "Yemen"
+  },
+  {
+    "key": "YT",
+    "latitude": -12.8275,
+    "longitude": 45.166244,
+    "name": "Mayotte"
+  },
+  {
+    "key": "ZA",
+    "latitude": -30.559482,
+    "longitude": 22.937506,
+    "name": "South Africa"
+  },
+  {
+    "key": "ZM",
+    "latitude": -13.133897,
+    "longitude": 27.849332,
+    "name": "Zambia"
+  },
+  {
+    "key": "ZW",
+    "latitude": -19.015438,
+    "longitude": 29.154857,
+    "name": "Zimbabwe"
+  }
+]
diff --git a/public/gazetteer/usa-states.json b/public/gazetteer/usa-states.json
new file mode 100644
index 00000000000..0d03650569e
--- /dev/null
+++ b/public/gazetteer/usa-states.json
@@ -0,0 +1,332 @@
+[
+  {
+    "key": "AK",
+    "latitude": 61.385,
+    "longitude": -152.2683,
+    "name": "Alaska"
+  },
+  {
+    "key": "AL",
+    "latitude": 32.799,
+    "longitude": -86.8073,
+    "name": "Alabama"
+  },
+  {
+    "key": "AR",
+    "latitude": 34.9513,
+    "longitude": -92.3809,
+    "name": "Arkansas"
+  },
+  {
+    "key": "AS",
+    "latitude": 14.2417,
+    "longitude": -170.7197,
+    "name": "American Samoa"
+  },
+  {
+    "key": "AZ",
+    "latitude": 33.7712,
+    "longitude": -111.3877,
+    "name": "Arizona"
+  },
+  {
+    "key": "CA",
+    "latitude": 36.17,
+    "longitude": -119.7462,
+    "name": "California"
+  },
+  {
+    "key": "CO",
+    "latitude": 39.0646,
+    "longitude": -105.3272,
+    "name": "Colorado"
+  },
+  {
+    "key": "CT",
+    "latitude": 41.5834,
+    "longitude": -72.7622,
+    "name": "Connecticut"
+  },
+  {
+    "key": "DC",
+    "latitude": 38.8964,
+    "longitude": -77.0262,
+    "name": "Washington DC"
+  },
+  {
+    "key": "DE",
+    "latitude": 39.3498,
+    "longitude": -75.5148,
+    "name": "Delaware"
+  },
+  {
+    "key": "FL",
+    "latitude": 27.8333,
+    "longitude": -81.717,
+    "name": "Florida"
+  },
+  {
+    "key": "GA",
+    "latitude": 32.9866,
+    "longitude": -83.6487,
+    "name": "Georgia"
+  },
+  {
+    "key": "HI",
+    "latitude": 21.1098,
+    "longitude": -157.5311,
+    "name": "Hawaii"
+  },
+  {
+    "key": "IA",
+    "latitude": 42.0046,
+    "longitude": -93.214,
+    "name": "Iowa"
+  },
+  {
+    "key": "ID",
+    "latitude": 44.2394,
+    "longitude": -114.5103,
+    "name": "Idaho"
+  },
+  {
+    "key": "IL",
+    "latitude": 40.3363,
+    "longitude": -89.0022,
+    "name": "Illinois"
+  },
+  {
+    "key": "IN",
+    "latitude": 39.8647,
+    "longitude": -86.2604,
+    "name": "Indiana"
+  },
+  {
+    "key": "KS",
+    "latitude": 38.5111,
+    "longitude": -96.8005,
+    "name": "Kansas"
+  },
+  {
+    "key": "KY",
+    "latitude": 37.669,
+    "longitude": -84.6514,
+    "name": "Kentucky"
+  },
+  {
+    "key": "LA",
+    "latitude": 31.1801,
+    "longitude": -91.8749,
+    "name": "Louisiana"
+  },
+  {
+    "key": "MA",
+    "latitude": 42.2373,
+    "longitude": -71.5314,
+    "name": "Massachusetts"
+  },
+  {
+    "key": "MD",
+    "latitude": 39.0724,
+    "longitude": -76.7902,
+    "name": "Maryland"
+  },
+  {
+    "key": "ME",
+    "latitude": 44.6074,
+    "longitude": -69.3977,
+    "name": "Maine"
+  },
+  {
+    "key": "MI",
+    "latitude": 43.3504,
+    "longitude": -84.5603,
+    "name": "Michigan"
+  },
+  {
+    "key": "MN",
+    "latitude": 45.7326,
+    "longitude": -93.9196,
+    "name": "Minnesota"
+  },
+  {
+    "key": "MO",
+    "latitude": 38.4623,
+    "longitude": -92.302,
+    "name": "Missouri"
+  },
+  {
+    "key": "MP",
+    "latitude": 14.8058,
+    "longitude": 145.5505,
+    "name": "Northern Mariana Islands"
+  },
+  {
+    "key": "MS",
+    "latitude": 32.7673,
+    "longitude": -89.6812,
+    "name": "Mississippi"
+  },
+  {
+    "key": "MT",
+    "latitude": 46.9048,
+    "longitude": -110.3261,
+    "name": "Montana"
+  },
+  {
+    "key": "NC",
+    "latitude": 35.6411,
+    "longitude": -79.8431,
+    "name": "North Carolina"
+  },
+  {
+    "key": "ND",
+    "latitude": 47.5362,
+    "longitude": -99.793,
+    "name": "North Dakota"
+  },
+  {
+    "key": "NE",
+    "latitude": 41.1289,
+    "longitude": -98.2883,
+    "name": "Nebraska"
+  },
+  {
+    "key": "NH",
+    "latitude": 43.4108,
+    "longitude": -71.5653,
+    "name": "New Hampshire"
+  },
+  {
+    "key": "NJ",
+    "latitude": 40.314,
+    "longitude": -74.5089,
+    "name": "New Jersey"
+  },
+  {
+    "key": "NM",
+    "latitude": 34.8375,
+    "longitude": -106.2371,
+    "name": "New Mexico"
+  },
+  {
+    "key": "NV",
+    "latitude": 38.4199,
+    "longitude": -117.1219,
+    "name": "Nevada"
+  },
+  {
+    "key": "NY",
+    "latitude": 42.1497,
+    "longitude": -74.9384,
+    "name": "New York"
+  },
+  {
+    "key": "OH",
+    "latitude": 40.3736,
+    "longitude": -82.7755,
+    "name": "Ohio"
+  },
+  {
+    "key": "OK",
+    "latitude": 35.5376,
+    "longitude": -96.9247,
+    "name": "Oklahoma"
+  },
+  {
+    "key": "OR",
+    "latitude": 44.5672,
+    "longitude": -122.1269,
+    "name": "Oregon"
+  },
+  {
+    "key": "PA",
+    "latitude": 40.5773,
+    "longitude": -77.264,
+    "name": "Pennsylvania"
+  },
+  {
+    "key": "PR",
+    "latitude": 18.2766,
+    "longitude": -66.335,
+    "name": "Puerto Rico"
+  },
+  {
+    "key": "RI",
+    "latitude": 41.6772,
+    "longitude": -71.5101,
+    "name": "Rhode Island"
+  },
+  {
+    "key": "SC",
+    "latitude": 33.8191,
+    "longitude": -80.9066,
+    "name": "South Carolina"
+  },
+  {
+    "key": "SD",
+    "latitude": 44.2853,
+    "longitude": -99.4632,
+    "name": "South Dakota"
+  },
+  {
+    "key": "TN",
+    "latitude": 35.7449,
+    "longitude": -86.7489,
+    "name": "Tennessee"
+  },
+  {
+    "key": "TX",
+    "latitude": 31.106,
+    "longitude": -97.6475,
+    "name": "Texas"
+  },
+  {
+    "key": "UT",
+    "latitude": 40.1135,
+    "longitude": -111.8535,
+    "name": "Utah"
+  },
+  {
+    "key": "VA",
+    "latitude": 37.768,
+    "longitude": -78.2057,
+    "name": "Virginia"
+  },
+  {
+    "key": "VI",
+    "latitude": 18.0001,
+    "longitude": -64.8199,
+    "name": "U.S. Virgin Islands"
+  },
+  {
+    "key": "VT",
+    "latitude": 44.0407,
+    "longitude": -72.7093,
+    "name": "Vermont"
+  },
+  {
+    "key": "WA",
+    "latitude": 47.3917,
+    "longitude": -121.5708,
+    "name": "Washington"
+  },
+  {
+    "key": "WI",
+    "latitude": 44.2563,
+    "longitude": -89.6385,
+    "name": "Wisconsin"
+  },
+  {
+    "key": "WV",
+    "latitude": 38.468,
+    "longitude": -80.9696,
+    "name": "West Virginia"
+  },
+  {
+    "key": "WY",
+    "latitude": 42.7475,
+    "longitude": -107.2085,
+    "name": "Wyoming"
+  }
+]
diff --git a/tsconfig.json b/tsconfig.json
index fc876b4b468..e9e82570335 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,7 +11,8 @@
     "rootDirs": ["public/"],
     "typeRoots": ["node_modules/@types", "public/app/types"],
     "allowJs": true,
-    "strictNullChecks": true
+    "strictNullChecks": true,
+    "resolveJsonModule": true
   },
   "extends": "@grafana/tsconfig/base.json",
   "include": [