From 00bdd6c558ec23a2d88f4e5dba6cb871b2a02863 Mon Sep 17 00:00:00 2001 From: portree_kid Date: Fri, 15 May 2020 16:33:33 +0200 Subject: [PATCH] Check parking number, number with letter (9L) --- .travis.yml | 2 +- package.json | 2 +- src/renderer/components/CheckPanel.vue | 7 +++++-- src/renderer/components/EditBar.vue | 11 ++++++++++- src/renderer/components/EditLayer.vue | 17 +++++++++++++++++ src/renderer/components/ParkingItem.vue | 3 --- src/renderer/loaders/groundnet_loader.js | 2 +- src/renderer/utils/check.js | 2 +- 8 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92790c0..55a0029 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,5 +31,5 @@ deploy: file_glob: true file: build/* on: - branches: 'master' + branches: '0.0.10' repo: Portree-Kid/flightgear-airports diff --git a/package.json b/package.json index c7c6153..0386f8f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "flightgear-airports", - "version": "0.0.9", + "version": "0.0.10", "author": "portree_kid ", "description": "An software to design Flightgear groundnets", "license": "GPL v3", diff --git a/src/renderer/components/CheckPanel.vue b/src/renderer/components/CheckPanel.vue index 0957da3..8184772 100644 --- a/src/renderer/components/CheckPanel.vue +++ b/src/renderer/components/CheckPanel.vue @@ -9,8 +9,7 @@
{{ result.message }} - Show - +
@@ -48,4 +47,8 @@ border-radius: 1px; padding: 0pt; } +.button { + padding-left: 10px; + padding-right: 10px; +} diff --git a/src/renderer/components/EditBar.vue b/src/renderer/components/EditBar.vue index e1cf3f2..29b9000 100644 --- a/src/renderer/components/EditBar.vue +++ b/src/renderer/components/EditBar.vue @@ -28,7 +28,13 @@ icon="fas fa-draw-polygon" v-on:click="drawPolyline" :show="editing" - tooltip="Draw Taxiline" + tooltip="Draw Bi-Directional Taxiline" + > + { + console.log(event) + event.target.addTo(this.groundnetLayerGroup) + }) + }, drawPushbackPolyline () { var polyLine = this.$parent.mapObject.editTools.startPolyline() polyLine.addTo(this.groundnetLayerGroup) diff --git a/src/renderer/components/ParkingItem.vue b/src/renderer/components/ParkingItem.vue index 0dcddf5..ba5eba3 100644 --- a/src/renderer/components/ParkingItem.vue +++ b/src/renderer/components/ParkingItem.vue @@ -61,9 +61,6 @@ number: { // getter get: function () { - if (isNaN(this.parking.number)) { - return '' - } return this.parking.number }, // setter diff --git a/src/renderer/loaders/groundnet_loader.js b/src/renderer/loaders/groundnet_loader.js index aaa34f9..9c5367f 100644 --- a/src/renderer/loaders/groundnet_loader.js +++ b/src/renderer/loaders/groundnet_loader.js @@ -102,7 +102,7 @@ exports.readGroundnetXML = function (fDir, icao, force) { }).sort(); store.default.dispatch('setParkings', parkingNodes.map( - p => ({index: Number(p.attrs.index), name: String(p.attrs.name), number: Number(p.attrs.number), type: String(p.attrs.type)} + p => ({index: Number(p.attrs.index), name: String(p.attrs.name), number: p.attrs.number, type: String(p.attrs.type)} )).sort((p1, p2) => { if (p1.name === p2.name) { return p1.number - p2.number diff --git a/src/renderer/utils/check.js b/src/renderer/utils/check.js index 1239d3f..95c8b76 100644 --- a/src/renderer/utils/check.js +++ b/src/renderer/utils/check.js @@ -254,7 +254,7 @@ var mapParkings = function (o) { var mapParkingNode = function (o) { if (o.type === 'parking') - return { index: o.index, lat: o.lat, lng: o.lng, name: o.name, radius: Number(o.radius) }; + return { index: o.index, lat: o.lat, lng: o.lng, name: o.name, radius: Number(o.radius), type: o.type }; console.log(o); }