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

Commit c700a05

Browse files
committed
docs(examples): attempting to fix LayerSimple example
1 parent 637382d commit c700a05

24 files changed

+63
-927
lines changed

grunt/concat.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ module.exports = function(grunt, options) {
4949
footer: '})(window.angular);'
5050
},
5151
src: ['website/src/js/app.js', 'website/src/js/**/*.js'],
52-
dest: 'website/distJs/<%= pkg.name %>-webpage.js',
52+
dest: 'website/dist/js/<%= pkg.name %>-webpage.js',
5353
}
5454
};
5555
};

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +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="website/distJs/ui-leaflet-webpage.js"></script>
63+
<script src="website/dist/js/ui-leaflet-webpage.js"></script>
6464
</body>
6565

6666
</html>
Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -333,35 +333,41 @@ app.controller("ImageOverlayController", [ "$scope", "$log", "leafletData", "lea
333333
});
334334
} ]);
335335

336-
app.controller("LayersSimpleController", [ '$scope', function($scope) {
337-
336+
app.controller("LayersSimpleController", ['$scope', '$log', function($scope, $log) {
337+
$log = $log.spawn("website:LayersSimpleController");
338338
angular.extend($scope, {
339-
taipei: {
339+
center: {
340340
lat: 25.0391667,
341341
lng: 121.525,
342342
zoom: 6
343343
},
344+
markers: {
345+
taipei: {
346+
lat: 25.0391667,
347+
lng: 121.525,
348+
}
349+
},
344350
layers: {
345351
baselayers: {
346-
osm: {
347-
name: 'OpenStreetMap',
348-
url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
349-
type: 'xyz'
350-
},
351352
mapbox_light: {
353+
name: 'Mapbox Light',
352354
url: 'http://api.tiles.mapbox.com/v4/{mapid}/{z}/{x}/{y}.png?access_token={apikey}',
353-
options: {
355+
type: 'xyz',
356+
layerOptions: {
354357
apikey: 'pk.eyJ1IjoiYnVmYW51dm9scyIsImEiOiJLSURpX0pnIn0.2_9NrLz1U9bpwMQBhVk97Q',
355358
mapid: 'bufanuvols.lia22g09'
356359
}
360+
},
361+
osm: {
362+
name: 'OpenStreetMap',
363+
url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
364+
type: 'xyz'
357365
}
358366
}
359-
},
360-
defaults: {
361-
scrollWheelZoom: false
362367
}
363368
});
364-
} ]);
369+
$log.debug($scope);
370+
}]);
365371

366372
app.controller("LegendController", [ '$scope', function($scope) {
367373

0 commit comments

Comments
 (0)