Release/2.1.x

.github/actions/build-and-test-branch/action.yml

@@ -63,6 +63,7 @@ runs:
 
     - name: Check frontend formatting with prettier
       run: |
+        npx prettier --version
         npm run prettier:check
       shell: bash
 

bcgov_arches_common/functions/abstract_primary_descriptors.py

@@ -7,11 +7,14 @@
 
 
 class AbstractPrimaryDescriptors(CoreDescriptorsFunction):
+    _template = "<div class='bc-popup-entry'><div class='bc-popup-label'>%s</div><div class='bc-popup-value'>%s</div></div>"
     _graph_slug = ""
     _name_node_aliases = []
     _card_node_aliases = []
     _popup_node_aliases = []
 
+    _html_nodes = []
+
     _datatype_factory = DataTypeFactory()
 
     _nodes = {}
@@ -32,6 +35,15 @@ def initialize(self):
                     )
                 )
 
+        # Get nodes that have HTML representations
+        all_nodes = set(AbstractPrimaryDescriptors._nodes.values())
+        cnws = (
+            models.CardXNodeXWidget.objects.filter(node__in=all_nodes)
+            .filter(widget__name="rich-text-widget")
+            .all()
+        )
+        AbstractPrimaryDescriptors._html_nodes = [cnw.node.alias for cnw in cnws]
+
         AbstractPrimaryDescriptors._initialized = True
 
     def get_all_nodes(self):
@@ -72,12 +84,14 @@ def get_values_in_order(
                         AbstractPrimaryDescriptors._nodes[node_alias].name,
                         value,
                         config,
+                        node_alias in AbstractPrimaryDescriptors._html_nodes,
                     )
                 display_values.append(
                     AbstractPrimaryDescriptors._format_value(
                         AbstractPrimaryDescriptors._nodes[node_alias].name,
                         value,
                         config,
+                        node_alias in AbstractPrimaryDescriptors._html_nodes,
                     )
                 )
         return connector.join(display_values)
@@ -139,18 +153,22 @@ def _get_value_from_node(node_alias, resourceinstanceid=None, data_tile=None):
         )
 
     @staticmethod
-    def _format_value(name, value, config):
-        if isinstance(value, list):
-            value = set([html.escape(str(v)) for v in value if v != ""])
+    def _format_value(name, value, config, is_html=False):
+        def escape_value(val):
+            if not val:
+                return val
+            return html.escape(str(val)) if not is_html else str(val)
+
+        if value is None:
+            return ""
+        elif isinstance(value, list):
+            value = set([escape_value(v) for v in value if v != ""])
             if "" in value:
                 value.remove("")
             value = ", ".join(sorted(value))
+        else:
+            value = escape_value(value)
 
-        if value is None:
-            return ""
-        elif config["show_name"]:
-            return (
-                "<div class='bc-popup-entry'><div class='bc-popup-label'>%s</div><div class='bc-popup-value'>%s</div></div>"
-                % (html.escape(name), html.escape(str(value)))
-            )
+        if config["show_name"]:
+            return AbstractPrimaryDescriptors._template % (html.escape(name), value)
         return value

bcgov_arches_common/media/css/bc_index.css

@@ -386,7 +386,6 @@ footer ul li a {
 }
 
 a:hover {
-    color: #fff;
     text-decoration: underline;
 }
 

bcgov_arches_common/media/css/project.css

@@ -5,43 +5,75 @@
 
 @font-face {
     font-family: BCSans;
+    font-weight: 100 300;
+    font-style: normal;
+    src: url('../fonts/BCSans/BCSans-Light.woff2') format('woff2'), /* Optimized for very modern browsers */
+    url('../fonts/BCSans/BCSans-Light.woff') format('woff'); /* Modern Browsers */
+}
+
+@font-face {
+    font-family: BCSans;
+    font-weight: 100 300;
+    font-style: italic;
+    src: url('../fonts/BCSans/BCSans-LightItalic.woff2') format('woff2'), /* Optimized for very modern browsers */
+    url('../fonts/BCSans/BCSans-LightItalic.woff') format('woff'); /* Modern Browsers */
+}
+
+@font-face {
+    font-family: BCSans;
+    font-weight: 400 599;
     font-style: normal;
     src: url('../fonts/BCSans/BCSans-Regular.woff2') format('woff2'), /* Optimized for very modern browsers */
     url('../fonts/BCSans/BCSans-Regular.woff') format('woff'); /* Modern Browsers */
 }
 
 @font-face {
     font-family: BCSans;
+    font-weight: 400 599;
     font-style: italic;
     src: url('../fonts/BCSans/BCSans-Italic.woff2') format('woff2'), /* Optimized for very modern browsers */
     url('../fonts/BCSans/BCSans-Italic.woff') format('woff'); /* Modern Browsers */
 }
 
 @font-face {
     font-family: BCSans;
-    font-weight: 700;
+    font-weight: 600 900;
+    font-style: normal;
     src: url('../fonts/BCSans/BCSans-Bold.woff2') format('woff2'), /* Optimized for very modern browsers */
     url('../fonts/BCSans/BCSans-Bold.woff') format('woff'); /* Modern Browsers */
 }
 
 @font-face {
     font-family: BCSans;
+    font-weight: 600 900;
     font-style: italic;
-    font-weight: 700;
     src: url('../fonts/BCSans/BCSans-BoldItalic.woff2') format('woff2'), /* Optimized for very modern browsers */
     url('../fonts/BCSans/BCSans-BoldItalic.woff') format('woff'); /* Modern Browsers */
 }
 
