jmapcloud-ng-core-types 1.0.9 → 1.0.11

package/all-enums.ts

@@ -139,16 +139,15 @@ export const ALL_LAYER_THEMATIC_FAMILY_TYPES: JLAYER_THEMATIC_FAMILY_TYPES[] = [
 export const ALL_LAYER_STYLE_TYPES: JLAYER_STYLE_TYPES[] = [
   JLAYER_STYLE_TYPES.POINT,
   JLAYER_STYLE_TYPES.LINE,
-  JLAYER_STYLE_TYPES.SURFACE,
-  JLAYER_STYLE_TYPES.ANNOTATION,
   JLAYER_STYLE_TYPES.IMAGE,
-  JLAYER_STYLE_TYPES.MIXED
+  JLAYER_STYLE_TYPES.TEXT,
+  JLAYER_STYLE_TYPES.IMAGE
 ]
 
-export const ALL_LAYER_STYLE_ARROWS: JLAYER_STYLE_ARROWS[] = [
-  JLAYER_STYLE_ARROWS.NONE,
-  JLAYER_STYLE_ARROWS.FORWARD,
-  JLAYER_STYLE_ARROWS.BACKWARD
+export const ALL_LAYER_STYLE_ARROW_TYPES: JLAYER_STYLE_ARROW_TYPES[] = [
+  JLAYER_STYLE_ARROW_TYPES.NONE,
+  JLAYER_STYLE_ARROW_TYPES.FORWARD,
+  JLAYER_STYLE_ARROW_TYPES.BACKWARD
 ]
 
 export const ALL_LAYER_INFORMATION_REPORT_TYPES: JLAYER_INFORMATION_REPORT_TYPES[] = [
@@ -192,16 +191,16 @@ export const ALL_LAYER_DYNAMIC_FILTER_OPERATORS: JLAYER_DYNAMIC_FILTER_OPERATORS
   JLAYER_DYNAMIC_FILTER_OPERATORS.INTERVAL
 ]
 
-export const ALL_LAYER_STYLE_LINE_STROKE_CAP: JLAYER_STYLE_LINE_STROKE_CAP[] = [
-  JLAYER_STYLE_LINE_STROKE_CAP.BUTT,
-  JLAYER_STYLE_LINE_STROKE_CAP.ROUND,
-  JLAYER_STYLE_LINE_STROKE_CAP.SQUARE
+export const ALL_LAYER_STYLE_LINE_CAP: JLAYER_STYLE_LINE_CAP[] = [
+  JLAYER_STYLE_LINE_CAP.BUTT,
+  JLAYER_STYLE_LINE_CAP.ROUND,
+  JLAYER_STYLE_LINE_CAP.SQUARE
 ]
 
-export const ALL_LAYER_STYLE_LINE_STROKE_JOIN: JLAYER_STYLE_LINE_STROKE_JOIN[] = [
-  JLAYER_STYLE_LINE_STROKE_JOIN.MITER,
-  JLAYER_STYLE_LINE_STROKE_JOIN.ROUND,
-  JLAYER_STYLE_LINE_STROKE_JOIN.BEVEL
+export const ALL_LAYER_STYLE_LINE_JOIN: JLAYER_STYLE_LINE_JOIN[] = [
+  JLAYER_STYLE_LINE_JOIN.MITER,
+  JLAYER_STYLE_LINE_JOIN.ROUND,
+  JLAYER_STYLE_LINE_JOIN.BEVEL
 ]
 
 export const ALL_LAYER_METADATA_TYPES: JLAYER_METADATA_TYPES[] = [

package/index.ts

@@ -329,6 +329,8 @@ export interface JLayerEventModule extends JEventModule {
     sourceChange(listenerId: string, fn: (params: JLayerEventParams) => void): void
     selectabilityWillChange(listenerId: string, fn: (params: JLayerEventSelectabilityParams) => void): void
     layerDeletion(listenerId: string, fn: (params: JLayerEventParams) => void): void
+    thematicAddition(listenerId: string, fn: (params: JAddMapThematicEventParams) => void): void
+    thematicDeletion(listenerId: string, fn: (params: JLayerThematicEventParams) => void): void
     initialSearchApplied(listenerId: string, fn: (params: JLayerInitialSearchEventParams) => void): void
     dynamicFilterSet(listenerId: string, fn: (params: JLayerDynamicFilterSetParams) => void): void
     dynamicFilterActivationChange(listenerId: string, fn: (params: JLayerDynamicFilterActivationParams) => void): void
@@ -696,6 +698,8 @@ export interface JMapService {
   isTerrainAvailable(): boolean
   isTerrainActive(): boolean
   setTerrainActive(active: boolean): void
+  setSelectionStyle(layerId: JId, style: JLayerSetStyleParams): void
+  resetSelectionStyle(layerId: JId): void
   setScaleControlVisibility(isVisible: boolean, position?: JMAP_POSITIONS): void
   setScaleControlUnits(units: "imperial" | "metric" | "nautical"): void
   setScaleControlPosition(position: JMAP_POSITIONS): void
@@ -895,6 +899,8 @@ export interface JLayerSearchService {
 }
 
 export interface JLayerThematicService {
+  addThematic(params: JLayerAddThematicParams): Promise<void>
+  deleteThematic(layerId: JId, thematicId: JId): void
   getAllByLayerId(layerId: JId): JLayerThematic[]
   getById(layerId: JId, thematicId: JId): JLayerThematic
   existsById(layerId: JId, thematicId: JId): boolean

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmapcloud-ng-core-types",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "JMap Cloud specific version of JMap Cloud NG Core types and interfaces",
   "main": "index.js",
   "scripts": {

package/public/core.d.ts

@@ -799,6 +799,190 @@ declare namespace JMap {
      * Methods used to manage thematics for a layer.
      */
     namespace Thematic {
+      /**
+       * ***JMap.Layer.Thematic.addThematic***
+       *
+       * This method allows you to add a custom thematic on a JMap Cloud layer. This method only works with vector layers that have attributes.
+       *
+       * The {@link JLayerAddThematicParams} parameter that you must provide include those properties:
+       * * the JMap Cloud layer id
+       * * a {@link JLayerUserStyleRule} specification
+       * * an array of {@link JLayerSetStyleParams}
+       *
+       * The id of the thematic that will be created will be the same id than the {@link JLayerUserStyleRule} that you provided.
+       *
+       * All objects that you provide that require an id should have a unique uuid v4 id. Many programming languages let you generate such ids.
+       *
+       * @param params the params to provide for the thematic creation
+       *
+       * @example
+       * ```ts
+       * // this code will add a custom thematic on a project that have a layer named "Neighborhood" with a "nom_qr" attribute.
+       * const addPolygonThematic = () => {
+       *   // find layer Neighborhood
+       *   const layer = JMap.Layer.getLayers().find(
+       *     l => l.elementType === "POLYGON" && l.attributes.length > 0 && l.name === "Neighborhood"
+       *   )
+       *   if (!layer) {
+       *     return
+       *   }
+       *   const layerAttribute = layer.attributes.find(la => la.name === "nom_qr")
+       *   if (!layerAttribute) {
+       *     return
+       *   }
+       *   const layerId = layer.id
+       *   const styles = []
+       *   const condition1StyleId = "8ae59ba6-0b0b-4a5e-8f8e-5b138bd53767"
+       *   const condition2StyleId = "eeeff29c-352f-4ba6-b354-7d7f7476f1fc"
+       *   const condition3StyleId = "85014948-1071-4257-a2f7-dbf75182fbfb"
+       *   const condition4StyleId = "f111e616-c4a6-497b-aeda-57af63c312b8"
+       *   const condition1Names = ["Anjou", "Beaconsfield", "Beaurivage", "Bois-Francs"]
+       *   const condition2Names = ["Étienne Desmarteaux", "Ville-Émard", "Tétreaultville", "Saint-Sulpice"]
+       *   const condition3Names = ["Westmount", "Saint-Henri", "Pierrefonds-Est", "Sault-au-Récollet"]
+       *   styles.push(
+       *     {
+       *       id: condition1StyleId,
+       *       type: "POLYGON",
+       *       borderColor: "#ff0000",
+       *       borderThickness: 4,
+       *       fillColor: "#00ff00"
+       *     },
+       *     {
+       *       id: condition2StyleId,
+       *       type: "POLYGON",
+       *       borderColor: "#00ff00",
+       *       borderThickness: 4,
+       *       fillColor: "#0000ff"
+       *     },
+       *     {
+       *       id: condition3StyleId,
+       *       type: "POLYGON",
+       *       borderColor: "#0000ff",
+       *       borderThickness: 4,
+       *       fillColor: "#ff0000"
+       *     },
+       *     {
+       *       id: condition4StyleId,
+       *       type: "POLYGON",
+       *       borderColor: "#000000",
+       *       borderThickness: 4,
+       *       fillColor: "#ffffff"
+       *     }
+       *   )
+       *   const styleRule = {
+       *     active: true,
+       *     id: "bc23f628-0fea-4e0c-8c23-d39c33ee0be2",
+       *     layerId: String(layer.id),
+       *     name: "Demographic repartition",
+       *     conditions: [
+       *       {
+       *         id: "573bf973-b574-46b5-b852-1bd17aa94c19",
+       *         name: "Less than 50 000 people",
+       *         conditionExpressions: [
+       *           {
+       *             id: "d6b1d717-b936-4b86-9011-6ce28af35237",
+       *             operator: "IN",
+       *             attribute: layerAttribute,
+       *             value: condition1Names
+       *           }
+       *         ],
+       *         styleMapScales: [
+       *           {
+       *             id: "a9ba5215-0511-4aa3-a724-6f14f10ab315",
+       *             maximumVisibleZoom: 23,
+       *             minimumVisibleZoom: 0,
+       *             styleId: condition1StyleId
+       *           }
+       *         ]
+       *       },
+       *       {
+       *         id: "a35679fa-860d-47d4-9b1a-24006bdd78be",
+       *         name: "Between 50 000 and 100 000",
+       *         conditionExpressions: [
+       *           {
+       *             id: "66de5d3b-5041-43d2-86b2-2639326ee6f7",
+       *             operator: "IN",
+       *             attribute: layerAttribute,
+       *             value: condition2Names
+       *           }
+       *         ],
+       *         styleMapScales: [
+       *           {
+       *             id: "8fb646bb-afee-4a3c-9545-e9716049d307",
+       *             maximumVisibleZoom: 23,
+       *             minimumVisibleZoom: 0,
+       *             styleId: condition2StyleId
+       *           }
+       *         ]
+       *       },
+       *       {
+       *         id: "4bd67df3-1ea3-4f3e-ad4b-1baa75a5cd5f",
+       *         name: "More than 100 000 people",
+       *         conditionExpressions: [
+       *           {
+       *             id: "2ff931ee-fa32-43e6-a3b1-314a806734c0",
+       *             operator: "IN",
+       *             attribute: layerAttribute,
+       *             value: condition3Names
+       *           }
+       *         ],
+       *         styleMapScales: [
+       *           {
+       *             id: "d0ad4bf4-f6a7-46f1-866b-74f97a5e7775",
+       *             maximumVisibleZoom: 23,
+       *             minimumVisibleZoom: 0,
+       *             styleId: condition3StyleId
+       *           }
+       *         ]
+       *       },
+       *       {
+       *         id: "25a4e4da-fe14-470d-aac2-37cfa7e367e2",
+       *         name: "Other",
+       *         conditionExpressions: [
+       *           {
+       *             id: "45f491d3-3a7b-4975-9296-7ff6e8516a6d",
+       *             operator: "NOT_IN",
+       *             attribute: layerAttribute,
+       *             value: condition1Names.concat(condition2Names).concat(condition3Names)
+       *           }
+       *         ],
+       *         styleMapScales: [
+       *           {
+       *             id: "94331295-86b3-455c-8946-d45f79b8bd21",
+       *             maximumVisibleZoom: 23,
+       *             minimumVisibleZoom: 0,
+       *             styleId: condition4StyleId
+       *           }
+       *         ]
+       *       }
+       *     ]
+       *   }
+       *   JMap.Layer.Thematic.addThematic({ layerId, styleRule, styles })
+       *   console.log(`added thematic on layer "${layer.name}", ids = "${layer.id}","${styleRule.id}" `)
+       * }
+       *
+       * if (JMap.Map.isMapLoaded()) {
+       *   addPolygonThematic()
+       * } else {
+       *   JMap.Event.Map.on.mapLoad("my-custom-event-map-load-add-polygon-thematic", () => {
+       *     JMap.Event.Map.remove("my-custom-event-map-load-add-polygon-thematic")
+       *     addPolygonThematic()
+       *   })
+       * }
+       * ```
+       */
+      function addThematic(params: JLayerAddThematicParams): Promise<void>
+
+      /**
+       * ***JMap.Layer.Thematic.addThematic***
+       *
+       * Deletes a thematic from JMap CLoud NG. The removal is client-side only and only for the current session.
+       *
+       * @param layerId the JMap Cloud layer id
+       * @param thematicId the thematic id (Style Rule id)
+       */
+      function deleteThematic(layerId: JId, thematicId: JId): void
+
       /**
        * ***JMap.Layer.Thematic.getAllByLayerId***
        *
@@ -3114,6 +3298,38 @@ declare namespace JMap {
      */
     function setTerrainActive(active: boolean): void
 
+    /**
+     * ***JMap.Map.setSelectionStyle***
+     *
+     * Sets the selection style for a specified JMap Cloud layer.
+     *
+     * When specified symbolData must be a data URL with a base64 encode PNG, JPEG or WEBP image. SVGs are not supported for the moment.
+     *
+     * @param layerId the JMap Cloud layer id
+     * @param style the selection style
+     * @example
+     * ```ts
+     * // define and apply a selection style to a polygone layer
+     * JMap.Map.setSelectionStyle("polygon-layer-id", {type: "POLYGON", fillColor: "#ff0000", borderColor: "#0000ff", borderThickness: 8})
+     *
+     * // define and apply a selection style to a line layer
+     * JMap.Map.setSelectionStyle("line-layer-id",{type:"LINE", lineColor:"#ff0000", lineThickness:4})
+     *
+     * // define and apply a selection style to a point layer
+     * JMap.Map.setSelectionStyle("point-layer-id",{type:"POINT", symbolData:"data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAACCElEQVR4XmNgwAH2vHQWjy9TOs/KxvQTyP2PC7NxMP0WlWSrBrKZELoJgI41Rtl6lgK/DG2FQIb8A2J7dDVQYM/IyPAfpFZYgv0akK+MrgADVM/SnS8oyva/eILW/1N/Pf+zsTN9Z8BhAUgtDz8LWB1IPQcX8xcGHGrBoH+LaRDIcJdQyf1A7gcGLEGCC4Mcktag+p+FlfE9kC8BNhAd+MRLP/ZLkgG54i0DPpdgB/a8Aqx/3SKkngLZfeiSDLMPWmgCFfyvnat7Csg9hy5PDJBV4f7Qt9H4PxMT40cglwtFMqNJvdPARvB/aLb8ZiB3NookkcDITvhs5XSd/6JS7DeBXGcUSZ846QvJNSr/FTV5dgK5GSiSRAI7X7GpASmy/0FmAbnNKJLaZvzfp+0x/8/KxngZyDVFkSQSWLiJeqob8v2fuNX0OZB7GEUSmKH+H/nqDkoRv4CYHUWSeMAOTEUwc0AZFAX8P/PfC5bsKAE4zQFL4MtYhAAs4+G0gAYYBYBtxoZxyeESh8mhmQ9RDPImA4nFBAyDgnfWAQv8FjBADLcHYeTwRHchsjguPXCToQAsAYtk9AhDNxxZHJceFNNhikFeBCkCYTTvYsUE9KAADBeiuxQd4xKHyaGZj+k6KmAEQE4BlGKklIgC7KGC6K4gB8NSFVYAdwmIjS6JA5CkhyTFUIBTDwBPxSZtxNLgXwAAAABJRU5ErkJggg=="})
+     * ```
+     */
+    function setSelectionStyle(layerId: JId, style: JLayerSetStyleParams): void
+
+    /**
+     * ***JMap.Map.resetSelectionStyle***
+     *
+     * Sets back the selection style of a layer to its original value. Use this method when the selection style has been modified by {@link JMap.Map.setSelectionStyle} and the style modification is not needed anymore.
+     *
+     * @param layerId the JMap Cloud layer id
+     */
+    function resetSelectionStyle(layerId: JId): void
+
     /**
      * ***JMap.Map.setScaleControlVisibility***
      *
@@ -8420,6 +8636,46 @@ declare namespace JMap {
          */
         function layerDeletion(listenerId: string, fn: (params: JLayerEventParams) => void): void
 
+        /**
+         * ***JMap.Event.Layer.on.thematicDeletion***
+         *
+         * This event is triggered when a thematic is deleted.
+         *
+         * @param listenerId Your listener id (must be unique for all layer events)
+         * @param fn Your listener function
+         * @example
+         * ```ts
+         * // Each time a thematic is deleted, will display a message in the console
+         * JMap.Event.Layer.on.thematicDeletion(
+         *    "custom-thematic-deletion",
+         *    params => {
+         *      console.log(`Thematic id="${params.thematicId}" of layer id="${params.layerId}" has been deleted client-side`)
+         *    }
+         * )
+         * ```
+         */
+        function thematicDeletion(listenerId: string, fn: (params: JLayerThematicEventParams) => void): void
+
+        /**
+         * ***JMap.Event.Layer.on.thematicAddition***
+         *
+         * This event is triggered when a custom thematic is added.
+         *
+         * @param listenerId Your listener id (must be unique for all layer events)
+         * @param fn Your listener function
+         * @example
+         * ```ts
+         * // Each time a custom thematic is added, will display a message in the console
+         * JMap.Event.Layer.on.thematicAddition(
+         *    "custom-thematic-addition",
+         *    params => {
+         *      console.log(`Thematic has been added for layer id="${params.layerId}". Params: `, params)
+         *    }
+         * )
+         * ```
+         */
+        function thematicAddition(listenerId: string, fn: (params: JAddMapThematicEventParams) => void): void
+
         /**
          * ***JMap.Event.Layer.on.initialSearchApplied***
          *

package/public/jmap/layer.d.ts

@@ -65,14 +65,13 @@ declare const enum JLAYER_THEMATIC_FAMILY_TYPES {
 declare const enum JLAYER_STYLE_TYPES {
   POINT = "POINT",
   LINE = "LINE",
-  SURFACE = "SURFACE",
-  ANNOTATION = "ANNOTATION",
-  IMAGE = "IMAGE",
-  MIXED = "MIXED"
+  POLYGON = "POLYGON",
+  TEXT = "TEXT",
+  IMAGE = "IMAGE"
 }
 
 // ALL_LAYER_STYLE_ARROWS in all-enum.ts
-declare const enum JLAYER_STYLE_ARROWS {
+declare const enum JLAYER_STYLE_ARROW_TYPES {
   NONE = "NONE",
   FORWARD = "FORWARD",
   BACKWARD = "BACKWARD"
@@ -99,7 +98,9 @@ declare const enum JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS {
   GREATER_THAN = "GREATER_THAN",
   LOWER_THAN = "LOWER_THAN",
   GREATER_OR_EQUALS_TO = "GREATER_OR_EQUALS_TO",
-  LOWER_OR_EQUALS_TO = "LOWER_OR_EQUALS_TO"
+  LOWER_OR_EQUALS_TO = "LOWER_OR_EQUALS_TO",
+  IN = "IN", // This operator does not yet exist in JMC
+  NOT_IN = "NOT_IN" // This operator does not yet exist in JMC
 }
 
 // ALL_LAYER_DYNAMIC_FILTER_OPERATORS in all-enum.ts
@@ -122,15 +123,15 @@ declare const enum JLAYER_DYNAMIC_FILTER_OPERATORS {
   INTERVAL = "INTERVAL"
 }
 
-// ALL_LAYER_STYLE_LINE_STROKE_CAP in all-enum.ts
-declare const enum JLAYER_STYLE_LINE_STROKE_CAP {
+// ALL_LAYER_STYLE_LINE_CAP in all-enum.ts
+declare const enum JLAYER_STYLE_LINE_CAP {
   BUTT = "BUTT",
   ROUND = "ROUND",
   SQUARE = "SQUARE"
 }
 
-// ALL_LAYER_STYLE_LINE_STROKE_JOIN in all-enum.ts
-declare const enum JLAYER_STYLE_LINE_STROKE_JOIN {
+// ALL_LAYER_STYLE_LINE_JOIN in all-enum.ts
+declare const enum JLAYER_STYLE_LINE_JOIN {
   MITER = "MITER",
   ROUND = "ROUND",
   BEVEL = "BEVEL"
@@ -223,6 +224,16 @@ declare interface JLayerEventParams {
   layerId: JId
 }
 
+declare interface JLayerThematicEventParams {
+  layerId: JId
+  thematicId: JId
+}
+
+declare interface JAddMapThematicEventParams {
+  layerId: JId
+  layerSpecifications: maplibregl.LayerSpecification[]
+}
+
 declare interface JLayerInitialSearchEventParams extends JLayerEventParams {
   features: GeoJSON.Feature[]
 }
@@ -301,7 +312,8 @@ declare interface JLayer extends JLayerTreeElement {
   forms: JLayerForm[]
   hasInformationReport: boolean
   informationReports: JLayerInformationReport[]
-  spatialDataSourceId: string // For JMap Cloud only
+  spatialDataSourceId: string
+  selectionStyleId: string
   dynamicFilter: JDynamicFilter
 }
 
@@ -382,6 +394,7 @@ declare interface JLayerThematicClassification extends JLayerThematic {
 }
 
 declare interface JLayerThematicStyleRule extends JLayerThematic {
+  type: JLAYER_THEMATIC_TYPES.STYLE_RULE
   conditions: JLayerThematicCondition[]
   hiddenConditionIds: string[]
 }
@@ -400,7 +413,7 @@ declare interface JLayerThematicConditionScaledStyle {
 
 declare interface JLayerThematicCategory {
   title: string
-  style: JLayerStyle
+  style: JLayerBaseStyle
   enabled: boolean
   nullValueCategory: boolean
   index: number
@@ -439,6 +452,7 @@ declare interface JLayerStyleRule {
 declare interface JLayerStyleRuleCondition {
   id: string
   name: string
+  conditionExpressions: JLayerStyleRuleConditionExpression[]
   styleMapScales: JLayerStyleScaled[]
 }
 
@@ -454,108 +468,85 @@ declare interface JLayerStyleSample {
   imageSampleInBase64: string
 }
 
-// @TODO we probably don't need this interface anymore
 declare interface JLayerStyleRuleConditionExpression {
+  id: string
   operator: JLAYER_STYLE_RULE_CONDITION_EXPRESSION_OPERATORS
   value: any
   attribute: JLayerAttribute
 }
 
-declare interface JLayerStyle {
-  styleType: JLAYER_STYLE_TYPES
+declare interface JLayerBaseStyle {
+  type: JLAYER_STYLE_TYPES
+  id: string
+  name: string
+  /**
+   * @deprecated
+   * this property will be removed once the legacy support for JMS thematics will be removed
+   */
   imageSampleInBase64: string
-  transparencyPerCent: number
-}
-
-declare interface JLayerStyleVector extends JLayerStyle {
-  antiAliasing: boolean
-}
-
-declare interface JLayerStylePoint extends JLayerStyleVector {
-  styleType: JLAYER_STYLE_TYPES.POINT
-  symbolScale: number
-  symbolRotationInDegree: number
-  symbolProportionalSizeEnabled: boolean
-  symbolProportionalSize: number
-  symbolRotateWithMapEnabled: boolean
-  symbolOffsetX: number
-  symbolOffsetY: number
-  symbolVector: JLayerStyleSymbolVector | null
-  symbolImage: JLayerStyleSymbolImage | null
+  transparency: number
 }
 
-declare interface JLayerStyleLineStroke {
-  width: number
-  cap: JLAYER_STYLE_LINE_STROKE_CAP
-  join: JLAYER_STYLE_LINE_STROKE_JOIN
+declare interface JLayerImageStyle extends JLayerBaseStyle {
+  type: JLAYER_STYLE_TYPES.IMAGE
 }
 
-declare interface JLayerStyleLineStrokeBasic extends JLayerStyleLineStroke {
-  miterLimit: number
-  dash: number[]
-  dash_phase: number
+declare interface JLayerPointStyle extends JLayerBaseStyle {
+  type: JLAYER_STYLE_TYPES.POINT
+  size: number
+  rotation: number
+  rotationLocked: boolean
+  proportional: boolean
+  proportionalScale: number
+  symbolOffset: [number, number]
+  symbolData: string
 }
 
-declare interface JLayerStyleLine extends JLayerStyleVector {
-  styleType: JLAYER_STYLE_TYPES.LINE
-  lineColor: JRGBColor
+declare interface JLayerLineStyle extends JLayerBaseStyle {
+  type: JLAYER_STYLE_TYPES.LINE
   lineThickness: number
-  arrowType: JLAYER_STYLE_ARROWS
-  arrowPositionFromLeftInPerCent: number
-  stroke: JLayerStyleLineStroke
-}
-
-declare interface JLayerStyleSurface extends JLayerStyleVector {
-  styleType: JLAYER_STYLE_TYPES.SURFACE
-  fillColor: JRGBColor
+  lineColor: string
+  arrowType: JLAYER_STYLE_ARROW_TYPES
+  arrowPosition: number
+  lineCap: JLAYER_STYLE_LINE_CAP
+  lineJoin: JLAYER_STYLE_LINE_JOIN
+  dashPattern: number[]
+  patternData: string
+}
+
+declare interface JLayerPolygonStyle extends JLayerBaseStyle {
+  type: JLAYER_STYLE_TYPES.POLYGON
+  fillColor: string
+  borderColor: string
   transparentFill: boolean
-  borderColor: JRGBColor
-  borderTransparencyInPercent: number
   borderThickness: number
-  surfacePattern: string
-  patternColor: JRGBColor
-  patternTransparentFill: boolean
+  borderTransparency: number
+  borderDashPattern: number[]
+  borderPatternData: string
+  patternData: string
 }
 
-declare interface JLayerStyleAnnotation extends JLayerStyleVector {
-  styleType: JLAYER_STYLE_TYPES.ANNOTATION
-  textFont: string
-  textColor: JRGBColor
-  textBold: boolean
-  textItalic: boolean
-  textUnderlined: boolean
-  textStrikeThrough: boolean
-  textOutlined: boolean
-  textOutlineColor: JRGBColor
+declare interface JLayerTextStyle extends JLayerBaseStyle {
+  type: JLAYER_STYLE_TYPES.TEXT
+  textColor: string
+  outlineColor: string
+  bold: boolean
+  italic: boolean
 }
 
-declare interface JLayerStyleMixed extends JLayerStyleVector {
-  styleType: JLAYER_STYLE_TYPES.MIXED
-  point: JLayerStylePoint
-  line: JLayerStyleLine
-  surface: JLayerStyleSurface
-  text: JLayerStyleAnnotation
-}
-
-declare interface JLayerStyleSymbolImage {
-  absoluteFilePath: string
-}
+declare type JLayerUserStyleRule = Omit<JLayerStyleRule, "defaultRule">
 
-declare interface JLayerStyleSymbolVector {
-  vectorSymbol: string
-  borderThickness: number
-  borderColor: JRGBColor
-  transparentFill: boolean
-  fillColor: JRGBColor
+declare type JLayerAddThematicParams = {
+  layerId: JId
+  styleRule: JLayerUserStyleRule
+  styles: JLayerSetStyleParams[]
 }
 
-declare interface JRGBColor {
-  red: number
-  green: number
-  blue: number
-  alpha: number
-  hexa: string
-}
+declare type JLayerSetStyleParams =
+  | (Pick<JLayerLineStyle, "type"> & Partial<Pick<JLayerLineStyle, "id" | "lineColor" | "lineThickness">>)
+  | (Pick<JLayerPolygonStyle, "type"> &
+      Partial<Pick<JLayerPolygonStyle, "id" | "fillColor" | "borderColor" | "borderThickness">>)
+  | (Pick<JLayerPointStyle, "type"> & Partial<Pick<JLayerPointStyle, "id" | "symbolData">>)
 
 declare interface JLayerSetLayersVisibilityParams {
   layerId: JId