Merge pull request #5116 from adube/gsgmf-1047-2-remove-old-query-stuff

Replace query directives by new component
camptocamp · Sep 18, 2019 · c4fbf56 · c4fbf56
2 parents 69fd21a + d3d02c8
commit c4fbf56
Show file tree

Hide file tree

Showing 29 changed files with 76 additions and 972 deletions.
diff --git a/contribs/gmf/apps/desktop/index.html.ejs b/contribs/gmf/apps/desktop/index.html.ejs
@@ -261,16 +261,13 @@
           gmf-contextualdata=""
           gmf-contextualdata-displayed="mainCtrl.contextdataActive"
           gmf-contextualdata-map="::mainCtrl.map"
-          gmf-contextualdata-projections="::[2056, 21781, 4326]"
-          ngeo-map-query=""
-          ngeo-map-query-map="::mainCtrl.map"
-          ngeo-map-query-active="mainCtrl.queryActive"
-          ngeo-map-query-autoclear="mainCtrl.queryAutoClear"
-          ngeo-bbox-query=""
-          ngeo-bbox-query-map="::mainCtrl.map"
-          ngeo-bbox-query-active="mainCtrl.queryActive"
-          ngeo-bbox-query-autoclear="mainCtrl.queryAutoClear">
+          gmf-contextualdata-projections="::[2056, 21781, 4326]">
         </gmf-map>
+        <ngeo-query
+          active="mainCtrl.queryActive"
+          autoclear="mainCtrl.queryAutoClear"
+          map="::mainCtrl.map">
+        </ngeo-query>
 
         <!--infobar-->
         <div class="gmf-app-footer" ng-class="{'gmf-app-active': mainCtrl.showInfobar}">

