IM-245 Moved the patternRegistry helper methods into patternRegistry

plugins/beta/datasets/src/adapters/maplibre/layerBuilders.js

@@ -1,5 +1,5 @@
 import { getValueForStyle } from '../../../../../../src/utils/getValueForStyle.js'
-import { hasPattern, getPatternImageId } from './patternImages.js'
+import { hasPattern } from './patternImages.js'
 import { mergeSublayer } from '../../utils/mergeSublayer.js'
 import { getSourceId, getLayerIds, getSublayerLayerIds, isDynamicSource, MAX_TILE_ZOOM } from './layerIds.js'
 import { hasSymbol, getSymbolDef, getSymbolAnchor, anchorToMaplibre, getSymbolImageId } from './symbolImages.js'
@@ -36,7 +36,7 @@ export const addFillLayer = (map, config, layerId, sourceId, sourceLayer, visibi
   if (!config.fill && !hasPattern(config)) {
     return
   }
-  const patternImageId = hasPattern(config) ? getPatternImageId(config, mapStyleId, patternRegistry, pixelRatio) : null
+  const patternImageId = hasPattern(config) ? patternRegistry.getPatternImageId(config, mapStyleId, pixelRatio) : null
   const paint = patternImageId
     ? { 'fill-pattern': patternImageId, 'fill-opacity': config.opacity || 1 }
     : { 'fill-color': getValueForStyle(config.fill, mapStyleId), 'fill-opacity': config.opacity || 1 }

plugins/beta/datasets/src/adapters/maplibre/maplibreLayerAdapter.js

@@ -1,7 +1,7 @@
 import { applyExclusionFilter } from '../../utils/filters.js'
 import { getSourceId, getLayerIds, getSublayerLayerIds, getAllLayerIds } from './layerIds.js'
 import { addDatasetLayers, addSublayerLayers } from './layerBuilders.js'
-import { getPatternConfigs, hasPattern, getPatternImageId } from './patternImages.js'
+import { getPatternConfigs, hasPattern } from './patternImages.js'
 import { getSymbolConfigs, getSymbolImageId } from './symbolImages.js'
 import { mergeSublayer } from '../../utils/mergeSublayer.js'
 import { scaleFactor } from '../../../../../../src/config/appConfig.js'
@@ -135,7 +135,7 @@ export default class MaplibreLayerAdapter {
       if (hasPattern(dataset)) {
         const { fillLayerId } = getLayerIds(dataset)
         if (this._map.getLayer(fillLayerId)) {
-          const imageId = getPatternImageId(dataset, mapStyle.id, this._patternRegistry, pixelRatio)
+          const imageId = this._patternRegistry.getPatternImageId(dataset, mapStyle.id, pixelRatio)
           if (imageId) {
             this._map.setPaintProperty(fillLayerId, 'fill-pattern', imageId)
           }
@@ -151,7 +151,7 @@ export default class MaplibreLayerAdapter {
           }
         }
         if (hasPattern(merged) && this._map.getLayer(fillLayerId)) {
-          const imageId = getPatternImageId(merged, mapStyle.id, this._patternRegistry, pixelRatio)
+          const imageId = this._patternRegistry.getPatternImageId(merged, mapStyle.id, pixelRatio)
           if (imageId) {
             this._map.setPaintProperty(fillLayerId, 'fill-pattern', imageId)
           }

plugins/beta/datasets/src/adapters/maplibre/patternImages.js

@@ -2,7 +2,7 @@
 import { hasPattern } from '../../../../../../src/utils/patternUtils.js'
 import { mergeSublayer } from '../../utils/mergeSublayer.js'
 
-export { hasPattern, getPatternInnerContent, getPatternImageId, getKeyPatternPaths, injectColors } from '../../../../../../src/utils/patternUtils.js'
+export { hasPattern } from '../../../../../../src/utils/patternUtils.js'
 
 /**
  * Returns a flat list of datasets and merged sublayers that require pattern images.

plugins/beta/datasets/src/components/KeySvgPattern.jsx

@@ -1,11 +1,10 @@
-import { getKeyPatternPaths } from '../../../../../src/utils/patternUtils.js'
 import { svgProps } from './svgProperties.js'
 const PATTERN_INSET = 2
 
 export const KeySvgPattern = (props) => {
   const { patternRegistry, mapStyle } = props
 
-  const paths = getKeyPatternPaths(props, mapStyle.id, patternRegistry)
+  const paths = patternRegistry.getKeyPatternPaths(props, mapStyle.id)
   return (
     <svg {...svgProps}>
       <g dangerouslySetInnerHTML={{ __html: paths.border }} />

providers/maplibre/src/utils/patternImages.js

@@ -1,4 +1,4 @@
-import { getPatternInnerContent, getPatternImageId, injectColors, PATTERN_MIN_PIXEL_RATIO } from '../../../../src/utils/patternUtils.js'
+import { injectColors, PATTERN_MIN_PIXEL_RATIO } from '../../../../src/utils/patternUtils.js'
 import { getValueForStyle } from '../../../../src/utils/getValueForStyle.js'
 import { rasteriseToImageData } from './rasteriseToImageData.js'
 
@@ -16,12 +16,12 @@ const imageDataCache = new Map()
  * @returns {Promise<{ imageId: string, imageData: ImageData }|null>}
  */
 const rasterisePattern = async (dataset, mapStyleId, patternRegistry, pixelRatio) => {
-  const innerContent = getPatternInnerContent(dataset, patternRegistry)
+  const innerContent = patternRegistry.getPatternInnerContent(dataset)
   if (!innerContent) {
     return null
   }
 
-  const imageId = getPatternImageId(dataset, mapStyleId, patternRegistry, pixelRatio)
+  const imageId = patternRegistry.getPatternImageId(dataset, mapStyleId, pixelRatio)
   if (!imageId) {
     return null
   }
@@ -64,7 +64,7 @@ export const addPatternsToMap = async (map, styleArray, mapStyleId, patternRegis
 
   const effectiveRatio = Math.max(PATTERN_MIN_PIXEL_RATIO, pixelRatio)
   await Promise.all(styleArray.map(async (config) => {
-    const imageId = getPatternImageId(config, mapStyleId, patternRegistry, pixelRatio)
+    const imageId = patternRegistry.getPatternImageId(config, mapStyleId, pixelRatio)
     if (!imageId || map.hasImage(imageId)) {
       return
     }