[Fix][xs]: Map expand and clear improvement

datopian · May 20, 2024 · da4db88 · da4db88
1 parent 89077b0
commit da4db88
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/ckanext/rvr/assets/css/rvr.css b/ckanext/rvr/assets/css/rvr.css
@@ -833,6 +833,17 @@ div#dataset-map-attribution div a{
     background-color: #c8e9e842;
 }
 
+.spatial-map-clear {
+    position: absolute;
+    z-index: 1;
+    right: 40px;
+    top: 4px;
+    color: #888888;
+    font-size: 12px;
+    line-height: 20px;
+    text-decoration: underline;
+}
+
 
 .dataset-map-expanded #dataset-map {
     height: 412px !important;
@@ -964,6 +975,9 @@ div#dataset-map-container.map-draw-field {
 }
 
 
+#dataset-map {
+    position: relative;
+}
 
 .dataset-map-expanded #dataset-map {
   position: absolute;

diff --git a/ckanext/rvr/assets/js/rvrSpatialQuery.js b/ckanext/rvr/assets/js/rvrSpatialQuery.js
@@ -108,15 +108,23 @@ this.ckan.module('rvr-spatial-query', function ($, _) {
 
         // OK add the expander
         $('a.leaflet-draw-draw-rectangle', module.el).on('click', function(e) {
+          e.preventDefault();
+
           if (!is_exanded) {
             $('body').addClass('dataset-map-expanded');
-            if (should_zoom && !extentLayer) {
+
+            if (should_zoom && !extentLayer && map) {
               map.zoomIn();
             }
-            resetMap();
+
+            if (typeof resetMap === "function") {
+              resetMap();
+            }
+
             is_exanded = true;
           }
         });
+
         var buttonsHtml = [
           '<div id="dataset-map-edit-buttons">',
           '<a href="javascript:;" class="btn cancel">'+ this._('Cancel')+ '</a> ',

diff --git a/ckanext/rvr/templates/spatial/spatial_query.html b/ckanext/rvr/templates/spatial/spatial_query.html
@@ -12,11 +12,11 @@
 
 #}
 <section id="dataset-map" class="module module-narrow module-shallow">
+    <a href="{{ h.remove_url_param(['ext_bbox']) }}" class="action spatial-map-clear">{{ _('Clear') }}</a>
     <h2 class="module-heading" data-bs-toggle="collapse" data-module="collapse-arrow" data-bs-target="#collapse-dataset-map" aria-expanded="true" aria-controls="collapse-dataset-map">
         <span class="fa fa-chevron-up collapse-arrow"></span>
         <i class="fa fa-globe"></i>
         {{ _('Filter this by location') }}
-        <a href="{{ h.remove_url_param(['ext_bbox']) }}" class="action">{{ _('Clear') }}</a>
         <p class="module-subheading">{{ _('Mit Klick auf den Stift Filterbereich festlegen.') }} </p>
     </h2>
     {% set map_config = h.get_common_map_config() %}