diff --git a/package-lock.json b/package-lock.json index a6342e0..10caf37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "flightgear-airports", - "version": "0.0.32", + "version": "0.0.33", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -12349,6 +12349,21 @@ "resolved": "https://registry.npmjs.org/leaflet-textpath/-/leaflet-textpath-1.2.0.tgz", "integrity": "sha512-anLGWptWb916MhEXi4WewYe08YKCawRvEXsMGj9fuYnUGd+irV3VG4UXcdW1l+Oa/TZoCTLQsg3LNwvFcroVog==" }, + "leaflet.pattern": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/leaflet.pattern/-/leaflet.pattern-0.1.0.tgz", + "integrity": "sha512-E4sxvvK0XHi1EhE1yUTG1bzafXZoXUPqWPjHz5fSpv/pOcT4CtS0qR1lhFSRtSUYios8OwlZmUGB9n91zQEgcw==", + "requires": { + "leaflet": "~0.7.1" + }, + "dependencies": { + "leaflet": { + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-0.7.7.tgz", + "integrity": "sha1-HjUrpU5j0HZFH6NjyQCJDLLPde4=" + } + } + }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", diff --git a/package.json b/package.json index 6416814..f3b2126 100644 --- a/package.json +++ b/package.json @@ -109,6 +109,7 @@ "leaflet-search": "^2.9.9", "leaflet-sidebar-v2": "^3.2.1", "leaflet-textpath": "^1.2.0", + "leaflet.pattern": "^0.1.0", "lokijs": "^1.5.8", "mathjs": "^6.2.5", "path": "^0.12.7", diff --git a/src/renderer/check/mapper.js b/src/renderer/check/mapper.js index 26f0ac7..6c9209c 100644 --- a/src/renderer/check/mapper.js +++ b/src/renderer/check/mapper.js @@ -31,7 +31,7 @@ export function checkMapper(o) { 'box': o.box !== undefined ? o.box.getLatLngs() : null }; } else if (o instanceof L.RunwayNode) { - console.log(o) + console.log(o) return { 'index': Number(o['glueindex']), '_leaflet_id': o._leaflet_id, 'lat': o._latlng.lat, 'lng': o._latlng.lng, 'type': 'runway' }; } else if (o instanceof L.HoldNode) { console.log(o) @@ -41,6 +41,11 @@ export function checkMapper(o) { 'type': 'runway_poly', 'pavement': o.getLatLngs() } + } else if (o instanceof L.TakeoffPolygon) { + return { + 'type': 'takeoffpad_poly', + 'pavement': o.getLatLngs() + } } else if (o instanceof L.Polyline) { console.log(o) var latLngs = o.getLatLngs().map(l => ({ lat: l.lat, lng: l.lng, index: l.glueindex })); @@ -56,7 +61,7 @@ export function checkMapper(o) { } export function groMapper(o) { - if (o instanceof L.Polygon) { + if (o instanceof L.Polygon) { } } diff --git a/src/renderer/components/EditBar.vue b/src/renderer/components/EditBar.vue index a87a84b..6431264 100644 --- a/src/renderer/components/EditBar.vue +++ b/src/renderer/components/EditBar.vue @@ -302,9 +302,16 @@ You should have received a copy of the GNU General Public License along with FG console.log(l) pavement.push(l) }) - var features2 = pavement.map(mapper.checkMapper).filter(n => n) + var thresholds = [] + this.$parent.$parent.$refs.thresholdLayer.getLayer().eachLayer(l => { + console.log(l) + thresholds.push(l) + }) + var pavementFeatures = pavement.map(mapper.checkMapper).filter(n => n) + //TODO + var thresholdFeatures = thresholds.map(mapper.checkMapper).filter(n => n) - worker.postMessage(['check', features.concat(features2) ] ) + worker.postMessage(['check', features.concat(pavementFeatures).concat(thresholdFeatures) ] ) this.pollData() // the reply var store = this.$store diff --git a/src/renderer/components/ThresholdLayer.vue b/src/renderer/components/ThresholdLayer.vue index 25d9e4f..0828478 100644 --- a/src/renderer/components/ThresholdLayer.vue +++ b/src/renderer/components/ThresholdLayer.vue @@ -3,6 +3,7 @@