Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide operator at the field scale #608

Merged
merged 8 commits into from
Mar 31, 2020
Merged

Provide operator at the field scale #608

merged 8 commits into from
Mar 31, 2020

Conversation

pelord
Copy link
Member

@pelord pelord commented Mar 27, 2020

Please check if the PR fulfills these requirements

What is the current behavior? (You can also link to an open issue here)
Allowed operator were defined for all the fields

What is the new behavior?
Allowed types are :

  • 'all' = PropertyIsEqualTo, PropertyIsNotEqualTo, PropertyIsLike, PropertyIsGreaterThan, PropertyIsGreaterThanOrEqualTo, PropertyIsLessThan, PropertyIsLessThanOrEqualTo, PropertyIsBetween, During, PropertyIsNull, Intersects, Within, Contains
  • 'spatial' = Intersects and Within
  • 'basicandspatial' = PropertyIsEqualTo,PropertyIsNotEqualTo,Intersects and Within
    (Default value if none provided)
  • 'basic' = PropertyIsEqualTo,PropertyIsNotEqualTo
  • 'time' = During
  • 'basicnumeric' = PropertyIsEqualTo, PropertyIsNotEqualTo, PropertyIsGreaterThan, - PropertyIsGreaterThanOrEqualTo, PropertyIsLessThan, PropertyIsLessThanOrEqualTo,

Now, we can define the allowed filter type for all fields or at the level field.

"sourceFields": [
          { "name": "code_municipalite", "alias": "# de la municipalitée" },
          { "name": "date_observation", "allowedOperatorsType": "time" },
          { "name": "urgence", "allowedOperatorsType": "basic" }
        ],
        "ogcFilters": {
          "allowedOperatorsType": "all",
          "enabled": true,
          "editable": true,
          "filters": {
            "operator": "PropertyIsEqualTo",
            "propertyName": "code_municipalite",
            "expression": "10043"
          }
        },

Does this PR introduce a breaking change? (check one with "x")

[ ] Yes
[ ] No

If this PR contains a breaking change, please describe the impact and migration path for existing applications:

Other information:

@mbarbeau mbarbeau merged commit 1950c95 into next Mar 31, 2020
@mbarbeau mbarbeau deleted the ogcFilterOperators branch March 31, 2020 15:15
mbarbeau pushed a commit that referenced this pull request May 11, 2020
* feat(ogc-filter)Provide allowed operator at the field scale

* wip

* wip

* feat(ogc-filter) provide tooltip for operators

* wip

* wip

* wip

* i18n(geo locale) wip

