socmap_adf 0.0.3 → 0.0.4

data/.rvmrc

@@ -4,7 +4,7 @@
 # development environment upon cd'ing into the directory
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.3-p125@rails32"
+environment_id="ruby-1.9.3@rails32"
 
 #
 # Uncomment the following lines if you want to verify rvm version per project

data/lib/assets/javascripts/socmap_adf/modules/gmap/views/overlay.js.coffee

@@ -3,7 +3,7 @@ class ADF.GMap.Views.Overlay extends google.maps.OverlayView
   hidden: true
   topPoint: null
   zindex: 1
-  body: "body"
+  divPixel: null
 
   constructor: (map, view) ->
     @map = map
@@ -14,7 +14,6 @@ class ADF.GMap.Views.Overlay extends google.maps.OverlayView
     @hoverable = @view.hoverable
     @showAfterDrag = @view.showAfterDrag
     @view.overlay = @
-    @body = @view.body if @view.body?
     @initMarker()
     @bindMapEvents()
     
@@ -164,6 +163,9 @@ class ADF.GMap.Views.Overlay extends google.maps.OverlayView
   getPosition: () ->
     @view.point
     
+  getDivPixel: () ->
+    @divPixel
+    
   # = From OverlayView 
   onAdd: ->
     @div = @view.render().el
@@ -171,23 +173,23 @@ class ADF.GMap.Views.Overlay extends google.maps.OverlayView
       @pane = @getPanes().overlayLayer
       @pane.appendChild(@div)
     else
-      $(@body).append(@div)
+      $(@view.getMapElement()).append(@div)
     @view.onMarkerAdded(@view.point)
 
   draw: () ->
     overlayProjection = @getProjection()
     if (overlayProjection != null && overlayProjection != undefined && @view.point)
       if @view.asLabel
-        divPixel = overlayProjection.fromLatLngToDivPixel(@view.point)
+        @divPixel = overlayProjection.fromLatLngToDivPixel(@view.point)
       else
-        divPixel = overlayProjection.fromLatLngToContainerPixel(@view.point)
+        @divPixel = overlayProjection.fromLatLngToContainerPixel(@view.point)
       
-      @left = divPixel.x + @view.left - (@view.getWidth() / 2)
+      @left = @divPixel.x + @view.left - (@view.getWidth() / 2)
       
       if @view.overlayPositionVertical == "top"
-        @top = divPixel.y + @view.top - @view.getHeight()
+        @top = @divPixel.y + @view.top - @view.getHeight()
       else
-        @top = divPixel.y + @view.top
+        @top = @divPixel.y + @view.top
 
       if @top < 0
         point = new google.maps.Point(@left, (@top / 2) + ($(window).height() / 2))

data/lib/assets/javascripts/socmap_adf/modules/gmap/views/overlay_view.js.coffee

@@ -64,7 +64,6 @@ class ADF.GMap.Views.OverlayView extends ADF.MVC.Views.Base
   redraw: () ->
     @overlay.draw()
 
-
   isClustering: () ->
     @clustering
 
@@ -75,6 +74,9 @@ class ADF.GMap.Views.OverlayView extends ADF.MVC.Views.Base
     @overlay = new ADF.GMap.Views.Overlay(@map.getGMap(), @)
     @map.addOverlay(@overlay)
 
+  getMapElement: () ->
+    @map.getMapElement()
+
   addOrChangeLocation: (point) ->
     @point = point
     if @overlay

data/lib/assets/javascripts/socmap_adf/modules/map/models/map.js.coffee

@@ -5,6 +5,7 @@ class ADF.Map.Models.Map extends Backbone.Model
 
   maxZoomLevelForClustering: 21
   maxZoomOnClick: 18
+  mapElement: null
 
   defaults:
     center: new google.maps.LatLng(57,25)
@@ -28,7 +29,8 @@ class ADF.Map.Models.Map extends Backbone.Model
     @clusterOptions = $.extend(@clusterDefaults, clusterOptions)
     
   initGMap: (mapElement) ->
-    @map = new google.maps.Map(document.getElementById(mapElement), @attributes)
+    @mapElement = mapElement
+    @map = new google.maps.Map(document.getElementById(@mapElement), @attributes)
     @markerClusterer = new ADF.Cluster.Views.MarkerClusterer(@map, null, @clusterOptions)
     @loadOSM() if @get("mapTypeId") == "OSM"
     return @map
@@ -39,6 +41,9 @@ class ADF.Map.Models.Map extends Backbone.Model
 
   getGMap: () ->
     return @map