-#main-content
-{
-    overflow: scroll;
+.editor-report .resource-report-abstract-container .resource-component-abstract {
+    height: calc(100vh - 100px);
 }
 
 body, h1, h2, h3, h4, h5
 {
     font-family: BCSans, 'Open Sans', 'Noto Sans', Verdana, Arial, sans-serif !important;
 }
 
+/* Counteract nifty */
+fieldset a {
+    text-decoration: none;
+    color: #337ab7;
+    outline: 0;
+}
+
+fieldset a:hover,a:focus {
+    text-decoration: none;
+    color: #000099;
+    outline: 0!important
+}
+/* End Counteract nifty */
+
 .hover-feature-nav-right + .hover-feature-title {
     width: 100%;
 }
@@ -340,6 +372,7 @@ img.bc-details-image
     flex-direction: row;
     align-items: flex-start;
     margin-bottom: 1px;
+    font-size: 1.3rem;
 }
 
 .bc-popup-label, .bc-popup-value
@@ -350,12 +383,12 @@ img.bc-details-image
 
 .bc-popup-label
 {
+    font-weight: 600;
     min-width: 105px;
 }
 
 .bc-popup-value
 {
-    font-weight: 800;
     margin-left: 10px;
 }
 
@@ -586,18 +619,6 @@ img.bc-details-image
         clear: none !important;
     }
 
-    /* For displaying long-form text blocks as full width of the page,
-     * some elements are within components and not easy to modify but do have
-     * an id that can be queried.
-     */
-    dd[data-bind*="addressPart"],
-    dd[data-bind*="physical_description"],
-    dd[data-bind*="heritage_value"],
-    dd[data-bind*="defining_elements"] {
-        width: auto !important;
-        display: block !important;
-    }
-
     .data-carousel {
         max-width: 100vw !important;
     }

bcgov_arches_common/media/js/utils/map-projection-tools.js