diff --git a/contribs/gmf/apps/desktop_alt/Controller.js b/contribs/gmf/apps/desktop_alt/Controller.js
@@ -196,4 +196,8 @@ module.value('gmfPermalinkOptions', /** @type {import('gmf/permalink/Permalink.j
   ]
 }));
 
+module.value('ngeoQueryOptions', {
+  'limit': 50
+});
+
 export default module;
diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs
@@ -300,17 +300,13 @@
           class="gmf-map"
           gmf-map-map="mainCtrl.map"
           gmf-map-manage-resize="mainCtrl.manageResize"
-          gmf-map-resize-transition="mainCtrl.resizeTransition"
-          ngeo-map-query=""
-          ngeo-map-query-map="::mainCtrl.map"
-          ngeo-map-query-active="mainCtrl.queryActive"
-          ngeo-map-query-autoclear="mainCtrl.queryAutoClear"
-          ngeo-bbox-query=""
-          ngeo-bbox-query-limit="50"
-          ngeo-bbox-query-map="::mainCtrl.map"
-          ngeo-bbox-query-active="mainCtrl.queryActive"
-          ngeo-bbox-query-autoclear="mainCtrl.queryAutoClear">
+          gmf-map-resize-transition="mainCtrl.resizeTransition">
         </gmf-map>
+        <ngeo-query
+          active="mainCtrl.queryActive"
+          autoclear="mainCtrl.queryAutoClear"
+          map="::mainCtrl.map">
+        </ngeo-query>
         <gmf-floorselector class="gmf-floorselector ol-unselectable ol-control"
           value="mainCtrl.dimensions.FLOOR">
         </gmf-floorselector>

diff --git a/contribs/gmf/apps/iframe_api/index.html.ejs b/contribs/gmf/apps/iframe_api/index.html.ejs
@@ -53,16 +53,13 @@
           class="gmf-map"
           gmf-map-map="mainCtrl.map"
           gmf-map-manage-resize="mainCtrl.manageResize"
-          gmf-map-resize-transition="mainCtrl.resizeTransition"
-          ngeo-map-query=""
-          ngeo-map-query-map="::mainCtrl.map"
-          ngeo-map-query-active="mainCtrl.queryActive"
-          ngeo-map-query-autoclear="mainCtrl.queryAutoClear"
-          ngeo-bbox-query=""
-          ngeo-bbox-query-map="::mainCtrl.map"
-          ngeo-bbox-query-active="mainCtrl.queryActive"
-          ngeo-bbox-query-autoclear="mainCtrl.queryAutoClear">
+          gmf-map-resize-transition="mainCtrl.resizeTransition">
         </gmf-map>
+        <ngeo-query
+          active="mainCtrl.queryActive"
+          autoclear="mainCtrl.queryAutoClear"
+          map="::mainCtrl.map">
+        </ngeo-query>
         <div id="scaleline"></div>
         <gmf-layertree
           gmf-layertree-dimensions="mainCtrl.dimensions"

diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs
@@ -24,11 +24,12 @@
       <gmf-map
         gmf-map-map="mainCtrl.map"
         gmf-map-manage-resize="mainCtrl.manageResize"
-        gmf-map-resize-transition="mainCtrl.resizeTransition"
-        ngeo-map-query=""
-        ngeo-map-query-map="::mainCtrl.map"
-        ngeo-map-query-active="mainCtrl.queryActive">
+        gmf-map-resize-transition="mainCtrl.resizeTransition">
       </gmf-map>
+      <ngeo-query
+        active="mainCtrl.queryActive"
+        map="::mainCtrl.map">
+      </ngeo-query>
       <gmf-displayquerywindow
         gmf-displayquerywindow-featuresstyle="::mainCtrl.queryFeatureStyle"
         gmf-displayquerywindow-defaultcollapsed="false">

diff --git a/contribs/gmf/apps/mobile_alt/index.html.ejs b/contribs/gmf/apps/mobile_alt/index.html.ejs
@@ -23,10 +23,11 @@
       <gmf-map
         gmf-map-map="mainCtrl.map"
         gmf-map-manage-resize="mainCtrl.manageResize"
-        gmf-map-resize-transition="mainCtrl.resizeTransition"
-        ngeo-map-query=""
-        ngeo-map-query-map="::mainCtrl.map"
-        ngeo-map-query-active="mainCtrl.queryActive"></gmf-map>
+        gmf-map-resize-transition="mainCtrl.resizeTransition"></gmf-map>
+      <ngeo-query
+        active="mainCtrl.queryActive"
+        map="::mainCtrl.map">
+      </ngeo-query>
       <gmf-displayquerywindow
         gmf-displayquerywindow-featuresstyle="::mainCtrl.queryFeatureStyle"
         gmf-displayquerywindow-defaultcollapsed="false">

diff --git a/contribs/gmf/apps/oeedit/index.html.ejs b/contribs/gmf/apps/oeedit/index.html.ejs
@@ -127,16 +127,13 @@
           gmf-contextualdata=""
           gmf-contextualdata-displayed="mainCtrl.contextdataActive"
           gmf-contextualdata-map="::mainCtrl.map"
-          gmf-contextualdata-projections="::[2056, 21781, 4326]"
-          ngeo-map-query=""
-          ngeo-map-query-map="::mainCtrl.map"
-          ngeo-map-query-active="mainCtrl.queryActive"
-          ngeo-map-query-autoclear="mainCtrl.queryAutoClear"
-          ngeo-bbox-query=""
-          ngeo-bbox-query-map="::mainCtrl.map"
-          ngeo-bbox-query-active="mainCtrl.queryActive"
-          ngeo-bbox-query-autoclear="mainCtrl.queryAutoClear">
+          gmf-contextualdata-projections="::[2056, 21781, 4326]">
         </gmf-map>
+        <ngeo-query
+          active="mainCtrl.queryActive"
+          autoclear="mainCtrl.queryAutoClear"
+          map="::mainCtrl.map">
+        </ngeo-query>
 
         <!--infobar-->
         <div class="gmf-app-footer" ng-class="{'gmf-app-active': mainCtrl.showInfobar}">

diff --git a/contribs/gmf/examples/displayquerygrid.html b/contribs/gmf/examples/displayquerygrid.html
@@ -9,14 +9,12 @@
   </head>
   <body ng-controller="MainController as ctrl">
 
-    <gmf-map gmf-map-map="ctrl.map"
-        ngeo-map-query=""
-        ngeo-map-query-map="::ctrl.map"
-        ngeo-map-query-active="ctrl.queryActive"
-        ngeo-bbox-query=""
-        ngeo-bbox-query-map="::ctrl.map"
-        ngeo-bbox-query-active="ctrl.queryActive">
-    </gmf-map>
+    <gmf-map gmf-map-map="ctrl.map"></gmf-map>
+
+    <ngeo-query
+        active="ctrl.queryActive"
+        map="::ctrl.map">
+    </ngeo-query>
 
     <div id="tree-container">
       <div>

diff --git a/contribs/gmf/examples/displayquerygrid.js b/contribs/gmf/examples/displayquerygrid.js
@@ -15,8 +15,7 @@ import ngeoGridModule from 'ngeo/grid/module.js';
 import ngeoMapModule from 'ngeo/map/module.js';
 import ngeoMiscBtnComponent from 'ngeo/misc/btnComponent.js';
 import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
-import ngeoQueryBboxQueryComponent from 'ngeo/query/bboxQueryComponent.js';
-import ngeoQueryMapQueryComponent from 'ngeo/query/mapQueryComponent.js';
+import ngeoQueryComponent from 'ngeo/query/component.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olLayerTile from 'ol/layer/Tile.js';
@@ -41,8 +40,7 @@ const module = angular.module('gmfapp', [
   ngeoGridModule.name,
   ngeoMapModule.name, // for ngeo.map.FeatureOverlay, perhaps remove me
   ngeoMiscBtnComponent.name,
-  ngeoQueryBboxQueryComponent.name,
-  ngeoQueryMapQueryComponent.name,
+  ngeoQueryComponent.name,
 ]);
 
 

diff --git a/contribs/gmf/examples/displayquerywindow.html b/contribs/gmf/examples/displayquerywindow.html
@@ -9,14 +9,12 @@
   </head>
   <body ng-controller="MainController as ctrl">
 
-    <gmf-map gmf-map-map="ctrl.map"
-        ngeo-map-query=""
-        ngeo-map-query-map="::ctrl.map"
-        ngeo-map-query-active="ctrl.queryActive"
-        ngeo-bbox-query=""
-        ngeo-bbox-query-map="::ctrl.map"
-        ngeo-bbox-query-active="ctrl.queryActive">
-    </gmf-map>
+    <gmf-map gmf-map-map="ctrl.map"></gmf-map>
+
+    <ngeo-query
+        active="ctrl.queryActive"
+        map="::ctrl.map">
+    </ngeo-query>
 
     <div id="tree-container">
       <div>
@@ -39,8 +37,8 @@
     <div class="clear-left"></div>
 
     <p id="desc">
-      This example shows how to use the <code>ngeo-map-query</code>
-      directive in combination with the
+      This example shows how to use the <code>ngeo-query</code>
+      component in combination with the
       <code>gmf.datasource.Manager</code>.
       The DataSourcesManager fetches the themes returned by the theme
       service and adds one DataSource, which is used by the querent service

diff --git a/contribs/gmf/examples/displayquerywindow.js b/contribs/gmf/examples/displayquerywindow.js
@@ -13,8 +13,7 @@ import gmfQueryWindowComponent from 'gmf/query/windowComponent.js';
 import gmfThemeThemes from 'gmf/theme/Themes.js';
 import ngeoMiscBtnComponent from 'ngeo/misc/btnComponent.js';
 import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
-import ngeoQueryBboxQueryComponent from 'ngeo/query/bboxQueryComponent.js';
-import ngeoQueryMapQueryComponent from 'ngeo/query/mapQueryComponent.js';
+import ngeoQueryComponent from 'ngeo/query/component.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
 import olLayerTile from 'ol/layer/Tile.js';
@@ -39,8 +38,7 @@ const module = angular.module('gmfapp', [
   gmfThemeThemes.name,
   ngeoMapModule.name, // for ngeo.map.FeatureOverlay, perhaps remove me
   ngeoMiscBtnComponent.name,
-  ngeoQueryBboxQueryComponent.name,
-  ngeoQueryMapQueryComponent.name,
+  ngeoQueryComponent.name,
 ]);
 
 

diff --git a/contribs/gmf/examples/filterselector.html b/contribs/gmf/examples/filterselector.html
@@ -8,15 +8,13 @@
     <meta name="mobile-web-app-capable" content="yes">
   </head>
   <body ng-controller="MainController as ctrl">
-    <gmf-map
-      gmf-map-map="ctrl.map"
-      ngeo-map-query=""
-      ngeo-map-query-map="::ctrl.map"
-      ngeo-map-query-active="ctrl.queryActive"
-      ngeo-bbox-query=""
-      ngeo-bbox-query-map="::ctrl.map"
-      ngeo-bbox-query-active="ctrl.queryActive">
-    </gmf-map>
+
+    <gmf-map gmf-map-map="ctrl.map"></gmf-map>
+
+    <ngeo-query
+        active="ctrl.queryActive"
+        map="::ctrl.map">
+    </ngeo-query>
 
     <gmf-layertree
         class="panel panel-default panel-body"

diff --git a/contribs/gmf/examples/filterselector.js b/contribs/gmf/examples/filterselector.js
@@ -15,8 +15,7 @@ import gmfMapComponent from 'gmf/map/component.js';
 
 import gmfThemeThemes from 'gmf/theme/Themes.js';
 import ngeoDatasourceDataSources from 'ngeo/datasource/DataSources.js';
-import ngeoQueryBboxQueryComponent from 'ngeo/query/bboxQueryComponent.js';
-import ngeoQueryMapQueryComponent from 'ngeo/query/mapQueryComponent.js';
+import ngeoQueryComponent from 'ngeo/query/component.js';
 import ngeoMiscToolActivate from 'ngeo/misc/ToolActivate.js';
 import ngeoMiscToolActivateMgr from 'ngeo/misc/ToolActivateMgr.js';
 import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
@@ -41,8 +40,7 @@ const module = angular.module('gmfapp', [
   gmfThemeThemes.name,
   ngeoDatasourceDataSources.name,
   ngeoMiscToolActivateMgr.name,
-  ngeoQueryBboxQueryComponent.name,
-  ngeoQueryMapQueryComponent.name,
+  ngeoQueryComponent.name,
 ]);
 
 

diff --git a/contribs/gmf/examples/importdatasource.html b/contribs/gmf/examples/importdatasource.html
@@ -8,15 +8,13 @@
     <meta name="mobile-web-app-capable" content="yes">
   </head>
   <body ng-controller="MainController as ctrl">
-    <gmf-map
-      gmf-map-map="ctrl.map"
-      ngeo-map-query=""
-      ngeo-map-query-map="::ctrl.map"
-      ngeo-map-query-active="ctrl.queryActive"
-      ngeo-bbox-query=""
-      ngeo-bbox-query-map="::ctrl.map"
-      ngeo-bbox-query-active="ctrl.queryActive">
-    </gmf-map>
+
+    <gmf-map gmf-map-map="ctrl.map"></gmf-map>
+
+    <ngeo-query
+        active="ctrl.queryActive"
+        map="::ctrl.map">
+    </ngeo-query>
 
     <div class="panel panel-default panel-body">
       <p id="desc">

diff --git a/contribs/gmf/examples/importdatasource.js b/contribs/gmf/examples/importdatasource.js
@@ -14,9 +14,8 @@ import gmfMapComponent from 'gmf/map/component.js';
 import gmfThemeThemes from 'gmf/theme/Themes.js';
 import ngeoDatasourceDataSources from 'ngeo/datasource/DataSources.js';
 
-import ngeoQueryBboxQueryComponent from 'ngeo/query/bboxQueryComponent.js';
+import ngeoQueryComponent from 'ngeo/query/component.js';
 
-import ngeoQueryMapQueryComponent from 'ngeo/query/mapQueryComponent.js';
 import EPSG21781 from '@geoblocks/proj/src/EPSG_21781.js';
 import olMap from 'ol/Map.js';
 import olView from 'ol/View.js';
@@ -37,8 +36,7 @@ const module = angular.module('gmfapp', [
   gmfMapComponent.name,
   gmfThemeThemes.name,
   ngeoDatasourceDataSources.name,
-  ngeoQueryBboxQueryComponent.name,
-  ngeoQueryMapQueryComponent.name,
+  ngeoQueryComponent.name,
 ]);
 
 

diff --git a/contribs/gmf/src/controllers/AbstractAPIController.js b/contribs/gmf/src/controllers/AbstractAPIController.js
@@ -1,7 +1,6 @@
 import angular from 'angular';
 import gmfControllersAbstractAppController, {AbstractAppController, getLocationIcon}
   from 'gmf/controllers/AbstractAppController.js';
-import ngeoQueryBboxQueryComponent from 'ngeo/query/bboxQueryComponent.js';
 import ngeoMapResizemap from 'ngeo/map/resizemap.js';
 import * as olProj from 'ol/proj.js';
 import olMap from 'ol/Map.js';
@@ -66,7 +65,6 @@ export class AbstractAPIController extends AbstractAppController {
 const module = angular.module('GmfAbstractAPIControllerModule', [
   gmfControllersAbstractAppController.name,
   ngeoMapResizemap.name,
-  ngeoQueryBboxQueryComponent.name
 ]);
 
 module.controller('AbstractAPIController', AbstractAPIController);

diff --git a/contribs/gmf/src/controllers/AbstractAppController.js b/contribs/gmf/src/controllers/AbstractAppController.js
@@ -19,7 +19,7 @@ import ngeoMiscExtraModule from 'ngeo/misc/extraModule.js';
 import ngeoMiscFeatureHelper, {FeatureFormatType} from 'ngeo/misc/FeatureHelper.js';
 import ngeoMiscToolActivate from 'ngeo/misc/ToolActivate.js';
 import ngeoQueryMapQuerent from 'ngeo/query/MapQuerent.js';
-import ngeoQueryMapQueryComponent from 'ngeo/query/mapQueryComponent.js';
+import ngeoQueryComponent from 'ngeo/query/component.js';
 import ngeoStatemanagerModule from 'ngeo/statemanager/module.js';
 import ngeoStatemanagerWfsPermalink from 'ngeo/statemanager/WfsPermalink.js';
 import ngeoGeolocation from 'ngeo/geolocation/component.js';
@@ -859,7 +859,7 @@ const module = angular.module('GmfAbstractAppControllerModule', [
   ngeoMiscExtraModule.name,
   ngeoMiscFeatureHelper.name,
   ngeoQueryMapQuerent.name,
-  ngeoQueryMapQueryComponent.name,
+  ngeoQueryComponent.name,
   ngeoStatemanagerModule.name,
   ngeoStatemanagerWfsPermalink.name,
   ngeoGeolocation.name,

diff --git a/examples/bboxquery-ref.png b/examples/bboxquery-ref.png
diff --git a/examples/bboxquery.css b/examples/bboxquery.css
diff --git a/examples/bboxquery.html b/examples/bboxquery.html