diff options
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/default.xml | 18 | ||||
| -rwxr-xr-x | setup/package.sh | 1 |
2 files changed, 16 insertions, 3 deletions
diff --git a/setup/default.xml b/setup/default.xml index 20bf515d2..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> @@ -48,6 +51,10 @@ SELECT * FROM tc_positions WHERE deviceId = :deviceId AND fixTime BETWEEN :from AND :to ORDER BY fixTime </entry> + <entry key='database.selectPrecedingPosition'> + SELECT * FROM tc_positions WHERE deviceId = :deviceId AND fixTime <= :time ORDER BY fixTime DESC LIMIT 1 + </entry> + <entry key='database.selectLatestPositions'> SELECT tc_positions.* FROM tc_positions INNER JOIN tc_devices ON tc_positions.id = tc_devices.positionid; </entry> @@ -294,5 +301,12 @@ <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/package.sh b/setup/package.sh index bb890fbd0..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 () { |