Merge a lot of PRs from the old repository #8
+106
−78
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| { | ||
| "name": "Leaflet.awesome-markers", | ||
| "version": "2.0.4", | ||
| "homepage": "https://github.com/sigma-geosistemas/Leaflet.awesome-markers", | ||
| "authors": [ | ||
| "Lennard Voogdt <[email protected]>", | ||
| "George Silva <[email protected]", | ||
|
There was a problem hiding this comment. Missing |
||
| "Bhaskar V. Karambelkar <[email protected]>" | ||
| ], | ||
| "description": "Colorful iconic & retina-proof markers for Leaflet, based on the Glyphicons / Font-Awesome icons", | ||
| "main": [ | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -6,26 +6,25 @@ | |
|
|
||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
|
|
||
| <link href="https://unpkg.com/[email protected]/css/font-awesome.css" rel="stylesheet"/> | ||
| <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" /> | ||
|
|
||
| <link rel="stylesheet" href="../dist/leaflet.awesome-markers.css"/> | ||
| </head> | ||
| <body> | ||
| <div id="map" style="width: 800px; height: 600px"></div> | ||
|
|
||
| <script src="https://unpkg.com/leaflet@0.7.7/dist/leaflet.js"></script> | ||
|
There was a problem hiding this comment. Leaflet 1.0.3 is out, you should try to use that here in and in other examples |
||
| <script src="../dist/leaflet.awesome-markers.js"></script> | ||
| <script> | ||
| var map = L.map('map').setView([51.932994,4.509373], 14); | ||
|
|
||
| L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpandmbXliNDBjZWd2M2x6bDk3c2ZtOTkifQ._QA7i5Mpkd_m30IGElHziw', { | ||
| maxZoom: 18, | ||
| attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' + | ||
| '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' + | ||
| 'Imagery © <a href="http://mapbox.com">Mapbox</a>', | ||
| id: 'mapbox.streets' | ||
| }).addTo(map); | ||
|
|
||
| L.marker([51.941196,4.512291], {icon: L.AwesomeMarkers.icon({icon: 'spinner', prefix: 'fa', markerColor: 'red', spin:true}) }).addTo(map); | ||
| L.marker([51.927913,4.521303], {icon: L.AwesomeMarkers.icon({icon: 'coffee', prefix: 'fa', markerColor: 'red', iconColor: '#f28f82'}) }).addTo(map); | ||
|
|
@@ -40,6 +39,9 @@ | |
| L.marker([51.930295,4.530745], {icon: L.AwesomeMarkers.icon({icon: 'phone', prefix: 'fa', markerColor: 'darkpurple'}) }).addTo(map); | ||
| L.marker([51.925055,4.512806], {icon: L.AwesomeMarkers.icon({icon: 'ambulance', prefix: 'fa', markerColor: 'darkgreen'}) }).addTo(map); | ||
| L.marker([51.925902,4.505768], {icon: L.AwesomeMarkers.icon({icon: 'medkit', prefix: 'fa', markerColor: 'darkblue'}) }).addTo(map); | ||
| L.marker([51.926902,4.502768], {icon: L.AwesomeMarkers.icon({icon: 'home', prefix: 'fa', markerColor: 'white'}) }).addTo(map); | ||
| L.marker([51.936902,4.512768], {icon: L.AwesomeMarkers.icon({icon: 'home', prefix: 'fa', markerColor: 'white', text: 'LK' }) }).addTo(map); | ||
| L.marker([51.936902,4.516768], {icon: L.AwesomeMarkers.icon({icon: 'shopping-cart', prefix: 'fa', markerColor: 'white', iconRotate: 45 }) }).addTo(map); | ||
| </script> | ||
| </body> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,29 +6,25 @@ | |
|
|
||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
|
|
||
| <link href="https://unpkg.com/[email protected]/css/font-awesome.css" rel="stylesheet"/> | ||
| <link rel="stylesheet" href="../dist/leaflet.awesome-markers.css"/> | ||
| <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" /> | ||
| </head> | ||
| <body> | ||
| <div id="map" style="width: 800px; height: 600px"></div> | ||
|
|
||
| <script src="https://unpkg.com/leaflet@0.7.7/dist/leaflet.js"></script> | ||
| <script src="../dist/leaflet.awesome-markers.js"></script> | ||
| <script> | ||
| var map = L.map('map').setView([51.5, -0.09], 9); | ||
|
|
||
| L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpandmbXliNDBjZWd2M2x6bDk3c2ZtOTkifQ._QA7i5Mpkd_m30IGElHziw', { | ||
| maxZoom: 18, | ||
| attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' + | ||
| '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' + | ||
| 'Imagery © <a href="http://mapbox.com">Mapbox</a>', | ||
| id: 'mapbox.streets' | ||
| }).addTo(map); | ||
|
|
||
| var colors = ['red', 'blue', 'green', 'purple', 'orange', 'darkred', 'lightred', 'beige', 'darkblue', 'darkgreen', 'cadetblue', 'darkpurple', 'white', 'pink', 'lightblue', 'lightgreen', 'gray', 'black', 'lightgray']; | ||
|
|
||
|
|
||
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 |
|---|---|---|
|
|
@@ -6,31 +6,27 @@ | |
|
|
||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
|
|
||
| <link href="https://unpkg.com/[email protected]/css/font-awesome.css" rel="stylesheet"/> | ||
| <link href="https://unpkg.com/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"> | ||
| <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" /> | ||
|
There was a problem hiding this comment. Still 0.7.7, use 1.0.3 There was a problem hiding this comment. darn, missed this one. |
||
| <link rel="stylesheet" href="../dist/leaflet.awesome-markers.css"/> | ||
|
|
||
| </head> | ||
| <body> | ||
| <div id="map" style="width: 800px; height: 600px"></div> | ||
|
|
||
| <script src="https://unpkg.com/leaflet@0.7.7/dist/leaflet.js"></script> | ||
| <script src="../dist/leaflet.awesome-markers.js"></script> | ||
|
|
||
| <script> | ||
| var map = L.map('map').setView([51.932994,4.509373], 14); | ||
| L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpandmbXliNDBjZWd2M2x6bDk3c2ZtOTkifQ._QA7i5Mpkd_m30IGElHziw', { | ||
| maxZoom: 18, | ||
| attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' + | ||
| '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' + | ||
| 'Imagery © <a href="http://mapbox.com">Mapbox</a>', | ||
| id: 'mapbox.streets' | ||
| }).addTo(map); | ||
|
|
||
| L.marker([51.941196,4.512291], {icon: L.AwesomeMarkers.icon({icon: 'link', prefix: 'glyphicon', markerColor: 'red', spin:true}) }).addTo(map); | ||
| L.marker([51.927913,4.521303], {icon: L.AwesomeMarkers.icon({icon: 'certificate', prefix: 'glyphicon', markerColor: 'red'}) }).addTo(map); | ||
|
|
@@ -41,7 +37,7 @@ | |
|
|
||
| L.marker([51.930454,4.527054], {icon: L.AwesomeMarkers.icon({icon: 'bookmark', prefix: 'fa', markerColor: 'darkred'}) }).addTo(map); | ||
| L.marker([51.929607,4.527054], {icon: L.AwesomeMarkers.icon({icon: 'picture-o', prefix: 'fa', markerColor: 'darkblue'}) }).addTo(map); | ||
| L.marker([51.928919,4.528856], {icon: L.AwesomeMarkers.icon({icon: 'suitcase', prefix: 'fa', markerColor: 'cadetblue'}) }).addTo(map); | ||
| L.marker([51.930295,4.530745], {icon: L.AwesomeMarkers.icon({icon: 'play', prefix: 'fa', markerColor: 'darkpurple'}) }).addTo(map); | ||
| L.marker([51.925055,4.512806], {icon: L.AwesomeMarkers.icon({icon: 'barcode', prefix: 'fa', markerColor: 'darkgreen'}) }).addTo(map); | ||
| L.marker([51.925902,4.505768], {icon: L.AwesomeMarkers.icon({icon: 'inbox', prefix: 'fa', markerColor: 'darkblue'}) }).addTo(map); | ||
|
|
||
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.
Use version 2.0.x for compatibility with newer versions of bootstrap, font-awesome and leaflet.
It is tested and works with the latest available versions: