diff --git a/public/app/plugins/panel/geomap/layers/data/geojsonDynamic.ts b/public/app/plugins/panel/geomap/layers/data/geojsonDynamic.ts
new file mode 100644
index 00000000000..bab9ee13391
--- /dev/null
+++ b/public/app/plugins/panel/geomap/layers/data/geojsonDynamic.ts
@@ -0,0 +1,229 @@
+import {
+  MapLayerRegistryItem,
+  MapLayerOptions,
+  PanelData,
+  GrafanaTheme2,
+  PluginState,
+  EventBus,
+} from '@grafana/data';
+import OlMap from 'ol/Map';
+import VectorLayer from 'ol/layer/Vector';
+import VectorSource from 'ol/source/Vector';
+import GeoJSON from 'ol/format/GeoJSON';
+import { unByKey } from 'ol/Observable';
+import { checkFeatureMatchesStyleRule } from '../../utils/checkFeatureMatchesStyleRule';
+import { ComparisonOperation, FeatureRuleConfig, FeatureStyleConfig } from '../../types';
+import { Fill, Stroke, Style } from 'ol/style';
+import { FeatureLike } from 'ol/Feature';
+import { defaultStyleConfig, StyleConfig, StyleConfigState } from '../../style/types';
+import { getStyleConfigState } from '../../style/utils';
+import { polyStyle } from '../../style/markers';
+import { StyleEditor } from '../../editor/StyleEditor';
+import { ReplaySubject } from 'rxjs';
+import { map as rxjsmap, first } from 'rxjs/operators';
+import { getLayerPropertyInfo } from '../../utils/getFeatures';
+import { findField } from 'app/features/dimensions';
+import { getStyleDimension, getPublicGeoJSONFiles } from '../../utils/utils';
+
+export interface DynamicGeoJSONMapperConfig {
+  // URL for a geojson file
+  src?: string;
+
+  // The default style (applied if no rules match)
+  style: StyleConfig;
+
+  // Pick style based on a rule
+  rules: FeatureStyleConfig[];
+  idField?: string;
+  dataStyle: StyleConfig;
+}
+
+const defaultOptions: DynamicGeoJSONMapperConfig = {
+  src: 'public/maps/countries.geojson',
+  rules: [],
+  style: defaultStyleConfig,
+  dataStyle: {},
+};
+
+interface StyleCheckerState {
+  state: StyleConfigState;
+  poly?: Style | Style[];
+  point?: Style | Style[];
+  rule?: FeatureRuleConfig;
+}
+
+export const DEFAULT_STYLE_RULE: FeatureStyleConfig = {
+  style: defaultStyleConfig,
+  check: {
+    property: '',
+    operation: ComparisonOperation.EQ,
+    value: '',
+  },
+};
+
+export const dynamicGeoJSONLayer: MapLayerRegistryItem<DynamicGeoJSONMapperConfig> = {
+  id: 'dynamic-geojson',
+  name: 'Dynamic GeoJSON',
+  description: 'Style a geojson file based on query results',
+  isBaseMap: false,
+  state: PluginState.alpha,
+
+  /**
+   * Function that configures transformation and returns a transformer
+   * @param map
+   * @param options
+   * @param theme
+   */
+  create: async (map: OlMap, options: MapLayerOptions<DynamicGeoJSONMapperConfig>, eventBus: EventBus, theme: GrafanaTheme2) => {
+    const config = { ...defaultOptions, ...options.config };
+
+    const source = new VectorSource({
+      url: config.src,
+      format: new GeoJSON(),
+    });
+
+    const features = new ReplaySubject<FeatureLike[]>();
+
+    const key = source.on('change', () => {
+      //one geojson loads
+      if (source.getState() == 'ready') {
+        unByKey(key);
+        features.next(source.getFeatures());
+      }
+    });
+
+    const styles: StyleCheckerState[] = [];
+    if (config.rules) {
+      for (const r of config.rules) {
+        if (r.style) {
+          const s = await getStyleConfigState(r.style);
+          styles.push({
+            state: s,
+            rule: r.check,
+          });
+        }
+      }
+    }
+    if (true) {
+      const s = await getStyleConfigState(config.style);
+      styles.push({
+        state: s,
+      });
+    }
+
+    const style = await getStyleConfigState(config.style);
+    const idToIdx = new Map<string, number>();
+
+    const vectorLayer = new VectorLayer({
+      source,
+      style: (feature: FeatureLike) => {
+        const idx = idToIdx.get(feature.getId() as string);
+        const dims = style.dims;
+
+        if (idx && dims) {
+          return new Style({
+            fill: new Fill({ color: dims.color?.get(idx) }),
+            stroke: new Stroke({ color: style.base.color, width: style.base.lineWidth ?? 1 }),
+          });
+        }
+
+        const isPoint = feature.getGeometry()?.getType() === 'Point';
+
+        for (const check of styles) {
+          if (check.rule && !checkFeatureMatchesStyleRule(check.rule, feature)) {
+            continue;
+          }
+
+          // Support dynamic values
+          if (check.state.fields) {
+            const values = { ...check.state.base };
+            const { text } = check.state.fields;
+
+            if (text) {
+              values.text = `${feature.get(text)}`;
+            }
+            if (isPoint) {
+              return check.state.maker(values);
+            }
+            return polyStyle(values);
+          }
+
+          // Lazy create the style object
+          if (isPoint) {
+            if (!check.point) {
+              check.point = check.state.maker(check.state.base);
+            }
+            return check.point;
+          }
+
+          if (!check.poly) {
+            check.poly = polyStyle(check.state.base);
+          }
+          return check.poly;
+        }
+        return undefined; // unreachable
+      },
+    });
+
+    return {
+      init: () => vectorLayer,
+      update: (data: PanelData) => {
+        const frame = data.series[0];
+        if (frame) {
+          const field = findField(frame, config.idField);
+          if (field) {
+            field.values.toArray().forEach((v, i) => idToIdx.set(v, i));
+          }
+
+          style.dims = getStyleDimension(frame, style, theme, config.dataStyle);
+        }
+        vectorLayer.changed();
+      },
+      registerOptionsUI: (builder) => {
+        // get properties for first feature to use as ui options
+        const layerInfo = features.pipe(
+          first(),
+          rxjsmap((v) => getLayerPropertyInfo(v))
+        );
+
+        builder
+          .addSelect({
+            path: 'config.src',
+            name: 'GeoJSON URL',
+            settings: {
+              options: getPublicGeoJSONFiles() ?? [],
+              allowCustomValue: true,
+            },
+            defaultValue: defaultOptions.src,
+          })
+          .addFieldNamePicker({
+            path: 'config.idField',
+            name: 'ID Field',
+          })
+          .addCustomEditor({
+            id: 'config.dataStyle',
+            path: 'config.dataStyle',
+            name: 'Data style',
+            editor: StyleEditor,
+            settings: {
+              displayRotation: false,
+            },
+            defaultValue: defaultOptions.dataStyle,
+          })
+          .addCustomEditor({
+            id: 'config.style',
+            path: 'config.style',
+            name: 'Default style',
+            description: 'The style to apply when no rules above match',
+            editor: StyleEditor,
+            settings: {
+              simpleFixedValues: true,
+              layerInfo,
+            },
+            defaultValue: defaultOptions.style,
+          })
+      },
+    };
+  },
+  defaultOptions,
+};
diff --git a/public/app/plugins/panel/geomap/layers/data/index.ts b/public/app/plugins/panel/geomap/layers/data/index.ts
index 871352c3a36..e6c7a8f8273 100644
--- a/public/app/plugins/panel/geomap/layers/data/index.ts
+++ b/public/app/plugins/panel/geomap/layers/data/index.ts
@@ -4,6 +4,7 @@ import { heatmapLayer } from './heatMap';
 import { lastPointTracker } from './lastPointTracker';
 import { routeLayer } from './routeLayer';
 import { dayNightLayer } from './dayNightLayer';
+import { dynamicGeoJSONLayer } from './geojsonDynamic';
 
 /**
  * Registry for layer handlers
@@ -13,6 +14,7 @@ export const dataLayers = [
     heatmapLayer, 
     lastPointTracker, 
     geojsonLayer, 
+    dynamicGeoJSONLayer, 
     dayNightLayer, 
     routeLayer,
 ];