Merge pull request #357 from Bayer-Group/Raster-pixel-identification

Identify pixel value on click
Bayer-Group · Nov 16, 2021 · 415ffdd · 415ffdd
2 parents e7d1421 + 4e31252
commit 415ffdd
Show file tree

Hide file tree

Showing 195 changed files with 617 additions and 350 deletions.
diff --git a/docs/BasemapBingMaps.html b/docs/BasemapBingMaps.html
diff --git a/docs/BasemapBlankWhite.html b/docs/BasemapBlankWhite.html
diff --git a/docs/BasemapContainer.html b/docs/BasemapContainer.html
diff --git a/docs/BasemapManager.html b/docs/BasemapManager.html
diff --git a/docs/BasemapOpenStreetMap.html b/docs/BasemapOpenStreetMap.html
diff --git a/docs/BasemapStamenTerrain.html b/docs/BasemapStamenTerrain.html
diff --git a/docs/BasemapStamenTonerDark.html b/docs/BasemapStamenTonerDark.html
diff --git a/docs/BasemapStamenTonerLite.html b/docs/BasemapStamenTonerLite.html
diff --git a/docs/Basemaps_BasemapContainer.js.html b/docs/Basemaps_BasemapContainer.js.html
diff --git a/docs/Basemaps_BasemapManager.js.html b/docs/Basemaps_BasemapManager.js.html
diff --git a/docs/Basemaps_BingMaps.js.html b/docs/Basemaps_BingMaps.js.html
diff --git a/docs/Basemaps_BlankWhite.js.html b/docs/Basemaps_BlankWhite.js.html
diff --git a/docs/Basemaps_OpenStreetMap.js.html b/docs/Basemaps_OpenStreetMap.js.html
diff --git a/docs/Basemaps_StamenTerrain.js.html b/docs/Basemaps_StamenTerrain.js.html
diff --git a/docs/Basemaps_StamenTonerDark.js.html b/docs/Basemaps_StamenTonerDark.js.html
diff --git a/docs/Basemaps_StamenTonerLite.js.html b/docs/Basemaps_StamenTonerLite.js.html
diff --git a/docs/Basemaps_utils.js.html b/docs/Basemaps_utils.js.html
diff --git a/docs/Compass.html b/docs/Compass.html
diff --git a/docs/ContextMenu.html b/docs/ContextMenu.html
diff --git a/docs/ContextMenuCoords.html b/docs/ContextMenuCoords.html
diff --git a/docs/ContextMenuListItem.html b/docs/ContextMenuListItem.html
diff --git a/docs/ContextMenu_ContextMenu.js.html b/docs/ContextMenu_ContextMenu.js.html
diff --git a/docs/ContextMenu_ContextMenuCoords.js.html b/docs/ContextMenu_ContextMenuCoords.js.html
diff --git a/docs/ContextMenu_ContextMenuListItem.js.html b/docs/ContextMenu_ContextMenuListItem.js.html
diff --git a/docs/ControlGroup.html b/docs/ControlGroup.html
diff --git a/docs/ControlGroupButton.html b/docs/ControlGroupButton.html
diff --git a/docs/Controls.html b/docs/Controls.html
diff --git a/docs/Controls_Compass.js.html b/docs/Controls_Compass.js.html
diff --git a/docs/Controls_ControlGroup.js.html b/docs/Controls_ControlGroup.js.html
diff --git a/docs/Controls_ControlGroupButton.js.html b/docs/Controls_ControlGroupButton.js.html
diff --git a/docs/Controls_Controls.js.html b/docs/Controls_Controls.js.html
diff --git a/docs/Controls_CurrentLocation.js.html b/docs/Controls_CurrentLocation.js.html
diff --git a/docs/Controls_ScaleLine.js.html b/docs/Controls_ScaleLine.js.html
diff --git a/docs/Controls_ZoomControls.js.html b/docs/Controls_ZoomControls.js.html
diff --git a/docs/Controls_ZoomIn.js.html b/docs/Controls_ZoomIn.js.html
diff --git a/docs/Controls_ZoomOut.js.html b/docs/Controls_ZoomOut.js.html
diff --git a/docs/CurrentLocation.html b/docs/CurrentLocation.html
diff --git a/docs/DataLayers_utils.js.html b/docs/DataLayers_utils.js.html
diff --git a/docs/Draw.html b/docs/Draw.html
diff --git a/docs/DrawBox.html b/docs/DrawBox.html
diff --git a/docs/DrawCircle.html b/docs/DrawCircle.html
diff --git a/docs/DrawContainer.html b/docs/DrawContainer.html
diff --git a/docs/DrawFreehand.html b/docs/DrawFreehand.html
diff --git a/docs/DrawLine.html b/docs/DrawLine.html
diff --git a/docs/DrawPin.html b/docs/DrawPin.html
diff --git a/docs/DrawPoint.html b/docs/DrawPoint.html
diff --git a/docs/DrawPolygon.html b/docs/DrawPolygon.html
diff --git a/docs/Draw_Box.js.html b/docs/Draw_Box.js.html
diff --git a/docs/Draw_Circle.js.html b/docs/Draw_Circle.js.html
diff --git a/docs/Draw_Draw.js.html b/docs/Draw_Draw.js.html
diff --git a/docs/Draw_DrawContainer.js.html b/docs/Draw_DrawContainer.js.html
diff --git a/docs/Draw_Freehand.js.html b/docs/Draw_Freehand.js.html
diff --git a/docs/Draw_Line.js.html b/docs/Draw_Line.js.html
diff --git a/docs/Draw_Pin.js.html b/docs/Draw_Pin.js.html
diff --git a/docs/Draw_Point.js.html b/docs/Draw_Point.js.html
diff --git a/docs/Draw_Polygon.js.html b/docs/Draw_Polygon.js.html
diff --git a/docs/Draw_utils.js.html b/docs/Draw_utils.js.html
diff --git a/docs/FeatureEditor.html b/docs/FeatureEditor.html
diff --git a/docs/FeatureEditor_FeatureEditor.js.html b/docs/FeatureEditor_FeatureEditor.js.html
diff --git a/docs/FeatureEditor_styles.js.html b/docs/FeatureEditor_styles.js.html
diff --git a/docs/GoogleDirections.html b/docs/GoogleDirections.html
diff --git a/docs/GoogleDirections_GoogleDirections.js.html b/docs/GoogleDirections_GoogleDirections.js.html
diff --git a/docs/GooglePlacesSearch.html b/docs/GooglePlacesSearch.html
diff --git a/docs/GooglePlacesSearch_GooglePlacesSearch.js.html b/docs/GooglePlacesSearch_GooglePlacesSearch.js.html
diff --git a/docs/HeatmapControls.html b/docs/HeatmapControls.html
diff --git a/docs/Heatmap_HeatmapControls.js.html b/docs/Heatmap_HeatmapControls.js.html
diff --git a/docs/ImageExif_ImageExif.js.html b/docs/ImageExif_ImageExif.js.html
diff --git a/docs/LayerPanel.html b/docs/LayerPanel.html
diff --git a/docs/LayerPanelActionDuplicate.html b/docs/LayerPanelActionDuplicate.html
diff --git a/docs/LayerPanelActionExport.html b/docs/LayerPanelActionExport.html
diff --git a/docs/LayerPanelActionExtent.html b/docs/LayerPanelActionExtent.html
diff --git a/docs/LayerPanelActionHeatmap.html b/docs/LayerPanelActionHeatmap.html
diff --git a/docs/LayerPanelActionImport.html b/docs/LayerPanelActionImport.html
diff --git a/docs/LayerPanelActionMerge.html b/docs/LayerPanelActionMerge.html
diff --git a/docs/LayerPanelActionMergeFeatures.html b/docs/LayerPanelActionMergeFeatures.html
diff --git a/docs/LayerPanelActionOpacity.html b/docs/LayerPanelActionOpacity.html
diff --git a/docs/LayerPanelActionRemove.html b/docs/LayerPanelActionRemove.html
diff --git a/docs/LayerPanelActions.html b/docs/LayerPanelActions.html
diff --git a/docs/LayerPanelBase.html b/docs/LayerPanelBase.html
diff --git a/docs/LayerPanelCheckbox.html b/docs/LayerPanelCheckbox.html
diff --git a/docs/LayerPanelContent.html b/docs/LayerPanelContent.html
diff --git a/docs/LayerPanelHeader.html b/docs/LayerPanelHeader.html
diff --git a/docs/LayerPanelLayersPage.html b/docs/LayerPanelLayersPage.html
diff --git a/docs/LayerPanelList.html b/docs/LayerPanelList.html
diff --git a/docs/LayerPanelListItem.html b/docs/LayerPanelListItem.html
diff --git a/docs/LayerPanelMenu.html b/docs/LayerPanelMenu.html
diff --git a/docs/LayerPanelPage.html b/docs/LayerPanelPage.html
diff --git a/docs/LayerPanel_LayerPanel.js.html b/docs/LayerPanel_LayerPanel.js.html
diff --git a/docs/LayerPanel_LayerPanelActionDuplicate_index.js.html b/docs/LayerPanel_LayerPanelActionDuplicate_index.js.html
diff --git a/docs/LayerPanel_LayerPanelActionExport_index.js.html b/docs/LayerPanel_LayerPanelActionExport_index.js.html
diff --git a/docs/LayerPanel_LayerPanelActionExport_utils.js.html b/docs/LayerPanel_LayerPanelActionExport_utils.js.html
diff --git a/docs/LayerPanel_LayerPanelActionExtent_index.js.html b/docs/LayerPanel_LayerPanelActionExtent_index.js.html
diff --git a/docs/LayerPanel_LayerPanelActionHeatmap_index.js.html b/docs/LayerPanel_LayerPanelActionHeatmap_index.js.html
diff --git a/docs/LayerPanel_LayerPanelActionHeatmap_utils.js.html b/docs/LayerPanel_LayerPanelActionHeatmap_utils.js.html
diff --git a/docs/LayerPanel_LayerPanelActionImport_index.js.html b/docs/LayerPanel_LayerPanelActionImport_index.js.html
diff --git a/docs/LayerPanel_LayerPanelActionImport_utils.js.html b/docs/LayerPanel_LayerPanelActionImport_utils.js.html
diff --git a/docs/LayerPanel_LayerPanelActionMergeFeatures_index.js.html b/docs/LayerPanel_LayerPanelActionMergeFeatures_index.js.html
diff --git a/docs/LayerPanel_LayerPanelActionMergeFeatures_utils.js.html b/docs/LayerPanel_LayerPanelActionMergeFeatures_utils.js.html
diff --git a/docs/LayerPanel_LayerPanelActionMerge_index.js.html b/docs/LayerPanel_LayerPanelActionMerge_index.js.html
diff --git a/docs/LayerPanel_LayerPanelActionMerge_utils.js.html b/docs/LayerPanel_LayerPanelActionMerge_utils.js.html
diff --git a/docs/LayerPanel_LayerPanelActionOpacity_index.js.html b/docs/LayerPanel_LayerPanelActionOpacity_index.js.html
diff --git a/docs/LayerPanel_LayerPanelActionRemove_index.js.html b/docs/LayerPanel_LayerPanelActionRemove_index.js.html
diff --git a/docs/LayerPanel_LayerPanelActions_index.js.html b/docs/LayerPanel_LayerPanelActions_index.js.html
diff --git a/docs/LayerPanel_LayerPanelBase_index.js.html b/docs/LayerPanel_LayerPanelBase_index.js.html
diff --git a/docs/LayerPanel_LayerPanelCheckbox_index.js.html b/docs/LayerPanel_LayerPanelCheckbox_index.js.html
diff --git a/docs/LayerPanel_LayerPanelContent_index.js.html b/docs/LayerPanel_LayerPanelContent_index.js.html
diff --git a/docs/LayerPanel_LayerPanelHeader_index.js.html b/docs/LayerPanel_LayerPanelHeader_index.js.html
diff --git a/docs/LayerPanel_LayerPanelLayersPage_index.js.html b/docs/LayerPanel_LayerPanelLayersPage_index.js.html
diff --git a/docs/LayerPanel_LayerPanelListItem_index.js.html b/docs/LayerPanel_LayerPanelListItem_index.js.html
diff --git a/docs/LayerPanel_LayerPanelList_index.js.html b/docs/LayerPanel_LayerPanelList_index.js.html
diff --git a/docs/LayerPanel_LayerPanelMenu_index.js.html b/docs/LayerPanel_LayerPanelMenu_index.js.html
diff --git a/docs/LayerPanel_LayerPanelPage_index.js.html b/docs/LayerPanel_LayerPanelPage_index.js.html
diff --git a/docs/LayerStyler.html b/docs/LayerStyler.html
diff --git a/docs/LayerStyler_LayerStyler.js.html b/docs/LayerStyler_LayerStyler.js.html
diff --git a/docs/LayerStyler_StyleManager_index.js.html b/docs/LayerStyler_StyleManager_index.js.html
diff --git a/docs/LayerStyler__AttributesFilter_index.js.html b/docs/LayerStyler__AttributesFilter_index.js.html
diff --git a/docs/LayerStyler__ColorPicker_index.js.html b/docs/LayerStyler__ColorPicker_index.js.html
diff --git a/docs/LayerStyler__LabelStyler_index.js.html b/docs/LayerStyler__LabelStyler_index.js.html
diff --git a/docs/LayerStyler__LayerStyler__StyleGroup__GenericSymbolizer_index.js.html b/docs/LayerStyler__LayerStyler__StyleGroup__GenericSymbolizer_index.js.html
diff --git a/docs/LayerStyler__LayerStyler__StyleGroup_index.js.html b/docs/LayerStyler__LayerStyler__StyleGroup_index.js.html
diff --git a/docs/LayerStyler__LayerStyler_index.js.html b/docs/LayerStyler__LayerStyler_index.js.html
diff --git a/docs/LayerStyler__Popover_index.js.html b/docs/LayerStyler__Popover_index.js.html
diff --git a/docs/LayerStyler__SelectTabs_index.js.html b/docs/LayerStyler__SelectTabs_index.js.html
diff --git a/docs/LayerStyler__Selector_index.js.html b/docs/LayerStyler__Selector_index.js.html
diff --git a/docs/Map.html b/docs/Map.html
diff --git a/docs/Map_Map.js.html b/docs/Map_Map.js.html
diff --git a/docs/Map_utils.js.html b/docs/Map_utils.js.html
diff --git a/docs/Measure_utils.js.html b/docs/Measure_utils.js.html
diff --git a/docs/MultiMapManager.html b/docs/MultiMapManager.html
diff --git a/docs/MultiMapManager_MultiMapManager.js.html b/docs/MultiMapManager_MultiMapManager.js.html
diff --git a/docs/MultiMapManager_SafeParent.js.html b/docs/MultiMapManager_SafeParent.js.html
diff --git a/docs/MultiMapManager_utils.js.html b/docs/MultiMapManager_utils.js.html
diff --git a/docs/Pdf_utils.js.html b/docs/Pdf_utils.js.html
diff --git a/docs/Popup.html b/docs/Popup.html
diff --git a/docs/PopupActionCopyWkt.html b/docs/PopupActionCopyWkt.html
diff --git a/docs/PopupActionGoogleMaps.html b/docs/PopupActionGoogleMaps.html
diff --git a/docs/PopupActionGroup.html b/docs/PopupActionGroup.html
diff --git a/docs/PopupActionItem.html b/docs/PopupActionItem.html
diff --git a/docs/PopupActionLink.html b/docs/PopupActionLink.html
diff --git a/docs/PopupBase.html b/docs/PopupBase.html
diff --git a/docs/PopupDataList.html b/docs/PopupDataList.html
diff --git a/docs/PopupDefaultInsert.html b/docs/PopupDefaultInsert.html
diff --git a/docs/PopupDefaultPage.html b/docs/PopupDefaultPage.html
diff --git a/docs/PopupPageLayout.html b/docs/PopupPageLayout.html
diff --git a/docs/PopupPageLayoutChild.html b/docs/PopupPageLayoutChild.html
diff --git a/docs/PopupTabs.html b/docs/PopupTabs.html
diff --git a/docs/Popup_Popup.js.html b/docs/Popup_Popup.js.html
diff --git a/docs/Popup_PopupActions_PopupActionCopyWkt_PopupActionCopyWkt.js.html b/docs/Popup_PopupActions_PopupActionCopyWkt_PopupActionCopyWkt.js.html
diff --git a/docs/Popup_PopupActions_PopupActionCopyWkt_utils.js.html b/docs/Popup_PopupActions_PopupActionCopyWkt_utils.js.html
diff --git a/docs/Popup_PopupActions_PopupActionCut_PopupActionCut.js.html b/docs/Popup_PopupActions_PopupActionCut_PopupActionCut.js.html
diff --git a/docs/Popup_PopupActions_PopupActionDuplicate_PopupActionDuplicate.js.html b/docs/Popup_PopupActions_PopupActionDuplicate_PopupActionDuplicate.js.html
diff --git a/docs/Popup_PopupActions_PopupActionGoogleMaps_PopupActionGoogleMaps.js.html b/docs/Popup_PopupActions_PopupActionGoogleMaps_PopupActionGoogleMaps.js.html
diff --git a/docs/Popup_PopupActions_PopupActionRemove_PopupActionRemove.js.html b/docs/Popup_PopupActions_PopupActionRemove_PopupActionRemove.js.html
diff --git a/docs/Popup_PopupActions_PopupActionZoomToExtent_PopupActionZoomToExtent.js.html b/docs/Popup_PopupActions_PopupActionZoomToExtent_PopupActionZoomToExtent.js.html
diff --git a/docs/Popup_PopupBase.js.html b/docs/Popup_PopupBase.js.html
diff --git a/docs/Popup_PopupInsert_PopupActionGroup_index.js.html b/docs/Popup_PopupInsert_PopupActionGroup_index.js.html
diff --git a/docs/Popup_PopupInsert_PopupActionItem_index.js.html b/docs/Popup_PopupInsert_PopupActionItem_index.js.html
diff --git a/docs/Popup_PopupInsert_PopupActionLink_index.js.html b/docs/Popup_PopupInsert_PopupActionLink_index.js.html
diff --git a/docs/Popup_PopupInsert_PopupDataList_index.js.html b/docs/Popup_PopupInsert_PopupDataList_index.js.html
diff --git a/docs/Popup_PopupInsert_PopupDefaultInsert.js.html b/docs/Popup_PopupInsert_PopupDefaultInsert.js.html
diff --git a/docs/Popup_PopupInsert_PopupDefaultPage_index.js.html b/docs/Popup_PopupInsert_PopupDefaultPage_index.js.html
diff --git a/docs/Popup_PopupInsert_PopupPageLayoutChild_index.js.html b/docs/Popup_PopupInsert_PopupPageLayoutChild_index.js.html
diff --git a/docs/Popup_PopupInsert_PopupPageLayout_index.js.html b/docs/Popup_PopupInsert_PopupPageLayout_index.js.html
diff --git a/docs/Popup_PopupInsert_PopupTabs_index.js.html b/docs/Popup_PopupInsert_PopupTabs_index.js.html
diff --git a/docs/Popup_PopupInsert__LoadingSpinner_index.js.html b/docs/Popup_PopupInsert__LoadingSpinner_index.js.html
diff --git a/docs/Popup_utils.js.html b/docs/Popup_utils.js.html
diff --git a/docs/ProjectMenu.html b/docs/ProjectMenu.html
diff --git a/docs/Project_Project.js.html b/docs/Project_Project.js.html
diff --git a/docs/Project_utils.js.html b/docs/Project_utils.js.html
diff --git a/docs/Provider.html b/docs/Provider.html
diff --git a/docs/Provider_Provider.js.html b/docs/Provider_Provider.js.html
diff --git a/docs/Provider_utils.js.html b/docs/Provider_utils.js.html
diff --git a/docs/TabbedPanel.html b/docs/TabbedPanel.html
diff --git a/docs/TabbedPanel_TabbedPanel.js.html b/docs/TabbedPanel_TabbedPanel.js.html
diff --git a/docs/TimeSlider.html b/docs/TimeSlider.html
diff --git a/docs/TimeSliderBase.html b/docs/TimeSliderBase.html
diff --git a/docs/TimeSlider_TimeSlider.js.html b/docs/TimeSlider_TimeSlider.js.html
diff --git a/docs/TimeSlider_TimeSliderBase.js.html b/docs/TimeSlider_TimeSliderBase.js.html
diff --git a/docs/Toolbar_Toolbar.js.html b/docs/Toolbar_Toolbar.js.html
diff --git a/docs/ZoomControls.html b/docs/ZoomControls.html
diff --git a/docs/ZoomIn.html b/docs/ZoomIn.html
diff --git a/docs/ZoomOut.html b/docs/ZoomOut.html
diff --git a/docs/classes_VectorLayer.js.html b/docs/classes_VectorLayer.js.html
diff --git a/docs/classes_VectorTileLayer.js.html b/docs/classes_VectorTileLayer.js.html
diff --git a/docs/docs.html b/docs/docs.html
diff --git a/docs/global.html b/docs/global.html
diff --git a/docs/tutorial-Getting Started.html b/docs/tutorial-Getting Started.html
diff --git a/docs/tutorial-LayerPanel_.html b/docs/tutorial-LayerPanel_.html
diff --git a/docs/tutorial-Popup_.html b/docs/tutorial-Popup_.html
diff --git a/docs/tutorial-TimeSlider_.html b/docs/tutorial-TimeSlider_.html
diff --git a/docs/tutorial-connectToContext.html b/docs/tutorial-connectToContext.html
diff --git a/docs/tutorial-contextProps.html b/docs/tutorial-contextProps.html
diff --git a/docs/tutorial-i18n Support.html b/docs/tutorial-i18n Support.html
diff --git a/src/Popup/utils.js b/src/Popup/utils.js
@@ -7,9 +7,42 @@ import GeoJSON from 'ol/format/GeoJSON'
 import olLayerVector from 'ol/layer/Vector'
 import olVectorTile from 'ol/layer/VectorTile'
 import olSourceCluster from 'ol/source/Cluster'
