4 files changed, 18 insertions, 20 deletions
diff --git a/setup/default.xml b/setup/default.xml
index e427d05e5..a592bbbed 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -12,9 +12,12 @@
 
     <entry key='web.port'>8082</entry>
     <entry key='web.path'>./web</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'>nominatim</entry>
+    <entry key='geocoder.url'>https://us1.locationiq.com/v1/reverse.php</entry>
+    <entry key='geocoder.key'>pk.689d849289c8c63708068b2ff1f63b2d</entry>
 
     <entry key='logger.level'>info</entry>
     <entry key='logger.file'>./logs/tracker-server.log</entry>
@@ -243,7 +246,7 @@
     <entry key='autotrack.port'>5172</entry>
     <entry key='tek.port'>5173</entry>
     <entry key='wristband.port'>5174</entry>
-    <entry key='applet.port'>5175</entry>
+    <entry key='lacak.port'>5175</entry>
     <entry key='milesmate.port'>5176</entry>
     <entry key='anytrek.port'>5177</entry>
     <entry key='smartsole.port'>5178</entry>
@@ -297,5 +300,13 @@
     <entry key='r12w.port'>5226</entry>
     <entry key='flexiblereport.port'>5227</entry>
     <entry key='thinkpower.port'>5228</entry>
+    <entry key='stb.port'>5229</entry>
+    <entry key='b2316.port'>5230</entry>
+    <entry key='hoopo.port'>5231</entry>
+    <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>
 
 </properties>
diff --git a/setup/environment.sh b/setup/environment.sh
index 34d919b56..cb80a296a 100644
--- a/setup/environment.sh
+++ b/setup/environment.sh
@@ -13,9 +13,6 @@ 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/ext/gpl/ext-6.2.0-gpl.zip
-unzip ext-*-gpl.zip ; rm ext-*-gpl.zip
-
 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-*
@@ -25,6 +22,6 @@ export PATH=$PATH:~/bin/Sencha/Cmd/
 
 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.9.11-1/java-11-openjdk-debug-11.0.9.11-1.windows.ojdkbuild.x86_64.zip
-wget https://github.com/ojdkbuild/contrib_jdk11u-ci/releases/download/jdk-11.0.8%2B10/jdk-11.0.8-ojdkbuild-linux-x64.zip
-wget https://github.com/ojdkbuild/contrib_jdk11u-arm32-ci/releases/download/jdk-11.0.8%2B10/jdk-11.0.8-ojdkbuild-linux-armhf.zip
+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 093db481b..e5f976b79 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -39,7 +39,6 @@ warn () {
 
 VERSION=$1
 PLATFORM=${2:-all}
-export EXTJS_PATH=$(cd ../..; pwd)/ext-6.2.0
 PREREQ=true
 
 check_requirement () {
@@ -54,11 +53,8 @@ check_requirement () {
 
 info "Checking build requirements for platform: "$PLATFORM
 check_requirement "Traccar server archive" "ls ../target/tracker-server.jar" "Missing traccar archive"
-check_requirement "Traccar web interface" "ls ../traccar-web/tools/minify.sh" "Missing traccar-web sources"
 check_requirement "Zip" "which zip" "Missing zip binary"
 check_requirement "Unzip" "which unzip" "Missing unzip binary"
-check_requirement "Ext JS" "ls $EXTJS_PATH" "ExtJS not found in $EXTJS_PATH (https://www.sencha.com/legal/GPL/)"
-check_requirement "Sencha Cmd" "which sencha" "Missing Sencha Cmd package (https://www.sencha.com/products/extjs/cmd-download/)"
 if [ $PLATFORM != "other" ]; then
   check_requirement "Jlink" "which jlink" "Missing jlink binary"
 fi
@@ -85,10 +81,6 @@ else
 fi
 
 prepare () {
-  info "Generating app.min.js"
-  ../traccar-web/tools/minify.sh >/dev/null
-  ok "Created app.min.js"
-
   mkdir -p out/{conf,data,lib,logs,web,schema,templates}
 
   cp ../target/tracker-server.jar out
@@ -107,8 +99,6 @@ prepare () {
 
 cleanup () {
   info "Cleanup"
-  rm ../traccar-web/web/app.min.js
-
   rm -r out
   if [ $PLATFORM = "all" -o $PLATFORM = "windows-64" ]; then
 	rm -r tmp
diff --git a/setup/traccar.iss b/setup/traccar.iss
index 25a642afa..316bc757b 100644
--- a/setup/traccar.iss
+++ b/setup/traccar.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Traccar
-AppVersion=4.13
+AppVersion=4.14
 DefaultDirName={pf}\Traccar
 OutputBaseFilename=traccar-setup
 ArchitecturesInstallIn64BitMode=x64