+    
+  getMapElement: () ->
+    return $("##{@mapElement}")
 
   addOverlay: (overlay, clustering = false) ->
     @overlays.push(overlay)
@@ -64,6 +69,13 @@ class ADF.Map.Models.Map extends Backbone.Model
     @overlays = []
     @markerClusterer.clearMarkers()
 
+  getOverlays: () ->
+    @overlays
+
+  hideAllOverlays: () ->
+    for overlay in @overlays
+      overlay.hide()
+
   clusterOverlay: (overlay) ->
     @markerClusterer.addMarker(overlay) if @markerClusterer
     

data/lib/assets/javascripts/socmap_adf/modules/minimap/models/minimap.js.coffee

@@ -1,6 +1,8 @@
 class ADF.Minimap.Models.Minimap extends Backbone.Model
 
   overlays: []
+  
+  mapElement: null
 
   defaults:
     center: new google.maps.LatLng(57,25)
@@ -15,15 +17,26 @@ class ADF.Minimap.Models.Minimap extends Backbone.Model
     streetViewControl: false
 
   initGMap: (mapElement) ->
-    @map = new google.maps.Map(document.getElementById(mapElement), @attributes)
+    @mapElement = mapElement
+    @map = new google.maps.Map(document.getElementById(@mapElement), @attributes)
     return @map
 
   getGMap: () ->
     return @map
+    
+  getMapElement: () ->
+    return $("##{@mapElement}")
 
   addOverlay: (overlay) ->
     @overlays.push(overlay)
 
+  getOverlays: () ->
+    @overlays
+
+  hideAllOverlays: () ->
+    for overlay in @overlays
+      overlay.hide()
+
   setCenter: (latLng) ->
     @map.setCenter(latLng)
 

data/lib/assets/javascripts/socmap_adf/modules/overlay/views/flash_overlay.coffee

@@ -0,0 +1,49 @@
+class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
+  
+  opened: false
+  hoverable: true
+  top: -60
+  left: 0
+  
+  constructor: (options) ->
+    super(options)
+    @clickable = false
+    @pushOverlay()
+    
+  onMarkerMouseOver: () =>
+    @openOverlayOnHover()
+    
+  onMarkerMouseOut: () =>
+    @hideOverlayAfterTime()
+
+  openOverlayOnHover: () =>
+    @map.hideAllOverlays()
+    @opened = true
+    @calculatePosition()
+    @show()
+    
+  hideOverlayIfNeeded: () =>
+    @hide() if !@opened
+
+  hideOverlayAfterTime: () =>
+    @opened = false
+    setTimeout(@hideOverlayIfNeeded, 1000)
+
+  onRenderCompleted: () =>
+    $(@el).hover(@openOverlayOnHover, @hideOverlayAfterTime)
+    
+  calculatePosition: () ->
+    arr = @getPositionArray()
+    @setPosition(arr[0], arr[1])
+    
+  getPositionArray: () ->
+    halfWidth = @map.getMapElement().width() / 2
+    halfHeight = @map.getMapElement().height() / 2
+    divPixel = @overlay.getDivPixel()
+    w = @getWidth() / 2
+    h = @getHeight()
+    
+    return [h, w] if divPixel.x <= halfWidth && divPixel.y < halfHeight
+    return [h, -w] if divPixel.x > halfWidth && divPixel.y < halfHeight
+    return [@top, w] if divPixel.x <= halfWidth && divPixel.y >= halfHeight
+    return [@top, -w] if divPixel.x > halfWidth && divPixel.y >= halfHeight

data/lib/socmap_adf/version.rb

@@ -1,3 +1,3 @@
 module SocmapAdf
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socmap_adf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -141,6 +141,7 @@ files:
 - lib/assets/javascripts/socmap_adf/modules/overlay/templates/main.jst.eco
 - lib/assets/javascripts/socmap_adf/modules/overlay/templates/polygon_label.jst.eco
 - lib/assets/javascripts/socmap_adf/modules/overlay/views/.DS_Store
+- lib/assets/javascripts/socmap_adf/modules/overlay/views/flash_overlay.coffee
 - lib/assets/javascripts/socmap_adf/modules/overlay/views/main.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/overlay/views/overlay.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/overlay/views/polygon_label.js.coffee
@@ -196,12 +197,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4555781509594738467
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4555781509594738467
 requirements: []
 rubyforge_project: socmap_adf
 rubygems_version: 1.8.24