Co-authored-by: Pierre-Étienne Lord <pe_lord@yahoo.ca>
mbarbeau added a commit that referenced this pull request Nov 3, 2020
…deletion) (#720)

* fix(directions): search term change and map synchronization (#580)

* fix(directions) Always subscribe to term change

* fix(directions) add layer to map synchronization

* refactior(directions) lint

* locale(mapTool): empty map

* refactor(map): remove not used alias property

* chore(template): fix pull request template

* fix(search): provide projection service for coordinates search source

* locale(auth): add login lockout message

* fix(ogc-filter, style): better handling grouped layers (#581)

* fix(*) better handling grouped layers

* refactor(share-map) Rollback for grouped layers

* fix(demo/toast-panel): fix spatial-filter alias in demo / resize checkbox in zoom menu feature (#586)

* feat(datasource): retrieve query format from capabilities (#582)

* query format from capabilities

* lint

* fix(geojson2): extract

* Update capabilities.service.ts

* feat(datasource): retrieve options from api (#583)

* in progress

* in progress

* in progress

* infoFormat

* remove console.log

* Update options-api.service.ts

* max resolutions null

* keep query params concept

* convert scaleDenom to resolution

* fix imports

* add providers

* fix options api error

* fix(datasource): improve error handling

* chore(*): add package dependencies

* fix(layer): add tile-watcher to vectortile-layer (#595)

* tile watcher added to vectortile layer

* fix export network-ionic

* remove networkionic import

* feat(search-setting): Add a button to check/uncheck all sources (#589)

* refactor(ilayer) add fileds to result formatter

* feat(search-setting)Add a button to check/uncheck all sources

* Update fr.geo.json

* Update en.geo.json

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>

* feat(context): allow user to filter context list (#588)

* feat(context): allow user to filter context list

* light interface changes

* Add a display control for the context filter

* fix(search) Last checked source result was kept into the search-results when unchecked. (#602)

Co-authored-by: PE Lord <pe_lord@yahoo.ca>

* fix(layer): updateInResolutionRange works properly if maxResolution = 0 (#597)

* fix(layer): updateInResolutionRange works properly if maxResolution = 0

* Update layer.ts

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>

* feat(import) configurable client side file size (#603)

* feat(import) configurable client side file size

* refactor(auth) typo

* refactor(import) review

Co-authored-by: PE Lord <pe_lord@yahoo.ca>

* fix(spatial-filter): fix bug when _internal is not defined

* fix(pointer summary) Fix context change, summary was not shown. (#607)

* fix(pointer summary) Fix context change, summary was not shown.

* refactor(pointer summary) Add layer if not in list

Co-authored-by: PE Lord <pe_lord@yahoo.ca>

* feat(search results): manage focus/unfocus and select action on search results (and get feature info) (#585)

* feat/fix(search results): manage focus/unfocus and select action on search results (and get feature info)

* feat/fix(search results): manage focus/unfocus and select action on search results (and get feature info)

* lasts modifs on focus/unfocus/select search results

* feat/fix(search results): manage focus/unfocus and select action on search results (and get feature info)

* lasts modifs on focus/unfocus/select search results

* search results display lasts modfis

* lasts modifs

* feat/fix(search-results): manage focus/unfocus/select event on search results type + automatic scroll on keypad event

* fix(search-results-tool): fix lint problem

* fix(search-results): fix focused style and scroll with panel and display more results

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>

* style(*): Group title emphasis opacity from 0.8 to 0.9 (#611)

* fix(query): fix Firefox and IE svg change bug (#610)

* chore(build): build warn ng-packagr  No name was provided for external module (#609)

* chore(*) build warn ng-packagr  No name was provided for external module '...' in output.globals – guessing '...'

* chore(*) combineLatest(a,b,c) deprecated

* ui(scale): better visibility on dark background

* feat(ogc-filter): Provide operator at the field scale (#608)

* feat(ogc-filter)Provide allowed operator at the field scale

* wip

* wip

* feat(ogc-filter) provide tooltip for operators

* wip

* wip

* wip

* i18n(geo locale) wip

Co-authored-by: Pierre-Étienne Lord <pe_lord@yahoo.ca>

* chore(*) warn ng-packagr No name was provided for external module (#612)

* i18n(geo locale) wip

* chore(*) warn ng-packagr No name was provided for external module

* chore(*) warn ng-packagr No name was provided for external module

* wip

* fix(context): queryable must be saved

* fix(context): queryable must be saved

* fix(queryFormat): fix layer's queryFormat htmlgml2 (#620)

* fix(queryFormat): fix HTMLGML2 query format

* WIP

* WIP

* feat(QueryService): Add create geom for mapTag when geom is null on extractData #617 (#618)

* fix(QueryService) : create geom when is null

* withdraw comment + add EX in query component

* withdraw comment

* restore demo

Co-authored-by: Josée Martel <josee.martel.9@ulaval.ca>

* fix(TimeFilter): calendar year range, don't reset year range in UI (igo2 #359) (#619)

* fix(timeFilter) bug #359

* fix(time-filter-form) withdraw comment

Co-authored-by: Josée Martel <josee.martel.9@ulaval.ca>

* fix(time-filter): fix UTC time, language and style on selected date (#621)

* WIP

* fix(time-filter)

* fix(time-filter)

* fix(network): connection message after leaving the tab on the phone (#614)

* feat(context-list): add context list tool (alpha, add context) (#624)

* feat(import-export): ajout de l'aggregation pour gpx (#623)

* fix(catalog): apply the regular expression on the isolated layers of the first level of the catalog (#599)

Co-authored-by: hbernard <Hugues.Bernard@transports.gouv.qc.ca>

* feat import-export ajout de l'aggregation pour gpx

* correctif pour le pull request camelCase et anglais

* feat(layers): Enhanced table of content for layers management (#625)


Co-authored-by: Pierre-Étienne Lord <pe_lord@yahoo.ca>
Co-authored-by: Philippe <phillaf4@gmail.com>
Co-authored-by: PhilippeL <PHILIPPE.LAFRENIERE@msp.gouv.qc.ca>
Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>

* fix(layer): prevent empty map message to be shown too quickly

* fix(layer-list): fix baselayer with select all and opacity CSS (#632)

* fix(map): tracking fix (#629)

* fix tracking

* remove console.log

* fix(feature): excludeAttribute works with offlineButton (#628)

* fix(feature): excludeAttribute offline now works with the offline button

* remove extra

* using offlineButtonToggle$

* remove uselesss attribute

Co-authored-by: drekss <bovictor123>

* feat (import/export) : export naming  (#631)

* lint(import-export)

* feat(import): import cluster (#616)

* commit 03-13

* commit cluster style into import feature

Co-authored-by: drekss <bovictor123>

* locale(import): fix translate

* fix(layer-list): fix selection mode (#635)

* style(map-offline): remove console.log

* fix(map-legend) listen to layers modification (#636)

* fix(map-legend) listen to layers modification

* ui(map tools) increase the delay before allow empty layers to be shown

* fix(map-legend) Hide all non active legend when allowShowAllLegends is false (on context change) (#637)

* fix(map-legend) Hide all non active legend when allowShowAllLegends is false (on context change)

* refactor lint

* wip

* wip

* wip

* wip

* wip

* wip

* feat(layer sync) allow min/max resolution sync.

* wip

* travis

* feat(libs): upgrade librairies (#696)

* chore(utils): bowser version

* fix(spatial-filter): fix spatial filter 1.4 (#697)

* fix(layer-list-tool) alphaSort icon name tooltip (#700)

Co-authored-by: Josée Martel <josee.martel.9@ulaval.ca>

* feat(interactiveTour + welcomeWindows): add new component and service (#701)

* tour

* lint

* feat add noBackButton on step

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>
Co-authored-by: Josée Martel <josee.martel.9@ulaval.ca>

* fix(layer-legend.component) Fix param legendOptions.display: false (#703)

* travis

* feat(libs): upgrade librairies (#696)

* chore(utils): bowser version

* fix(spatial-filter): fix spatial filter 1.4 (#697)

* fix bug legend param display:false

* fix exemple legend param

* rebase

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>
Co-authored-by: Philippe Lafrenière <53181414+PhilippeLafreniere18@users.noreply.github.com>
Co-authored-by: Josée Martel <josee.martel.9@ulaval.ca>

* feat(entity-table): add pagination (#707)

* feat(entity-table) Pagination

* lint

* wip

* chore(build): build warn ng-packagr No name was provided for external module

* wip

* refactor(entity-table-paginator) refector individual input as options

* Update workspace.component.ts

* wip

* Update entity-table-paginator.component.html

* Update entity-table-paginator.component.ts

* fix(context-service) refer to issue #702 - message stored in base.json

* refactor(entity-table) translation and paginationOptions processing

* fix(entity-table)  deprecation warnint on event

* fix(entity-table) wrong last record used when clicking on a row (outside checkbox)

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>

* feat(catalog): arcgis rest data catalog (#709)

* WIP

* WIP

* WIP

* WIP

* feat(catalog): Allow arcGISRest data catalog

* unnecessary changes

* fix(interactive-tour): css fix for interactive tour (#708)

* travis

* feat(libs): upgrade librairies (#696)

* chore(utils): bowser version

* fix(spatial-filter): fix spatial filter 1.4 (#697)

* fix(layer-list-tool) alphaSort icon name tooltip (#700)

Co-authored-by: Josée Martel <josee.martel.9@ulaval.ca>

* feat(interactiveTour + welcomeWindows): add new component and service (#701)

* tour

* lint

* feat add noBackButton on step

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>
Co-authored-by: Josée Martel <josee.martel.9@ulaval.ca>

* fix(layer-legend.component) Fix param legendOptions.display: false (#703)

* travis

* feat(libs): upgrade librairies (#696)

* chore(utils): bowser version

* fix(spatial-filter): fix spatial filter 1.4 (#697)

* fix bug legend param display:false

* fix exemple legend param

* rebase

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>
Co-authored-by: Philippe Lafrenière <53181414+PhilippeLafreniere18@users.noreply.github.com>
Co-authored-by: Josée Martel <josee.martel.9@ulaval.ca>

* feat(entity-table): add pagination (#707)

* feat(entity-table) Pagination

* lint

* wip

* chore(build): build warn ng-packagr No name was provided for external module

* wip

* refactor(entity-table-paginator) refector individual input as options

* Update workspace.component.ts

* wip

* Update entity-table-paginator.component.html

* Update entity-table-paginator.component.ts

* fix(context-service) refer to issue #702 - message stored in base.json

* refactor(entity-table) translation and paginationOptions processing

* fix(entity-table)  deprecation warnint on event

* fix(entity-table) wrong last record used when clicking on a row (outside checkbox)

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>

* feat(catalog): arcgis rest data catalog (#709)

* WIP

* WIP

* WIP

* WIP

* feat(catalog): Allow arcGISRest data catalog

* unnecessary changes

* fix(interactive-tour): css fix for interactive tour (#708)

* feat(search-bar): can set appearance and map is optional

* wip

* wip

* feat(layer) linked layers could now be deleted simultaneously (syncedDelete)

* feat(mini-basemap) base layer could now have linked layers.

* wip

* merge diff

* wip zIndex

* wip

* wip

* feat(layer) sync layer displacement into the layer list

* feat(layer) time filter synchronisation between 2 layers

* refactor(layer) binded layers properties to enum

* wip

* wip

* feat(search-result) add a emphasis feature for line and poly too deep in view (#750)

* feat(search-result) add a emphasis feature for line and poly too deep in view

* wip

* feat(workspace) create a workspace on wms with wfsparams

* refactor(layer) Moving layer syn to a watcher

* wip

* refactor(workspace) refactor and some minor fix

* fix(workspace-button) presence/absence is now maintained by the current layer, not only if a workspace is available.

* wip

* wip

* refactor(icherche) lint

* refactor(wms-workspace) workspace disabled by default

* refactor(spatial-filter) prevent to create a workspace for zones

* refactor(spatial-filter) create a workspace for zone

* wip

* refactor(workspace) rename WorkspaceOptions to GeoWorkspaceOptions

* feat(*) allow to open export tool for wms with workspace

* feat(workspace) provide a default renderer for workspace column.

* wip

* wip

* i18n(workspace actions)

* fix(export-button) layers without the workspace options crash

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>
Co-authored-by: Philippe Lafrenière <53181414+PhilippeLafreniere18@users.noreply.github.com>
Co-authored-by: PE Lord <pe_lord@yahoo.ca>
Co-authored-by: Déreck Lynch <50959537+drekss@users.noreply.github.com>
Co-authored-by: josee666 <josee.martel@mffp.gouv.qc.ca>
Co-authored-by: Josée Martel <josee.martel.9@ulaval.ca>
Co-authored-by: LavoieO <64489810+LavoieO@users.noreply.github.com>
Co-authored-by: Philippe <phillaf4@gmail.com>
Co-authored-by: PhilippeL <PHILIPPE.LAFRENIERE@msp.gouv.qc.ca>
Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants