Merge remote-tracking branch 'origin/main' into feature-customizer-to…

…-all
geoblocks · Jul 24, 2024 · 932253b · 932253b
2 parents 5292e58 + 918de2b
commit 932253b
Show file tree

Hide file tree

Showing 8 changed files with 188 additions and 146 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,15 @@
 # @geoblocks/geoblocks changes
 
+## 0.2.15
+
+- Use ol getFontParameters to parse font.
+- Fallback to fill color if none is specified on circle style.
+
+Breaking changes:
+
+- Pass feature object to allow informed customization.
+
+
 ## 0.2.14
 
 - Fix (invert) text Y axis offset.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@geoblocks/mapfishprint",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "publishConfig": {
     "access": "public"
   },
@@ -37,15 +37,15 @@
     "@geoblocks/print": "0.7.8",
     "@geoblocks/recast-utils": "0.1.0",
     "@types/geojson": "7946.0.14",
-    "@typescript-eslint/eslint-plugin": "7.7.1",
+    "@typescript-eslint/eslint-plugin": "^7.13.0",
     "color-name": "2.0.0",
     "color-parse": "2.0.2",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.1.3",
     "gh-pages": "6.1.1",
-    "ol": "9.0.0",
-    "prettier": "3.2.5",
+    "ol": "^9.2.4",
+    "prettier": "^3.3.2",
     "typedoc": "0.25.13",
     "typescript": "5.4.5"
   }

diff --git a/src/BaseCustomizer.ts b/src/BaseCustomizer.ts
@@ -67,23 +67,23 @@ export default class BaseCustomizer {
    * @param symbolizer
    * @param stroke
    */
-  line(layerState: State, symbolizer: MFPSymbolizerLine, stroke: Stroke) {}
+  line(layerState: State, geojsonFeature: GeoJSONFeature, symbolizer: MFPSymbolizerLine, stroke: Stroke) {}
 
   /**
    * Can be used to manipulate the image symbolizers
    * @param layerState
    * @param symbolizer
    * @param image
    */
-  point(layerState: State, symbolizer: MFPSymbolizerPoint, image: Image) {}
+  point(layerState: State, geojsonFeature: GeoJSONFeature, symbolizer: MFPSymbolizerPoint, image: Image) {}
 
   /**
    * Can be used to manipulate the text symbolizers
    * @param layerState
    * @param symbolizer
    * @param text
    */
-  text(layerState: State, symbolizer: MFPSymbolizerText, text: Text) {}
+  text(layerState: State, geojsonFeature: GeoJSONFeature, symbolizer: MFPSymbolizerText, text: Text) {}
 
   /**
    * Can be used to manipulate a converted WMTS layer