@@ -0,0 +1,175 @@
+import proj4 from "proj4";
+
+// Common projected coordinate systems used in BC/Western Canada.
+//
+// Reference:
+//     BC FSP Electronic Submission Format, Data Types Overview
+//         - (www.for.gov.bc.ca/his/fsp/webhelp/FSP/Online_Tech_Specs/PDFs/FSP_ESF_2-6_Overview__Data_Types.pdf)
+//     Proj4 strings sourced from epsg.io.
+//
+// These are registered with proj4 so we can transform coordinates when a
+// user uploads a bare .shp file without an accompanying .prj. When a .prj
+// is provided it is passed directly to shpjs which handles reprojection
+// automatically.
+const PROJECTIONS = {
+    WGS84: "EPSG:4326",
+    BC_ALBERS: "EPSG:3005",
+    NAD83_UTM_7N: "EPSG:26907",
+    NAD83_UTM_8N: "EPSG:26908",
+    NAD83_UTM_9N: "EPSG:26909",
+    NAD83_UTM_10N: "EPSG:26910",
+    NAD83_UTM_11N: "EPSG:26911",
+    WGS84_UTM_7N: "EPSG:32607",
+    WGS84_UTM_8N: "EPSG:32608",
+    WGS84_UTM_9N: "EPSG:32609",
+    WGS84_UTM_10N: "EPSG:32610",
+    WGS84_UTM_11N: "EPSG:32611",
+};
+
+proj4.defs(
+    PROJECTIONS.BC_ALBERS,
+    "+proj=aea +lat_1=50 +lat_2=58.5 +lat_0=45 +lon_0=-126 +x_0=1000000 +y_0=0 +datum=NAD83 +units=m +no_defs",
+);
+proj4.defs(
+    PROJECTIONS.NAD83_UTM_7N,
+    "+proj=utm +zone=7 +datum=NAD83 +units=m +no_defs",
+);
+proj4.defs(
+    PROJECTIONS.NAD83_UTM_8N,
+    "+proj=utm +zone=8 +datum=NAD83 +units=m +no_defs",
+);
+proj4.defs(
+    PROJECTIONS.NAD83_UTM_9N,
+    "+proj=utm +zone=9 +datum=NAD83 +units=m +no_defs",
+);
+proj4.defs(
+    PROJECTIONS.NAD83_UTM_10N,
+    "+proj=utm +zone=10 +datum=NAD83 +units=m +no_defs",
+);
+proj4.defs(
+    PROJECTIONS.NAD83_UTM_11N,
+    "+proj=utm +zone=11 +datum=NAD83 +units=m +no_defs",
+);
+proj4.defs(
+    PROJECTIONS.WGS84_UTM_7N,
+    "+proj=utm +zone=7 +datum=WGS84 +units=m +no_defs",
+);
+proj4.defs(
+    PROJECTIONS.WGS84_UTM_8N,
+    "+proj=utm +zone=8 +datum=WGS84 +units=m +no_defs",
+);
+proj4.defs(
+    PROJECTIONS.WGS84_UTM_9N,
+    "+proj=utm +zone=9 +datum=WGS84 +units=m +no_defs",
+);
+proj4.defs(
+    PROJECTIONS.WGS84_UTM_10N,
+    "+proj=utm +zone=10 +datum=WGS84 +units=m +no_defs",
+);
+proj4.defs(
+    PROJECTIONS.WGS84_UTM_11N,
+    "+proj=utm +zone=11 +datum=WGS84 +units=m +no_defs",
+);
+
+// Check whether any coordinates in a FeatureCollection fall outside valid
+// WGS84 lng/lat bounds, which indicates the data is still in a projected
+// coordinate system and needs reprojection before Mapbox can display it.
+const needsReprojection = function (geoJSON) {
+    var checked = 0;
+    var outOfBounds = 0;
+    var walkCoords = function (coords) {
+        if (typeof coords[0] === "number") {
+            checked++;
+            if (
+                coords[0] < -180 ||
+                coords[0] > 180 ||
+                coords[1] < -90 ||
+                coords[1] > 90
+            ) {
+                outOfBounds++;
+            }
+            return;
+        }
+        for (var i = 0; i < coords.length; i++) {
+            walkCoords(coords[i]);
+        }
+    };
+    if (geoJSON && geoJSON.features) {
+        for (var i = 0; i < geoJSON.features.length; i++) {
+            var geom = geoJSON.features[i].geometry;
+            if (geom && geom.coordinates) {
+                walkCoords(geom.coordinates);
+            }
+        }
+    }
+    return checked > 0 && outOfBounds / checked > 0.5;
+};
+
+// Transform all coordinates in a FeatureCollection in-place from sourceCRS
+// to WGS84. It is used as a fallback when shpjs could not reproject (i.e., no
+// .prj was available).
+const reprojectGeoJSON = function (geoJSON, sourceCRS) {
+    var transformCoords = function (coords) {
+        if (typeof coords[0] === "number") {
+            var transformed = proj4(sourceCRS, PROJECTIONS.WGS84, [
+                coords[0],
+                coords[1],
+            ]);
+            coords[0] = transformed[0];
+            coords[1] = transformed[1];
+            return;
+        }
+        for (var i = 0; i < coords.length; i++) {
+            transformCoords(coords[i]);
+        }
+    };
+    if (geoJSON && geoJSON.features) {
+        for (var i = 0; i < geoJSON.features.length; i++) {
+            var geom = geoJSON.features[i].geometry;
+            if (geom && geom.coordinates) {
+                transformCoords(geom.coordinates);
+            }
+        }
+    }
+    return geoJSON;
+};
+
+// Attempt to guess the source projection from coordinate ranges when no .prj
+// file is available. This is specific to BC/Western Canada — BC Albers
+// (EPSG:3005) coordinates have large x values around 1,000,000 and y values
+// under ~1,200,000, while UTM coordinates have y values in the 5–7 million
+// range. It defaults to EPSG:3005 (BC Albers) as it is the most common
+// projection used by the BC government.
+const guessProjectionFromCoords = function (geoJSON) {
+    var sample = null;
+    if (geoJSON && geoJSON.features && geoJSON.features.length > 0) {
+        var geom = geoJSON.features[0].geometry;
+        if (geom && geom.coordinates) {
+            var coords = geom.coordinates;
+            while (Array.isArray(coords[0])) {
+                coords = coords[0];
+            }
+            sample = coords;
+        }
+    }
+    if (!sample) return PROJECTIONS.BC_ALBERS;
+    var x = sample[0];
+    var y = sample[1];
+    if (x > 200000 && x < 1900000 && y > 0 && y < 1200000) {
+        return PROJECTIONS.BC_ALBERS;
+    }
+    if (x > 100000 && x < 900000 && y > 5000000 && y < 7000000) {
+        if (x < 500000) {
+            return PROJECTIONS.NAD83_UTM_10N;
+        }
+        return PROJECTIONS.NAD83_UTM_9N;
+    }
+    return PROJECTIONS.BC_ALBERS;
+};
+
+export default {
+    PROJECTIONS,
+    needsReprojection,
+    reprojectGeoJSON,
+    guessProjectionFromCoords,
+};