diff --git a/public_html/planeObject.js b/public_html/planeObject.js index a5847ce..a02c2ac 100644 --- a/public_html/planeObject.js +++ b/public_html/planeObject.js @@ -111,15 +111,15 @@ function PlaneObject(icao) { PlaneObject.prototype.isFiltered = function() { // aircraft type filter if (this.filter.aircraftTypeCode) { - if (this.icaotype === null || (typeof this.icaotype === 'string' && this.icaotype.toUpperCase() !== this.filter.aircraftTypeCode.toUpperCase())) { + if (this.icaotype === null || (typeof this.icaotype === 'string' && !this.icaotype.toUpperCase().trim().match(this.filter.aircraftTypeCode))) { return true; } } // aircraft ident filter if (this.filter.aircraftIdent) { - if (this.flight === null || (typeof this.flight === 'string' && this.flight.toUpperCase().trim() !== this.filter.aircraftIdent.toUpperCase())) { - return true; + if (this.flight === null || (typeof this.flight === 'string' && !this.flight.toUpperCase().trim().match(this.filter.aircraftIdent))) { + return true; } } diff --git a/public_html/script.js b/public_html/script.js index e520b72..a0044c7 100644 --- a/public_html/script.js +++ b/public_html/script.js @@ -2125,12 +2125,12 @@ function updatePlaneFilter() { PlaneFilter.maxAltitude = maxAltitude; PlaneFilter.altitudeUnits = DisplayUnits; - var aircraftTypeCode = $("#aircraft_type_filter").val().trim() + var aircraftTypeCode = $("#aircraft_type_filter").val().trim().toUpperCase() if (aircraftTypeCode === "") { aircraftTypeCode = undefined } - var aircraftIdent = $("#aircraft_ident_filter").val().trim() + var aircraftIdent = $("#aircraft_ident_filter").val().trim().toUpperCase() if (aircraftIdent === "") { aircraftIdent = undefined }