Skip to content

Commit d07de17

Browse files
elesdoarelesdoar
committed
docs(website): fix main website
1 parent 71dd97b commit d07de17

29 files changed

+94
-79
lines changed

‎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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<script src="../bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
1010
<script src="../bower_components/leaflet-plugins/layer/tile/Google.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']);

‎index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<a class="forkme" href="https://github.com/angular-ui/ui-leaflet" rel="external">
3131
<img src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub">
3232
</a>
33-
<leaflet center="center" defaults="defaults" events="events" id="header"></leaflet>
33+
<leaflet id="home-map" center="center" defaults="defaults" events="events" id="header"></leaflet>
3434
</div>
3535
<div class="bottom-banner">
3636
<div class="container">
@@ -49,7 +49,7 @@
4949
</footer>
5050
</div>
5151

52-
<script src="https://maps.googleapis.com/maps/api/js?libraries=geometry&sensor=false"></script>
52+
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBazU_OOTAZRmxQfaiirM1EDPLCiUSTlrY"></script>
5353
<script src="bower_components/jquery/dist/jquery.min.js"></script>
5454
<script src="bower_components/leaflet/dist/leaflet.js"></script>
5555
<script src="bower_components/leaflet-plugins/layer/tile/Google.js"></script>
@@ -60,6 +60,7 @@
6060
<script src="bower_components/angular-highlightjs/angular-highlightjs.min.js"></script>
6161
<script src="bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
6262
<script src="dist/ui-leaflet.js"></script>
63+
<script src="//rawgit.com/elesdoar/ui-leaflet-layers/master/dist/ui-leaflet-layers.min.js"></script>
6364
<script src="website/dist/js/ui-leaflet-webpage.js"></script>
6465
</body>
6566

‎website/css.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.1/leaflet.css">
2+
<link rel="stylesheet" href="//unpkg.com/leaflet@0.7.7/dist/leaflet.css">

