New overview page and new map #1501

Merged
merged 920 commits into from Jul 26, 2015

Projects

None yet
@laf
Member
laf commented Jul 20, 2015

** for those who tested the other one, you will need to run the following command: **

ALTER TABLE `devices`   DROP `lat`,   DROP `lng`,   DROP `latlng_update`;

1 .This will now perform lookups of sysLocation to work out coords (disabled by default whilst people test). Lookups are limited by checking if a device with the same sysLocation has done a lookup within the last 24 hours and use that.
2 .lat / lng coords then stored in the DB.
3. Map is then available by setting the new frontpage to be map.php. Varying options supported to get a map of the area you want. See docs for details.

Would be great for people to test this functionality.

Things to do:

  1. Allow users to override the lat/lng coords in web ui.
  2. Add a central DB where we can store some common address to lat/lng lookups (maybe data centres, IX's, etc).
  3. more depending on feedback.

We will be able to add more geocoding services quite easily.
We will be able to add more map vendors quite easily.

image

XhmikosR and others added some commits Nov 15, 2013
@XhmikosR XhmikosR Fix lint errors. 0f09166
@neveldo neveldo Added labelAttrsHover option for the plots and areas legend 8adb3d1
@neveldo neveldo Added some new examples of use 454e1b1
@neveldo neveldo improved zooming feature 72fa42d
@neveldo neveldo Added new example with the zoom features 7923a83
@neveldo neveldo version 0.7.0 feb99f3
@neveldo neveldo version 0.7.0 04ec7c0
@brandonaaron brandonaaron Merge pull request #80 from XhmikosR/master
Minor improvements
7568a8e
@XhmikosR XhmikosR test/index.html: move CSS before JS. a2a365f
@XhmikosR XhmikosR test/index.html: remove unused variables. 5ad5017
@XhmikosR XhmikosR test/index.html: put a few common properties together. 932c3c5
@brandonaaron brandonaaron Merge pull request #83 from XhmikosR/master
Update test/index.html
b6b3a70
Adam Bramley Crude fix for issue#273 map loses focus when zooming in on cluster wi…
…th keyboard
975d332
Adam Bramley Left out the crucial .id 7473ced
Adam Bramley map._container is an element so we can call focus() on that directly 952d417
@frankrowe frankrowe leaflet 0.7 + remove ie css 5614141
@frankrowe frankrowe add oldie styles 84454ce
@frankrowe frankrowe remove ie css a45ae4b
@frankrowe frankrowe update examples 12367da
@frankrowe frankrowe update README to require Leaflet 0.7 cfc200f
markaspot Some new colors for markers-soft images, CSS and example 768d01d
@neveldo neveldo Fix legend colorisation with zero values in slices definition e36153f
@neveldo neveldo don't animate areas and plots in the legend on mouse hover 9b4a750
@danzel danzel Fix incorrectly adding parent clusters when doing a big move that cha…
…nges zoom levels. Fixes #281
53eab49
@danzel danzel Merge pull request #280 from frankrowe/remove-ie-css
Remove IE CSS
882f032
@danzel danzel Fix this back to mobiles styles 59560b4
@danzel danzel Update build f4e7845
@brandonaaron brandonaaron Better handle deltaModes 1 (scroll by lines) and 2 (scroll by pages). 5aaaf69
@brandonaaron brandonaaron offsetParent was not added until 1.2.6 and should probably continue s…
…upport for 1.2.2 since this is going to be a bug fix release
17b6d36
@brandonaaron brandonaaron can just use $ here 84f0578
@brandonaaron brandonaaron fix my indents 41b980a
@brandonaaron brandonaaron Attempt to beter handle older browsers that use a wheelDelta based on…
… 120
5d771ab
@brandonaaron brandonaaron again with my indents 85b8429
@brandonaaron brandonaaron Bump version to 3.1.7 and update my info in a few places. cafeaf9
@brandonaaron brandonaaron Fix the handling of older 120 based deltas. c7a2d66
@brandonaaron brandonaaron add scrolling test 89baea9
@brandonaaron brandonaaron fix comment 937799d
@brandonaaron brandonaaron update change log 1690349
@brandonaaron brandonaaron bump version to 3.1.8 3efd554
@brandonaaron brandonaaron again with my indents 171976e
@jmeas jmeas Update bower.json 906ace7
@brandonaaron brandonaaron Merge pull request #91 from jmeas/master
Update bower.json
0a7fe84
@brandonaaron brandonaaron Bumping to 3.1.9. Including a fix for the broken bower.json in 3.1.8 and
updates to the old delta handling code.
d55a79e
@brandonaaron brandonaaron missed a version again 87aa074
Adam Bramley Remove check for undefined, reverted dist/* changes e3dac5c
@danzel danzel Merge pull request #275 from Zombienaute/master
Map loses focus when zooming in on cluster with keyboard
9165b87
@danzel danzel Fix code for unit tests, refs #275 5a8872a
@neveldo neveldo Added map of European Union 6bc6935
@danzel danzel If fitBounds wouldn't zoom us down, zoom us down instead. Fixes #144 957a69d
@danzel danzel Prevent multiple clustermouseover/off events if the icon is made up o…
…f stacked divs. Fixes #252.

Doesn't fix this bug in IE <= 8 as they don't support relatedTarget, could fix it by looking at the event type and using fromElement/toElement, but I'm not going to.
6d12053
@danzel danzel Fix broken tests d525b15
@danzel danzel Bumping pages to 0.7 08275bb
@danzel danzel Implementation of LayerGroup.getLayer with really bad performance. fi…
…xes #244
243c484
@danzel danzel use getAllChildMarkers in this example. fixes #270 6835a77
@danzel danzel Update the build 9be0747
@danzel danzel Update the changelog too! 5e2d103
@danzel danzel Bump required leaflet version (as of the ie css changes) 653b420
@danzel danzel Lowercase the name, waiting on #230 21ba129
@danzel danzel Fix quick zoom in/out in firefox making everything disappear. Fixes #140
 Fixes #272
c5efb23
@danzel danzel Slow the animation down, looks better :) 7e31b27
@danzel danzel Fix some cases where zoomToShowLayer wouldn't work. Fixes #286 #228 #203
f0b1618
@danzel danzel Update change log, bump to 0.4.0 and rebuild 20cf8ed
@migmruiz migmruiz correcting date of v0.4 changes in CHANGELOG.md a6628a6
@danzel danzel Merge pull request #291 from migmruiz/patch-1
correcting date of v0.4 changes in CHANGELOG.md
a7b9136
@danzel danzel Add chunkedLoading option. refs #292 8b65285
@danzel danzel Use chunkedLoading for the 2 big examples cf6f45e
@danzel danzel Fix up a performance issue found, when adding markers we were doing a…
… lot of unnecessary checks for duplicate markers.
e102ec0
@danzel danzel Remove console.log lines 289ae90
@danzel danzel Update build c1d4a88
markaspot Retina display css fix 41b6101
@mindplay-dk mindplay-dk instrument time elapsed and report progress 8732cb4
@mindplay-dk mindplay-dk add a simple progress bar to the 50K sample 8d53c8a
@neveldo neveldo Added Northern Ireland 1ad2023
@Schwanksta Schwanksta Add ability to use a function for maxClusterRadius
I find it's necessary to use a different radius at different zoom levels. This patch lets you continue to use a single number for all zoom levels, but also lets you use a function to vary the radius for each zoom level.
9381d3e
@Schwanksta Schwanksta Update README.md
added reference to the maxClusterRadius function ability.
f7bd083
@Schwanksta Schwanksta fixed tabs and spacing 05f2131
@Schwanksta Schwanksta fixed other style issues f7de94b
@danzel danzel Fix zoom out with a single circle marker. fixes #300 683bf4c
@nlemoine nlemoine afterUpdate call: fixed undefined opt bf6d19d
@neveldo neveldo Merge pull request #24 from nlemoine/master
afterUpdate call: fixed undefined opt
3fbde0d
@danzel danzel Merge pull request #298 from Schwanksta/patch-1
Add ability to use a function for maxClusterRadius
2b22452
@danzel danzel Little bit of tidy up, refs #298 e78b61d
@danzel danzel Update build caa138d
@Wildhoney Wildhoney Added Bower configuration file 3ad6e75
@Wildhoney Wildhoney Updated README to include instructions on installing via Bower ba53f30
@danzel danzel Merge pull request #307 from Wildhoney/BOWER
Bower
04a50ab
@mindplay-dk mindplay-dk Revert "instrument time elapsed and report progress"
This reverts commit 8732cb4.
a718530
@danzel danzel Merge pull request #294 from mindplay-dk/better-loading
Better loading
cb5662e
@danzel danzel whitespace 85120c2
@danzel danzel More whitespace fixes :) 78ccf98
@danzel danzel Merge branch 'better-loading'
Conflicts:
	dist/leaflet.markercluster.js
fb4b6d3
@danzel danzel Update build 436caf0
@neveldo neveldo version 0.7.1 556cd9d
@peterneubauer peterneubauer Adding an additional option
 to specify custom classes
27c84df
@peterneubauer peterneubauer Update doc 80b7384
@danzel danzel Fire animationend event even in non-animated versions of the zoom in/…
…out animation. Makes oldie fire the same events as modern browsers. Fixes #310
55cbaa6
@danzel danzel Make chunked=false option work. woops. 4f19c14
@danzel danzel Update build 6e9ffc4
@neveldo neveldo New options to set an initial zoom on the map : options.map.zoom.init…
….level and map.zoom.init.latitude, map.zoom.init.longitude (or map.zoom.init.x, map.zoom.init.y)
8a9d1e9
@neveldo neveldo Fixed map of France by region eca88f0
neveldo and others added some commits Nov 27, 2014
@neveldo neveldo Improved zoom feature and zoom on mousewheel 9ba7c79
@neveldo neveldo Added bower.json file 651a834
@neveldo neveldo Deleted raphael.js dependency b2df738
@neveldo neveldo Updated dependencies b3ec9bb
@neveldo neveldo Zoom on mousewheel only if zoom is enabled 42e9ae5
@neveldo neveldo Fixed zoom on mousewheel ff9ea21
@neveldo neveldo Fixed tooltip position on mouseover 653a573
@neveldo neveldo Updated examples 93019ef
@neveldo neveldo Updated examples 1d80066
@neveldo neveldo Added Wales country 3b072a0
@neveldo neveldo Updated readme 30c77d6
@neveldo neveldo Updated readme 116241a
@neveldo neveldo Removed unused variables f3fb0ad
@neveldo neveldo Updated readme 184806a
@neveldo neveldo Allow to add links between couples of lat,long or x,y coordinates f83dabf
@eldiego34 eldiego34 Create argentina 17d5fbb
@joni-jones joni-jones Added Ukraine map b907301
@neveldo neveldo Merge pull request #9 from joni-jones/master
Added Ukraine map
8e7419e
@neveldo neveldo Merge pull request #8 from eldiego34/patch-1
Create argentina
be590af
@neveldo neveldo Merge pull request #6 from rassh82/patch-1
Create Thailand
56d476d
@neveldo neveldo Moved map of Thailand e2dfee4
@neveldo neveldo Moved map of Argentina f92eada
@neveldo neveldo Fixed thailand map size 7840816
@joni-jones joni-jones Refactored code styles. 283d138
@joni-jones joni-jones Added Vinnytsia region. bde6a26
@joni-jones joni-jones Added source. 1aba8fe
@danzel danzel Merge pull request #358 from Grsmto/spiderified-removelayers
RemoveLayers() when spiderified bug fix
5e2eda7
@joni-jones joni-jones Added coords calculation. d53df9e
@neveldo neveldo Merge pull request #10 from joni-jones/master
Added coords calculation for Ukraine map
12afb7a
@neveldo neveldo Added map of united Kingdom 23f4d4e
@neveldo neveldo Merge branch 'master' of https://github.com/neveldo/mapael-maps af1fa19
@neveldo neveldo Version 1.0.0 af6dac1
@neveldo neveldo Fix spaces 5c19e18
@neveldo neveldo Added jquery-mousewheel dependency 0d360d8
@neveldo neveldo Added package.json file 286e54e
@danzel danzel Update README.md c5864db
@IvanSanchez IvanSanchez Added dependencies in bower.json 9b923fb
@danzel danzel Merge pull request #440 from IvanSanchez/master
Added dependencies in bower.json
e63f39e
@IvanSanchez IvanSanchez On becoming visible, markers retain their original opacity. Fixes Lea… 2099aef
@IvanSanchez IvanSanchez Fix indentation to make Jake and TravisCI happy. 477a0e4
@IvanSanchez IvanSanchez Have spiderifier use the opacity-retaining functionality. 773d500
@ChALkeR ChALkeR bower.json: ignore tests and examples. Solves #462, reduces the bower…
… distribution size ~7 times.
57f2c79
@danzel danzel Merge pull request #463 from ChALkeR/master
bower.json: ignore tests and examples.
7ab96ae
Mike Atlas Merge pull request #1 from Leaflet/master
get up to date with latest markercluster
c40768b
@mikeatlas mikeatlas polyline styling options - attempt 2 fa487f5
@danzel danzel Merge pull request #466 from weftio/polyline-options-attempt2
Spiderleg Polyline options - attempt - 2
3d3f002
@IvanSanchez IvanSanchez Merge branch 'master' of https://github.com/Leaflet/Leaflet.markerclu… a861842
@IvanSanchez IvanSanchez Unit tests for the "remember opacity" functionality 13c6aff
@danzel danzel Merge pull request #444 from MazeMap/master
On becoming visible, markers retain their original opacity.
1659237
@neveldo neveldo Update README.md c76f53d
Samuel Bolduc Added "main" property to bower.json to make it compatible with wiredep b66b9d7
@danzel danzel Merge pull request #484 from SamuelBolduc/master
Added "main" property to bower.json to make it compatible with wiredep
3c97c40
@franckl franckl Update for README.md
corrected a typo.
5cd7b4b
@danzel danzel Merge pull request #487 from franckl/patch-1
Update for README.md
9f975fa
@mfeerick mfeerick Fix tooltip position in absolutely positioned elements 5700efe
@neveldo neveldo Fixed undeclared variable in drawLegend function 0607d45
@neveldo neveldo Version 1.0.1 9b81c44
@neveldo neveldo Bind event handlers before the binding of mouseover and mouseout events 6733137
@neveldo neveldo Upgraded Raphael.js dependency to v2.1.4 a793e5f
@neveldo neveldo Merge pull request #56 from mfeerick/master
Fix tooltip position in absolutely positioned elements
899e789
@stevewillard stevewillard Adding repository field to package.json 732ad45
@danzel danzel Merge pull request #506 from stevewillard/patch-1
Adding repository field to package.json
e96388d
@dmethvin dmethvin Update license and regenerate the correct compressed version 1299f36
@dmethvin dmethvin Remove the obsolete jQuery Plugin Registry file 216acc5
@dmethvin dmethvin Version 3.1.13 67289b6
@neveldo neveldo Added 'exclusive' option on legend, and 'hidden' option on legend items d7a8ba4
@dmethvin dmethvin Remove moot `version` property from bower.json
See bower/spec@a325da3

Closes #140
Thanks for the heads-up @kkirsche!
b1c062e
@laf laf Initial setup of new map system b3e14c9
@laf laf Add 'lib/jQuery-Mapael/' from commit 'd7a8ba46314d7e4aa11df79ff468b31…
…9f45f1447'

git-subtree-dir: lib/jQuery-Mapael
git-subtree-mainline: b3e14c9
git-subtree-split: d7a8ba4
2c2b60e
@laf laf Add 'lib/mapael-maps/' from commit 'c76f53d1f89408927dc12cf13d1e8cda2…
…b5ba17f'

git-subtree-dir: lib/mapael-maps
git-subtree-mainline: 2c2b60e
git-subtree-split: c76f53d
11c222f
@laf laf Add 'lib/jquery-mousewheel/' from commit 'b1c062e93b44f473022297c386d…
…57fa7e58b6aae'

git-subtree-dir: lib/jquery-mousewheel
git-subtree-mainline: 11c222f
git-subtree-split: b1c062e
1218d22
@laf laf Add 'lib/Leaflet.markercluster/' from commit 'e96388d6cb2be12f113a20a…
…9b40812f42f96d805'

git-subtree-dir: lib/Leaflet.markercluster
git-subtree-mainline: 1218d22
git-subtree-split: e96388d
f2b3dab
@laf laf Add 'lib/Leaflet.awesome-markers/' from commit '4dfeef6943d58bde2d8ea…
…1213250f6e1aa49ef0f'

git-subtree-dir: lib/Leaflet.awesome-markers
git-subtree-mainline: f2b3dab
git-subtree-split: 4dfeef6
31ee67f
@laf laf Mapping should be complete
fbec75a
@laf laf added the WebUI label Jul 20, 2015
laf added some commits Jul 20, 2015
@laf laf Removed references to location override 031a818
@laf laf Fixed scrut issues
b2b0d89
@laf
Member
laf commented Jul 20, 2015

trigger ci

@laf laf Actually add sql file
f6967ef
@laf laf Update sql file
e9cabb9
@laf laf Stop updating device when override is set
7951ad4
@Rosiak
Contributor
Rosiak commented Jul 21, 2015

Gogogogogo :)

@f0o
Member
f0o commented Jul 23, 2015

@spinza has a point (perhaps even with both :P)

@laf
Member
laf commented Jul 23, 2015

Yeah I'll sort those out don't worry :)

@spinza
Contributor
spinza commented Jul 23, 2015

Sorry :)

@laf laf Updated to use new table name
0b93725
@laf
Member
laf commented Jul 23, 2015

Ok, table name changed along with code to: locations.

At the moment I don't think using the location column as a unique index. The code does a duplication check so unless someone is adding locations manually then for now I'll not do this.

@laf laf fixed table name
4a91324
@laf laf Fixed scrut issue
b5538d8
@paulgear paulgear merged commit 064f374 into librenms:master Jul 26, 2015

2 checks passed

Auto-Deploy Build finished.
Details
Scrutinizer No new issues
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment