Floating Dynamic Legend Plugin for ArcGIS & WMS layers

.github/workflows/CI.yml

@@ -8,14 +8,23 @@ on:
     - master
     # using filter pattern: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
     - '[cC][0-9][0-9][0-9]-+**' # c123 or c123-something for custom branch
-    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable brances. E.g. 2021.01.xx
+    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable branches. E.g. 2021.01.xx
   pull_request:
+    types: [opened, synchronize, reopened]
     branches:
     - master
     # using filter pattern: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
     - '[cC][0-9][0-9][0-9]-+**' # c123 or c123-something for custom branch
-    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable brances. E.g. 2021.01.xx
-
+    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable branches. E.g. 2021.01.xx
+    - '[geonode]-[0-9].[0-9].x' # stable branches for GeoNode. E.g. geonode-4.4.x
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+    branches:
+    - master
+    # using filter pattern: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
+    - '[cC][0-9][0-9][0-9]-+**' # c123 or c123-something for custom branch
+    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable branches. E.g. 2021.01.xx
+    - '[geonode]-[0-9].[0-9].x' # stable branches for GeoNode. E.g. geonode-4.4.x
 jobs:
   test-front-end:
     runs-on: ubuntu-latest
@@ -180,6 +189,10 @@ jobs:
         # Here it deploys only java modules and root, needed for MS project builds.
         # Product, binary modules are to big to be hosted on the repository in snapshots, so they are skipped
         run: |
+          # Setup SSH keys for SFTP
+          mkdir -p ~/.ssh && chmod 700 ~/.ssh
+          # add geo-solutions.it to known hosts to avoid prompts
+          ssh-keyscan -H maven.geo-solutions.it >> ~/.ssh/known_hosts
           # deploys java packages
           mvn clean install deploy -f java/pom.xml
           # deploys also the root module, needed for dependencies
@@ -189,4 +202,3 @@ jobs:
           MAVEN_PASSWORD: ${{ secrets.GS_MAVEN_PASSWORD }}
 
 
-

binary/bin-war/pom.xml

@@ -65,6 +65,29 @@
                     </webResources>
                 </configuration>
             </plugin>
+            <!-- artifact assembly moved here so it runs after WAR packaging -->
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>../bin.xml</descriptor>
+                    </descriptors>
+                    <finalName>mapstore2-${binary.number}</finalName>
+                    <!-- place ZIP in the binary module target directory (bin-war -> ../../target) -->
+                    <outputDirectory>${project.build.directory}/../../target</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <inherited>false</inherited>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

binary/bin.xml

@@ -4,10 +4,12 @@
     <format>zip</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
+  <!-- main webapp (war built by bin-war module) -->
   <fileSets>
+    <!-- NOTE: we keep fileSets for other files (jre, libs, scripts, tomcat conf, logs, work) -->
     <fileSet>
-      <!-- the main webapp -->
-      <directory>./bin-war/target/</directory>
+      <!-- the main webapp (relative to bin-war module where assembly will run) -->
+      <directory>target/</directory>
       <outputDirectory>mapstore2/webapps/</outputDirectory>
       <includes>
         <include>mapstore.war</include>
@@ -22,7 +24,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <!-- the libs needed to run tomcat -->
+      <!-- the libs needed to run tomcat (copied by dependency plugin into target/dependency) -->
       <directory>target/dependency</directory>
       <outputDirectory>mapstore2/lib</outputDirectory>
       <includes>
@@ -31,17 +33,17 @@
       </includes>
     </fileSet>
     <fileSet>
-      <!-- windows batch files -->
-      <directory>bin</directory>
+      <!-- windows batch files (stored in binary/bin) -->
+      <directory>../bin</directory>
       <lineEnding>keep</lineEnding>
       <outputDirectory>mapstore2/</outputDirectory>
       <includes>
         <include>mapstore2-*.bat</include>
       </includes>
     </fileSet>
     <fileSet>
-      <!-- unix shell scripts -->
-      <directory>bin</directory>
+      <!-- unix shell scripts (stored in binary/bin) -->
+      <directory>../bin</directory>
       <lineEnding>unix</lineEnding>
       <outputDirectory>mapstore2/</outputDirectory>
       <fileMode>0755</fileMode>
