Skip to content

Commit

Permalink
Rc/1.0 (#14)
Browse files Browse the repository at this point in the history
* fixed config post merge (#3)

* Feature/address interrigator (#4)

* added addressInterrogator and InfoTable helper component

* added address interrogator and info table

* removed testing url

* reverted mistaken save

* added zoom to civic address point and cleaned up styling

* added secure config to address interrogator

* added option to activate address interrogator from property report

* Merge/public rc1.0 (#6)

* Bump ua-parser-js from 0.7.19 to 0.7.28

Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.19 to 0.7.28.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.19...0.7.28)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump lodash from 4.17.20 to 4.17.21

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump dns-packet from 1.3.1 to 1.3.4

Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <[email protected]>

* swtiched sorting to use layer index instead of drawIndex
update layer index on sort move to ensure user sorting is maintained after a-z sorting toggle

* incremented patch version

* - switched search, mymaps, and local real estate to use localStorage helpers
- added cleanup function to remove full geojson from saved search history
- disabled saving of layers added from files
- fixed error in show message event listener
- extensive "prettier" formatting changes

* removed settings buttons and functions that were added for testing

* - fixed issue with slim sidebar not showing active tool
- various code formatting changes

* added localStorage cleanup and removed refreshStorage helper

* fixed crash on slim sidebar toggle

* increment patch version

* Release 1.1 (#130)

* added global opacity slider to toc settings menu

* - fixed bug preventing default layer visibility from being applied
- added keyword check for VISIBLE_LAYERS=ALL

* fixed bug in addlayer tool preventing default server url from changing with selection

* added defaultTheme and defaultTool to mapSettings handler

* removed unnecessary emit from default tools and themes in map settings api parsing

* added toc loader for ersi rest service

* - added ability to load arcgis or geoserver content in map config
- added ARCGIS_SERVICE url parameter
- added case sensitive flag to url parameter parsing

* - added ability to identify on ImageArcGISRest layers
- added title case splitting/formatting to identify field names

* refined parsing of property names in identify

* fixed bug preventing worldImagery from loading

* set min resolution on world imagery

* - moved identify feature to common location
- added regex checking for excluded feature fields
-

* removed minResolution for world imagery

* added react router and legend app

* brought back makeGroup function in TOCHelpers

* Added all layers group

* - integrated stand alone legend app to webmap project
 - added react router
 - added ShowWindow component to display components similar to showUrlWindow

* updated handling of ArcGIS metadata url

* changed how default group is selected and loaded

* added all layers code from dev branch

* resolved issues with arcgis and the new dynamic all layers group

* removed duplicate code from merge

* fixed bug loading group with no layers and moved group parsing into function

* fixed issue with loading saved layers in default group

* switched duplicate layer/group checking to use tocName instead of layer name

* cleaned up layer loading sequence

* fixed bug in basemap imagery slider layer visibility

* added generic TableDisplay component to helpers

* - updated legend component to handle secure layers
- moved get image functions from TOC helpers to generic helpers

* fixed bug when caused by empty savedLayer object

* fixed bug causing crash when added layer is removed from all layers

* added support for secured layers

* added window.loaded and helpers to support waiting for components to load, replaced several event listeners for map, toc, and sidebar loading

* integrated layerInfo app into web viewer

* added secureKey parameter check to live layer

* added window.config and helpers to manage global settings

* merged toc loading from TOCConfig into main config

* -added parsing for zoom and center from api
-prevented geoserver load from overriding api center and zoom

* improved readability of zoom and center parsing from api

* removed unneccessary call on unmount

* - fixed bug in adding WMTS layers
- added helper to get and regiter proj4 from epsg.io
- switched default WMTS url in add data tool to weather.gc.ca

* override saved user extent when loading from mapId

* commented out console log in waitForLoad helper

* applied prettier code formatting

* fixed merge conflicts

* removed references to TOCConfig

* code layout change

* - converted usage of mainConfig to window.config
- added waitForLoad to usage of window.config
- added array object merge to handle sidebar component config from api

* removed testing value from print config

* added map id to feedback url

* added handling for viewer mode to config helper

* added municipality to search

* added printLogo handling to printRequest

* fixed styling issue in window popup header

* - added try close before showMessage to cleanup any open messages before displaying the next
 - removed arcgis layers with sublayers
 - switched getCapabilities helper to use options object
 -

* added ability to hide sidebar tabs

* - fixed several listener issues cause by waitForLoad
- fixed center coords parsing issue
- fixed loading of toc type from settings api

* - added ability to set layer visibility through settings
- added ability to collapse featured property through settings

* removed best start logo and updated the url for 211 theme popup

* added case sensitivity to search url parameters

* added length constraint to date format

* - added XYZ default to add layers tool
- updated validate layer in add layer tool to exclude xyz layer
- removed unnecessary import on TwoOneOne theme

* - added showTerms on load
- added terms popup on map load

* switched terms popup on startup to show don't show again option

* updated config with a valid local toc config

* switched default group of local config

* updated default group of local config

* added handling for GROUP url parameter

* print tool - added handling for dot and dashed lines

* applied code formatting changes

* - added ability to show coordinates for MyMaps items
- added ability to export MyMaps items
- fixed bug in getting map id from url parameters
- switched showWindow helper to accept an options object

* switched getDefaultGroup to compare with group label rather than value

* switched feature zoom on search to variable based on the size of the feature.

* added ability to export drawing to multiple formats

* removed "Cancel" from drawType lookup

* changed SR compare to uppercase

* added check for items prior to saving MyMaps

* added warning message option for layers and re-enabled disclaimer message option

* hide export option in my map for items that are not open data

* updated community services theme logo

* fixed issue with arcgis layers showing disclaimer message

* update documentation for GROUP url parameter

* Dev (#131)

* added global opacity slider to toc settings menu

* - fixed bug preventing default layer visibility from being applied
- added keyword check for VISIBLE_LAYERS=ALL

* fixed bug in addlayer tool preventing default server url from changing with selection

* added defaultTheme and defaultTool to mapSettings handler

* removed unnecessary emit from default tools and themes in map settings api parsing

* added toc loader for ersi rest service

* - added ability to load arcgis or geoserver content in map config
- added ARCGIS_SERVICE url parameter
- added case sensitive flag to url parameter parsing

* - added ability to identify on ImageArcGISRest layers
- added title case splitting/formatting to identify field names

* refined parsing of property names in identify

* fixed bug preventing worldImagery from loading

* set min resolution on world imagery

* - moved identify feature to common location
- added regex checking for excluded feature fields
-

* removed minResolution for world imagery

* added react router and legend app

* brought back makeGroup function in TOCHelpers

* Added all layers group

* - integrated stand alone legend app to webmap project
 - added react router
 - added ShowWindow component to display components similar to showUrlWindow

* updated handling of ArcGIS metadata url

* changed how default group is selected and loaded

* added all layers code from dev branch

* resolved issues with arcgis and the new dynamic all layers group

* removed duplicate code from merge

* fixed bug loading group with no layers and moved group parsing into function

* fixed issue with loading saved layers in default group

* switched duplicate layer/group checking to use tocName instead of layer name

* cleaned up layer loading sequence

* fixed bug in basemap imagery slider layer visibility

* added generic TableDisplay component to helpers

* - updated legend component to handle secure layers
- moved get image functions from TOC helpers to generic helpers

* fixed bug when caused by empty savedLayer object

* fixed bug causing crash when added layer is removed from all layers

* added support for secured layers

* added window.loaded and helpers to support waiting for components to load, replaced several event listeners for map, toc, and sidebar loading

* integrated layerInfo app into web viewer

* added secureKey parameter check to live layer

* added window.config and helpers to manage global settings

* merged toc loading from TOCConfig into main config

* -added parsing for zoom and center from api
-prevented geoserver load from overriding api center and zoom

* improved readability of zoom and center parsing from api

* removed unneccessary call on unmount

* - fixed bug in adding WMTS layers
- added helper to get and regiter proj4 from epsg.io
- switched default WMTS url in add data tool to weather.gc.ca

* override saved user extent when loading from mapId

* commented out console log in waitForLoad helper

* applied prettier code formatting

* fixed merge conflicts

* removed references to TOCConfig

* code layout change

* - converted usage of mainConfig to window.config
- added waitForLoad to usage of window.config
- added array object merge to handle sidebar component config from api

* removed testing value from print config

* added map id to feedback url

* added handling for viewer mode to config helper

* added municipality to search

* added printLogo handling to printRequest

* fixed styling issue in window popup header

* - added try close before showMessage to cleanup any open messages before displaying the next
 - removed arcgis layers with sublayers
 - switched getCapabilities helper to use options object
 -

* added ability to hide sidebar tabs

* - fixed several listener issues cause by waitForLoad
- fixed center coords parsing issue
- fixed loading of toc type from settings api

* - added ability to set layer visibility through settings
- added ability to collapse featured property through settings

* removed best start logo and updated the url for 211 theme popup

* added case sensitivity to search url parameters

* added length constraint to date format

* - added XYZ default to add layers tool
- updated validate layer in add layer tool to exclude xyz layer
- removed unnecessary import on TwoOneOne theme

* - added showTerms on load
- added terms popup on map load

* switched terms popup on startup to show don't show again option

* updated config with a valid local toc config

* switched default group of local config

* updated default group of local config

* added handling for GROUP url parameter

* print tool - added handling for dot and dashed lines

* applied code formatting changes

* - added ability to show coordinates for MyMaps items
- added ability to export MyMaps items
- fixed bug in getting map id from url parameters
- switched showWindow helper to accept an options object

* switched getDefaultGroup to compare with group label rather than value

* switched feature zoom on search to variable based on the size of the feature.

* added ability to export drawing to multiple formats

* removed "Cancel" from drawType lookup

* changed SR compare to uppercase

* added check for items prior to saving MyMaps

* added warning message option for layers and re-enabled disclaimer message option

* hide export option in my map for items that are not open data

* updated community services theme logo

* fixed issue with arcgis layers showing disclaimer message

* update documentation for GROUP url parameter

* update version

* Hotfix/1.1.x (#134)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#135)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#138)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#132)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#133)

* Dev (#131)

* added global opacity slider to toc settings menu

* - fixed bug preventing default layer visibility from being applied
- added keyword check for VISIBLE_LAYERS=ALL

* fixed bug in addlayer tool preventing default server url from changing with selection

* added defaultTheme and defaultTool to mapSettings handler

* removed unnecessary emit from default tools and themes in map settings api parsing

* added toc loader for ersi rest service

* - added ability to load arcgis or geoserver content in map config
- added ARCGIS_SERVICE url parameter
- added case sensitive flag to url parameter parsing

* - added ability to identify on ImageArcGISRest layers
- added title case splitting/formatting to identify field names

* refined parsing of property names in identify

* fixed bug preventing worldImagery from loading

* set min resolution on world imagery

* - moved identify feature to common location
- added regex checking for excluded feature fields
-

* removed minResolution for world imagery

* added react router and legend app

* brought back makeGroup function in TOCHelpers

* Added all layers group

* - integrated stand alone legend app to webmap project
 - added react router
 - added ShowWindow component to display components similar to showUrlWindow

* updated handling of ArcGIS metadata url

* changed how default group is selected and loaded

* added all layers code from dev branch

* resolved issues with arcgis and the new dynamic all layers group

* removed duplicate code from merge

* fixed bug loading group with no layers and moved group parsing into function

* fixed issue with loading saved layers in default group

* switched duplicate layer/group checking to use tocName instead of layer name

* cleaned up layer loading sequence

* fixed bug in basemap imagery slider layer visibility

* added generic TableDisplay component to helpers

* - updated legend component to handle secure layers
- moved get image functions from TOC helpers to generic helpers

* fixed bug when caused by empty savedLayer object

* fixed bug causing crash when added layer is removed from all layers

* added support for secured layers

* added window.loaded and helpers to support waiting for components to load, replaced several event listeners for map, toc, and sidebar loading

* integrated layerInfo app into web viewer

* added secureKey parameter check to live layer

* added window.config and helpers to manage global settings

* merged toc loading from TOCConfig into main config

* -added parsing for zoom and center from api
-prevented geoserver load from overriding api center and zoom

* improved readability of zoom and center parsing from api

* removed unneccessary call on unmount

* - fixed bug in adding WMTS layers
- added helper to get and regiter proj4 from epsg.io
- switched default WMTS url in add data tool to weather.gc.ca

* override saved user extent when loading from mapId

* commented out console log in waitForLoad helper

* applied prettier code formatting

* fixed merge conflicts

* removed references to TOCConfig

* code layout change

* - converted usage of mainConfig to window.config
- added waitForLoad to usage of window.config
- added array object merge to handle sidebar component config from api

* removed testing value from print config

* added map id to feedback url

* added handling for viewer mode to config helper

* added municipality to search

* added printLogo handling to printRequest

* fixed styling issue in window popup header

* - added try close before showMessage to cleanup any open messages before displaying the next
 - removed arcgis layers with sublayers
 - switched getCapabilities helper to use options object
 -

* added ability to hide sidebar tabs

* - fixed several listener issues cause by waitForLoad
- fixed center coords parsing issue
- fixed loading of toc type from settings api

* - added ability to set layer visibility through settings
- added ability to collapse featured property through settings

* removed best start logo and updated the url for 211 theme popup

* added case sensitivity to search url parameters

* added length constraint to date format

* - added XYZ default to add layers tool
- updated validate layer in add layer tool to exclude xyz layer
- removed unnecessary import on TwoOneOne theme

* - added showTerms on load
- added terms popup on map load

* switched terms popup on startup to show don't show again option

* updated config with a valid local toc config

* switched default group of local config

* updated default group of local config

* added handling for GROUP url parameter

* print tool - added handling for dot and dashed lines

* applied code formatting changes

* - added ability to show coordinates for MyMaps items
- added ability to export MyMaps items
- fixed bug in getting map id from url parameters
- switched showWindow helper to accept an options object

* switched getDefaultGroup to compare with group label rather than value

* switched feature zoom on search to variable based on the size of the feature.

* added ability to export drawing to multiple formats

* removed "Cancel" from drawType lookup

* changed SR compare to uppercase

* added check for items prior to saving MyMaps

* added warning message option for layers and re-enabled disclaimer message option

* hide export option in my map for items that are not open data

* updated community services theme logo

* fixed issue with arcgis layers showing disclaimer message

* update documentation for GROUP url parameter

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Added handling for GeoTiff metadata

* increment patch version

* Hotfix layer info legend printing (#140)

* Hotfix/1.1.x (#132)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#136)

* update version

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Added handling for GeoTiff metadata

* increment patch version

* removed package-lock.json as it is recreated when running npm install

* added package-lock.json to .gitignore

* added hide to unused layerInfo buttons
added print override to make map and window show full screen
switched map-theme to css class

* incremented patch version

* Hotfix/new radar code disable whats new (#142)

* Hotfix/1.1.x (#132)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#136)

* update version

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Added handling for GeoTiff metadata

* increment patch version

* removed package-lock.json as it is recreated when running npm install

* added package-lock.json to .gitignore

* Hotfix layer info legend printing (#139)

* added hide to unused layerInfo buttons
added print override to make map and window show full screen
switched map-theme to css class

* incremented patch version

* turned off what's new in default config and added

* added stats canada web services to add data services tab

* added merge polygon feature (#143)

* Feature/previous next extent (#144)

* Hotfix/1.1.x (#132)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#136)

* update version

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Added handling for GeoTiff metadata

* increment patch version

* Previous - Next Extent

* - added buttons for prev/next
 - moved extent history into helper function
- blocked trapped keyboard shortcuts in text input boxes
- switched search to use helper function to disable shortcuts

* added appstats to extent history

Co-authored-by: iquitwow <[email protected]>

* fixed merge bug

* fixed merge issues

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Al Proulx <[email protected]>

* Feature/address interrigator (#7)

* added addressInterrogator and InfoTable helper component

* added address interrogator and info table

* removed testing url

* reverted mistaken save

* added zoom to civic address point and cleaned up styling

* added secure config to address interrogator

* added option to activate address interrogator from property report

* Feature/apptrack (#5)

* initial commit of apptrack features

* fixed select from apptrack to work with lists of geoids

* added add polygon functions to my map polygons

* setup security for apptrack theme

* Feature/planning council reports (#8)

* added planning and coundil reports to apptrack theme

* removed alerts from apptrack calls

* merged changed from public rc/1.2 (#9)

* -disabled apptrack by default
-updated msal

* Feature/add emaps functionality (#11)

* Bump ua-parser-js from 0.7.19 to 0.7.28

Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.19 to 0.7.28.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.19...0.7.28)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump lodash from 4.17.20 to 4.17.21

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump dns-packet from 1.3.1 to 1.3.4

Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <[email protected]>

* swtiched sorting to use layer index instead of drawIndex
update layer index on sort move to ensure user sorting is maintained after a-z sorting toggle

* incremented patch version

* - switched search, mymaps, and local real estate to use localStorage helpers
- added cleanup function to remove full geojson from saved search history
- disabled saving of layers added from files
- fixed error in show message event listener
- extensive "prettier" formatting changes

* removed settings buttons and functions that were added for testing

* - fixed issue with slim sidebar not showing active tool
- various code formatting changes

* added localStorage cleanup and removed refreshStorage helper

* fixed crash on slim sidebar toggle

* increment patch version

* Release 1.1 (#130)

* added global opacity slider to toc settings menu

* - fixed bug preventing default layer visibility from being applied
- added keyword check for VISIBLE_LAYERS=ALL

* fixed bug in addlayer tool preventing default server url from changing with selection

* added defaultTheme and defaultTool to mapSettings handler

* removed unnecessary emit from default tools and themes in map settings api parsing

* added toc loader for ersi rest service

* - added ability to load arcgis or geoserver content in map config
- added ARCGIS_SERVICE url parameter
- added case sensitive flag to url parameter parsing

* - added ability to identify on ImageArcGISRest layers
- added title case splitting/formatting to identify field names

* refined parsing of property names in identify

* fixed bug preventing worldImagery from loading

* set min resolution on world imagery

* - moved identify feature to common location
- added regex checking for excluded feature fields
-

* removed minResolution for world imagery

* added react router and legend app

* brought back makeGroup function in TOCHelpers

* Added all layers group

* - integrated stand alone legend app to webmap project
 - added react router
 - added ShowWindow component to display components similar to showUrlWindow

* updated handling of ArcGIS metadata url

* changed how default group is selected and loaded

* added all layers code from dev branch

* resolved issues with arcgis and the new dynamic all layers group

* removed duplicate code from merge

* fixed bug loading group with no layers and moved group parsing into function

* fixed issue with loading saved layers in default group

* switched duplicate layer/group checking to use tocName instead of layer name

* cleaned up layer loading sequence

* fixed bug in basemap imagery slider layer visibility

* added generic TableDisplay component to helpers

* - updated legend component to handle secure layers
- moved get image functions from TOC helpers to generic helpers

* fixed bug when caused by empty savedLayer object

* fixed bug causing crash when added layer is removed from all layers

* added support for secured layers

* added window.loaded and helpers to support waiting for components to load, replaced several event listeners for map, toc, and sidebar loading

* integrated layerInfo app into web viewer

* added secureKey parameter check to live layer

* added window.config and helpers to manage global settings

* merged toc loading from TOCConfig into main config

* -added parsing for zoom and center from api
-prevented geoserver load from overriding api center and zoom

* improved readability of zoom and center parsing from api

* removed unneccessary call on unmount

* - fixed bug in adding WMTS layers
- added helper to get and regiter proj4 from epsg.io
- switched default WMTS url in add data tool to weather.gc.ca

* override saved user extent when loading from mapId

* commented out console log in waitForLoad helper

* applied prettier code formatting

* fixed merge conflicts

* removed references to TOCConfig

* code layout change

* - converted usage of mainConfig to window.config
- added waitForLoad to usage of window.config
- added array object merge to handle sidebar component config from api

* removed testing value from print config

* added map id to feedback url

* added handling for viewer mode to config helper

* added municipality to search

* added printLogo handling to printRequest

* fixed styling issue in window popup header

* - added try close before showMessage to cleanup any open messages before displaying the next
 - removed arcgis layers with sublayers
 - switched getCapabilities helper to use options object
 -

* added ability to hide sidebar tabs

* - fixed several listener issues cause by waitForLoad
- fixed center coords parsing issue
- fixed loading of toc type from settings api

* - added ability to set layer visibility through settings
- added ability to collapse featured property through settings

* removed best start logo and updated the url for 211 theme popup

* added case sensitivity to search url parameters

* added length constraint to date format

* - added XYZ default to add layers tool
- updated validate layer in add layer tool to exclude xyz layer
- removed unnecessary import on TwoOneOne theme

* - added showTerms on load
- added terms popup on map load

* switched terms popup on startup to show don't show again option

* updated config with a valid local toc config

* switched default group of local config

* updated default group of local config

* added handling for GROUP url parameter

* print tool - added handling for dot and dashed lines

* applied code formatting changes

* - added ability to show coordinates for MyMaps items
- added ability to export MyMaps items
- fixed bug in getting map id from url parameters
- switched showWindow helper to accept an options object

* switched getDefaultGroup to compare with group label rather than value

* switched feature zoom on search to variable based on the size of the feature.

* added ability to export drawing to multiple formats

* removed "Cancel" from drawType lookup

* changed SR compare to uppercase

* added check for items prior to saving MyMaps

* added warning message option for layers and re-enabled disclaimer message option

* hide export option in my map for items that are not open data

* updated community services theme logo

* fixed issue with arcgis layers showing disclaimer message

* update documentation for GROUP url parameter

* Dev (#131)

* added global opacity slider to toc settings menu

* - fixed bug preventing default layer visibility from being applied
- added keyword check for VISIBLE_LAYERS=ALL

* fixed bug in addlayer tool preventing default server url from changing with selection

* added defaultTheme and defaultTool to mapSettings handler

* removed unnecessary emit from default tools and themes in map settings api parsing

* added toc loader for ersi rest service

* - added ability to load arcgis or geoserver content in map config
- added ARCGIS_SERVICE url parameter
- added case sensitive flag to url parameter parsing

* - added ability to identify on ImageArcGISRest layers
- added title case splitting/formatting to identify field names

* refined parsing of property names in identify

* fixed bug preventing worldImagery from loading

* set min resolution on world imagery

* - moved identify feature to common location
- added regex checking for excluded feature fields
-

* removed minResolution for world imagery

* added react router and legend app

* brought back makeGroup function in TOCHelpers

* Added all layers group

* - integrated stand alone legend app to webmap project
 - added react router
 - added ShowWindow component to display components similar to showUrlWindow

* updated handling of ArcGIS metadata url

* changed how default group is selected and loaded

* added all layers code from dev branch

* resolved issues with arcgis and the new dynamic all layers group

* removed duplicate code from merge

* fixed bug loading group with no layers and moved group parsing into function

* fixed issue with loading saved layers in default group

* switched duplicate layer/group checking to use tocName instead of layer name

* cleaned up layer loading sequence

* fixed bug in basemap imagery slider layer visibility

* added generic TableDisplay component to helpers

* - updated legend component to handle secure layers
- moved get image functions from TOC helpers to generic helpers

* fixed bug when caused by empty savedLayer object

* fixed bug causing crash when added layer is removed from all layers

* added support for secured layers

* added window.loaded and helpers to support waiting for components to load, replaced several event listeners for map, toc, and sidebar loading

* integrated layerInfo app into web viewer

* added secureKey parameter check to live layer

* added window.config and helpers to manage global settings

* merged toc loading from TOCConfig into main config

* -added parsing for zoom and center from api
-prevented geoserver load from overriding api center and zoom

* improved readability of zoom and center parsing from api

* removed unneccessary call on unmount

* - fixed bug in adding WMTS layers
- added helper to get and regiter proj4 from epsg.io
- switched default WMTS url in add data tool to weather.gc.ca

* override saved user extent when loading from mapId

* commented out console log in waitForLoad helper

* applied prettier code formatting

* fixed merge conflicts

* removed references to TOCConfig

* code layout change

* - converted usage of mainConfig to window.config
- added waitForLoad to usage of window.config
- added array object merge to handle sidebar component config from api

* removed testing value from print config

* added map id to feedback url

* added handling for viewer mode to config helper

* added municipality to search

* added printLogo handling to printRequest

* fixed styling issue in window popup header

* - added try close before showMessage to cleanup any open messages before displaying the next
 - removed arcgis layers with sublayers
 - switched getCapabilities helper to use options object
 -

* added ability to hide sidebar tabs

* - fixed several listener issues cause by waitForLoad
- fixed center coords parsing issue
- fixed loading of toc type from settings api

* - added ability to set layer visibility through settings
- added ability to collapse featured property through settings

* removed best start logo and updated the url for 211 theme popup

* added case sensitivity to search url parameters

* added length constraint to date format

* - added XYZ default to add layers tool
- updated validate layer in add layer tool to exclude xyz layer
- removed unnecessary import on TwoOneOne theme

* - added showTerms on load
- added terms popup on map load

* switched terms popup on startup to show don't show again option

* updated config with a valid local toc config

* switched default group of local config

* updated default group of local config

* added handling for GROUP url parameter

* print tool - added handling for dot and dashed lines

* applied code formatting changes

* - added ability to show coordinates for MyMaps items
- added ability to export MyMaps items
- fixed bug in getting map id from url parameters
- switched showWindow helper to accept an options object

* switched getDefaultGroup to compare with group label rather than value

* switched feature zoom on search to variable based on the size of the feature.

* added ability to export drawing to multiple formats

* removed "Cancel" from drawType lookup

* changed SR compare to uppercase

* added check for items prior to saving MyMaps

* added warning message option for layers and re-enabled disclaimer message option

* hide export option in my map for items that are not open data

* updated community services theme logo

* fixed issue with arcgis layers showing disclaimer message

* update documentation for GROUP url parameter

* update version

* Hotfix/1.1.x (#134)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#135)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#138)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#132)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#133)

* Dev (#131)

* added global opacity slider to toc settings menu

* - fixed bug preventing default layer visibility from being applied
- added keyword check for VISIBLE_LAYERS=ALL

* fixed bug in addlayer tool preventing default server url from changing with selection

* added defaultTheme and defaultTool to mapSettings handler

* removed unnecessary emit from default tools and themes in map settings api parsing

* added toc loader for ersi rest service

* - added ability to load arcgis or geoserver content in map config
- added ARCGIS_SERVICE url parameter
- added case sensitive flag to url parameter parsing

* - added ability to identify on ImageArcGISRest layers
- added title case splitting/formatting to identify field names

* refined parsing of property names in identify

* fixed bug preventing worldImagery from loading

* set min resolution on world imagery

* - moved identify feature to common location
- added regex checking for excluded feature fields
-

* removed minResolution for world imagery

* added react router and legend app

* brought back makeGroup function in TOCHelpers

* Added all layers group

* - integrated stand alone legend app to webmap project
 - added react router
 - added ShowWindow component to display components similar to showUrlWindow

* updated handling of ArcGIS metadata url

* changed how default group is selected and loaded

* added all layers code from dev branch

* resolved issues with arcgis and the new dynamic all layers group

* removed duplicate code from merge

* fixed bug loading group with no layers and moved group parsing into function

* fixed issue with loading saved layers in default group

* switched duplicate layer/group checking to use tocName instead of layer name

* cleaned up layer loading sequence

* fixed bug in basemap imagery slider layer visibility

* added generic TableDisplay component to helpers

* - updated legend component to handle secure layers
- moved get image functions from TOC helpers to generic helpers

* fixed bug when caused by empty savedLayer object

* fixed bug causing crash when added layer is removed from all layers

* added support for secured layers

* added window.loaded and helpers to support waiting for components to load, replaced several event listeners for map, toc, and sidebar loading

* integrated layerInfo app into web viewer

* added secureKey parameter check to live layer

* added window.config and helpers to manage global settings

* merged toc loading from TOCConfig into main config

* -added parsing for zoom and center from api
-prevented geoserver load from overriding api center and zoom

* improved readability of zoom and center parsing from api

* removed unneccessary call on unmount

* - fixed bug in adding WMTS layers
- added helper to get and regiter proj4 from epsg.io
- switched default WMTS url in add data tool to weather.gc.ca

* override saved user extent when loading from mapId

* commented out console log in waitForLoad helper

* applied prettier code formatting

* fixed merge conflicts

* removed references to TOCConfig

* code layout change

* - converted usage of mainConfig to window.config
- added waitForLoad to usage of window.config
- added array object merge to handle sidebar component config from api

* removed testing value from print config

* added map id to feedback url

* added handling for viewer mode to config helper

* added municipality to search

* added printLogo handling to printRequest

* fixed styling issue in window popup header

* - added try close before showMessage to cleanup any open messages before displaying the next
 - removed arcgis layers with sublayers
 - switched getCapabilities helper to use options object
 -

* added ability to hide sidebar tabs

* - fixed several listener issues cause by waitForLoad
- fixed center coords parsing issue
- fixed loading of toc type from settings api

* - added ability to set layer visibility through settings
- added ability to collapse featured property through settings

* removed best start logo and updated the url for 211 theme popup

* added case sensitivity to search url parameters

* added length constraint to date format

* - added XYZ default to add layers tool
- updated validate layer in add layer tool to exclude xyz layer
- removed unnecessary import on TwoOneOne theme

* - added showTerms on load
- added terms popup on map load

* switched terms popup on startup to show don't show again option

* updated config with a valid local toc config

* switched default group of local config

* updated default group of local config

* added handling for GROUP url parameter

* print tool - added handling for dot and dashed lines

* applied code formatting changes

* - added ability to show coordinates for MyMaps items
- added ability to export MyMaps items
- fixed bug in getting map id from url parameters
- switched showWindow helper to accept an options object

* switched getDefaultGroup to compare with group label rather than value

* switched feature zoom on search to variable based on the size of the feature.

* added ability to export drawing to multiple formats

* removed "Cancel" from drawType lookup

* changed SR compare to uppercase

* added check for items prior to saving MyMaps

* added warning message option for layers and re-enabled disclaimer message option

* hide export option in my map for items that are not open data

* updated community services theme logo

* fixed issue with arcgis layers showing disclaimer message

* update documentation for GROUP url parameter

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Added handling for GeoTiff metadata

* increment patch version

* Hotfix layer info legend printing (#140)

* Hotfix/1.1.x (#132)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#136)

* update version

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Added handling for GeoTiff metadata

* increment patch version

* removed package-lock.json as it is recreated when running npm install

* added package-lock.json to .gitignore

* added hide to unused layerInfo buttons
added print override to make map and window show full screen
switched map-theme to css class

* incremented patch version

* Hotfix/new radar code disable whats new (#142)

* Hotfix/1.1.x (#132)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#136)

* update version

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Added handling for GeoTiff metadata

* increment patch version

* removed package-lock.json as it is recreated when running npm install

* added package-lock.json to .gitignore

* Hotfix layer info legend printing (#139)

* added hide to unused layerInfo buttons
added print override to make map and window show full screen
switched map-theme to css class

* incremented patch version

* turned off what's new in default config and added

* added stats canada web services to add data services tab

* added merge polygon feature (#143)

* Feature/previous next extent (#144)

* Hotfix/1.1.x (#132)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#136)

* update version

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Added handling for GeoTiff metadata

* increment patch version

* Previous - Next Extent

* - added buttons for prev/next
 - moved extent history into helper function
- blocked trapped keyboard shortcuts in text input boxes
- switched search to use helper function to disable shortcuts

* added appstats to extent history

Co-authored-by: iquitwow <[email protected]>

* fixed merge bug

* Hotfix/remove is loaded fails (#147)

* Hotfix/1.1.x (#132)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#136)

* update version

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Added handling for GeoTiff metadata

* increment patch version

* removed package-lock.json as it is recreated when running npm install

* added package-lock.json to .gitignore

* Hotfix layer info legend printing (#139)

* added hide to unused layerInfo buttons
added print override to make map and window show full screen
switched map-theme to css class

* incremented patch version

* turned off what's new in default config and added (#141)

* increament patch version

* fixed remove from array in helpers.removeIsLoaded

* Feature/grouped layers support (#148)

* added ability to handle esri grouped layers

* - Added handling for a single layer from map config to be added to any group
- fixed bug when attempting to register existing projection
- fixed bug when adding wmts layer

* fixed print issue when printing WMTS layers

* - fixed saving/loading of groups and layer  visibility
- removed all layers group from folder view

* Bug/search address tool brokenlayer (#150)

* Hotfix/1.1.x (#132)

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Hotfix/1.1.x (#136)

* update version

* fixed identify by my maps geometry
added add geometry option to identify results

* added grouped settings local storage key clear button for login info

* increment patch version

* aligned add to my map button to right side of reports panel

* adjusted display of add to my maps link

* Added handling for GeoTiff metadata

* increment patch version

* removed package-lock.json as it is recreated when running npm install

* added package-lock.json to .gitignore

* Hotfix layer info legend printing (#139)

* added hide to unused layerInfo buttons
added print override to make map and window show full screen
switched map-theme to css class

* incremented patch version

* turned off what's new in default config and added (#141)

* increament patch version

* fixed remove from array in helpers.removeIsLoaded (#146)

* moved server any layer into config

* added alpha sort option to group merge functions (#153)

* Rc/1.2.x mto tokens (#151)

* This commit includes new files which will be created to accomodate following pull request  from MTO.

* Added MTO Report and new Tile Layer Data Sources for Seismic Hazard tile layer

* Removed 3 duplicated images

* Removed .bak file creted by winmerge compare

* Basement Configuration optoins for Basic Map is added

* MTO Coordinate Toll fixes and MTO Report Functions is added

* -moved geoserver keywords to config (#154)

-added single parsing function for geoserver keywords
-allowed geoserver keywords to be loaded from map config api

* added emaps features

* minor bug fixes and updates

* fixed keyword parsing issue
fixed identify bug
added security keyword to emaps

* minor bug fix in handling of geoserver keywords
changed default map id to land-values

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Al Proulx <[email protected]>
Co-authored-by: Oren <[email protected]>

* Bugfix/various bugfixes (#12)

* fixed toggler legend failing to toggle back on

* fixed "Start Ticket" always showing on property popup

* fixed styling bugs in popup

* updated various packages

* Minor merge updates

* Minor fixes to emaps functions

* added filter to return on owner autocomplete (#13)

* bump version to 1.0.0

* removed premature error message

* fixed selection bug in emaps

* Bugfix/update emaps from feedback (#15)

* include inactive layers in emaps report

* fixed styling issue on info table label

* added activate/deactivate to emaps report selector

* removed recordset call as results extracted on the server (#16)

* fixed minor bug in default folder group

* Add Miller AVL (#17)

* Bugfix/apptrack popup pop in (#18)

* added check in secure property report for app track

* re-enabled disable parcel click on theme load

* removed callback from fetch catch block

* switched account selection to filter by tenant Id (#20)

* added link to Download land values report if user has mpac teranet access (#21)

* avl-changes (#19)

* avl-changes

* added timing control to popup to prevent delayed popups from stealing focus

* moved sidebar tool/theme enabling into single location

* fixed bug in secured version of lots and concession tool

* made avl layers identifyable

* updated avl legend image

* added check for visible avl layer on map click

Co-authored-by: Tom <[email protected]>

* Avl raw data (#23)

* Added Raw GPS Data Checkbox

* Remove Z from date string

* Register Click Event to UnKey it

* Add Supervisor and Minis to Config

* Set Raw GPS Layer to not visible by default

Co-authored-by: iquitwow <[email protected]>

* added homepage to appstats and removed path from appstats (#24)

* Added property report button on apptrack popup (#25)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Al Proulx <[email protected]>
Co-authored-by: Oren <[email protected]>
Co-authored-by: iquitwow <[email protected]>
  • Loading branch information
5 people authored Nov 24, 2021
1 parent 1db7128 commit c899521
Show file tree
Hide file tree
Showing 131 changed files with 15,648 additions and 28,418 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,7 @@ deploy/*
debug.log
/src/sidebar/components/toc/debug.log
*.zip
package-lock.json
package-lock.json

sc_copyToServer.bat
Build.ps1
4 changes: 2 additions & 2 deletions Build.ps1
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Compress-Archive D:\0_Projects\Websites\React\SimcoeCountyWebViewerSecure\build -Force -DestinationPath ('\\maple\c$\GIS\node\secure\build.zip')
Compress-Archive D:\0_Projects\Websites\React\SimcoeCountyWebViewerSecure\build -DestinationPath ('\\maple\c$\GIS\node\secure\build_archive\build-' + (Get-Date).ToString('MMM-dd-yyyy hh-mm-ss') + '.zip')
Compress-Archive C:\_acp\git\SimcoeCountyWebViewerSecure\build -Force -DestinationPath ('\\maple\c$\GIS\node\secure\build.zip')
Compress-Archive C:\_acp\git\SimcoeCountyWebViewerSecure\build -DestinationPath ('\\maple\c$\GIS\node\secure\build_archive\build-' + (Get-Date).ToString('MMM-dd-yyyy hh-mm-ss') + '.zip')
2 changes: 1 addition & 1 deletion docs/Map/URLParameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://opengis.simcoe.ca/?MODE=ADVANCED

#### OPEN LAYER GROUP

https://opengis.simcoe.ca?GROUP=simcoe:Historical
https://opengis.simcoe.ca/?GROUP=Historical

#### ZOOM TO ROLL NUMBER

Expand Down
19,817 changes: 0 additions & 19,817 deletions package-lock.json

This file was deleted.

40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "openlayers",
"homepage": "https://opengis2.simcoe.ca/secure",
"version": "0.1.0",
"name": "openlayers-secure",
"homepage": "secure",
"version": "1.0.0",
"private": true,
"dependencies": {
"@azure/msal-browser": "^2.17.0",
"@azure/msal-react": "^1.0.2",
"@azure/msal-browser": "^2.18.0",
"@azure/msal-react": "^1.1.0",
"array-move": "^2.2.2",
"create-react-class": "^15.7.0",
"eslint-utils": "^1.4.3",
Expand All @@ -15,30 +15,30 @@
"immutability-helper": "^3.1.1",
"minimist": "^1.2.5",
"moment": "^2.29.1",
"npm": "^6.14.11",
"ol": "^6.5.0",
"npm": "^6.14.15",
"ol": "^6.9.0",
"ol-contextmenu": "^3.3.2",
"proj4": "^2.7.0",
"proj4": "^2.7.5",
"rc-menu": "^7.5.5",
"rc-slider": "^8.7.1",
"re-resizable": "^6.9.0",
"react": "^17.0.1",
"re-resizable": "^6.9.1",
"react": "^17.0.2",
"react-app-polyfill": "^0.2.2",
"react-autocomplete": "^1.8.1",
"react-collapsible": "^2.8.3",
"react-collapsible": "^2.8.4",
"react-color": "^2.19.3",
"react-copy-to-clipboard": "^5.0.3",
"react-copy-to-clipboard": "^5.0.4",
"react-datepicker": "^2.16.0",
"react-device-detect": "^1.15.0",
"react-device-detect": "^1.17.0",
"react-dom": "^16.14.0",
"react-ga": "^2.7.0",
"react-github-btn": "^1.2.0",
"react-github-btn": "^1.2.1",
"react-highlight-words": "^0.16.0",
"react-icons": "^4.2.0",
"react-icons": "^4.3.1",
"react-loadable": "^5.5.0",
"react-loading": "^2.0.3",
"react-masonry-css": "^1.0.16",
"react-modal": "^3.12.1",
"react-modal": "^3.14.3",
"react-responsive-modal": "^3.6.0",
"react-router-dom": "^4.3.1",
"react-scripts": "^3.4.4",
Expand All @@ -50,19 +50,19 @@
"react-sortable-tree": "^2.8.0",
"react-sortable-tree-theme-file-explorer": "^2.0.0",
"react-switch": "^5.0.1",
"react-table": "^7.6.3",
"react-table": "^7.7.0",
"react-table-sticky": "^1.1.3",
"react-tabs": "^3.2.0",
"react-tabs": "^3.2.2",
"react-tooltip": "^3.11.6",
"react-transition-group": "^4.4.1",
"react-transition-group": "^4.4.2",
"react-use-iframe-content-height": "^1.0.2",
"react-virtualized": "^9.22.3",
"react-window": "^1.8.6",
"serialize-javascript": "^3.1.0",
"shortid": "^2.2.16",
"shp-write": "^0.3.2",
"slick-carousel": "^1.8.1",
"styled-components": "^5.2.1",
"styled-components": "^5.3.1",
"xml2js": "^0.4.23"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion sc_copyToServer.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
npm run build && Powershell.exe -executionpolicy remotesigned -File D:\0_Projects\Websites\React\SimcoeCountyWebViewerSecure\Build.ps1
npm run build && Powershell.exe -executionpolicy remotesigned -File C:\_acp\git\SimcoeCountyWebViewerSecure\Build.ps1
1 change: 1 addition & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class App extends Component {
}
componentWillMount() {
window.app = packageJson.name;
window.homepage = packageJson.homepage;
window.version = packageJson.version;
this.setControlPreferences();
}
Expand Down
51 changes: 28 additions & 23 deletions src/AppSecure.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,24 @@ const ErrorComponent = ({ error }) => {

const MainContent = () => {
const { instance, accounts } = useMsal();

useEffect(() => {
window.app = packageJson.name;
window.version = packageJson.version;
setControlPreferences();

let account = undefined;
const tenantId = msalConfig.auth.authority.split("/").reverse()[0];
if (accounts.length === 0) return;

account = accounts.filter((item) => {
return item.tenantId === tenantId;
})[0];
if (!account) return;
window.instance = instance;
window.account = accounts[0];

setSecurity(accounts[0]);
window.account = account;
setSecurity(account);
});
useEffect(() => {
window.app = packageJson.name;
window.homepage = packageJson.homepage;
window.version = packageJson.version;
setControlPreferences();

helpers.loadConfig(() => {
document.title = window.config.title;
helpers.addIsLoaded("settings");
Expand Down Expand Up @@ -125,26 +129,27 @@ const setSecurity = (account) => {
securityCalled = true;
helpers.addAppStat("SECURITY_LOG_ON", account.name);
helpersSecured.getJSONSecured(apiUrl + "getAccessDetails/" + account.localAccountId, (result) => {
console.log(result);
// console.log(result);
if (!result.toString().includes("error")) {
window.security = result;
saveSecurityToStorage(result);
// saveSecurityToStorage(result);
console.log("Emitting security complete without errors");
window.emitter.emit("securityComplete", result);
helpers.addIsLoaded("security");
} else {
console.log("call failed to secure API, attempting to retreive from storage");
const storedSecurity = getSecurityStorage();
if (storedSecurity === null) {
console.log("Security not found in Storage");
helpers.showMessage("Security Failure", "Please contact [email protected]", "red", 30000);
} else {
console.log("Pulling security Found in Storage - API had errors");
window.security = storedSecurity;
window.emitter.emit("securityComplete", storedSecurity);
helpers.addIsLoaded("security");
}
}
// else {
// console.log("call failed to secure API, attempting to retreive from storage");
// const storedSecurity = getSecurityStorage();
// if (storedSecurity === null) {
// console.log("Security not found in Storage");
// helpers.showMessage("Security Failure", "Please contact [email protected]", "red", 30000);
// } else {
// console.log("Pulling security Found in Storage - API had errors");
// window.security = storedSecurity;
// window.emitter.emit("securityComplete", storedSecurity);
// helpers.addIsLoaded("security");
// }
// }
});
};

Expand Down
46 changes: 43 additions & 3 deletions src/config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"useMapConfigApi": true,
"mapId": "secure",
"mapId": "land-values",
"headerLogoImageName": "logo.png",
"title": "Interactive Map - County of Simcoe (GIS)",
"originUrl": "https://opengis.simcoe.ca",
"feedbackUrl": "https://opengis.simcoe.ca/feedback",
"geoserverUrl": "https://opengis2.simcoe.ca/geoserver/",
"publicUrl": "https://opengis.simcoe.ca/public/",
"geoserverPath": "geoserver",
"printUrl": "https://opengis.simcoe.ca/print/",
"includeAppStats": true,
Expand All @@ -14,7 +15,7 @@
"excludeIdentifyTitleName": false,
"showFeedbackMessageOnStartup": false,
"showWhatsNewOnStartup": false,
"showWhatsNewPopupOnStartup": true,
"showWhatsNewPopupOnStartup": false,
"showTermsOnStartup": true,
"googleAnalyticsID": "UA-3104541-53",
"appStatsUrl": "https://opengis.simcoe.ca/api/appStats/",
Expand Down Expand Up @@ -121,7 +122,27 @@
}
],
"helpLink": "https://county-of-simcoe-gis.github.io/SimcoeCountyWebViewer/Layers",
"layerInfoURL": "https://opengis.simcoe.ca/layerInfo/?URL="
"layerInfoURL": "https://opengis.simcoe.ca/layerInfo/?URL=",
"keywords": {
"DEFAULT_GROUP": { "keyword": "DEFAULT_GROUP", "type": "string", "value": "" },
"LIVE_LAYER": { "keyword": "LIVE_LAYER", "type": "bool", "value": false },
"GROUP_PREFIX": { "keyword": "GROUP_PREFIX", "type": "string", "value": "" },
"DISPLAY_NAME": { "keyword": "DISPLAY_NAME", "type": "string", "value": "" },
"IDENTIFY_TITLE_COLUMN": { "keyword": "IDENTIFY_TITLE_COLUMN", "type": "string", "value": "" },
"IDENTIFY_DISPLAY_NAME": { "keyword": "IDENTIFY_DISPLAY_NAME", "type": "string", "value": "" },
"WARNING": { "keyword": "WARNING", "type": "string", "value": "", "splitChar": "" },
"DISCLAIMER_URL": { "keyword": "DISCLAIMER_URL", "type": "string", "value": "", "splitChar": "" },
"DISCLAIMER_TITLE": { "keyword": "DISCLAIMER_TITLE", "type": "string", "value": "", "splitChar": "" },
"IDENTIFY_ID_COLUMN": { "keyword": "IDENTIFY_ID_COLUMN", "type": "string", "value": "" },
"VISIBLE_LAYERS": { "keyword": "VISIBLE_LAYERS", "type": "array", "value": [], "splitChar": ",", "relatedKeys": ["All_VISIBLE_LAYERS"] },
"All_VISIBLE_LAYERS": { "keyword": "VISIBLE_LAYERS", "type": "bool", "value": false, "checkValue": "ALL" },
"MAP_CENTER": { "keyword": "MAP_CENTER", "type": "array", "value": [], "splitChar": "," },
"MAP_ZOOM": { "keyword": "MAP_ZOOM", "type": "int", "value": 1 },
"OPACITY": { "keyword": "OPACITY", "type": "float", "value": 1 },
"DOWNLOAD": { "keyword": "DOWNLOAD", "type": "bool", "value": false },
"NO_ATTRIBUTE_TABLE": { "keyword": "NO_ATTRIBUTE_TABLE", "type": "bool", "value": false },
"STATIC_IMAGE_LEGEND": { "keyword": "STATIC_IMAGE_LEGEND", "type": "bool", "value": false }
}
},
"wmsGeoJsonTemplate": "https://maps.simcoe.ca/ESRIWMSTemplates/featureinfo_application_geojson.xsl",

Expand Down Expand Up @@ -214,6 +235,15 @@
"imageName": "searchOwnerNames.png",
"secure": true,
"securityKeywords": ["mpac_teranet"]
},
{
"id": 21,
"name": "Address Interrogator",
"componentName": "AddressInterrogator",
"description": "Lookup Address Data",
"imageName": "searchAddresses.png",
"secure": true,
"securityKeywords": ["gis_internal"]
}
],

Expand Down Expand Up @@ -297,6 +327,16 @@
"imageName": "customerService.png",
"secure": true,
"securityKeywords": ["theme_customer_service"]
},
{
"id": 11,
"name": "AppTrack",
"componentName": "AppTrack",
"description": "",
"imageName": "apptrack.png",
"secure": true,
"securityKeywords": ["planning"],
"disable": true
}
],
"sidebarShortcutParams": [
Expand Down
Loading

0 comments on commit c899521

Please sign in to comment.