diff --git a/src/renderer/components/EditLayer.vue b/src/renderer/components/EditLayer.vue index 4f89ae7..0d29af8 100644 --- a/src/renderer/components/EditLayer.vue +++ b/src/renderer/components/EditLayer.vue @@ -695,15 +695,15 @@ You should have received a copy of the GNU General Public License along with FG !this.editing) { return; } - console.debug("Edit Type : " + this.$store.state.Editable.data.multiarc.ids); + console.debug("Edit Type : " + this.$store.state.Editable.data.multiarc.ids + ' ' + String(this.$store.state.Editable.data.multiarc.direction)); this.$store.state.Editable.data.multiarc.ids.forEach(id => { console.debug(id); var arc = this.groundnetLayerGroup.getLayer(id); if (arc && arc instanceof L.Polyline) { console.log('Edited Arc : ' + this.$store.state.Editable.index); - arc.options.attributes.direction = this.$store.state.Editable.data.multiarc.direction - arc.options.attributes.name = this.$store.state.Editable.data.multiarc.name - arc.options.attributes.isPushBackRoute = this.$store.state.Editable.data.multiarc.isPushBackRoute + arc.options.attributes.direction = String(this.$store.state.Editable.data.multiarc.direction) + arc.options.attributes.name = String(this.$store.state.Editable.data.multiarc.name) + arc.options.attributes.isPushBackRoute = Number(this.$store.state.Editable.data.multiarc.isPushBackRoute) arc.updateStyle(); } }); diff --git a/src/renderer/loaders/groundnet_writer.js b/src/renderer/loaders/groundnet_writer.js index 4fc2c74..9e96d0b 100644 --- a/src/renderer/loaders/groundnet_writer.js +++ b/src/renderer/loaders/groundnet_writer.js @@ -201,7 +201,10 @@ var mapParkings = function (o) { var lat = convertLat(o.getLatLng()); var lon = convertLon(o.getLatLng()); // - var parking = { '@index': String(o['id']), '@type': o.options.attributes.type, '@name': o.options.attributes.name, '@lat': lat, '@lon': lon, '@heading': Number(o.options.attributes.heading%360).toFixed(1), '@radius': String(o.options.attributes.radius) }; + var parking = { '@index': String(o['id']), '@type': o.options.attributes.type, '@lat': lat, '@lon': lon, '@heading': Number(o.options.attributes.heading%360).toFixed(1), '@radius': String(o.options.attributes.radius) }; + if (o.options.attributes.name !== '' && o.options.attributes.name !== 'undefined' && o.options.attributes.name !== undefined) { + parking['@name'] = o.options.attributes.name; + } if( o.options.attributes.airlineCodes) { console.debug(o.options.attributes.airlineCodes); parking['@airlineCodes'] = o.options.attributes.airlineCodes; @@ -247,7 +250,7 @@ var mapHoldPoint = function (o) { var mapBeginNode = function (o) { if (o instanceof L.TaxiwaySegment) { - console.debug(o); + console.debug('Map Begin : ', o['begin']); // return { '@index': String(o['begin']), '@lat': convertLat(o._latlngs[0]), '@lon': convertLon(o._latlngs[0]), '@isOnRunway': '0', '@type': 'begin' }; } @@ -255,7 +258,7 @@ var mapBeginNode = function (o) { var mapEndNode = function (o) { if (o instanceof L.TaxiwaySegment) { - console.debug(o); + console.debug('Map End : ', o['end']); // return { '@index': String(o['end']), '@lat': convertLat(o._latlngs[1]), '@lon': convertLon(o._latlngs[1]), '@isOnRunway': '0', '@type': 'end' }; } @@ -295,6 +298,8 @@ var styleArc = function (attributes, arc) { } else { arc['@isPushBackRoute'] = "0"; } - arc['@name'] = attributes.name; + if ( attributes.name !== '' && attributes.name !== 'undefined') { + arc['@name'] = attributes.name; + } } } \ No newline at end of file