Merge pull request #357 from gtt-project/main

chore: sync next with main (bring main-only fixes/features into next)

Author: dkastl

init.rb

@@ -6,7 +6,7 @@
   author_url 'https://github.com/georepublic'
   url 'https://github.com/gtt-project/redmine_gtt'
   description 'Adds location-based task management and maps'
-  version '6.0.1'
+  version '6.0.3'
 
   requires_redmine :version_or_higher => '5.1.0'
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redmine_gtt",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Plugin that adds spatial capabilities to Redmine",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

src/components/gtt-client/init/layers.ts

@@ -76,14 +76,15 @@ function createLayers(this: any): void {
     if (config.source) {
       const SourceClass = olSource[config.source as keyof typeof olSource] as typeof olSource.Source;
       const sourceOptions = config.source_options;
+      if (config.format) {
+        const FormatClass = olFormat[config.format as keyof typeof olFormat] as any;
+        const formatOptions = config.format_options;
+        layerOptions['format'] = new FormatClass(formatOptions);
+        (sourceOptions as { format?: any })['format'] = layerOptions['format'];
+      }
       layerOptions['source'] = new SourceClass(sourceOptions);
     }
 
-    if (config.format) {
-      const FormatClass = olFormat[config.format as keyof typeof olFormat] as any;
-      const formatOptions = config.format_options;
-      layerOptions['format'] = new FormatClass(formatOptions);
-    }
 
     const layer = new LayerClass(layerOptions);
 

src/styles/icons/custom/custom-icons-def.ts

@@ -1,5 +1,6 @@
 import * as FontFaceObserver from 'fontfaceobserver';
 import FontSymbol from 'ol-ext/style/FontSymbol';
+import './custom-icons.woff2';
 
 const iconMappings: { [key: string]: any } = {
   'lobsta': '\uf101',

src/styles/index.ts

@@ -19,3 +19,6 @@ import '@mdi/font/css/materialdesignicons.css';
 
 // Import Material Design icons definition JS file to define icon names and variations
 import './icons/material-design/material-design-def';
+
+// Import plugin SVG icons to make them available in assets/images
+import './images/icons.svg';