0001-maps-factor-all-geojson-layer-tracking-into-a-single.patch

Frédéric Péters, 12 mai 2020 15:45

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/3] maps: factor all geojson layer tracking into a single
 object (#42761)

 combo/apps/maps/static/js/combo.map.js       | 92 +++++++++++---------
 combo/apps/maps/templates/maps/map_cell.html |  6 +-
 2 files changed, 56 insertions(+), 42 deletions(-)

     $(function() {
         L.Map.include(
+          {
             add_geojson_layer: function(callback, geojson_data) {
             init_geojson_layers: function(layers) {
                if (Array.isArray(layers)) { // backward compatibility
                  this.geojson_layers = Object();
                  for (var i=0; i<layers.length; i++) {
                    this.geojson_layers[layers[i].slug] = Object();
                    this.geojson_layers[layers[i].slug].url = layers[i].url;
+                 }
                } else {
                  this.geojson_layers = layers;
+               }
             },
             load_geojson_layers: function(callback) {
               var layer_slugs = Object.keys(this.geojson_layers);
               for (var i=0; i<layer_slugs.length; i++) {
                 var layer = this.geojson_layers[layer_slugs[i]];
                 layer.status = 'loading';
                 this.add_geojson_layer(callback, layer);
+              }
             },
             add_geojson_layer: function(callback, geojson_layer) {
               var map = this;
               var $map_widget = $(map.getContainer());
               var cell = $map_widget.parents('div.cell')[0];
               var geojson_url = geojson_data.url;
               var geojson_url = geojson_layer.url;
               $.getJSON(geojson_url).done(
                 function(data) {
-...
                           return L.marker(latlng, {icon: marker});
+                      }
                   });
                   // track global marker bounds
                   var bounds = geo_json.getBounds();
                   if (bounds.isValid()) {
                     if (!map.bounds) {
                       map.bounds = L.latLngBounds(bounds);
                     } else {
                       map.bounds.extend(bounds);
+                    }
+                  }
                   if ($map_widget.data('group-markers')) {
                       if (map.geojson_layers[geojson_data.slug]) {
                           map.clustered_markers.removeLayer(map.geojson_layers[geojson_data.slug]);
                       if (geojson_layer.leaflet_layer) {
                           map.clustered_markers.removeLayer(geojson_layer.leaflet_layer);
+                      }
                       map.clustered_markers.addLayer(geo_json);
                   } else {
                       if (map.geojson_layers[geojson_data.slug]) {
                           map.geojson_layers[geojson_data.slug].remove();
                       if (geojson_layer.leaflet_layer) {
                           geojson_layer.leaflet_layer.remove();
+                      }
                       geo_json.addTo(map);
+                  }
                   map.geojson_layers[geojson_data.slug] = geo_json;
                   geojson_layer.leaflet_layer = geo_json;
                   if (callback) {
                       callback(geo_json);
+                  }
                   geojson_data.status = 'loaded';
                   geojson_layer.status = 'loaded';
               }).fail(function(jqxhr, textStatus, error) {
                   geojson_data.status = 'error';
                   geojson_layer.status = 'error';
               }).always(function() {
                   map.trigger_markers_if_ready();
               });
             },
             trigger_markers_if_ready: function() {
               var map = this;
               var $map_widget = $(map.getContainer());
               var map_id = $map_widget.data('cell-id');
               var cell = $map_widget.parents('div.cell')[0];
               var geojson_layers = window['geojson_'+map_id];
               var layer_slugs = Object.keys(this.geojson_layers);
               var loading = 0;
               for (var i=0; i<geojson_layers.length; i++) {
                 if (geojson_layers[i].status == 'loading') loading++;
               for (var i=0; i<layer_slugs.length; i++) {
                 var layer = this.geojson_layers[layer_slugs[i]];
                 if (layer.status == 'loading') loading++;
+              }
               if (loading == 0) {
                 $(cell).trigger('combo:map-markers-ready');
-...
                 });
                 map.addLayer(map.clustered_markers);
+            }
             map.geojson_layers = Object();
             if ($map_widget.data('draggable') === false) {
               map.dragging.disable();
+            }
-...
                 ).addTo(map);
             });
             map.bounds = null;
             map.geojson_layers_loaded = 0;
             var geojson_layers = window['geojson_'+map_id];
             if (geojson_layers.length) {
                 $.each(geojson_layers, function(idx, geojson_data) {
                     geojson_data.status = 'loading';
                     map.add_geojson_layer(function(geo_json) {
                         var bounds = geo_json.getBounds();
                         if (bounds.isValid()) {
                             if (!map.bounds) {
                                 map.bounds = L.latLngBounds(bounds);
                             } else {
                                 map.bounds.extend(bounds);
+                            }
                             if (init_state == 'fit-markers') {
                                 map.fitBounds(map.bounds);
+                            }
+                        }
                     }, geojson_data);
                     map.geojson_layers_loaded += 1;
                     if (map.geojson_layers_loaded == geojson_layers.length) {
                         $(cell).trigger('combo:map-ready');
+                    }
                 });
             } else {
                 $(cell).trigger('combo:map-ready');
             map.init_geojson_layers(window['geojson_'+map_id]);
             if (init_state == 'fit-markers') {
               $(cell).on('combo:map-markers-ready', function() {
                 map.fitBounds(map.bounds);
               });
+            }
             map.load_geojson_layers()
             $(cell).trigger('combo:map-ready');
         };
         $('div.cell.map').each(function() {
             render_map(this);

           opacity: {{ layer.opacity|as_json|safe }}
         });
       {% endfor %}
       var geojson_{{ cell.pk }} = [];
       var geojson_{{ cell.pk }} = Object();
       {% for layer in geojson_layers %}
       geojson_{{ cell.pk }}.push({
       geojson_{{ cell.pk }}["{{ layer.slug }}"] = {
         url: '{{ layer.url }}',
         slug: '{{ layer.slug }}'
       });
       };
       {% endfor %}
     </script>
     </div>
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-maps-factor-all-geojson-layer-tracking-into-a-single.patch