Commit Graph

67 Commits

Author SHA1 Message Date
8f412d1b94 [1.2.7] Reorganise a lot of things, add Support for Cameradata 2019-06-24 18:07:53 +02:00
6a871ba280 Move Dockerfile and docker-compose.yml into Project repository 2019-06-24 18:07:13 +02:00
de889459bb Display Crowd-Density Data on Map 2019-06-14 13:02:04 +02:00
a9dd168238 Add support for crowddensity data 2019-06-13 15:21:27 +02:00
9b98bd8660 Rename Adminmodel.cs to AdminModel.cs, cause it sould be Uppercase! 2019-06-11 18:22:46 +02:00
Jannis Warnat
6d28eb4b37 Merge branch 'master' of https://gitlab.fit.fraunhofer.de/monica/lora-map/lora-map 2019-06-11 09:53:36 +02:00
Jannis Warnat
ba5dc9e8f3 added maps and json folders - these may need to be persisted 2019-06-11 09:53:06 +02:00
56de95003e Update README.md 2019-06-10 23:10:55 +02:00
Jannis Warnat
131773d5cb clarifications 2019-06-07 17:52:39 +02:00
Jannis Warnat
c5e7b9e103 added Dockerfile and docker-compose.yml
Build:

docker-compose build

Run (Provide ./Lora-Map/config/requests.conf and ./Lora-Map/config/settings.conf):

docker-compose up -d
2019-06-07 17:37:12 +02:00
9f7e6b4b24 Add support to display camera values that counts people. needs to be on a mqtt toipc camera/counting 2019-06-07 15:06:55 +02:00
3a3b3618bd Add CHANGELOG, CONTRIBUTING.md, LICENSE and README.md 2019-05-30 13:32:19 +02:00
0bc3f6c1e7 [1.2.6] New Types of marker for person 2019-04-29 23:08:46 +02:00
e244aef202 [1.2.5] #10 text Letzer Datenempfang is too long when scrollbar is there and #11 set textsize for every zoomlevel 2019-04-29 16:56:15 +02:00
ba3b56ee8d [1.2.4] Can draw Textmarkers on the Map, use MGRS (UTM) on the Map 2019-04-28 13:37:54 +02:00
b82b071d4d now with MGRS Coordinates 2019-04-26 00:18:05 +02:00
3ad491ccd5 [1.2.3] #9 display polygons and marker on the map 2019-04-24 20:27:27 +02:00
8e9388685e More Icons... 2019-04-22 23:25:29 +02:00
08180734e8 [1.2.2] Bugfix, if only recieve panic packet with gps data, update the marker on the map also 2019-04-22 20:56:26 +02:00
617fbc4dea [1.2.1] #6 Load the map from the Device 2019-04-21 15:29:00 +02:00
418a6e8aad [1.2.0] #4 Possible to Ex and Import Setting 2019-04-15 21:19:29 +02:00
3744613277 [1.1.7] #8 Editor for Names 2019-04-14 17:25:37 +02:00
aff3528ac8 continue with nameseditor 2019-04-13 23:12:05 +02:00
981d4042ea change colors in Marker.svg
continue editor for icons
2019-04-11 23:29:30 +02:00
c1786b4e82 continue iconeditor 2019-04-10 20:15:32 +02:00
c81b02546f continue nameseditor 2019-04-09 18:26:47 +02:00
29b6d3fd27 Continue with nameseditor 2019-04-09 09:21:08 +02:00
e41e6ddabc new battery levels
begin of adminpannel and names editor
2019-04-07 23:07:29 +02:00
925e30e086 Fixing dependencies, missing system.web 2019-04-04 21:23:26 +02:00
37ee169ed1 [1.1.6] #5 Create admin area 2019-04-03 23:57:07 +02:00
645070a3c2 refactoring, so that a function called update_(name of the pannel) will automaticaly executed if the pannel is clicked
make the pannel as overflow auto
style loginpage for admin
2019-04-03 20:55:27 +02:00
81ea11e2fe Update Levels for Battery 2019-04-03 13:39:46 +02:00
6cadaf0bd5 forget the project file 2019-04-02 23:33:45 +02:00
8fb438238d add admin session and some resources
implement login function
2019-04-02 23:32:27 +02:00
b19a32c569 start of adminpannel 2019-04-01 18:15:50 +02:00
4ad9814a84 [1.1.5] Add support for alert button
Rename Panicclient to AlarmItem and Botclient to PositionItem, also use all dates in UTC
functions.js is now responsible for timecalculations, so that the utc times are changed to the local browser time
nav.js is now map.js so its more clear what it did
Server.cs has now a function that gives the utc server time for timecorrection
2019-03-31 12:57:59 +02:00
4444b97d3b add alert border and open device info 2019-03-29 13:46:41 +01:00
52406de2ba show primitive alert on screen when panic button pressed 2019-03-28 17:06:46 +01:00
1f8bb79d43 ask server for panic data 2019-03-28 15:18:33 +01:00
c90a311320 add Panicclient and rewrite Botclient so that is less code
add the possiblity to ask the Server for Panic button presses
remove the version box and put that to the global version-info pannel
2019-03-27 19:36:45 +01:00
c25b6f7ebb add new Icons
not redraw the icons in the devices list
2019-03-27 15:45:11 +01:00
b53f95efec change parsing of names.json
make marker visible in menu.js
2019-03-26 18:43:26 +01:00
6cf17f80d7 remove mapbox
add div icon that use svg directly
2019-03-14 19:32:05 +01:00
2b46f6d16a Update Leaflet to 1.4.0 2019-03-14 19:04:42 +01:00
e9fbc4d13f Change Icons 2019-03-14 15:58:59 +01:00
8e66686c7c Create SVG Icons 2019-03-13 00:18:21 +01:00
aa4f2de809 Modify Icons 2019-03-12 15:49:09 +01:00
cfe818fa00 Change icons 2019-03-11 23:58:08 +01:00
1a4851451e [1.1.4] #3 Create icons for devices 2019-03-10 13:06:15 +01:00
bed3e4b22c [1.1.3] #1 Click on icon and show details 2019-03-08 18:33:11 +01:00