From 843ea9faef9da087415c2cc0587f5991dd7a4396 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Thu, 5 Jun 2014 15:08:50 +1000 Subject: [PATCH] Basic but hacky way to get events out of map --- .../darkswarm/controllers/map_controller.js.coffee | 9 ++++++--- app/helpers/shared_helper.rb | 4 ++-- app/views/map/index.html.haml | 12 +++++++++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/darkswarm/controllers/map_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/map_controller.js.coffee index 5e35f3eb94..cfa1f28693 100644 --- a/app/assets/javascripts/darkswarm/controllers/map_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/map_controller.js.coffee @@ -1,7 +1,10 @@ -Darkswarm.controller "MapCtrl", ($scope, MapConfiguration)-> +Darkswarm.controller "MapCtrl", ($scope, MapConfiguration, OfnMap, Marker)-> + $scope.OfnMap = OfnMap + console.log Marker + window.Marker = Marker $scope.map = center: - latitude: 45 - longitude: -73 + latitude: -37.775757 + longitude: 144.743663 zoom: 8 styles: MapConfiguration.options diff --git a/app/helpers/shared_helper.rb b/app/helpers/shared_helper.rb index f856a088d1..3dee7eefbf 100644 --- a/app/helpers/shared_helper.rb +++ b/app/helpers/shared_helper.rb @@ -1,7 +1,7 @@ module SharedHelper - def inject_json(name, partial) - render "json/injection", name: name, partial: partial + def inject_json(name, partial, opts = {}) + render "json/injection", {name: name, partial: partial}.merge(opts) end def distributor_link_class(distributor) diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml index 06e4cda6b8..712e835cfe 100644 --- a/app/views/map/index.html.haml +++ b/app/views/map/index.html.haml @@ -1,5 +1,15 @@ - content_for :scripts do %script{src: "//maps.googleapis.com/maps/api/js?sensor=false"} += inject_json "enterprisesForMap" , "enterprises_for_map", collection: @enterprises + %map{"ng-controller" => "MapCtrl"} - %google-map{center: "map.center", zoom: "map.zoom", styles: "map.styles"} + %span{"ng-repeat" => "marker in OfnMap.enterprises"} + {{ marker.visible }} + + %google-map{center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"} + + %markers{models: "OfnMap.enterprises", fit: "true", + coords: "'self'", icon: "'icon'", click: "'reveal'"} + +