Commit c3f785e8 authored by Michael Underwood's avatar Michael Underwood
Browse files

Rename `mapObject` to `leafletObject` throughout

parent cade1815

src/components/LControlLayers.vue

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ export default { 
      lMethods.registerLayerControl({

        ...props,

        ...methods,

        mapObject: leafletRef.value,

        leafletObject: leafletRef.value,

      });

    });

  },

src/components/LMap.vue

+8 −8
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ export default { 
              blueprint.layersToAdd.push(layer);

            } else {

              const exist = blueprint.layersInControl.find(

                (l) => l.mapObject._leaflet_id === layer.mapObject._leaflet_id

                (l) => l.leafletObject._leaflet_id === layer.leafletObject._leaflet_id

              );

              if (!exist) {

                blueprint.layerControl.addLayer(layer);
@@ -238,7 +238,7 @@ export default { 
            }

          }

          if (layer.visible !== false) {

            blueprint.leafletRef.addLayer(layer.mapObject);

            blueprint.leafletRef.addLayer(layer.leafletObject);

          }

        },

        removeLayer(layer) {
@@ -248,18 +248,18 @@ export default { 
                (l) => l.name !== layer.name

              );

            } else {

              blueprint.layerControl.removeLayer(layer.mapObject);

              blueprint.layerControl.removeLayer(layer.leafletObject);

              blueprint.layersInControl = blueprint.layersInControl.filter(

                (l) => l.mapObject._leaflet_id !== layer.mapObject._leaflet_id

                (l) => l.leafletObject._leaflet_id !== layer.leafletObject._leaflet_id

              );

            }

          }

          blueprint.leafletRef.removeLayer(layer.mapObject);

          blueprint.leafletRef.removeLayer(layer.leafletObject);

        },



        registerLayerControl(lControlLayer) {

          blueprint.layerControl = lControlLayer;

          blueprint.leafletRef.addControl(lControlLayer.mapObject);

          blueprint.leafletRef.addControl(lControlLayer.leafletObject);

          blueprint.layersToAdd.forEach((layer) => {

            blueprint.layerControl.addLayer(layer);

          });
@@ -355,9 +355,9 @@ export default { 
      }

    });



    const mapObject = computed(() => blueprint.leafletRef);

    const leafletObject = computed(() => blueprint.leafletRef);

    const ready = computed(() => blueprint.ready);

    return { root, ready, mapObject };

    return { root, ready, leafletObject };

  },

};

</script>

src/components/LMarker.vue

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ export default { 


      leafletRef.value.on("move", debounce(methods.latLngSync, 100));

      propsBinder(methods, leafletRef.value, props, setOptions);

      lMethods.addLayer({ ...props, ...methods, mapObject: leafletRef.value });

      lMethods.addLayer({ ...props, ...methods, leafletObject: leafletRef.value });

      ready.value = true;

    });

    return { ready };

src/components/LTileLayer.vue

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ export default { 
      DomEvent.on(leafletRef.value, listeners);



      propsBinder(methods, leafletRef.value, props, setOptions);

      lMethods.addLayer({ ...props, ...methods, mapObject: leafletRef.value });

      lMethods.addLayer({ ...props, ...methods, leafletObject: leafletRef.value });

    });

  },

  render() {

src/components/LTooltip.vue

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export default { 
      const listeners = remapEvents(context.attrs);

      DomEvent.on(leafletRef.value, listeners);

      leafletRef.value.setContent(props.content || root.value);

      lMethods.bindTooltip({ mapObject: leafletRef.value });

      lMethods.bindTooltip({ leafletObject: leafletRef.value });

    });

    return { root };

  },