Merge branch 'master' into develop

4 files changed, 34 insertions, 73 deletions

diff --git a/setup/default.xml b/setup/default.xml
index f314413f1..c00d29384 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -11,11 +11,15 @@
     -->
 
     <entry key='web.port'>8082</entry>
-    <entry key='web.path'>./web</entry>
+    <entry key='web.path'>./modern</entry>
+    <entry key='web.sanitize'>false</entry>
     <entry key='web.persistSession'>false</entry>
 
-    <entry key='geocoder.enable'>false</entry>
-    <entry key='geocoder.type'>google</entry>
+    <entry key='geocoder.enable'>true</entry>
+    <entry key='geocoder.type'>locationiq</entry>
+    <entry key='geocoder.key'>pk.689d849289c8c63708068b2ff1f63b2d</entry>
+    <entry key='geocoder.onRequest'>true</entry>
+    <entry key='geocoder.ignorePositions'>true</entry>
 
     <entry key='logger.level'>info</entry>
     <entry key='logger.file'>./logs/tracker-server.log</entry>
@@ -25,8 +29,6 @@
     <entry key='filter.future'>86400</entry>
 
     <entry key='event.ignoreDuplicateAlerts'>true</entry>
-    <entry key='processing.computedAttributes.enable'>true</entry>
-    <entry key='processing.engineHours.enable'>true</entry>
 
     <entry key='media.path'>./media</entry>
 
@@ -37,33 +39,7 @@
     <entry key='commands.queueing'>true</entry>
 
     <entry key='database.ignoreUnknown'>true</entry>
-    <entry key='database.generateQueries'>true</entry>
     <entry key='database.changelog'>./schema/changelog-master.xml</entry>
- 
-    <entry key='database.loginUser'>
-        SELECT * FROM tc_users
-        WHERE email = :email OR login = :email
-    </entry>
-
-    <entry key='database.selectPositions'>
-        SELECT * FROM tc_positions WHERE deviceId = :deviceId AND fixTime BETWEEN :from AND :to ORDER BY fixTime
-    </entry>
-
-    <entry key='database.selectLatestPositions'>
-        SELECT tc_positions.* FROM tc_positions INNER JOIN tc_devices ON tc_positions.id = tc_devices.positionid;
-    </entry>
-
-    <entry key='database.updateLatestPosition'>
-        UPDATE tc_devices SET positionId = :id WHERE id = :deviceId
-    </entry>
-
-    <entry key='database.selectEvents'>
-        SELECT * FROM tc_events WHERE deviceId = :deviceId AND eventTime BETWEEN :from AND :to ORDER BY eventTime
-    </entry>
-
-    <entry key='database.selectStatistics'>
-        SELECT * FROM tc_statistics WHERE captureTime BETWEEN :from AND :to ORDER BY captureTime
-    </entry>
 
     <entry key='gps103.port'>5001</entry>
     <entry key='tk103.port'>5002</entry>
@@ -300,5 +276,16 @@
     <entry key='dualcam.port'>5232</entry>
     <entry key='xexun2.port'>5233</entry>
     <entry key='techtocruz.port'>5234</entry>
+    <entry key='flexapi.port'>5235</entry>
+    <entry key='dsf22.port'>5236</entry>
+    <entry key='jido.port'>5237</entry>
+    <entry key='armoli.port'>5238</entry>
+    <entry key='teratrack.port'>5239</entry>
+    <entry key='envotech.port'>5240</entry>
+    <entry key='bstpl.port'>5241</entry>
+    <entry key='thuraya.port'>5242</entry>
+    <entry key='ndtpv6.port'>5243</entry>
+    <entry key='g1rus.port'>5244</entry>
+    <entry key='rftrack.port'>5245</entry>
 
 </properties>
diff --git a/setup/environment.sh b/setup/environment.sh
deleted file mode 100644
index cb80a296a..000000000
--- a/setup/environment.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-add-apt-repository ppa:openjdk-r/ppa
-curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
-dpkg --add-architecture i386
-apt update
-apt install -y git openjdk-11-jdk zip unzip innoextract wine wine32 makeself nodejs
-
-# /usr/bin/printf '\xfe\xed\xfe\xed\x00\x00\x00\x02\x00\x00\x00\x00\xe2\x68\x6e\x45\xfb\x43\xdf\xa4\xd9\x92\xdd\x41\xce\xb6\xb2\x1c\x63\x30\xd7\x92' > /etc/ssl/certs/java/cacerts
-# /var/lib/dpkg/info/ca-certificates-java.postinst configure
-
-git clone --recurse-submodules https://github.com/traccar/traccar.git
-(cd traccar/traccar-web && git checkout master)
-(cd traccar && ./gradlew build)
-
-wget http://cdn.sencha.com/cmd/7.1.0.15/no-jre/SenchaCmd-7.1.0.15-linux-i386.sh.zip
-unzip SenchaCmd-*.zip ; rm SenchaCmd-*.zip
-./SenchaCmd-*.sh -q ; rm SenchaCmd-*
-export PATH=$PATH:~/bin/Sencha/Cmd/
-
-(cd traccar/traccar-web && ./tools/package.sh)
-
-cd traccar/setup
-wget http://files.jrsoftware.org/is/5/isetup-5.5.6.exe
-wget https://github.com/ojdkbuild/ojdkbuild/releases/download/java-11-openjdk-debug-11.0.12.7-1/java-11-openjdk-debug-11.0.12.7-1.windows.ojdkbuild.x86_64.zip
-wget https://github.com/ojdkbuild/contrib_jdk11u-ci/releases/download/jdk-11.0.12%2B7/jdk-11.0.12-ojdkbuild-linux-x64.zip
-wget https://github.com/ojdkbuild/contrib_jdk11u-arm32-ci/releases/download/jdk-11.0.12%2B7/jdk-11.0.12-ojdkbuild-linux-armhf.zip
diff --git a/setup/package.sh b/setup/package.sh
index e5f976b79..71b86014f 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -61,17 +61,17 @@ fi
 if [ $PLATFORM = "all" -o $PLATFORM = "windows-64" ]; then
   check_requirement "Inno Extractor" "which innoextract" "Missing innoextract binary"
   check_requirement "Inno Setup" "ls i*setup-*.exe" "Missing Inno Setup (http://www.jrsoftware.org/isdl.php)"
