ua1zbe
/
openwebrxplus
mirror of https://github.com/luarvique/openwebrx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26 from 0xAF/master 

add LSimpleMarker (fix custom markers)
This commit is contained in:
Luarvique L. Luarvique 2023-09-30 18:39:28 -04:00 committed by GitHub
parent 552865f6bf cc4e9e3a74
commit 354646f3e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/deb_based/install-owrxp-extra.sh
View File

@ -33,7 +33,7 @@ esac
echo "+ Install dev packages..." echo "+ Install dev packages..."
BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libsoapysdr-dev debhelper cmake libprotobuf-dev protobuf-compiler libcodecserver-dev build-essential xxd qt5-qmake libpulse-dev libfaad-dev libopus-dev libfftw3-dev pkg-config libglib2.0-dev libconfig++-dev libliquid-dev libairspyhf-dev libpopt-dev libiio-dev libad9361-dev libhidapi-dev libasound2-dev qtmultimedia5-dev libqt5serialport5-dev qttools5-dev qttools5-dev-tools libboost-all-dev libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev asciidoctor gfortran libhamlib-dev" BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libsoapysdr-dev debhelper cmake libprotobuf-dev protobuf-compiler libcodecserver-dev build-essential xxd qt5-qmake libpulse-dev libfaad-dev libopus-dev libfftw3-dev pkg-config libglib2.0-dev libconfig++-dev libliquid-dev libairspyhf-dev libpopt-dev libiio-dev libad9361-dev libhidapi-dev libasound2-dev qtmultimedia5-dev libqt5serialport5-dev qttools5-dev qttools5-dev-tools libboost-all-dev libfftw3-dev libreadline-dev libusb-1.0-0-dev libudev-dev asciidoctor gfortran libhamlib-dev libsndfile1-dev"
apt-get -y install --no-install-recommends $BUILD_PACKAGES apt-get -y install --no-install-recommends $BUILD_PACKAGES
echo "+ Install SDRPlay..." echo "+ Install SDRPlay..."
@ -103,10 +103,14 @@ mv /files/wsjtx/wsjtx.patch ${WSJT_DIR}
cmakebuild ${WSJT_DIR} cmakebuild ${WSJT_DIR}
rm ${WSJT_TGZ} rm ${WSJT_TGZ}
echo "+ Install HFDL..." echo "+ Install ACARSDEC..."
git clone https://github.com/szpajder/libacars.git git clone https://github.com/szpajder/libacars.git
cmakebuild libacars v2.1.4 cmakebuild libacars v2.1.4
git clone https://github.com/TLeconte/acarsdec.git
cmakebuild acarsdec
echo "+ Install HFDL..."
git clone https://github.com/szpajder/dumphfdl.git git clone https://github.com/szpajder/dumphfdl.git
cmakebuild dumphfdl v1.4.1 cmakebuild dumphfdl v1.4.1

3
docker/scripts/add-dependencies.sh
View File

@ -120,6 +120,9 @@ cmakebuild m17-cxx-demod v2.3
git clone https://github.com/szpajder/libacars.git git clone https://github.com/szpajder/libacars.git
cmakebuild libacars v2.1.4 cmakebuild libacars v2.1.4
git clone https://github.com/TLeconte/acarsdec.git
cmakebuild acarsdec
git clone https://github.com/szpajder/dumphfdl.git git clone https://github.com/szpajder/dumphfdl.git
cmakebuild dumphfdl v1.4.1 cmakebuild dumphfdl v1.4.1

3
htdocs/lib/Leaflet.js
View File

@ -68,6 +68,9 @@ function LAprsMarker () { $.extend(this, new LMarker(), new AprsMarker()); }
// Leaflet-Specific AircraftMarker // Leaflet-Specific AircraftMarker
function LAircraftMarker () { $.extend(this, new LMarker(), new AircraftMarker()); } function LAircraftMarker () { $.extend(this, new LMarker(), new AircraftMarker()); }
// Leaflet-Specific SimpleMarker
function LSimpleMarker() { $.extend(this, new LMarker(), new AprsMarker()); }
// //
// Leaflet-Specific Locator // Leaflet-Specific Locator
// //