Projet

Général

Profil

0001-misc-fix-block-map-field-67888.patch

Lauréline Guérin, 13 septembre 2022 17:11

Télécharger (3,36 ko)

Voir les différences: 

Subject: [PATCH] misc:fix block & map field (#67888)

fix map init on block row add
fix geocoding reverse for map field in block row

 wcs/qommon/static/js/qommon.forms.js       |  1 +
 wcs/qommon/static/js/qommon.geolocation.js | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)
wcs/qommon/static/js/qommon.forms.js
687 687 
          const $new_blockrow = $new_block.find('.BlockSubWidget').last();
688 688 
          add_js_behaviours($('[data-field-id="' + block_id + '"]'));
689 689 
          $('form').trigger('wcs:block-row-added');
690 
          $(document).trigger('wcs:maps-init');
690 691 
          if ($new_block.find('[data-live-source]')) {
691 692 
            $('form div[data-live-source]').parents('form').trigger('wcs:change', {modified_field: 'init'});
692 693 
          }
wcs/qommon/static/js/qommon.geolocation.js
102 102 
    init_sync_from_template_address();
103 103 
  });
104 104 
  $(document).on('set-geolocation', function(event, coords, options) {
105 
    var widget_name = $(event.target).parents('div.widget').data('widget-name');
105 106 
    $.getJSON(WCS_ROOT_URL + '/api/reverse-geocoding?lat=' + coords.lat + '&lon=' + coords.lng, function(data) {
106 107 
      unset_sync_callback()
107 108 
      if (data.err) return;
......
116 117 
      }
117 118 

  		




  118
  119
  
    
      if (typeof(options) == 'undefined' || !options.force_house_number === false || data.address.house_number) {

  		




  119
  
  
    
        geoloc_prefill('house', data.address.house_number);

  		




  
  120
  
    
        geoloc_prefill('house', data.address.house_number, widget_name);

  		




  120
  121
  
    
      }

  		




  121
  122
  
    
      var number_and_street = null;

  		




  122
  123
  
    
      var street = data.address.road;

  		




  ......




  131
  132
  
    
      } else if (!street && data.address.park) {

  		




  132
  133
  
    
        street = data.address.park;

  		




  133
  134
  
    
      }

  		




  134
  
  
    
      geoloc_prefill('road', street);

  		




  
  135
  
    
      geoloc_prefill('road', street, widget_name);

  		




  135
  136
  
    
      if (street && data.address.house_number) {

  		




  136
  137
  
    
        number_and_street = data.address.house_number + ' ' + street;

  		




  137
  138
  
    
      } else {

  		




  138
  139
  
    
        number_and_street = street;

  		




  139
  140
  
    
      }

  		




  140
  
  
    
      geoloc_prefill('number-and-street', number_and_street);

  		




  141
  
  
    
      geoloc_prefill('postcode', data.address.postcode);

  		




  142
  
  
    
      geoloc_prefill('city', data.address.village || data.address.town || data.address.city || data.address.locality || data.address.municipality || data.address.county);

  		




  143
  
  
    
      geoloc_prefill('country', data.address.country);

  		




  
  141
  
    
      geoloc_prefill('number-and-street', number_and_street, widget_name);

  		




  
  142
  
    
      geoloc_prefill('postcode', data.address.postcode, widget_name);

  		




  
  143
  
    
      geoloc_prefill('city', data.address.village || data.address.town || data.address.city || data.address.locality || data.address.municipality || data.address.county, widget_name);

  		




  
  144
  
    
      geoloc_prefill('country', data.address.country, widget_name);

  		




  144
  145
  
    
      $(document).trigger('wcs:set-last-auto-save');

  		




  145
  146
  
    
      set_sync_callback()

  		




  146
  147
  
    
    });

  		




  147
  
  
    
-