add lodash

Peco-Log · Jul 16, 2014 · 771e0ff · 771e0ff
1 parent 2389a73
commit 771e0ff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/www/index.html b/www/index.html
@@ -9,6 +9,7 @@
     <script src="http://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.10/angular-ui-router.min.js"></script>
     <!-- google maps javascript -->
     <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB16sGmIekuGIvYOfNoW9T44377IU2d2Es&sensor=true"></script>
+    <script src="http://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script>
 
     <script src="js/app.js"></script>
     <script src="js/controllers.js"></script>

diff --git a/www/js/controllers.js b/www/js/controllers.js
@@ -8,9 +8,11 @@ angular.module('pecologApp.controllers', ['ionic','pecologApp.services'])
 .controller('MapController', function($scope, $ionicLoading, $ionicActionSheet, shops) {
   var initialize = function() {
 
-    var data = new Array();
-    data.push({ z: shops._objs[0]._coord[1],   x: shops._objs[0]._coord[0],   content: shops._objs[0].name,  comment: "うまい！"});
-    data.push({ z: shops._objs[1]._coord[1],   x: shops._objs[1]._coord[0],   content: shops._objs[1].name,  comment: "まずい！"});
+    var markerDataList = new Array();
+    var comments = ["うまい", "まずい"]
+    _(shops._objs).each(function(shop) {
+      markerDataList.push({ z: shop._coord[1],   x: shop._coord[0],   content: shop.name,  comment: comments.shift() });
+    });
 
     var latlng = new google.maps.LatLng(shops._objs[0]._coord[1], shops._objs[0]._coord[0]);
     var mapOptions = {
@@ -26,20 +28,22 @@ angular.module('pecologApp.controllers', ['ionic','pecologApp.services'])
       new google.maps.Point(0, 0),
       new google.maps.Point(25.0, 60.0)
     );
-    for (i = 0; i < data.length; i++) {
+
+    _(markerDataList).each(function(markerData) {
       var marker = new google.maps.Marker({
         //position: data[i].position, /* マーカーを立てる場所の緯度・経度 */
-        position: new google.maps.LatLng(data[i].z, data[i].x),
+        position: new google.maps.LatLng(markerData.z, markerData.x),
         map: map, /*マーカーを配置する地図オブジェクト */
         icon: img
       });
       var infowindow = new google.maps.InfoWindow({
-        content: data[i].content + ":" + data[i].comment,
-        position: new google.maps.LatLng(data[i].z, data[i].x),
+        content: markerData.content + ":" + markerData.comment,
+        position: new google.maps.LatLng(markerData.z, markerData.x),
         disableAutoPan: true
       });
       attachMessage(marker, infowindow);
-    }
+    });
+
     // Stop the side bar from dragging when mousedown/tapdown on the map
     google.maps.event.addDomListener(document.getElementById('map'), 'mousedown', function(e) {
       e.preventDefault();