@@ -51,21 +53,21 @@
       </includes>
     </fileSet>
     <fileSet>
-      <!-- tomcat configuration -->
-      <directory>tomcat</directory>
+      <!-- tomcat configuration (stored in binary/tomcat) -->
+      <directory>../tomcat</directory>
       <outputDirectory>mapstore2</outputDirectory>
       <includes>
         <include>**/*</include>
       </includes>
     </fileSet>
     <fileSet>
-      <!-- empty log directory -->
-      <directory>logs</directory>
+      <!-- empty log directory (in binary/logs) -->
+      <directory>../logs</directory>
       <outputDirectory>mapstore2</outputDirectory>
     </fileSet>
     <fileSet>
-      <!-- empty work directory -->
-      <directory>work</directory>
+      <!-- empty work directory (in binary/work) -->
+      <directory>../work</directory>
       <outputDirectory>mapstore2</outputDirectory>
     </fileSet>
   </fileSets>

binary/pom.xml

@@ -13,7 +13,7 @@
     <url>http://www.geo-solutions.it</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomcat.version>9.0.108</tomcat.version>
+        <tomcat.version>9.0.110</tomcat.version>
         <binary.number>${mapstore2.version}</binary.number>
     </properties>
     <dependencies>
@@ -142,27 +142,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- artifact assembly -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>bin.xml</descriptor>
-                    </descriptors>
-                    <finalName>mapstore2-${binary.number}</finalName>
-                    <outputDirectory>${project.build.directory}</outputDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <modules>

build/testConfig.js

@@ -63,7 +63,7 @@ module.exports = ({browsers = [ 'ChromeHeadless' ], files, path, testFile, singl
     },
     browserConsoleLogOptions: {
         terminal: true,
-        level: 'DISABLE'
+        level: 'DEBUG'
     },
     webpack: {
         devtool: 'eval',

docs/developer-guide/mapstore-migration-guide.md

@@ -22,6 +22,28 @@ This is a list of things to check if you want to update from a previous version
 
 ## Migration from 2025.01.01 to 2025.02.00
 
+### Update authenticationRules in localConfig.json
+
+The previous default authentication rule used a broad pattern (`.*geostore.*`) that unintentionally matched internal GeoServer delegation endpoints (e.g., `/rest/security/usergroup/service/geostore/...`). This could cause delegated user/group requests to fail due to forced `bearer` authentication overriding the intended method (e.g., `authkey`).
+
+To avoid this conflict, update the authenticationRules entry in localConfig.json as follows:
+
+``` diff
+{
+  "authenticationRules": [
+    {
+-      "urlPattern": ".*geostore.*",
++      "urlPattern": ".*rest/geostore.*",
+      "method": "bearer"
+    },
+    {
+      "urlPattern": ".*rest/config.*",
+      "method": "bearer"
+    }
+  ]
+}
+```
+
 ### Set minimum NodeJS version to 20
 
 Node 16 and 18 are at end of life. Therefore there is no reason to keep maintaining compatibility with these old versions. In the meantime we want to concentrate to Make MapStore compatible with future version of NodeJS, and update the libraries to reduce the dependency tree.

docs/user-guide/filtering-layers.md

@@ -18,7 +18,7 @@ In [MapStore](https://mapstore.geosolutionsgroup.com/mapstore/#/) it is possible
 
 * With the [Quick Filter](attributes-table.md#quick-filter) available in the [Attribute Table](attributes-table.md#attribute-table)
 
-### Layer Filter
+### Layer Filters
 
 This filter is applicable from the **Filter layer** button <img src="../img/button/filter-layer.jpg" class="ms-docbutton"/> in TOC's [Layers Toolbar](toc.md#toolbar-options) and it will persist in the following situations:
 
@@ -56,7 +56,7 @@ This tool is used to define advanced filters in [MapStore](https://mapstore.geos
 
 <img src="../img/filtering-layers/query-panel.jpg" class="ms-docimage" style="max-width:500px;"/>
 
-#### Attribute filter
+#### Attribute Filter
 
 This filter allows to set one or more conditions referred to the [Attribute Table](attributes-table.md#attribute-table) fields. <br>
 First of all it is possible to choose if the filter will match:
@@ -87,7 +87,7 @@ A simple *Attribute Filter* applied for a numerical field can be, for example:
 
 <video class="ms-docimage" controls><source src="../img/filtering-layers/att_filter.mp4"/></video>
 
-#### Area of interest
+#### Area of Interest
 
 In order to set this filter the user can:
 
@@ -107,7 +107,7 @@ Once this filter is set, it is always possible to edit the coordinates and the d
      Also for [Dashboard](exploring-dashboards.md) [widgets](widgets.md) (charts, table and counter) it is possible to define a spatial filter without necessarily connect the widget to the map widget by using the usual **Area of interest** filtering section. The example below sows how:
      <video class="ms-docimage" style="max-width:600px;" controls><source src="../img/filtering-layers/area-filter-dash.mp4"/></video>
 
-#### Layer filter
+#### Layer Filter
 
 This tool allows to set [cross-layer filters](https://docs.geoserver.org/stable/en/user/extensions/querylayer/index.html) for a layer by using another layer or even the same one.
 
@@ -132,3 +132,11 @@ In particular, if our goal is to take a look at the Italian Regions that contain
 
 !!! note
     The **Layer Filter** option is only available for [widgets](widgets.md) defined in [Map viewer](exploring-maps.md) and not for [Dashboards](exploring-dashboards.md) widgets.
+
+#### Combining Multiple Filtering
+
+To filter a layer, the user can also combine the two methods described above. This way, the user can first apply an [Area of Interest Filter](filtering-layers.md#area-of-interest) to a layer and then use a second layer to define the cross-layer filter using the [Layer Filter](filtering-layers.md#layer-filter) method.
+
+The following example shows this workflow: the meteorites layer is filtered using a square area of interest, and then a second filter excludes features located in the state of California by using the USA States layer. It is also worth clarifying that the AOI thus defined is used in this case to also restrict the [Layer Filter's](filtering-layers.md#layer-filter) action to that area only.
+
+<img src="../img/filtering-layers/cascading-search-filter.jpg" class="ms-docimage"/>

docs/user-guide/layer-settings.md

@@ -132,6 +132,10 @@ On the *Display* tab, only the following options are available for a **3D Tile**
 
 * The **Visibility limits** to display the layer only within certain scale limits, as reported above.
 
+* The **Imagery Layers Overlay** to drape imagery layers, such as `WMS`, `TMS`, or `WMTS`, on top of `3D Tiles` and rendering them sequentially in the order defined in the TOC. An example can be the following one:
+
+<img src="../img/layer-settings/imagery-layers.jpg" class="ms-docimage"style="max-width:600px;"/>
+
 * The **Height Offset** above the ground.
 
 * The **Format** choosing between `3D Model` and `Point Cloud`. The *Point Cloud* option allows the user to customize the `Maximum Attenuation` of the points based on the distance from the current viewpoint and customize the `Lighting strength` and the `Lighting radius` to improve visualization of the point cloud.

docs/user-guide/tags.md

@@ -10,17 +10,17 @@ As an admin user, it is possible to manage **Tags** by selecting **Manage Tags**
 
 <img src="../img/tags/tags-manager.jpg" class="ms-docimage" style="max-width:500px;"/>
 
-The *Tags panel* opens, allowing the admin user to:
+The *Manager* page opens on **Tags** tab, allowing the admin user to:
 
-<img src="../img/tags/tags-panel.jpg" class="ms-docimage" style="max-width:500px;"/>
+<img src="../img/tags/tags-panel.jpg" class="ms-docimage" />
 
 * Create a **New tag** through the <img src="../img/button/new_tag_button.jpg" class="ms-docbutton"/> button and customize it by adding a *Name*, a *Description* and choosing a *Color* for the label.
 
-<img src="../img/tags/new_tag.jpg" class="ms-docimage" style="max-width:500px;"/>
+<img src="../img/tags/new_tag.jpg" class="ms-docimage" />
 
 * **Search** for a tag using the search bar
 
-<img src="../img/tags/search_tag.jpg" class="ms-docimage" style="max-width:500px;"/>
+<img src="../img/tags/search_tag.jpg" class="ms-docimage" />
 
 * **Edit** a tag through the <img src="../img/button/edit_properties.jpg" class="ms-docbutton"/> button next to each tag in the list.
 

docs/user-guide/widgets.md

@@ -73,6 +73,7 @@ Once the chart type is chosen, it is possible to set up the trace with the follo
 * **Trace style**
 * **Trace axes**
 * **Trace value formatting**
+* **Null Value Handling**
 
 ##### Trace Data
 
@@ -182,6 +183,18 @@ An example of a custom trace value tooltip can be the following:
 
 <img src="../img/widgets/custom_trace_value_tooltip.jpg" class="ms-docimage"  style="max-width:450px;"/>
 
+##### Null Value Handling
+
+The user can customize how **Null Value** are handled for the `X Attribute` field by selecting a *Strategy* from the following options:
+
+<img src="../img/widgets/trace_null_value.jpg" class="ms-docimage"  style="max-width:450px;"/>
+
+* **Ignore** to keep the *Null* values unchanged in the data.
+
+* **Exclude** to remove all records where the value is *Null*
+
+* **Use Placeholder** to replace *Null* values with a custom value provided by the user
+
 ##### Trace legend options
 
 For the *Pie Charts*, the *Trace legend options* is available and it is displayed as follows:
@@ -210,6 +223,16 @@ Through this section, for each axis, the user is allowed to:
 
 * Choose the **Type** (between `Auto`, `Linear`, `Category`, `Log` or `Date`): the axis type is auto-detected by looking at the data (*Auto* option is automatically managed and selected by the tool and it is usually good as default setting).
 
+!!! Note
+    If **`Date`** is selected in the *Type* option, the **Show the Current Time** setting becomes available in the *Axes* panel, allowing you to highlight the current date in the chart.
+    <img src="../img/widgets/show-current-time.jpg" class="ms-docimage" style="max-width:300px;"/>
+    Once enabled, you can customize the appearance of the current time line using the following options:
+    <img src="../img/widgets/customize-current-time.jpg" class="ms-docimage" style="max-width:300px;"/>
+
+    * **Color**: choose the line color using the *Color Picker*.
+    * **Size**: set the line thickness in `px`.
+    * **Style**: select the line style from `Solid`, `Dot`, `Dash`, `LongDash` or `DashDot`
+
 * Change the **Color** through the color picker
 
 * Change the **Font size**

java/services/pom.xml

@@ -163,15 +163,15 @@
             <!--.............................................-->
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ftp</artifactId>
-                <version>1.0-beta-2</version>
+                <artifactId>wagon-ssh</artifactId>
+                <version>3.5.3</version>
             </extension>
         </extensions>
     </build>
-    <distributionManagement>
+   <distributionManagement>
         <repository>
             <id>geosolutions</id>
-            <url>ftp://maven.geo-solutions.it/</url>
+            <url>sftp://maven.geo-solutions.it/</url>
         </repository>
     </distributionManagement>
     <profiles>

java/web/pom.xml

@@ -104,20 +104,20 @@
         </plugins>
         <extensions>
             <!--.............................................-->
-            <!--       GeoSolutions (using wagon ftp)       -->
+            <!--       GeoSolutions (using wagon ssh)       -->
             <!--.............................................-->
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ftp</artifactId>
-                <version>1.0-beta-2</version>
+                <artifactId>wagon-ssh</artifactId>
+                <version>3.5.3</version>
             </extension>
         </extensions>
     </build>
 
-    <distributionManagement>
+   <distributionManagement>
         <repository>
             <id>geosolutions</id>
-            <url>ftp://maven.geo-solutions.it/</url>
+            <url>sftp://maven.geo-solutions.it/</url>
         </repository>
     </distributionManagement>