From 6bd9c3c5755a5848b5189770959324aa7f488771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20de=20Metz?= <francois@2metz.fr>
Date: Thu, 30 May 2024 10:57:34 +0200
Subject: [PATCH] Use composition API on toolbar.

---
 js/toolbar.vue | 143 ++++++++++++++++++++++---------------------------
 1 file changed, 64 insertions(+), 79 deletions(-)

diff --git a/js/toolbar.vue b/js/toolbar.vue
index 743f6a5..18bfe71 100644
--- a/js/toolbar.vue
+++ b/js/toolbar.vue
@@ -69,103 +69,88 @@
   </v-card>
 </template>
 
-<script>
-import { mergeProps } from 'vue';
+<script setup>
+import { mergeProps, ref, computed } from 'vue';
 import { mdiPencilOutline } from '@mdi/js';
 import GeocoderInput from './geocoder';
 import { useNews } from './news';
 import equalLogo from 'data-url:../icons/equal.svg';
-export default {
-  components: {
-    GeocoderInput
+
+const { hasUnreadNews } = useNews();
+
+const props = defineProps({
+  mapBounds: {
+    type: Array,
+    required: false,
+    default() { return []; }
   },
 
-  setup() {
-    const { hasUnreadNews } = useNews();
-    return { hasUnreadNews, mergeProps };
+  mapCenter: {
+    type: Object,
+    required: true
   },
 
-  props: {
-    mapBounds: {
-      type: Array,
-      required: false,
-      default() { return []; }
-    },
-
-    mapCenter: {
-      type: Object,
-      required: true
-    },
-
-    mapLevel: {
-      type: String,
-      required: true
-    },
-
-    mapZoom: {
-      type: Number,
-      required: true
-    },
-
-    indoorMinZoom: {
-      type: Number,
-      required: true
-    },
-
-    menu: {
-      type: String,
-    }
+  mapLevel: {
+    type: String,
+    required: true
   },
 
-  data() {
-    return { equalLogo, mdiPencilOutline, editOpen: false };
+  mapZoom: {
+    type: Number,
+    required: true
   },
 
-  computed: {
-    editDisabled() {
-      return this.mapZoom < this.indoorMinZoom;
-    },
+  indoorMinZoom: {
+    type: Number,
+    required: true
+  },
+});
 
-    JOSMParams() {
-      const bounds = this.mapBounds;
-      return `load_and_zoom?left=${bounds[0]}&right=${bounds[2]}&top=${bounds[3]}&bottom=${bounds[1]}`;
-    },
+const editOpen = ref(false);
 
-    JOSMUrl() {
-      return `http://localhost:8111/${this.JOSMParams}`;
-    },
+const editDisabled = computed(() => {
+  return props.mapZoom < props.indoorMinZoom;
+})
 
-    OSMUrl() {
-      return `https://www.openstreetmap.org/edit?editor=id#map=${this.mapZoom}/${this.mapCenter.lat}/${this.mapCenter.lng}`;
-    },
+const JOSMParams = computed(() => {
+  const [left, bottom, right, top] = props.mapBounds;
+  return `load_and_zoom?left=${left}&right=${right}&top=${top}&bottom=${bottom}`;
+});
 
-    OsmInEditUrl() {
-      return `https://osminedit.pavie.info/#${this.mapZoom}/${this.mapCenter.lat}/${this.mapCenter.lng}`;
-    },
+const JOSMUrl = computed(() => {
+  return `http://localhost:8111/${JOSMParams.value}`;
+});
 
-    OpenLevelUpUrl() {
-      return `https://openlevelup.net/?l=${this.mapLevel}#${this.mapZoom}/${this.mapCenter.lat}/${this.mapCenter.lng}`;
-    },
+const OSMUrl = computed(() => {
+  return `https://www.openstreetmap.org/edit?editor=id#map=${props.mapZoom}/${props.mapCenter.lat}/${props.mapCenter.lng}`;
+});
 
-    VespucciUrl() {
-      return `josm:/${this.JOSMParams}`;
-    }
-  },
+const OsmInEditUrl = computed(() => {
+  return `https://osminedit.pavie.info/#${props.mapZoom}/${props.mapCenter.lat}/${props.mapCenter.lng}`;
+});
+
+const OpenLevelUpUrl = computed(() => {
+  return `https://openlevelup.net/?l=${props.mapLevel}#${props.mapZoom}/${props.mapCenter.lat}/${props.mapCenter.lng}`;
+});
+
+const VespucciUrl = computed(() => {
+  return `josm:/${JOSMParams.value}`;
+});
+
+const openJOSM = function() {
+  fetch(JOSMUrl.value).catch(() => {
+    alert("Could not talk to JOSM. Ensure it's running");
+  });
+};
+
+const menu = defineModel('menu', { type: [String, null] });
+
+const openMenu = function() {
+  menu.value = '';
+};
 
-  methods: {
-    openJOSM() {
-      fetch(this.JOSMUrl).catch(() => {
-        alert("Could not talk to JOSM. Ensure it's running");
-      });
-    },
-
-    openMenu() {
-      this.$emit('update:menu', '');
-    },
-
-    updateBounds(bbox) {
-      this.$emit('updateBounds', bbox);
-    }
-  }
+const emit = defineEmits(['updateBounds']);
+const updateBounds = function(bbox) {
+  emit('updateBounds', bbox);
 }
 </script>