+import olFeature from 'ol/Feature'
+import olGeomPoint from 'ol/geom/Point'
 import debounce from 'lodash.debounce'
 import ugh from 'ugh'
 
+/**
+ * Creates a new feature with point geometry at the location of the pixel and attributes describing the pixel's value
+ * @function
+ * @category Popup
+ * @since 1.17.0
+ * @param {ol.Layer} layer - The openlayers layer
+ * @param {Object} event - An object with a `map` and `pixel` property
+ * @returns {ol.Feature} An openlayers feature with point geometry at the location of the pixel and attributes describing the pixel's value
+ */
+export const getPixelValue = (layer, event) => {
+  const { map, pixel } = event
+  const clickCoordinate = map.getCoordinateFromPixel(pixel)
+
+  let renderedLayer = layer
+
+  if (layer.isGeoserverLayer) renderedLayer = layer.getWMSLayer()
+
+  const renderContext = renderedLayer.getRenderer().context
+  const pixelImageData = renderContext.getImageData(pixel[0], pixel[1], 1, 1)
+  const [red, green, blue, alpha] = pixelImageData.data
+
+  return new olFeature({
+    geometry: new olGeomPoint(clickCoordinate),
+    title: layer.getProperties().title || 'Raster Pixel',
+    red,
+    green,
+    blue,
+    alpha
+  })
+}
+
 /**
  * Bind multiple move listeners with the same callback
  * @function
@@ -41,137 +74,138 @@ export const addMovementListener = (map, callback) => {
  * @category Popup
  * @since 0.2.0
  * @param {ol.Map} map - The openlayers map to which the events are bound
- * @param {Array} keys - remove the listeners via an array of event keys
+ * @param {Array} keys - remove the listeners via` an array of event keys
  */
 export const removeMovementListener = (keys = []) => {
   keys.forEach(({ target, type, listener }) => target.un(type, listener))
 }
 