‎website/dist/js/ui-leaflet-webpage.js‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -351,12 +351,10 @@ app.controller("LayersSimpleController", ['$scope', '$log', function($scope, $lo
351351
baselayers: {
352352
mapbox_light: {
353353
name: 'Mapbox Light',
354-
url: 'http://api.tiles.mapbox.com/v4/{mapid}/{z}/{x}/{y}.png?access_token={apikey}',
355-
type: 'xyz',
356-
layerOptions: {
357-
apikey: 'pk.eyJ1IjoiYnVmYW51dm9scyIsImEiOiJLSURpX0pnIn0.2_9NrLz1U9bpwMQBhVk97Q',
358-
mapid: 'bufanuvols.lia22g09'
359-
}
354+
type: 'mapbox',
355+
user: 'elesdoar',
356+
key: 'citojtj9e00022iqjmdzhrdwd',
357+
apiKey: 'pk.eyJ1IjoiZWxlc2RvYXIiLCJhIjoiY2l0bmcwaDNpMDQzMTJvbDRpaTltN2dlbiJ9.KDnhRVh9St6vpQovMI7iLg'
360358
},
361359
osm: {
362360
name: 'OpenStreetMap',
@@ -562,7 +560,7 @@ app.controller("MenuController", [ '$scope', '$location', function($scope, $loca
562560
];
563561
}]);
564562

565-
app.controller("MultiLayerMapController", [ '$scope', '$http', function($scope, $http) {
563+
app.controller("MultiLayerMapController", [ '$scope', function($scope) {
566564

567565
var tiles = {
568566
osm: {
@@ -572,17 +570,23 @@ app.controller("MultiLayerMapController", [ '$scope', '$http', function($scope,
572570
url: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png'
573571
},
574572
mapbox_light: {
575-
url: 'http://api.tiles.mapbox.com/v4/{mapid}/{z}/{x}/{y}.png?access_token={apikey}',
573+
name: 'Mapbox Light',
574+
url: '//api.mapbox.com/styles/v1/{user}/{mapId}/tiles/256/{z}/{x}/{y}?access_token={apiKey}',
575+
type: 'xyz',
576576
options: {
577-
apikey: 'pk.eyJ1IjoiYnVmYW51dm9scyIsImEiOiJLSURpX0pnIn0.2_9NrLz1U9bpwMQBhVk97Q',
578-
mapid: 'bufanuvols.lia22g09'
577+
user: 'elesdoar',
578+
apiKey: 'pk.eyJ1IjoiZWxlc2RvYXIiLCJhIjoiY2l0bmcwaDNpMDQzMTJvbDRpaTltN2dlbiJ9.KDnhRVh9St6vpQovMI7iLg',
579+
mapId: 'citojtj9e00022iqjmdzhrdwd'
579580
}
580581
},
581-
mapbox_wheatpaste: {
582-
url: 'http://api.tiles.mapbox.com/v4/{mapid}/{z}/{x}/{y}.png?access_token={apikey}',
582+
mapbox_outdoors: {
583+
name: 'Mapbox Outdoors',
584+
url: '//api.mapbox.com/styles/v1/{user}/{mapId}/tiles/256/{z}/{x}/{y}?access_token={apiKey}',
585+
type: 'xyz',
583586
options: {
584-
apikey: 'pk.eyJ1IjoiYnVmYW51dm9scyIsImEiOiJLSURpX0pnIn0.2_9NrLz1U9bpwMQBhVk97Q',
585-
mapid: 'bufanuvols.lia35jfp'
587+
user: 'elesdoar',
588+
apiKey: 'pk.eyJ1IjoiZWxlc2RvYXIiLCJhIjoiY2l0bmcwaDNpMDQzMTJvbDRpaTltN2dlbiJ9.KDnhRVh9St6vpQovMI7iLg',
589+
mapId: 'citng3g0g003s2it88y9lg769'
586590
}
587591
}
588592
};

‎website/javascript.inc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2-
<script src="http://cdn.leafletjs.com/leaflet-0.7.5/leaflet.js"></script>
3-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
2+
<script src="//unpkg.com/leaflet@0.7.7/dist/leaflet.js"></script>
3+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
44
<script src="/js/ui-leaflet.min.js"></script>
5+
<!-- If you need other layers -->
6+
<script src="//unpkg.com/ui-leaflet-layers@0.1.3/dist/ui-leaflet-layers.min.js"></script>

‎website/partials/examples/bounds.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="col-md-10" ng-controller="BoundsController">
2-
<leaflet bounds="bounds" center="center" defaults="defaults"></leaflet>
2+
<leaflet id="map-bounds" bounds="bounds" center="center" defaults="defaults"></leaflet>
33
<form class="form-inline" role="form">
44
<div class="form-group">
55
<div class="control-group col col-lg-2">
@@ -51,7 +51,7 @@ <h2>Bounds example</h2>
5151
Latitude SouthWest: <input type="number" step="any" ng-model="bounds.southWest.lat" />
5252
Longitude SouthWest: <input type="number" step="any" ng-model="bounds.southWest.lng" />
5353
</form>
54-
<leaflet bounds="bounds"></leaflet>
54+
<leaflet id="map-bounds" bounds="bounds"></leaflet>
5555
</div></div>
5656
<div hljs ng-switch-when="javascript" include="'website/src/js/controllers/BoundsController.js'"></div>
5757
</div>

‎website/partials/examples/center-url-hash.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="col-md-10" ng-controller="CenterUrlHashController">
2-
<leaflet center="center" url-hash-center="yes" defaults="defaults"></leaflet>
2+
<leaflet id="map-center-url-hash" center="center" url-hash-center="yes" defaults="defaults"></leaflet>
33
<form class="form-inline" role="form">
44
<div class="form-group">
55
<div class="control-group col col-lg-3">
@@ -39,7 +39,7 @@ <h2>Center Url Hash example</h2>
3939
Longitude : <input type="number" step="any" ng-model="center.lng" />
4040
Zoom : <input type="number" step="any" ng-model="center.zoom" />
4141
</form>
42-
<leaflet center="center"></leaflet>
42+
<leaflet id="map-center-url-hash" center="center"></leaflet>
4343
</div></div>
4444
<div hljs ng-switch-when="javascript" include="'website/src/js/controllers/CenterUrlHashController.js'"></div>
4545
</div>

‎website/partials/examples/center.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="col-md-10" ng-controller="CenterController">
2-
<leaflet center="center" defaults="defaults"></leaflet>
2+
<leaflet id="map-center" center="center" defaults="defaults"></leaflet>
33
<form class="form-inline" role="form">
44
<div class="form-group">
55
<div class="control-group col col-lg-3">
@@ -39,7 +39,7 @@ <h2>Center example</h2>
3939
Longitude : <input type="number" step="any" ng-model="center.lng" />
4040
Zoom : <input type="number" step="any" ng-model="center.zoom" />
4141
</form>
42-
<leaflet center="center"></leaflet>
42+
<leaflet id="map-center" center="center"></leaflet>
4343
</div></div>
4444
<div hljs ng-switch-when="javascript" include="'website/src/js/controllers/CenterController.js'"></div>
4545
</div>

‎website/partials/examples/custom-parameters.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="col-md-10" ng-controller="CustomParametersController">
2-
<leaflet center="london" defaults="defaults"></leaflet>
2+
<leaflet id="map-custom-parameters" center="london" defaults="defaults"></leaflet>
33
<h2>Custom parameters example</h2>
44
<p>Now that we know how to center the map to a selected position, we would like to change some default features or visualizations of the map. We can override the default behaviour of the map properties via the <strong>defaults</strong> attribute. The options are pretty self-explanatory:</p>
55
<ul class="nav nav-tabs">
@@ -50,7 +50,7 @@ <h2>Custom parameters example</h2>
5050
<div class="tab-container" ng-switch on="activeTab">
5151
<div hljs ng-switch-default>
5252
<div ng-controller="CustomParametersController">
53-
<leaflet center="london" defaults="defaults"></leaflet>
53+
<leaflet id="map-custom-parameters" center="london" defaults="defaults"></leaflet>
5454
</div></div>
5555
<div hljs ng-switch-when="javascript" include="'website/src/js/controllers/CustomParametersController.js'"></div>
5656
</div>

0 commit comments

Comments
 (0)