-
Notifications
You must be signed in to change notification settings - Fork 32
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
Size spec added and new template added using BlurredLocation object #7
Merged
Merged
Changes from 21 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
f6921cb
new example using object added
mridulnagpal d7696ad
size spec added
mridulnagpal d7a4617
small tweaks
mridulnagpal b78d5ea
README updated
mridulnagpal c29e827
README updated
mridulnagpal 138b289
Update README.md
mridulnagpal d05e6ef
Update README.md
mridulnagpal ab651be
Update README.md
mridulnagpal f70fc71
README updated
mridulnagpal 42c8f43
README updated
mridulnagpal 0124158
README updated
mridulnagpal b7b9ac7
Size removed
mridulnagpal 1a486dc
options added
mridulnagpal b62fa04
object.js changed
mridulnagpal 51d742c
merge conflict
mridulnagpal 4c0c13a
addgrid working
mridulnagpal 32cb2fb
README updated
mridulnagpal 363190f
tweaks
mridulnagpal 8bfa37c
changes in Gruntfile
mridulnagpal 0af7deb
js file updated
mridulnagpal 655845e
renaming examples
mridulnagpal f1d554e
Test passing
mridulnagpal 81efadc
Structuring the library
mridulnagpal e345dca
Restructuring dist/built.js
mridulnagpal 0c49afb
Renaming and using geocode function inside of panMapToGeocodedLocation()
mridulnagpal 54cb90e
Removing redundancies
mridulnagpal 1bbab6b
Renaming function
mridulnagpal c289926
Little tweaks to clean code
mridulnagpal f5fd39a
tweaks
mridulnagpal 9b3507f
tweaks
mridulnagpal d51c63c
Making global methods internal
mridulnagpal 642ab51
Test passing
mridulnagpal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| module.exports = function addGrid(map) { | ||
| var map = map || document.getElementById("map") || L.map('map'); | ||
| // A function to return the style of a cell | ||
| function create_cell_style(fill) { | ||
| return { | ||
| stroke: true, | ||
| color: ' #ff0000 ', | ||
| dashArray: null, | ||
| lineCap: null, | ||
| lineJoin: null, | ||
| weight: 2, | ||
| opacity: 1, | ||
|
|
||
| fill: fill, | ||
| fillColor: null, //same as color by default | ||
| fillOpacity: 0.5, | ||
|
|
||
| clickable: true | ||
| } | ||
| } | ||
| L.VirtualGrid = L.FeatureGroup.extend({ | ||
| include: L.Mixin.Events, | ||
| options: { | ||
| cellSize: 64, | ||
| delayFactor: 0.5, | ||
| }, | ||
| initialize: function(options) { | ||
| L.Util.setOptions(this, options); | ||
| L.FeatureGroup.prototype.initialize.call(this, [], options); | ||
| }, | ||
| onAdd: function(map) { | ||
| L.FeatureGroup.prototype.onAdd.call(this, map); | ||
| this._map = map; | ||
| this._cells = []; | ||
| this._setupGrid(map.getBounds()); | ||
|
|
||
| map.on("move", this._moveHandler, this); | ||
| map.on("zoomend", this._zoomHandler, this); | ||
| map.on("resize", this._resizeHandler, this); | ||
| }, | ||
| onRemove: function(map) { | ||
| L.FeatureGroup.prototype.onRemove.call(this, map); | ||
| map.off("move", this._moveHandler, this); | ||
| map.off("zoomend", this._zoomHandler, this); | ||
| map.off("resize", this._resizeHandler, this); | ||
| }, | ||
| _clearLayer: function(e) { | ||
| this._cells = []; | ||
| }, | ||
| _moveHandler: function(e) { | ||
| this._cells = []; | ||
| this._renderCells(e.target.getBounds()); | ||
| }, | ||
| _zoomHandler: function(e) { | ||
| this.clearLayers(); | ||
| this._renderCells(e.target.getBounds()); | ||
| }, | ||
| _renderCells: function(bounds) { | ||
| var cells = this._cellsInBounds(bounds); | ||
| this.focused_cell_id = cells.length == 0 ? null : cells[0].id; | ||
| gridSquareNWCorner = function() { | ||
| var lat = cells[0].bounds._northEast.lat; | ||
| var lng = cells[0].bounds._southWest.lng; | ||
| var NW = { lat: lat, lng: lng } | ||
| return NW; | ||
| }; | ||
| getLocationFromMap(bounds.getCenter().lat, bounds.getCenter().lng); | ||
| this.fire("newcells", cells); | ||
| for (var i = cells.length - 1; i >= 0; i--) { | ||
| var cell = cells[i]; | ||
|
|
||
| var should_fill_cell = cell.id == this.focused_cell_id; | ||
| (function(cell, i) { | ||
| var cur_style = create_cell_style(should_fill_cell); | ||
| setTimeout(this.addLayer.bind(this, L.rectangle(cell.bounds, cur_style)), this.options.delayFactor * i); | ||
| }.bind(this))(cell, i); | ||
| this._loadedCells.push(cell.id); | ||
| } | ||
| }, | ||
| _resizeHandler: function(e) { | ||
| this._setupSize(); | ||
| }, | ||
| _setupSize: function() { | ||
| this._rows = Math.ceil(this._map.getSize().x / this._cellSize); | ||
| this._cols = Math.ceil(this._map.getSize().y / this._cellSize); | ||
| }, | ||
| _setupGrid: function(bounds) { | ||
| this._origin = this._map.project(bounds.getNorthWest()); | ||
| this._cellSize = this.options.cellSize; | ||
| this._setupSize(); | ||
| this._loadedCells = []; | ||
| this.clearLayers(); | ||
| this._renderCells(bounds); | ||
| }, | ||
| _cellPoint: function(row, col) { | ||
| var x = this._origin.x + (row * this._cellSize); | ||
| var y = this._origin.y + (col * this._cellSize); | ||
| return new L.Point(x, y); | ||
| }, | ||
| _cellExtent: function(row, col) { | ||
| var swPoint = this._cellPoint(row, col); | ||
| var nePoint = this._cellPoint(row - 1, col - 1); | ||
| var sw = this._map.unproject(swPoint); | ||
| var ne = this._map.unproject(nePoint); | ||
| return new L.LatLngBounds(ne, sw); | ||
| }, | ||
| _cellsInBounds: function(bounds) { | ||
| var offset = this._map.project(bounds.getNorthWest()); | ||
| var center = bounds.getCenter(); | ||
| var offsetX = this._origin.x - offset.x; | ||
| var offsetY = this._origin.y - offset.y; | ||
| var offsetRows = Math.round(offsetX / this._cellSize); | ||
| var offsetCols = Math.round(offsetY / this._cellSize); | ||
| var cells = []; | ||
| for (var i = 0; i <= this._rows; i++) { | ||
| for (var j = 0; j <= this._cols; j++) { | ||
| var row = i - offsetRows; | ||
| var col = j - offsetCols; | ||
| var cellBounds = this._cellExtent(row, col); | ||
| var cellId = row + ":" + col; | ||
| cells.push({ | ||
| id: cellId, | ||
| bounds: cellBounds, | ||
| distance: cellBounds.getCenter().distanceTo(center), | ||
| }); | ||
| } | ||
| } | ||
| cells.sort(function(a, b) { | ||
| return a.distance - b.distance; | ||
| }); | ||
| return cells; | ||
| } | ||
| }); | ||
|
|
||
| L.virtualGrid = function(url, options) { | ||
| return new L.VirtualGrid(options); | ||
| }; | ||
|
|
||
| L.virtualGrid({ | ||
| cellSize: 64 | ||
| }).addTo(map); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, let's build to
'dist/Leaflet.BlurredLocation.js'here -- thanks!There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done