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

Bindind layers together (some identified properties and deletion) #513

Merged
merged 56 commits into from
Nov 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
fcfc9ea
refactor(demo) provide composite catalog (#411)
mbarbeau Feb 13, 2020
4ce7fa2
fix(toast-panel): zoom menu icon IE fix (#414)
PhilippeLafreniere18 Feb 24, 2020
d39df8b
feat(datasource): Provide options service (#410)
mbarbeau Feb 24, 2020
6d22684
fix(forceCoordsNA): bad config
mbarbeau Feb 26, 2020
e0feb30
doc(catalog): composite catalog (#417)
mbarbeau Mar 4, 2020
d4f4e34
feat(catalog-browser-tool): set catalog browser tool title to the sel…
mbarbeau Mar 4, 2020
6faa57e
fix(search) Last checked source result was kept into the search-resul…
pelord Mar 24, 2020
5884ad8
docs(*): adding doc for map view, tool filters, message, analytics, f…
Mar 25, 2020
cc2c137
doc(import) configurable file size on import (#424)
pelord Mar 25, 2020
bac4c81
feat(search results): manage focus/unfocus and select action on searc…
PhilippeLafreniere18 Mar 25, 2020
e3ed75c
demo(ogc-filter) allowed operator at the field scale (#428)
pelord Mar 31, 2020
2307854
Docs(*) - Correction TOC level (#427)
Mar 31, 2020
e568b60
fix(query): zoom auto on single query feature (#429)
PhilippeLafreniere18 Mar 31, 2020
0c8a59c
docs(*): fix error maxZoomOnExtent and level of table of content (#437)
Apr 30, 2020
5eef39c
docs(gpx): add gpxAggregateInComment (#448)
LavoieO May 1, 2020
8bafc7c
feat(layers): Enhanced table of content for layers management (#446)
pelord May 1, 2020
63f3406
fix(contextManager): default tool after context change
mbarbeau May 4, 2020
8d5adef
feat (import/export) : export naming (#449)
LavoieO May 4, 2020
11c9471
wip
pelord May 5, 2020
e401fb9
doc(mapTool): toggleLegendOnVisibilityChange - set default value to f…
mbarbeau May 5, 2020
8be9edf
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord May 8, 2020
7a15360
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord May 11, 2020
30398fc
wip
pelord May 12, 2020
ee52705
wip
pelord May 12, 2020
dd4a036
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Jun 16, 2020
ba28529
wip
pelord Jun 16, 2020
9154e07
feat(libs): upgrade librairies (#485)
mbarbeau Aug 5, 2020
94a9658
feat(interactiveTour + welcomeWindows+docs) add new component, config…
Aug 12, 2020
db556f4
docs(legend, interactiveTour): add legendOption and fix interactiveTo…
Aug 17, 2020
abee1b7
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Sep 2, 2020
ca477af
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Sep 9, 2020
886a4f8
wip
pelord Sep 10, 2020
a7530ec
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Sep 15, 2020
c3e1e4b
wip
pelord Sep 18, 2020
207d785
wip
pelord Sep 18, 2020
be44fc7
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Sep 22, 2020
095459f
merge
pelord Oct 2, 2020
dbe552f
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Oct 2, 2020
413b0b4
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Oct 13, 2020
590544d
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Oct 13, 2020
bbb7efc
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Oct 14, 2020
c890c35
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Oct 15, 2020
9c778fc
Merge remote-tracking branch 'origin/master' into bindedLayers
pelord Oct 16, 2020
8f05dae
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Oct 20, 2020
ef0ac67
feat(search-result) clear selected feature to clear feature emphasis …
pelord Oct 20, 2020
a624227
Merge branch 'next' into bindedLayers
pelord Oct 22, 2020
d57948c
fix(docs) Documentation (#540)
Oct 26, 2020
d31366a
feat(toast-panel): Add a warning icon/tooltip if the selected result …
pelord Oct 26, 2020
9ffb06a
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Oct 26, 2020
f71be00
Merge remote-tracking branch 'origin/next' into bindedLayers
pelord Oct 26, 2020
2fc867f
feat(workspace) WMS with underlying WFS params now have a workspace
pelord Oct 27, 2020
2fdee24
wip
pelord Oct 27, 2020
5bd9007
wip
pelord Oct 27, 2020
d134425
wip
pelord Oct 27, 2020
b21b11e
wip
pelord Nov 2, 2020
653add5
Merge branch 'next' into bindedLayers
mbarbeau Nov 3, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app/pages/portal/portal.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@
[withTitle]="actionbarWithTitle"
[horizontal]="true"
[withToggleButton]="actionbarMode === 'overlay'"
[iconColor]="'primary'"
[color]="'primary'"
[mode]="actionbarMode">
</igo-actionbar>
<div class="spacer"></div>
Expand Down
77 changes: 76 additions & 1 deletion src/contexts/_base.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,81 @@
"crossOrigin": "anonymous"
}
},
{
"title": "Hybride automobile",
"baseLayer": true,
"visible": true,
"linkedLayers": {
"linkId": "HybrideAuto",
"links": [{
"bidirectionnal": true,
"syncedDelete": true,
"linkedIds": ["bgr_v_sous_route_res_sup_act"],
"properties": ["visible"]
}]
},
"sourceOptions": {
"url": "https://geoegl.msp.gouv.qc.ca/apis/carto/tms/1.0.0/orthos@EPSG_3857/{z}/{x}/{-y}.jpeg",
"attributions": "© <a href='http://www.droitauteur.gouv.qc.ca/copyright.php' target='_blank'><img src='/gouvouvert/public/images/quebec/gouv_qc_logo.png' width='64' height='14'>Gouvernement du Québec</a> / <a href='http://www.igouverte.org/' target='_blank'>IGO2</a>",
"type": "xyz",
"maxZoom": 19,
"crossOrigin": "anonymous"
}
},
{
"title": "bgr_v_sous_route_res_sup_act",
"opacity": 0.5,
"showInLayerList": false,
"linkedLayers": {
"linkId": "bgr_v_sous_route_res_sup_act"
},
"sourceOptions": {
"type": "wms",
"queryable": true,
"url": "/swtq",
"params": {
"layers": "bgr_v_sous_route_res_sup_act"
}
}
},
{
"title": "Hybride vélo",
"baseLayer": true,
"visible": false,
"linkedLayers": {
"linkId": "HybrideVelo",
"links": [{
"bidirectionnal": true,
"syncedDelete": true,
"linkedIds": ["convi_velo_glv"],
"properties": ["visible"]
}]
},
"sourceOptions": {
"url": "https://geoegl.msp.gouv.qc.ca/apis/carto/tms/1.0.0/orthos@EPSG_3857/{z}/{x}/{-y}.jpeg",
"attributions": "© <a href='http://www.droitauteur.gouv.qc.ca/copyright.php' target='_blank'><img src='/gouvouvert/public/images/quebec/gouv_qc_logo.png' width='64' height='14'>Gouvernement du Québec</a> / <a href='http://www.igouverte.org/' target='_blank'>IGO2</a>",
"type": "xyz",
"maxZoom": 19,
"crossOrigin": "anonymous"
}
},
{
"title": "convi_velo_glv",
"opacity": 0.5,
"showInLayerList": false,
"linkedLayers": {
"linkId": "convi_velo_glv"
},
"sourceOptions": {
"type": "wms",
"url": "/swtq",
"params": {
"layers": "convi_velo_glv"
}
}
},


{
"title": "Aucun",
"baseLayer": true,
Expand All @@ -46,7 +121,7 @@
{
"id": "carte_gouv_qc",
"title": "Carte Topo",
"visible": true,
"visible": false,
"baseLayer": true,
"sourceOptions": {
"url": "https://geoegl.msp.gouv.qc.ca/apis/carto/tms/1.0.0/carte_gouv_qc_ro@EPSG_3857/{z}/{x}/{-y}.png",
Expand Down
4 changes: 4 additions & 0 deletions src/contexts/_contexts.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
{
"uri": "ogcFilters",
"title": "Filtre attributaire (Attribute filter)"
},
{
"uri": "layerSync",
"title": "Synchronisation de layers"
},
{
"uri": "workspace",
Expand Down
264 changes: 264 additions & 0 deletions src/contexts/layerSync.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
{
"uri": "layerSync",
"title": "Layer Sync",
"base": "_base",
"layers": [
{
"title": "TimeFilter WMS Destination",
"id": "TIMEFILTERDestination",
"linkedLayers": {
"linkId": "wmsTimeFilterDest"
},
"visible": true,
"sourceOptions": {
"url": "https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi",
"timeFilterable": true,
"queryable": true,
"queryFormat": "gml2",
"queryTitle": "date_observation",
"optionsFromCapabilities": true,
"params": {
"layers": "vg_observation_v_autre_wmst",
"version": "1.3.0"
},
"type": "wms"
}
},
{
"title": "TimeFilter WMS Source",
"id": "TIMEFILTERSource",
"linkedLayers": {
"linkId": "wmsTimeFilterSrc",
"links": [{
"bidirectionnal": true,
"linkedIds": ["wmsTimeFilterDest"],
"properties": ["opacity","timeFilter","visible"]
}]
},
"visible": true,
"sourceOptions": {
"url": "https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi",
"timeFilterable": true,
"timeFilter": {
"min": "1990-01-01",
"max": "2020-03-28",
"style": "calendar",
"range": true,
"type": "date"
},
"queryable": true,
"queryFormat": "gml2",
"queryTitle": "date_observation",
"optionsFromCapabilities": true,
"params": {
"layers": "vg_observation_v_autre_wmst",
"version": "1.3.0"
},
"type": "wms"
}
},

{
"title": "OgcFilters WMS Destination",
"visible": false,
"id": "DestinationWMSOGCFILTERS",
"linkedLayers": {
"linkId": "wmsOgcFiltersDest"
},
"sourceOptions": {
"queryable": true,
"type": "wms",
"url": "https://geoegl.msp.gouv.qc.ca/apis/ws/swtq",
"urlWfs": "https://geoegl.msp.gouv.qc.ca/apis/ws/swtq",
"params": {
"layers": "radars_photos"
},
"paramsWFS": {
"featureTypes": "radars_photos",
"fieldNameGeometry": "geometry",
"maxFeatures": 10000,
"version": "1.1.0",
"outputFormat": "geojson",
"outputFormatDownload": "shp"
}
}
},
{
"title": "OgcFilters WMS Source",
"id": "wmsOgcFiltersSrc",
"minResolution": 0,
"maxResolution": 400,
"linkedLayers": {
"linkId": "wmsOgcFiltersSrc",
"links": [{
"bidirectionnal": true,
"syncedDelete": true,
"linkedIds": ["wmsOgcFiltersDest","wfsOgcFilterDest"],
"properties": ["zIndex", "opacity","visible","ogcFilters","minResolution", "maxResolution" ]
}]
},
"sourceOptions": {
"queryable": true,
"type": "wms",
"url": "https://geoegl.msp.gouv.qc.ca/apis/ws/swtq",
"urlWfs": "https://geoegl.msp.gouv.qc.ca/apis/ws/swtq",
"params": {
"layers": "radars_photos"
},
"ogcFilters": {
"enabled": true,
"editable": true,
"pushButtons": {
"groups": [
{"title": "Group 1 Title","name": "1","ids": ["id1","id2"]},
{"title": "Group 2 Title", "name": "2", "ids": ["id1"]}
],
"bundles": [
{
"id": "id1",
"logical": "Or",
"buttons": [
{
"title": "Radar photo fixe",
"enabled": true,
"color": "0,0,255",
"tooltip": "Here a tooltip explaning ...",
"filters": {
"operator": "PropertyIsEqualTo",
"propertyName": "typeAppareil",
"expression": "Radar photo fixe"
}
},
{
"title": "Radar photo mobile",
"enabled": false,
"color": "255,200,0",
"tooltip": "Here a tooltip explaning ...",
"filters": {
"operator": "PropertyIsEqualTo",
"propertyName": "typeAppareil",
"expression": "Radar photo mobile"
}
},
{
"title": "Radar photo fixe + feu rouge",
"enabled": false,
"color": "0,200,0",
"tooltip": "Here a tooltip explaning ...",
"filters": {
"operator": "PropertyIsEqualTo",
"propertyName": "typeAppareil",
"expression": "Radar photo fixe et surveillance au feu rouge"
}
},
{
"title": "Radar feu rouge",
"enabled": false,
"color": "255,0,0",
"tooltip": "Here a tooltip explaning ...",
"filters": {
"operator": "PropertyIsEqualTo",
"propertyName": "typeAppareil",
"expression": "Appareil de surveillance au feu rouge"
}
}
]
},
{
"id": "id2",
"logical": "Or",
"vertical": true,
"buttons": [
{
"title": "Montréal & Laval",
"enabled": false,
"tooltip": "Here a tooltip explaning ...",
"filters": {
"logical": "Or",
"filters": [
{
"operator": "PropertyIsEqualTo",
"propertyName": "region",
"expression": "Montréal"
},
{
"operator": "PropertyIsEqualTo",
"propertyName": "region",
"expression": "Laval"
}
]
}
},
{
"title": "Outside Montréal & Laval",
"enabled": false,
"tooltip": "Here a tooltip explaning ...",
"filters": {
"logical": "And",
"filters": [
{
"operator": "PropertyIsNotEqualTo",
"propertyName": "region",
"expression": "Montréal"
},
{
"operator": "PropertyIsNotEqualTo",
"propertyName": "region",
"expression": "Laval"
}
]
}
}
]
}
]
},
"allowedOperatorsType": "all"
},
"paramsWFS": {
"featureTypes": "radars_photos",
"fieldNameGeometry": "geometry",
"maxFeatures": 10000,
"version": "1.1.0",
"outputFormat": "geojson",
"outputFormatDownload": "shp"
}
}
},
{
"title": "OgcFilters WFS Destination",
"linkedLayers": {
"linkId": "wfsOgcFilterDest"
},
"showInLayerList": true,
"visible": true,
"sourceOptions": {
"queryable": true,
"params": {
"featureTypes": "radars_photos",
"fieldNameGeometry": "geometry",
"maxFeatures": 10000,
"version": "2.0.0",
"outputFormatDownload": "shp"
},
"type": "wfs",
"url": "https://geoegl.msp.gouv.qc.ca/apis/ws/swtq"
}
}
],
"toolbar": [
"searchResults",
"contextManager",
"mapTools",
"ogcFilter",
"timeFilter",
"measurer",
"directions",
"catalog",
"importExport",
"print",
"shareMap",
"about"
]
}

Loading