Skip to content
This repository was archived by the owner on Sep 20, 2019. It is now read-only.

Commit cd7a93f

Browse files
committed
docs(examples): fix some examples
1 parent 77296de commit cd7a93f

33 files changed

+328
-609
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "ui-leaflet",
33
"author": "https://github.com/angular-ui/ui-leaflet/graphs/contributors",
44
"description": "ui-leaflet - An AngularJS directive to easily interact with Leaflet maps",
5-
"version": "1.0.0",
5+
"version": "3.0.0",
66
"homepage": "http://angular-ui.github.io/ui-leaflet/",
77
"keywords": [
88
"angularjs",
@@ -21,7 +21,7 @@
2121
},
2222
"resolutions": {
2323
"angular": "~1.5.x",
24-
"leaflet": "1.0.x"
24+
"leaflet": "~1.0.x"
2525
},
2626
"devDependencies": {
2727
"jquery": "*",

dist/ui-leaflet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* ui-leaflet 1.0.0 2016-09-30
2+
* ui-leaflet 1.0.0 2016-10-03
33
* ui-leaflet - An AngularJS directive to easily interact with Leaflet maps
44
* git: https://github.com/angular-ui/ui-leaflet
55
*/

dist/ui-leaflet.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-leaflet.min.no-header.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-leaflet_dev_mapped.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/0000-viewer.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
<!-- Mapbox GL -->
2626
<link rel="stylesheet" href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.2/mapbox-gl.css"/>
2727

28-
<script src="http://maps.google.com/maps/api/js?v=3&sensor=false"></script>
28+
<script src="//maps.google.com/maps/api/js?key=AIzaSyBazU_OOTAZRmxQfaiirM1EDPLCiUSTlrY"></script>
2929
<script src="../bower_components/leaflet/dist/leaflet-src.js"></script>
3030
<script src="../bower_components/proj4/dist/proj4.js"></script>
3131
<script src="../bower_components/proj4leaflet/src/proj4leaflet.js"></script>
32-
<script src="../bower_components/leaflet-plugins/layer/tile/Google.js"></script>
32+
<script src='//unpkg.com/leaflet.gridlayer.googlemutant@0.3.1/Leaflet.GoogleMutant.js'></script>
3333
<script src="../bower_components/esri-leaflet/dist/esri-leaflet.js"></script>
3434
<script src="../bower_components/webgl-heatmap-leaflet/js/webgl-heatmap.js"></script>
3535
<script src="../bower_components/webgl-heatmap-leaflet/js/webgl-heatmap-leaflet.js"></script>
@@ -52,6 +52,7 @@
5252
<script src="../bower_components/esri-leaflet-heatmap-feature-layer/dist/esri-leaflet-heatmap-feature-layer.js"></script>
5353
<script src="../bower_components/Leaflet.fullscreen/dist/Leaflet.fullscreen.min.js"></script>
5454
<script src="../bower_components/leaflet-minimap/dist/Control.MiniMap.min.js"></script>
55+
<script src="//leaflet.github.io/Leaflet.markercluster/example/realworld.10000.js"></script>
5556
<!-- Mapbox GL -->
5657
<script src="https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.2/mapbox-gl.js"></script>
5758
<!-- Mapbox GL Leaflet Plugin -->
@@ -65,7 +66,7 @@
6566
<script src="../bower_components/angular-route/angular-route.min.js"></script>
6667
<script src="../bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
6768
<script src="../dist/ui-leaflet.min.js"></script>
68-
<script src="https://rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
69+
<script src="//rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
6970
<script src="js/viewer.js"></script>
7071
<script src="js/controllers.js"></script>
7172
</head>

examples/0205-layers-googlemaps-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../bower_components/angular/angular.min.js"></script>
88
<script src="../bower_components/leaflet/dist/leaflet.js"></script>
99
<script src="../bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
10-
<script src="../bower_components/leaflet-plugins/layer/tile/Google.js"></script>
10+
<script src='//unpkg.com/leaflet.gridlayer.googlemutant@0.3.1/Leaflet.GoogleMutant.js'></script>
1111
<script src="../dist/ui-leaflet.min.js"></script>
12-
<script src="https://rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
12+
<script src="//rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
1313
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
1414
<script>
1515
var app = angular.module("demoapp", ['ui-leaflet']);

examples/0206-layers-googlemaps-fullsize-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../bower_components/angular/angular.min.js"></script>
88
<script src="../bower_components/leaflet/dist/leaflet.js"></script>
99
<script src="../bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
10-
<script src="../bower_components/leaflet-plugins/layer/tile/Google.js"></script>
10+
<script src='//unpkg.com/leaflet.gridlayer.googlemutant@0.3.1/Leaflet.GoogleMutant.js'></script>
1111
<script src="../dist/ui-leaflet.min.js"></script>
12-
<script src="https://rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
12+
<script src="//rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
1313
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
1414
<script>
1515
var app = angular.module("demoapp", ['ui-leaflet']);

examples/0210-layers-webgl-heatmap-example.html renamed to examples/0210-layers-heatmap-example.html

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,25 @@
55
<script src="../bower_components/angular/angular.min.js"></script>
66
<script src="../bower_components/leaflet/dist/leaflet.js"></script>
77
<script src="../bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
8+
<script src="../bower_components/Leaflet.heat/dist/leaflet-heat.js"></script>
89
<script src="../dist/ui-leaflet.min.js"></script>
9-
<script src="https://rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
10-
<script src="../bower_components/webgl-heatmap-leaflet/js/webgl-heatmap.js"></script>
11-
<script src="../bower_components/webgl-heatmap-leaflet/js/webgl-heatmap-leaflet.js"></script>
10+
<script src="//rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
11+
<script src="//leaflet.github.io/Leaflet.markercluster/example/realworld.10000.js"></script>
1212
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
1313
<script>
1414
var app = angular.module("demoapp", ['ui-leaflet']);
15-
app.controller("LayersWebGLHeatmapController", [ "$scope", function($scope) {
15+
app.controller("LayersHeatmapController", [ "$scope", function($scope) {
1616
var dataPoints = [
17+
[50.5, 30.5, 0.2], // lat, lng, intensity
18+
[50.6, 30.4, 0.5],
1719
[44.651144316,-63.586260171, 0.5],
1820
[44.75, -63.5, 0.8] ];
1921

2022
angular.extend($scope, {
2123
center: {
22-
lat: 44.8091,
23-
lng: -63.3636,
24-
zoom: 9
24+
lat: -37.87,
25+
lng: 175.475,
26+
zoom: 12
2527
},
2628
layers: {
2729
baselayers: {
@@ -34,8 +36,8 @@
3436
overlays: {
3537
heatmap: {
3638
name: 'Heat Map',
37-
type: 'webGLHeatmap',
38-
data: dataPoints,
39+
type: 'heat',
40+
data: addressPoints.map(function (p) { return [p[0], p[1]]; }),
3941
visible: true
4042
}
4143
}
@@ -44,10 +46,14 @@
4446
}]);
4547
</script>
4648
</head>
47-
<body ng-controller="LayersWebGLHeatmapController">
49+
<body ng-controller="LayersHeatmapController">
4850
<leaflet lf-center="center" layers="layers" width="100%" height="480px"></leaflet>
49-
<h1>HeatMap WebGL overlay example</h1>
50-
<p>You can use the <a href="https://github.com/ursudio/webgl-heatmap-leaflet">WebGL HeatMap overlay plugin</a>, like this. Please read the heatmap plugin documentation to use it.</p>
51-
<pre ng-bind="layers | json"></pre>
51+
<h1>HeatMap overlay example</h1>
52+
<p>
53+
A 10,000-point demo of Leaflet.heat, a tiny and fast
54+
<a href="https://github.com/Leaflet/Leaflet.heat" target="_blank">Leaflet heatmap plugin</a>.
55+
Please read the heatmap plugin documentation to use it.
56+
</p>
57+
<!--<pre ng-bind="layers | json"></pre>-->
5258
</body>
5359
</html>

examples/0600-mixed-image-legend-example.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<script src="../bower_components/angular/angular.min.js"></script>
99
<script src="../bower_components/leaflet/dist/leaflet.js"></script>
1010
<script src="../bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
11-
<script src="../bower_components/leaflet-plugins/layer/tile/Google.js"></script>
11+
<script src='//unpkg.com/leaflet.gridlayer.googlemutant@0.3.1/Leaflet.GoogleMutant.js'></script>
1212
<script src="../dist/ui-leaflet.min.js"></script>
13-
<script src="https://rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
14-
<link href='http://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
13+
<script src="//rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
14+
<link href='//fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
1515
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
1616

1717
<script>

0 commit comments

Comments
 (0)