-  check_requirement "Windows 64 Java" "ls java-*.windows.ojdkbuild.x86_64.zip" "Missing Windows 64 Java (https://github.com/ojdkbuild/ojdkbuild)"
+  check_requirement "Windows 64 Java" "ls OpenJDK*64_windows*.zip" "Missing Windows 64 JDK (https://adoptium.net/)"
   check_requirement "Wine" "which wine" "Missing wine binary"
 fi
 if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" -o $PLATFORM = "linux-arm" ]; then
   check_requirement "Makeself" "which makeself" "Missing makeself binary"
 fi
 if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" ]; then
-  check_requirement "Linux 64 Java" "ls jdk-*-linux-x64.zip" "Missing Linux 64 Java (https://github.com/ojdkbuild/contrib_jdk11u-ci/releases)"
+  check_requirement "Linux 64 Java" "ls OpenJDK*64_linux*.tar.gz" "Missing Linux 64 JDK (https://adoptium.net/)"
 fi
 if [ $PLATFORM = "all" -o $PLATFORM = "linux-arm" ]; then
-  check_requirement "Linux ARM Java" "ls jdk-*-linux-armhf.zip" "Missing Linux ARM Java (https://github.com/ojdkbuild/contrib_jdk11u-aarch32-ci/releases)"
+  check_requirement "Linux ARM Java" "ls OpenJDK*arm_linux*.tar.gz" "Missing Linux ARM JDK (https://adoptium.net/)"
 fi
 if [ $PREREQ = false ]; then
   info "Missing build requirements, aborting..."
@@ -81,13 +81,14 @@ else
 fi
 
 prepare () {
-  mkdir -p out/{conf,data,lib,logs,web,schema,templates}
+  mkdir -p out/{conf,data,lib,logs,legacy,modern,schema,templates}
 
   cp ../target/tracker-server.jar out
   cp ../target/lib/* out/lib
   cp ../schema/* out/schema
   cp -r ../templates/* out/templates
-  cp -r ../traccar-web/web/* out/web
+  cp -r ../traccar-web/web/* out/legacy
+  cp -r ../traccar-web/modern/build/* out/modern
   cp default.xml out/conf
   cp traccar.xml out/conf
 
@@ -118,9 +119,9 @@ package_other () {
 
 package_windows () {
   info "Building Windows 64 installer"
-  unzip -q -o java-*.windows.ojdkbuild.x86_64.zip
-  jlink --module-path java-*.windows.ojdkbuild.x86_64/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec --output out/jre
-  rm -rf java-*.windows.ojdkbuild.x86_64
+  unzip -q OpenJDK*64_windows*.zip
+  jlink --module-path jdk-*/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec --output out/jre
+  rm -rf jdk-*
   wine app/ISCC.exe traccar.iss >/dev/null
   rm -rf out/jre
   zip -q -j traccar-windows-64-$VERSION.zip Output/traccar-setup.exe README.txt
@@ -132,13 +133,13 @@ package_linux () {
   cp setup.sh out
   cp traccar.service out
 
-  unzip -q -o jdk-*-linux-$1.zip
-  jlink --module-path jdk-*-linux-$1/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec --output out/jre
-  rm -rf jdk-*-linux-$1
+  tar -xf OpenJDK*$1_linux*.tar.gz
+  jlink --module-path jdk-*/jmods --add-modules java.se,jdk.charsets,jdk.crypto.ec --output out/jre
+  rm -rf jdk-*
   makeself --needroot --quiet --notemp out traccar.run "traccar" ./setup.sh
   rm -rf out/jre
 
-  zip -q -j traccar-linux-$2-$VERSION.zip traccar.run README.txt
+  zip -q -j traccar-linux-$1-$VERSION.zip traccar.run README.txt
 
   rm traccar.run
   rm out/setup.sh
@@ -147,13 +148,13 @@ package_linux () {
 
 package_linux_64 () {
   info "Building Linux 64 installer"
-  package_linux x64 64
+  package_linux 64
   ok "Created Linux 64 installer"
 }
 
 package_linux_arm () {
   info "Building Linux ARM installer"
-  package_linux armhf arm
+  package_linux arm
   ok "Created Linux ARM installer"
 }
 
diff --git a/setup/traccar.iss b/setup/traccar.iss
index 316bc757b..28b33adfb 100644
--- a/setup/traccar.iss
+++ b/setup/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Traccar
-AppVersion=4.14
+AppVersion=5.5
 DefaultDirName={pf}\Traccar
 OutputBaseFilename=traccar-setup
 ArchitecturesInstallIn64BitMode=x64