From 806253dfb62bdf080dc76d6e9839a146d2047e69 Mon Sep 17 00:00:00 2001
From: portree_kid <keith.paterson@gmx.de>
Date: Wed, 29 Jan 2020 21:17:23 +0100
Subject: [PATCH] Reload force

---
 src/renderer/components/EditBar.vue   | 24 +++++++++++++++++++-----
 src/renderer/components/EditLayer.vue |  8 ++++----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/renderer/components/EditBar.vue b/src/renderer/components/EditBar.vue
index 7934ddd..64a5536 100644
--- a/src/renderer/components/EditBar.vue
+++ b/src/renderer/components/EditBar.vue
@@ -1,9 +1,16 @@
 <template>
   <div id="BLABLA">
     <EditButton icon="fas fa-edit" v-on:click="edit" :show="!editing" tooltip="Edit"></EditButton>
-    <EditButton icon="fas fa-undo" v-on:click="undo" :show="editing" tooltip="Undo"></EditButton>
-    <EditButton icon="fas fa-save" v-on:click="save" :show="editing" tooltip="Save"></EditButton>
+    <EditButton icon="fas fa-undo" v-on:click="centerDialogVisible = true" :show="editing" tooltip="Undo"></EditButton>
+    <el-dialog title="Reload" :visible.sync="centerDialogVisible" width="30%" center>
+      <span style="center">Reload from last save? You will lose the current edits.</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="undoFirst">Base version (GIT)</el-button>
+        <el-button type="primary" @click="undoLast">Last save</el-button>
+      </span>
+    </el-dialog>
 
+    <EditButton icon="fas fa-save" v-on:click="save" :show="editing" tooltip="Save"></EditButton>
     <EditButton icon="fas fa-draw-polygon" v-on:click="drawPolyline" :show="editing" tooltip="Draw Taxiline"></EditButton>
     <EditButton icon="fas fa-parking" v-on:click="drawParking" :show="editing" tooltip="Draw Parking"></EditButton>
     <EditButton icon="fas fa-trash-alt" v-on:click="deleteFeature" :show="editing" tooltip="Remove"></EditButton>
@@ -15,7 +22,7 @@
   export default {
     components: { EditButton },
     data () {
-      return {isEditing: false}
+      return {isEditing: false, centerDialogVisible: false}
     },
     created () {
     },
@@ -24,10 +31,17 @@
         this.editing = true
         this.$parent.$parent.$refs.editLayer.enableEdit()
       },
-      undo () {
+      undoFirst () {
         this.editing = false
+        this.centerDialogVisible = false
         this.$parent.$parent.$refs.editLayer.disableEdit()
-        this.$parent.$parent.$refs.editLayer.reload()
+        this.$parent.$parent.$refs.editLayer.reload(true)
+      },
+      undoLast () {
+        this.editing = false
+        this.centerDialogVisible = false
+        this.$parent.$parent.$refs.editLayer.disableEdit()
+        this.$parent.$parent.$refs.editLayer.reload(false)
       },
       save () {
         this.editing = false
diff --git a/src/renderer/components/EditLayer.vue b/src/renderer/components/EditLayer.vue
index be8cbea..9f89a0d 100644
--- a/src/renderer/components/EditLayer.vue
+++ b/src/renderer/components/EditLayer.vue
@@ -38,12 +38,12 @@
       }
     },
     methods: {
-      load (icao) {
+      load (icao, force) {
         if (this.groundnetLayerGroup !== undefined) {
           this.groundnetLayerGroup.removeFrom(this.$parent.mapObject)
         }
         this.icao = icao
-        this.groundnetLayerGroup = readGroundnetXML(this.$store.state.Settings.settings.airportsDirectory, icao, true)
+        this.groundnetLayerGroup = readGroundnetXML(this.$store.state.Settings.settings.airportsDirectory, icao, force)
         if (this.groundnetLayerGroup === undefined) {
           console.console.error('ICAO not loaded ' + icao)
           return
@@ -197,8 +197,8 @@
         // console.log(this.groundnetLayerGroup)
         this.$parent.mapObject.off('click', this.addParking)
       },
-      reload () {
-        this.load(this.icao)
+      reload (force) {
+        this.load(this.icao, force)
       },
       save () {
         var xml = []