Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Even better map #1166

Closed
wants to merge 19 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
465ac96
Upgrade to bettermap: you can now select regions on the map by drawin…
eriky Apr 19, 2014
3c8b611
Added default OSM url to use in case none was entered
eriky Apr 19, 2014
8d9647f
Removed unused parameter (to fix the jshint warning about it)
eriky Apr 22, 2014
34c8747
changed from leaflet.js to leaflet-src.js (same code, just not minified)
eriky Apr 29, 2014
2a9be48
Merge branch 'master' of https://github.com/elasticsearch/kibana into…
eriky Apr 29, 2014
a0e5195
Selections on map are no longer editable. If a selection exists, a ne…
eriky Apr 29, 2014
4107b81
do not try to update map if there is no selection layer defined
eriky Apr 29, 2014
044f76a
improved display of geo_polygon filter type: now also shows the field…
eriky Apr 29, 2014
138b914
small bugfix: when deleting a geo_polygon filter, set currentLayer to…
eriky Apr 29, 2014
b3bf961
use null instead of undefined to detect if a layer is present or not.…
eriky Apr 29, 2014
fe3f646
only try to fit bound if there is currently data with geo coordinates…
eriky Apr 29, 2014
79cadf4
Added relative root to cssmin options, so image locations in vendor l…
eriky May 6, 2014
9462cbd
do not keep the red region on bettermap once selection is made
eriky May 6, 2014
43a8a66
reverted back to original image location after some fiddling around
eriky May 6, 2014
787c441
Merge branch 'master' of https://github.com/elasticsearch/kibana into…
eriky May 7, 2014
ef0dc99
Merge remote-tracking branch 'upstream/master' into evenbettermap
eriky Oct 3, 2014
7cab9c8
updated leaflet to 0.7.3
eriky Oct 3, 2014
97d13d9
bettermap now allows selection of multiple regions like before
eriky Oct 3, 2014
20ee808
implemented some fixes from upstream into bettermap
eriky Oct 3, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ node_modules
.aws-config.json
dist
.DS_Store
.idea/*
.gitignore
9 changes: 9 additions & 0 deletions src/app/panels/bettermap/editor.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<div class="editor-row">
<div class="editor-option">
<form>
<h6>OpenStreetMaps URL</h6>
<p><small>If empty a default of http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg will be used.</small></p>
<input type="text" class="input-large" ng-model="panel.osm_url">
</form>
</div>
</div>
<div class="editor-row">
<div class="editor-option">
<form>
Expand Down
60 changes: 60 additions & 0 deletions src/app/panels/bettermap/leaflet/MarkerCluster.Default.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
.marker-cluster-small {
background-color: rgba(181, 226, 140, 0.6);
}
.marker-cluster-small div {
background-color: rgba(110, 204, 57, 0.6);
}

.marker-cluster-medium {
background-color: rgba(241, 211, 87, 0.6);
}
.marker-cluster-medium div {
background-color: rgba(240, 194, 12, 0.6);
}

.marker-cluster-large {
background-color: rgba(253, 156, 115, 0.6);
}
.marker-cluster-large div {
background-color: rgba(241, 128, 23, 0.6);
}

/* IE 6-8 fallback colors */
.leaflet-oldie .marker-cluster-small {
background-color: rgb(181, 226, 140);
}
.leaflet-oldie .marker-cluster-small div {
background-color: rgb(110, 204, 57);
}

.leaflet-oldie .marker-cluster-medium {
background-color: rgb(241, 211, 87);
}
.leaflet-oldie .marker-cluster-medium div {
background-color: rgb(240, 194, 12);
}

.leaflet-oldie .marker-cluster-large {
background-color: rgb(253, 156, 115);
}
.leaflet-oldie .marker-cluster-large div {
background-color: rgb(241, 128, 23);
}

.marker-cluster {
background-clip: padding-box;
border-radius: 20px;
}
.marker-cluster div {
width: 30px;
height: 30px;
margin-left: 5px;
margin-top: 5px;

text-align: center;
border-radius: 15px;
font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
}
.marker-cluster span {
line-height: 30px;
}
6 changes: 6 additions & 0 deletions src/app/panels/bettermap/leaflet/MarkerCluster.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.leaflet-cluster-anim .leaflet-marker-icon, .leaflet-cluster-anim .leaflet-marker-shadow {
-webkit-transition: -webkit-transform 0.3s ease-out, opacity 0.3s ease-in;
-moz-transition: -moz-transform 0.3s ease-out, opacity 0.3s ease-in;
-o-transition: -o-transform 0.3s ease-out, opacity 0.3s ease-in;
transition: transform 0.3s ease-out, opacity 0.3s ease-in;
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading