Merge pull request #58 from akhuoa/bugfix/setPaint

Fix coloured and outlined options in setPaint

Author: dbrnz

src/flatmap.ts

@@ -1182,8 +1182,8 @@ export class FlatMap
     //==================
     {
         options = utils.setDefaults(options, {
-            colour: true,
-            outline: true
+            coloured: true,
+            outlined: true
         })
         if (this.#userInteractions !== null) {
             this.#userInteractions.setPaint(options)

src/interactions.ts

@@ -200,7 +200,7 @@ export class UserInteractions
         this.#map = flatmap.map!
 
         // Default colour settings
-        this.#colourOptions = {colour: true, outline: true}
+        this.#colourOptions = {coloured: true, outlined: true}
 
         // Track enabled features
 

src/layers/index.ts

@@ -368,7 +368,7 @@ class FlatMapStylingLayer
     #setPaintRasterLayers(options)
     //============================
     {
-        const coloured = !('colour' in options) || options.colour
+        const coloured = !('coloured' in options) || options.coloured
         for (const layer of this.#rasterStyleLayers) {
             // Check active status when resetting to visible....
             this.#map.setLayoutProperty(layer.id, 'visibility',

src/layers/styling.ts

@@ -330,7 +330,7 @@ export class FeatureFillLayer extends VectorStyleLayer
 
     paintStyle(options: StylingOptions, changes=false)
     {
-        const coloured = options.coloured || true
+        const coloured = !('coloured' in options) || options.coloured
         const dimmed = options.dimmed || false
         const functional = (options.flatmapStyle === FLATMAP_STYLE.FUNCTIONAL)
         const paintStyle: PaintSpecification = {
@@ -397,8 +397,8 @@ export class FeatureBorderLayer extends VectorStyleLayer
 
     paintStyle(options: StylingOptions, changes=false)
     {
-        const coloured = options.coloured || true
-        const outlined = options.outlined || true
+        const coloured = !('coloured' in options) || options.coloured
+        const outlined = !('outlined' in options) || options.outlined
         const dimmed = options.dimmed || false
         const activeRasterLayer = options.activeRasterLayer || false
         const functional = (options.flatmapStyle === FLATMAP_STYLE.FUNCTIONAL)
@@ -490,7 +490,7 @@ export class FeatureLineLayer extends VectorStyleLayer
 
     paintStyle(options: StylingOptions, changes=false)
     {
-        const coloured = options.coloured || true
+        const coloured = !('coloured' in options) || options.coloured
         const paintStyle: PaintSpecification = {
             'line-color': [
                 'case',
@@ -1323,7 +1323,7 @@ export class RasterStyleLayer extends StyleLayer
 
     style(layer: FlatMapLayer, options: StylingOptions): RasterLayerSpecification
     {
-        const coloured = options.coloured || true
+        const coloured = !('coloured' in options) || options.coloured
         const style: RasterLayerSpecification = {
             ...super.style(layer),
             source: this.id,