Unverified Commit 4a3f9eb4 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera Committed by GitHub
Browse files

Merge pull request #53 from vue-leaflet/resolve-47 

Remove dependence on `L.latLng` function entirely from LMarker component
parents 4c5ff277 ab806169

src/Playground.vue

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 


        <l-circle :lat-lng="[35.865, 12.865]" :radius="10000" color="green" />

        <l-geo-json :geojson="geojson"></l-geo-json>



      </l-map>

      <button @click="changeIcon">New kitten icon</button>

      <label for="attributionPrefix">Attribution prefix:</label>

src/components/LMarker.vue

+4 −15
Original line number Diff line number Diff line 
<script>

import { onMounted, ref, provide, inject } from "vue";

import {

  remapEvents,

  propsBinder,

  debounce,

  provideLeafletWrapper,

  updateLeafletWrapper,

} from "../utils.js";

import { remapEvents, propsBinder, debounce } from "../utils.js";

import { props, setup as markerSetup } from "../functions/marker";

import { render } from "../functions/layer";
@@ -22,7 +16,6 @@ export default { 


    const addLayer = inject("addLayer");



    const latLng = provideLeafletWrapper("latLng");

    provide("canSetParentHtml", () => !!leafletRef.value.getElement());

    provide(

      "setParentHtml",
@@ -35,13 +28,9 @@ export default { 
    const { options, methods } = markerSetup(props, leafletRef, context);



    onMounted(async () => {

      const {

        marker,

        DomEvent,

        latLng: leafletLatLng,

        setOptions,

      } = await import("leaflet/dist/leaflet-src.esm");

      updateLeafletWrapper(latLng, leafletLatLng);

      const { marker, DomEvent, setOptions } = await import(

        "leaflet/dist/leaflet-src.esm"

      );



      leafletRef.value = marker(props.latLng, options);

src/functions/marker.js

+2 −8
Original line number Diff line number Diff line 
import { inject } from "vue";

import { props as layerProps, setup as layerSetup } from "../functions/layer";



export const props = {
@@ -38,7 +37,6 @@ export const setup = (props, leafletRef, context) => { 
    ...layerOptions,

    ...props,

  };

  const latLng = inject("latLng");



  const methods = {

    ...layerMethods,
@@ -60,12 +58,8 @@ export const setup = (props, leafletRef, context) => { 


      if (leafletRef.value) {

        const oldLatLng = leafletRef.value.getLatLng();

        const newLatLng = latLng(newVal);

        if (

          newLatLng.lat !== oldLatLng.lat ||

          newLatLng.lng !== oldLatLng.lng

        ) {

          leafletRef.value.setLatLng(newLatLng);

        if (!oldLatLng || !oldLatLng.equals(newVal)) {

          leafletRef.value.setLatLng(newVal);

        }

      }

    },