Skip to content

Commit

Permalink
Merge branch 'develop' into adding-global-style-overrides
Browse files Browse the repository at this point in the history
  • Loading branch information
cphelefu authored Feb 19, 2024
2 parents e766c1d + 65f743c commit 39c57eb
Show file tree
Hide file tree
Showing 54 changed files with 1,771 additions and 649 deletions.
28 changes: 14 additions & 14 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions docs/programming/logging.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ export const LOG_TRACE_USE_EFFECT_UNMOUNT = 2;
export const LOG_TRACE_RENDER = 3;
// For tracing useCallback. Disabled by default. Only shows if running in dev environment or GEOVIEW_LOG_ACTIVE key is set in local storage.
export const LOG_TRACE_USE_CALLBACK = 4;
// For tracing useMemo. Disabled by default. Only shows if running in dev environment or GEOVIEW_LOG_ACTIVE key is set in local storage.
export const LOG_TRACE_USE_MEMO = 5;
// For tracing useEffect mounting. Disabled by default. Only shows if running in dev environment or GEOVIEW_LOG_ACTIVE key is set in local storage.
export const LOG_TRACE_USE_EFFECT = 5;
export const LOG_TRACE_USE_EFFECT = 6;
// For tracing store subscription events. Disabled by default. Only shows if running in dev environment or GEOVIEW_LOG_ACTIVE key is set in local storage.
export const LOG_TRACE_CORE_STORE_SUBSCRIPTION = 8;
// For tracing api events. Disabled by default. Only shows if running in dev environment or GEOVIEW_LOG_ACTIVE key is set in local storage.
export const LOG_TRACE_CORE_API_EVENT = 9;
// For tracing core functions. Disabled by default. Only shows if running in dev environment or GEOVIEW_LOG_ACTIVE key is set in local storage.
export const LOG_TRACE_CORE = 10;
// Default. For debugging and development. Enabled by default. Only shows if running in dev environment or GEOVIEW_LOG_ACTIVE key is set in local storage.
Expand All @@ -35,7 +41,7 @@ export const LOG_ERROR = 50;

The `logger` is active when (1) running in dev environment or (2) the local storage `GEOVIEW_LOG_ACTIVE` key is set.

The `logger` singleton is created using the logging level specified by the local storage `GEOVIEW_LOG_LEVEL` value. __To change your logging level, edit that local storage key__. When no value can be found, the local storage is set to LOG_DEBUG level.
The `logger` singleton is created using the logging level specified by the local storage `GEOVIEW_LOG_LEVEL` value. When `GEOVIEW_LOG_LEVEL` is a number, all levels above the specified number are logged. When `GEOVIEW_LOG_LEVEL` is a comma separate value e.g.: "4, 6,10" then only those levels and all levels >= 20 are logged. __To change your logging level, edit that local storage key__. When no value can be found, the local storage is set to LOG_DEBUG level.

The `LOG_TRACE` functions are used when the developer wants to view the call stack in the console. The calls to `logger.logTrace` are meant to remain in the code forever. By default they will just be ignored, because the logger logs level LOG_DEBUG and higher. There is a extra level of granularity for tracing (`LOG_TRACE_USE_EFFECT`, `LOG_TRACE_RENDER`, etc) , due to GeoView needs.

Expand Down
178 changes: 178 additions & 0 deletions packages/geoview-core/public/configs/raw-app-bar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
{
"map": {
"interaction": "dynamic",
"viewSettings": {
"zoom": 3,
"center": [
-100,
50
],
"projection": 3978
},
"basemapOptions": {
"basemapId": "osm",
"shaded": false,
"labeled": false
},
"listOfGeoviewLayerConfig": [
{
"geoviewLayerId": "esriFeatureLYR4",
"geoviewLayerName": {
"en": "Water quality at monitoring sites",
"fr": "Qualité eau"
},
"metadataAccessPath": {
"en": "https://maps-cartes.ec.gc.ca/arcgis/rest/services/DMS/DEU_CSO_Volume/MapServer",
"fr": "https://maps-cartes.ec.gc.ca/arcgis/rest/services/DMS/DEU_CSO_Volume/MapServer"
},
"geoviewLayerType": "esriFeature",
"initialSettings": {
"visible": "always"
},
"listOfLayerEntryConfig": [
{
"layerId": "8"
}
]
},
{
"geoviewLayerId": "uniqueValueId",
"geoviewLayerName": {
"en": "uniqueValue",
"fr": "uniqueValue"
},
"metadataAccessPath": {
"en": "https://maps-cartes.ec.gc.ca/arcgis/rest/services/CESI/MapServer/",
"fr": "https://maps-cartes.ec.gc.ca/arcgis/rest/services/CESI/MapServer/"
},
"geoviewLayerType": "esriFeature",
"listOfLayerEntryConfig": [
{
"layerId": "1"
}
]
},
{
"geoviewLayerId": "esriFeatureLYR5",
"geoviewLayerName": {
"en": "Top Projects",
"fr": "Projets super"
},
"metadataAccessPath": {
"en": "https://maps-cartes.services.geo.ca/server_serveur/rest/services/NRCan/900A_and_top_100_en/MapServer/",
"fr": "https://maps-cartes.services.geo.ca/server_serveur/rest/services/NRCan/900A_and_top_100_en/MapServer/"
},
"geoviewLayerType": "esriFeature",
"listOfLayerEntryConfig": [
{
"layerId": "0"
}
]
},
{
"geoviewLayerId": "geojsonLYR1",
"geoviewLayerName": {
"en": "GeoJSON Sample",
"fr": "GeoJSON Échantillon"
},
"metadataAccessPath": {
"en": "./datasets/geojson/metadata.json",
"fr": "./datasets/geojson/metadata.json"
},
"geoviewLayerType": "GeoJSON",
"listOfLayerEntryConfig": [
{
"layerId": "polygons.json",
"layerName": {
"en": "Polygons",
"fr": "Polygones"
}
},
{
"layerId": "lines.json",
"layerName": {
"en": "Lines",
"fr": "Lignes"
}
},
{
"entryType": "group",
"layerId": "point-feature-group",
"layerName": {
"en": "point-feature-group",
"fr": "point-feature-group"
},
"listOfLayerEntryConfig": [
{
"layerId": "icon_points.json",
"layerName": {
"en": "Icons",
"fr": "Icones"
},
"initialSettings": {
"visible": "yes"
}
},
{
"layerId": "points.json",
"layerName": {
"en": "Points",
"fr": "Points"
}
},
{
"layerId": "points_1.json",
"layerName": {
"en": "Points 1",
"fr": "Points 1"
}
},
{
"layerId": "points_2.json",
"layerName": {
"en": "Points 2",
"fr": "Points 2"
}
},
{
"layerId": "points_3.json",
"layerName": {
"en": "Points 3",
"fr": "Points 3"
}
}
]
}
]
}
]
},
"theme": "geo.ca",
"appBar": {
"tabs": {
"core": [
"geolocator",
"export",
"guide",
"details",
"legend"
]
}
},
"navBar": [
"zoom",
"fullscreen",
"home",
"location",
"export"
],
"components": [
"north-arrow"
],
"corePackages": [],
"externalPackages": [],
"suportedLanguages": [
"en",
"fr"
]
}
Loading

0 comments on commit 39c57eb

Please sign in to comment.