Size spec added and new template added using BlurredLocation object #7
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
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,50 @@ | ||
| <!DOCTYPE html> | ||
|
There was a problem hiding this comment. This is ok but by using |
||
| <html lang="en"> | ||
| <head> | ||
|
|
||
| <title>Leaflet.BlurredLocation</title> | ||
| </head> | ||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> | ||
| <link href="../node_modules/leaflet/dist/leaflet.css" rel="stylesheet"> | ||
| <body> | ||
| <!-- START OF EXAMPLE --> | ||
| <div class="container" > | ||
| <div class="row" > | ||
| <div class="col-md-8"> | ||
| <label class="h2 font-size-big"><input type="radio" /> Add location to your content</label> | ||
| <br/><br/> | ||
| <h4 class="font-size-small">Option 1 : By Placename</h4> | ||
| </br> | ||
| <input id="geo_location" type="text" class="form-control"><br/> | ||
| <h4 class="font-size-small">Option 2 : By dragging the map</h4></br> | ||
| <h4 class="font-size-small">Option 3 : By giving co-ordinates</h4></br> | ||
| <div class="col-md-6"> | ||
| <input id="lat" type="text" class="form-control" placeholder="Latitude"><br/> | ||
| </div> | ||
| <div class="col-md-6"> | ||
| <input id="lng" type="text" class="form-control" placeholder="Longitude"><br/> | ||
| </div> | ||
| <label class="h2 font-size-big"><input type="checkbox" onchange='getLocation(this);'> Obscure my exact location</label> | ||
| </div> | ||
| <div class="col-md-4"> | ||
| <h3 class="font-size-small">On a map : </h3> | ||
| <br /> | ||
| <div id="map" class="leaflet-map" style="width: 400px; height: 400px;"></div> | ||
| <br/> | ||
| <h3 class="font-size-small">In Text:</h3><br/> | ||
| <input id="location" type="text" class="form-control"><br/> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <!-- END OF EXAMPLE --> | ||
| </body> | ||
| <script src="../dist/built.js"></script> | ||
|
|
||
|
|
||
| <script> | ||
| var blurredLocation = new BlurredLocation({ | ||
| lat: 41.01, | ||
| lon: -85.66 | ||
| }); | ||
| </script> | ||
| </html> | ||
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 |
|---|---|---|
| @@ -1,29 +1,35 @@ | ||
| function BlurredLocation(location) { | ||
| if(!map) { | ||
|
There was a problem hiding this comment. This is great, but lets set function BlurredLocation(options) {
options = options || {};
options.map = options.map || L.map('map');
options.location = options.location || someDefault;
}There was a problem hiding this comment. Yeah that looks neat. |
||
| var map = L.map('map'); | ||
| L.tileLayer("https://a.tiles.mapbox.com/v3/jywarren.map-lmrwb2em/{z}/{x}/{y}.png").addTo(map); | ||
| } | ||
| map.setView([location.lat, location.lon], 10); | ||
| this.getLat = function () { | ||
| return map.getCenter().lat; | ||
| } | ||
| this.getLon = function() { | ||
| return map.getCenter().lng; | ||
| } | ||
| this.goTo = function(lat, lon, zoom) { | ||
| map.setView([lat, lon], zoom); | ||
| } | ||
| this.geocode = function(string) { | ||
| var url = "https://maps.googleapis.com/maps/api/geocode/json?address="+string.split(" ").join("+"); | ||
| var Blurred = $.ajax({ | ||
| async: false, | ||
| url: url | ||
| }); | ||
| // console.log(Object.getOwnPropertyNames(Blurred)); | ||
| // console.log(Blurred.readyState); | ||
|
|
||
| var geometry = Blurred.responseJSON.results[0].geometry.location; | ||
| var default_zoom = 13; | ||
| // console.log(geometry.lat); | ||
| map.setView([geometry.lat, geometry.lng],default_zoom); | ||
| return geometry; | ||
| } | ||
| this.getSize = function() { | ||
| return map.getSize(); | ||
| } | ||
| } | ||
| exports.BlurredLocation = BlurredLocation; | ||
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.
Then concat also seems redundant with Browserify and uglify - which are we using to compile? It looks liek concat, based on line 76, but maybe we should be using Browserify, no?
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.
Take a look at the Browserify example in PublicLab.Editor -- it'll be helpful! or in https://github.com/publiclab/inline-markdown-editor/blob/master/Gruntfile.js#L55 -- a bit simpler!