FGFS-4.1/flightgear-airports-old
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Checking

Browse Source
This commit is contained in:
portree_kid
2020-03-01 21:50:16 +01:00
parent bff3af2c52
commit ad3bd57448
10 changed files with 360 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/CheckPanel.vue
+46
View File
@@ -0,0 +1,46 @@
<template>
<div>
<h1 class="leaflet-sidebar-header">
Check Result
<div class="leaflet-sidebar-close">
<i class="fa fa-caret-left"></i>
</div>
</h1>
<div id="panel" width="100%">
<el-row v-for="(result,idx) in results" :key="idx">
<el-col :span="7">{{ result.id }}</el-col>
<el-col :span="15">{{ result.message }}</el-col>
</el-row>
</div>
</div>
</template>
<script lang="js">
export default {
name: 'settings-panel',
components: {},
props: [],
mounted () {
},
data () {
return {
}
},
methods: {
},
computed: {
results: function () {
return this.$store.state.Check.results
}
}
}
</script>
<style>
.el-row {
margin-bottom: 1px;
}
.el-col {
border-radius: 1px;
}
</style>
src/renderer/components/EditBar.vue
+116 -4
View File
@@ -1,7 +1,12 @@
<template>
<div id="EditBar">
<EditButton icon="fas fa-edit" v-on:click="edit" :show="!editing" tooltip="Edit"></EditButton>
<EditButton icon="fas fa-undo" v-on:click="centerDialogVisible = true" :show="editing" tooltip="Undo"></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">
@@ -14,9 +19,25 @@
</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-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>
<EditButton icon="far fa-check-square" v-on:click="showCheck" :show="editing" tooltip="Check"></EditButton>
<el-dialog title="Checking" width="30%" center :visible.sync="checkDialogVisible">
<el-container direction="vertical">
<el-progress :percentage="Number(((progress / max)*100).toPrecision(3))" v-if="max>0"></el-progress>
</el-container>
</el-dialog>
</div>
</template>
@@ -24,10 +45,14 @@
/* eslint-disable */
import EditButton from './EditButton'
import Vue from 'vue'
import fileUrl from 'file-url'
const path = require('path')
export default {
components: { EditButton },
data () {
return {isEditing: false, centerDialogVisible: false, saveDialogVisible: false}
return {isEditing: false, centerDialogVisible: false, saveDialogVisible: false, checkDialogVisible: false, checking: false, progress: 0, max: 0}
},
created () {
},
@@ -58,6 +83,75 @@
Vue.set(this, 'saveDialogVisible', false)
}, this)
},
pollData () {
var workery = this.worker
var view = this
workery.polling = setInterval(() => {
if (workery != null) {
view.max = Number(workery.max)
view.progress = Number(workery.progress)
view.scanning = Boolean(workery.checking)
workery.view = view
}
}, 1000)
},
check () {
try {
this.scanning = true
const winURL = process.env.NODE_ENV === 'development'
? `http://localhost:9080/src/renderer/utils/check.js`
: `file://${__dirname}/check.js`
console.log('make a worker: ', path.resolve(__dirname, 'check.js'))
const worker = new Worker(winURL)
console.log(fileUrl('src/renderer/utils/check.js'))
worker.checking = this.checking
worker.max = this.max
worker.view = this
worker.editLayer = this.$parent.$parent.$refs.editLayer
worker.progress = 0
// var worker = new Worker(fileUrl('src/renderer/utils/worker.js'))
this.worker = worker
var xml = []
this.$parent.$parent.$refs.editLayer.groundnetLayerGroup.eachLayer(l => {
console.log(l)
xml.push(l)
})
var features = xml.map(this.featuresMapper).filter(n => n)
worker.postMessage(['check', features ] )
this.pollData()
// the reply
var store = this.$store
worker.onmessage = function (e) {
if (e.data === 'checkStarted') {
this.progress = 0
this.max = 4
} else if (e.data[0] === 'DONE') {
console.log('DONE')
store.dispatch('setResults', e.data[1])
worker.terminate()
worker.view.max = 0
worker.view.checkDialogVisible = false
clearInterval(this.polling)
this.checking = false
} else if (e.data.length > 0) {
if (e.data[0] === 'max') {
this.max = e.data[1]
}
if (e.data[0] === 'progress') {
this.progress += e.data[1]
}
}
// console.log(e.data)
}
} catch (err) {
console.error(err)
}
},
drawPolyline () {
this.$parent.$parent.$refs.editLayer.drawPolyline()
},
@@ -66,6 +160,24 @@
},
deleteFeature () {
this.$parent.$parent.$refs.editLayer.deleteFeature()
},
showCheck() {
Vue.set(this, 'checkDialogVisible', true)
this.check()
},
featuresMapper(o) {
if (o instanceof L.ParkingSpot) {
return { 'index': Number(o['id']), '_leaflet_id': o._leaflet_id, 'type': 'parking', 'name': o.options.attributes.name, 'radius': String(o.options.attributes.radius) };
} else if (o instanceof L.RunwayNode) {
console.log(o)
return { 'index': Number(o['glueindex']), '_leaflet_id': o._leaflet_id, 'type': 'runway' };
} else if (o instanceof L.Polyline) {
console.log(o)
return { 'start': Number(o['begin']), 'end': Number(o['end']), '_leaflet_id': o._leaflet_id, 'type': 'poly' };
} else {
console.log('Unknown Type ')
console.log(typeof o)
}
}
},
computed: {
src/renderer/components/EditLayer.vue
+16 -10
View File
@@ -1,7 +1,4 @@
<template>
<section class="edit-layer">
<h1>edit-layer Component</h1>
</section>
</template>
<script lang="js">
@@ -13,11 +10,13 @@
import {extendTaxiSegment} from '../loaders/TaxiwaySegmentExtender'
import {writeGroundnetXML} from '../loaders/groundnet_writer'
import L2 from 'leaflet-textpath'
import Vue from 'vue'
// import {LSymbol} from 'leaflet-polylinedecorator'
export default {
name: 'edit-layer',
components: {},
props: [],
created () {
console.log(LMap)
@@ -66,15 +65,14 @@
},
data () {
return {
maxId: 1, icao: String
maxId: 1, icao: String, checking: false
}
},
methods: {
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, force)
@@ -129,6 +127,9 @@
this.deferredMountedTo(this.$parent.mapObject)
}
},
showCheck() {
Vue.set(this, 'checking', true)
},
enableEdit () {
this.editable = true
this.featureLookup = [];
@@ -264,14 +265,14 @@
if (element instanceof L.RunwayNode) {
if (isOnRunway === 0) {
// We shouldn't have a RunwayNode
element.removeFrom(layerGroup);
element.removeFrom(this.groundnetLayerGroup);
this.featureLookup[nIndex].splice(index,1);
}
hasRunwayNode = true;
} else if (element instanceof L.HoldNode) {
if (!isHoldPoint) {
// We shouldn't have a RunwayNode
element.removeFrom(layerGroup);
element.removeFrom(this.groundnetLayerGroup);
this.featureLookup[nIndex].splice(index,1);
} else {
var fa_icon;
@@ -322,9 +323,11 @@
});
const node = new L.RunwayNode(latlng, { icon: icon });
node.glueindex = nIndex;
node.addTo(layerGroup);
node.addTo(this.groundnetLayerGroup);
this.featureLookup[nIndex].push(node);
node.featureLookup = this.featureLookup;
node.addListeners();
node.extensions();
}
if (!hasHoldPointNode && isHoldPoint) {
var fa_icon = null;
@@ -341,9 +344,11 @@
});
const node = new L.HoldNode(latlng, { icon: icon });
node.glueindex = nIndex;
node.addTo(layerGroup);
node.addTo(this.groundnetLayerGroup);
node.featureLookup = this.featureLookup;
this.featureLookup[nIndex].push(node);
node.addListeners();
node.extensions();
}
},
closestLayerSnap (eventLatlng, snap) {
@@ -398,6 +403,7 @@
const circle = new L.ParkingSpot(event.latlng, {attributes: {radius: 20, heading: 0}})
circle.id = (++this.groundnetLayerGroup.maxId)
circle.addTo(this.groundnetLayerGroup)
circle.featureLookup = this.featureLookup
circle.enableEdit()
circle.extensions()
circle.addListeners()
src/renderer/components/LeafletSidebar.vue
+10 -5
View File
@@ -7,6 +7,7 @@
<li><a href="#edit" role="tab"><i class="fas fa-edit"></i></a></li>
<li><a href="#search" role="tab"><i class="fa fa-search"></i></a></li>
<li><a href="#scan" role="tab"><i class="fa fa-sync"></i></a></li>
<li><a href="#check" role="tab"><i class="far fa-check-square"></i></a></li>
</ul>
<ul role="tablist"> <!-- bottom aligned tabs -->
@@ -42,6 +43,9 @@
<div class="leaflet-sidebar-pane" id="settings">
<SettingsPanel></SettingsPanel>
</div>
<div class="leaflet-sidebar-pane" id="check">
<CheckPanel></CheckPanel>
</div>
</div>
</div>
</template>
@@ -52,17 +56,18 @@
import {} from 'leaflet-sidebar-v2'
import L from 'leaflet'
import AirportEdit from './AirportEdit'
import CheckPanel from './CheckPanel'
import ParkingEdit from './ParkingEdit'
import ArcEdit from './ArcEdit'
import NodeEdit from './NodeEdit'
import SettingsPanel from './SettingsPanel'
import RunScan from './RunScan'
import Search from './Search'
import FileSelect from './FileSelect'
import NodeEdit from './NodeEdit'
import RunScan from './RunScan'
import SettingsPanel from './SettingsPanel'
import Search from './Search'
export default {
name: 'leaflet-sidebar',
components: { AirportEdit, ArcEdit, NodeEdit, ParkingEdit, SettingsPanel, RunScan, FileSelect, Search },
components: { AirportEdit, ArcEdit, CheckPanel, NodeEdit, ParkingEdit, SettingsPanel, RunScan, FileSelect, Search },
props: [],
mounted () {
this.add()