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

Decrease variable name collisions

parent db8710db

src/components/LCircle.vue

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import { 
  WINDOW_OR_GLOBAL,

  GLOBAL_LEAFLET_OPT,

} from "../utils.js";

import { props, setup as circleSetup } from "../functions/circle";

import { circleProps, setupCircle } from "../functions/circle";

import { render } from "../functions/layer";



/**
@@ -14,7 +14,7 @@ import { render } from "../functions/layer"; 
 */

export default {

  name: "LCircle",

  props,

  props: circleProps,

  setup(props, context) {

    const leafletRef = ref({});

    const ready = ref(false);
@@ -22,7 +22,7 @@ export default { 
    const useGlobalLeaflet = inject(GLOBAL_LEAFLET_OPT);

    const addLayer = inject("addLayer");



    const { options, methods } = circleSetup(props, leafletRef, context);

    const { options, methods } = setupCircle(props, leafletRef, context);



    onMounted(async () => {

      const { circle, DomEvent } = useGlobalLeaflet

src/components/LCircleMarker.vue

+6 −3
Original line number Diff line number Diff line
@@ -6,7 +6,10 @@ import { 
  WINDOW_OR_GLOBAL,

  GLOBAL_LEAFLET_OPT,

} from "../utils.js";

import { props, setup as circleMarkerSetup } from "../functions/circleMarker";

import {

  circleMarkerProps,

  setupCircleMarker,

} from "../functions/circleMarker";

import { render } from "../functions/layer";



/**
@@ -14,7 +17,7 @@ import { render } from "../functions/layer"; 
 */

export default {

  name: "LCircleMarker",

  props,

  props: circleMarkerProps,

  setup(props, context) {

    const leafletRef = ref({});

    const ready = ref(false);
@@ -22,7 +25,7 @@ export default { 
    const useGlobalLeaflet = inject(GLOBAL_LEAFLET_OPT);

    const addLayer = inject("addLayer");



    const { options, methods } = circleMarkerSetup(props, leafletRef, context);

    const { options, methods } = setupCircleMarker(props, leafletRef, context);



    onMounted(async () => {

      const { circleMarker, DomEvent } = useGlobalLeaflet

src/components/LControl.vue

+2 −6
Original line number Diff line number Diff line 
<script>

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

import {

  props as controlProps,

  setup as controlSetup,

  render,

} from "../functions/control";

import { controlProps, setupControl, render } from "../functions/control";

import { propsBinder, WINDOW_OR_GLOBAL, GLOBAL_LEAFLET_OPT } from "../utils.js";



export default {
@@ -29,7 +25,7 @@ export default { 
    const useGlobalLeaflet = inject(GLOBAL_LEAFLET_OPT);

    const registerControl = inject("registerControl");



    const { options, methods } = controlSetup(props, leafletRef);

    const { options, methods } = setupControl(props, leafletRef);



    onMounted(async () => {

      const { Control, DomEvent } = useGlobalLeaflet

src/components/LControlAttribution.vue

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

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

import {

  props,

  setup as attributionControlSetup,

  controlAttributionProps,

  setupControlAttribution,

} from "../functions/controlAttribution";

import { propsBinder, WINDOW_OR_GLOBAL, GLOBAL_LEAFLET_OPT } from "../utils.js";



export default {

  name: "LControlAttribution",

  props,

  props: controlAttributionProps,

  setup(props, context) {

    const leafletRef = ref({});



    const useGlobalLeaflet = inject(GLOBAL_LEAFLET_OPT);

    const registerControl = inject("registerControl");



    const { options, methods } = attributionControlSetup(props, leafletRef);

    const { options, methods } = setupControlAttribution(props, leafletRef);



    onMounted(async () => {

      const { control } = useGlobalLeaflet

src/components/LControlLayers.vue

+6 −3
Original line number Diff line number Diff line 
<script>

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

import { props, setup as layerControlSetup } from "../functions/controlLayers";

import {

  controlLayersProps,

  setupControlLayers,

} from "../functions/controlLayers";

import { propsBinder, WINDOW_OR_GLOBAL, GLOBAL_LEAFLET_OPT } from "../utils.js";



export default {

  name: "LControlLayers",

  props,

  props: controlLayersProps,

  setup(props, context) {

    const leafletRef = ref({});



    const useGlobalLeaflet = inject(GLOBAL_LEAFLET_OPT);

    const registerLayerControl = inject("registerLayerControl");



    const { options, methods } = layerControlSetup(props, leafletRef);

    const { options, methods } = setupControlLayers(props, leafletRef);



    onMounted(async () => {

      const { control } = useGlobalLeaflet