Merge pull request #9551 from camptocamp/add-selection

Add missing selection tool 0894b56
camptocamp · Dec 4, 2024 · b6b1574 · b6b1574
2 parents d0678cc + c167284
commit b6b1574
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 63 deletions.
diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs
@@ -232,7 +232,7 @@
 
       <!-- Selection -->
       <gmf-selection-button slot="tool-button"></gmf-selection-button>
-      <div slot="tool-panel-query"  class="row pointer-events-none">
+      <div slot="tool-panel-selection"  class="row pointer-events-none">
         <div class="col-sm-12">
           <div class="gmf-app-tools-content-heading">
             {{ 'Selection' | translate }}

diff --git a/contribs/gmf/examples/options.js b/contribs/gmf/examples/options.js
@@ -59,7 +59,7 @@ const MAPSERVER_WFS_FEATURE_NS = 'http://mapserver.gis.umn.edu/mapserver';
  *
  * @type {string}
  */
-export const MAPSERVER_PROXY = `${GMF_DEMO}mapserv_proxy?ogcserver=Main+PNG`;
+export const MAPSERVER_PROXY = `${GMF_DEMO}mapserv_proxy?ogcserver=MapServer`;
 
 /**
  * MapServer proxy

diff --git a/contribs/gmf/test/spec/classes/legendmapfishprintv3.spec.js b/contribs/gmf/test/spec/classes/legendmapfishprintv3.spec.js
@@ -126,7 +126,7 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
             {
               'name': 'post_office',
               'icons': [
-                'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
+                'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=MapServer&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
               ],
             },
           ],
@@ -159,7 +159,7 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
             {
               'name': 'post_office',
               'icons': [
-                'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
+                'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=MapServer&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
               ],
             },
           ],
@@ -222,13 +222,13 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
                 {
                   'name': 'sustenance',
                   'icons': [
-                    'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=sustenance&SCALE=25000',
+                    'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=MapServer&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=sustenance&SCALE=25000',
                   ],
                 },
                 {
                   'name': 'entertainment',
                   'icons': [
-                    'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=entertainment&SCALE=25000',
+                    'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=MapServer&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=entertainment&SCALE=25000',
                   ],
                 },
               ],
@@ -251,7 +251,7 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
         {
           'name': 'fuel',
           'icons': [
-            'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=fuel&SCALE=25000',
+            'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=MapServer&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=fuel&SCALE=25000',
           ],
         },
       ],