Merge branch 'feature/HDX-10036-geopreview-maplibre' into dev-next-re…

…lease
OCHA-DAP · Aug 13, 2024 · a81a0a8 · a81a0a8
2 parents 5ef73f2 + 475123f
commit a81a0a8
Show file tree

Hide file tree

Showing 15 changed files with 1,232 additions and 2,879 deletions.
diff --git a/ckanext-hdx_package/ckanext/hdx_package/controller_logic/dataset_view_logic.py b/ckanext-hdx_package/ckanext/hdx_package/controller_logic/dataset_view_logic.py
@@ -15,8 +15,10 @@ def process_shapes(resources, id=None):
 
             res_pbf_url = res_pbf_template_url.replace('{resource_id}', shp_info['layer_id'])
             name = resource['name']
+            res_format = resource['format']
             shp_dict = {
                 'resource_name': name,
+                'resource_format': res_format,
                 'url': res_pbf_url,
                 'bounding_box': shp_info['bounding_box'],
                 'layer_fields': shp_info.get('layer_fields', []),

diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis/crisis-base.css b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/crisis/crisis-base.css
@@ -36,6 +36,11 @@
     max-height: 320px;
     overflow-y: auto;
 }
+
+.map-info td {
+  color: white;
+}
+
 .map-info h4 {
     font: 'Source Sans Pro';
     margin: 0 0 5px;
@@ -61,6 +66,34 @@
 }
 
 .leaflet-container label::after {
-    content: "";
+  content: '';
+}
+
+.layers-control-toggle {
+  background-image: url("/images/maps/layers-2x.png");
+  background-position: 50% 50%;
+  background-repeat: no-repeat;
+  background-size: 26px 26px;
+  display: block;
+  height: 44px;
+  width: 44px;
+}
+.layers-control-list {
+  display: none;
+  padding: 0.2em;
 }
 
+.layers-control:hover > .layers-control-list {
+  display: block;
+}
+.layers-control:hover > .layers-control-toggle {
+  display: none;
+}
+
+.layer-control {
+  display: block;
+  padding: 0.2em;
+}
+.layer-control > input[type='checkbox'] {
+  margin-right: 0.4em;
+}
diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/map_base.js b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/map_base.js
@@ -1,3 +1,5 @@
+/* This file is deprecated. Keeping it for the still existing but deprecated /ebola page */
+
 function setHDXBaseMap(map, maxZoomValue) {
   map.scrollWheelZoom.disable();