-/**
- * Get all features for a given click event
- * @function
- * @category Popup
- * @since 0.2.0
- * @param {Object} event - An object with an `event` and `pixel` property
- * @param {ol.Map} event.map - The openlayers map where the layer exists
- * @param {Number[]} event.pixel - An array consisting of `x` and `y` pixel locations
- * @param {Object} [opts] - Object of optional params
- * @param {Number} [opts.hitTolerance = 3] - Additional area around features that is clickable to select them
- * @returns {Promise[]} An array of promises, each of which resolve to an object `{ layer, features }`
- */
-export const getLayersAndFeaturesForEvent = (event, opts = {}) => {
-  if (typeof event !== 'object') return ugh.error('getLayersAndFeaturesForEvent first arg must be an object') // eslint-disable-line
-  const { map, pixel } = event
-  const promises = []
-  const clickCoordinate = map.getCoordinateFromPixel(pixel)
+const setParentLayer = ({ features, layer }) => {
+  return new Promise(resolve => {
+    const parentLayer = layer.get('_ol_kit_parent')
+    const parent = parentLayer || layer
 
-  if (!(map instanceof olMap) || !Array.isArray(pixel)) return ugh.error('getLayersAndFeaturesForEvent requires a valid openlayers map & pixel location (as an array)') // eslint-disable-line
-
-  const setParentLayer = ({ features, layer }) => {
-    return new Promise(resolve => {
-      const parentLayer = layer.get('_ol_kit_parent')
-      const parent = parentLayer || layer
-
-      features.forEach((feature, i) => {
-        // true makes this performant with a silent trigger: https://openlayers.org/en/latest/apidoc/module-ol_Feature.html#set
-        feature.set('_ol_kit_parent', parent, true)
-
-        return feature
-      })
+    features.forEach((feature, i) => {
+      // true makes this performant with a silent trigger: https://openlayers.org/en/latest/apidoc/module-ol_Feature.html#set
+      feature.set('_ol_kit_parent', parent, true)
 
-      resolve({ features, layer })
+      return feature
     })
-  }
 
-  const wfsSelector = layer => {
-    // this logic only handles clicks on vector layer types
-    const allowedLayerType = layer.isVectorLayer || layer instanceof olLayerVector
+    resolve({ features, layer })
+  })
+}
 
-    // layer.getLayerState().managed is an undocumented ol prop that lets us ignore select's vector layer
-    if (!layer.getLayerState().managed || !allowedLayerType) return // do nothing with these layer types
+const wfsSelector = (layer, event, opts) => {
+  let features = []
+  const source = layer.getSource()
+  const { map, pixel } = event
+  const clickCoordinate = map.getCoordinateFromPixel(pixel)
+  // check for featuresAtPixel to account for hitTolerance
+  const featuresAtPixel = map.getFeaturesAtPixel(pixel, {
+    layerFilter: () => true,
+    hitTolerance: opts.hitTolerance ? opts.hitTolerance : 3,
+    checkWrapped: true
+  })
 
-    let features = []
-    const source = layer.getSource()
+  if (source instanceof olSourceCluster) {
+    // support for clustered feature clicks
+    const clusteredFeatures = source.getClosestFeatureToCoordinate(clickCoordinate).get('features')
 
-    if (source instanceof olSourceCluster) {
-      // support for clustered feature clicks
-      const clusteredFeatures = source.getClosestFeatureToCoordinate(clickCoordinate).get('features')
+    features = clusteredFeatures
+  } else {
+    const sourceFeatures = source.getFeatures()
 
-      features = clusteredFeatures
-    } else {
-      const sourceFeatures = source.getFeatures()
+    sourceFeatures.forEach(sourceFeature => {
+      // check if any feature on layer source is also at click location
+      const isAtPixel = featuresAtPixel ? featuresAtPixel.find(f => f === sourceFeature) : null
 
-      sourceFeatures.forEach(sourceFeature => {
-        // check if any feature on layer source is also at click location
-        const isAtPixel = featuresAtPixel ? featuresAtPixel.find(f => f === sourceFeature) : null
+      if (isAtPixel) features.push(sourceFeature)
+    })
+  }
 
-        if (isAtPixel) features.push(sourceFeature)
-      })
-    }
+  if (features.length) return setParentLayer({ features, layer })
+}
 
-    if (features.length) {
-      const wfsPromise = setParentLayer({ features, layer })
+const wmsSelector = (layer, event) => {
+  const { pixel, map } = event
+  const coords = map.getCoordinateFromPixel(pixel)
 
-      promises.push(wfsPromise)
-    }
-  }
-  const wmsSelector = layer => {
-    if (layer.get('_ol_kit_parent')?.isGeoserverLayer) {
-      // this logic handles clicks on GeoserverLayers
-      const geoserverLayer = layer.get('_ol_kit_parent')
-      const coords = map.getCoordinateFromPixel(pixel)
-      const wmsPromise = new Promise(async resolve => { // eslint-disable-line no-async-promise-executor
-        const rawFeatures = await geoserverLayer.fetchFeaturesAtClick(coords, map)
-        const { features } = await setParentLayer({ features: rawFeatures, layer })
-
-        resolve({ features, layer })
-      })
+  return new Promise(async resolve => { // eslint-disable-line no-async-promise-executor
+    const rawFeatures = await layer.fetchFeaturesAtClick(coords, map)
+    const { features } = await setParentLayer({ features: rawFeatures, layer })
 
-      promises.push(wmsPromise)
+    if (features.length) {
+      resolve({ features, layer })
+    } else {
+      resolve({ features: [getPixelValue(layer, event)], layer })
     }
-  }
+  })
+}
 
+const vectorTileSelector = (layer, event, opts) => {
+  const { map, pixel } = event
   // check for featuresAtPixel to account for hitTolerance
   const featuresAtPixel = map.getFeaturesAtPixel(pixel, {
     layerFilter: () => true,
     hitTolerance: opts.hitTolerance ? opts.hitTolerance : 3,
     checkWrapped: true
   })
 
-  // if there's features at click, loop through the layers to find corresponding layer & features
-  if (featuresAtPixel?.length) {
-    map.getLayers().forEach(async layer => {
-      if (layer instanceof olVectorTile) {
-        const vectorTilePromise = new Promise(async resolve => { // eslint-disable-line no-async-promise-executor
-          const vectorTileSourceFeatures = await layer.getSource()
-            .getFeaturesInExtent(map.getView().calculateExtent(map.getSize()))
-          const matchingFeaturesAtPixel = vectorTileSourceFeatures.filter(sourceFeature => {
-            const { ol_uid } = sourceFeature // eslint-disable-line camelcase
+  return new Promise(async resolve => { // eslint-disable-line no-async-promise-executor
+    const vectorTileSourceFeatures = await layer.getSource()
+      .getFeaturesInExtent(map.getView().calculateExtent(map.getSize()))
+    const matchingFeaturesAtPixel = vectorTileSourceFeatures.filter(sourceFeature => {
+      const { ol_uid } = sourceFeature // eslint-disable-line camelcase
+
+      let isFeatureAtClick = false
 
-            let isFeatureAtClick = false
+      featuresAtPixel.forEach(feat => {
+        if (feat?.ol_uid === ol_uid) isFeatureAtClick = true // eslint-disable-line camelcase
+      })
+
+      return isFeatureAtClick
+    })
 
-            featuresAtPixel.forEach(feat => {
-              if (feat?.ol_uid === ol_uid) isFeatureAtClick = true // eslint-disable-line camelcase
-            })
+    const { features } = await setParentLayer({ features: matchingFeaturesAtPixel, layer })
 
-            return isFeatureAtClick
-          })
+    resolve({ features, layer })
+  })
+}
 
-          const { features } = await setParentLayer({ features: matchingFeaturesAtPixel, layer })
+/**
+ * Get all features for a given click event
+ * @function
+ * @category Popup
+ * @since 0.2.0
+ * @param {Object} event - An object with a `map` and `pixel` property
+ * @param {ol.Map} event.map - The openlayers map where the layer exists
+ * @param {Number[]} event.pixel - An array consisting of `x` and `y` pixel locations
+ * @param {Object} [opts] - Object of optional params
+ * @param {Number} [opts.hitTolerance = 3] - Additional area around features that is clickable to select them
+ * @returns {Promise[]} An array of promises, each of which resolve to an object `{ layer, features }`
+ */
+export const getLayersAndFeaturesForEvent = (event, opts = {}) => {
+  if (typeof event !== 'object') return ugh.error('getLayersAndFeaturesForEvent first arg must be an object') // eslint-disable-line
+  const { map, pixel } = event
 
-          resolve({ features, layer })
-        })
+  if (!(map instanceof olMap) || !Array.isArray(pixel)) return ugh.error('getLayersAndFeaturesForEvent requires a valid openlayers map & pixel location (as an array)') // eslint-disable-line
 
-        promises.push(vectorTilePromise)
-      } else {
+  const promises = map.getLayers().getArray().map(layer => {
+    if (layer instanceof olVectorTile) {
+      // handle vector tile features
+      return vectorTileSelector(layer, event, opts)
+    } else if (layer.isVectorLayer || layer instanceof olLayerVector || !layer.getLayerState().managed) { // layer.getLayerState().managed is an undocumented ol prop that lets us ignore select's vector layer
       // handle non vector tile wfs layers
-        wfsSelector(layer)
-      }
-    })
-  }
-
-  // this check is for wms features
-  map.forEachLayerAtPixel(pixel, wmsSelector)
+      return wfsSelector(layer, event, opts)
+    } else if (layer.isGeoserverLayer) {
+      // handle geoserver layers
+      return wmsSelector(layer, event)
+    } else if (!layer.getProperties()._ol_kit_basemap) {
+      // get the pixel value for any other non-basemap layers
+      return { features: [getPixelValue(layer, event)] }
+    }
+  }).filter(Boolean)
 
   return promises
 }

diff --git a/src/__snapshots__/index.test.js.snap b/src/__snapshots__/index.test.js.snap
@@ -306,6 +306,7 @@ Object {
   "exportFeatures": [Function],
   "getExtentForFeatures": [Function],
   "getLayersAndFeaturesForEvent": [Function],
+  "getPixelValue": [Function],
   "getPopupPositionFromFeatures": [Function],
   "getSelectInteraction": [Function],
   "getStyledFeatures": [Function],