socmap_adf 0.0.4 → 0.0.5

data/lib/assets/javascripts/socmap_adf/modules/gmap/views/marker_with_label.js

@@ -405,8 +405,8 @@ MarkerLabel_.prototype.setMandatoryStyles = function () {
  */
 MarkerLabel_.prototype.setAnchor = function () {
   var anchor = this.marker_.get("labelAnchor");
-  this.labelDiv_.style.marginLeft = -anchor.x + "px";
-  this.labelDiv_.style.marginTop = -anchor.y + "px";
+  this.labelDiv_.style.marginLeft = -(this.labelDiv_.offsetWidth / 2) + "px";
+  this.labelDiv_.style.marginTop = -anchor.y + 2 + "px";
   this.eventDiv_.style.marginLeft = -anchor.x + "px";
   this.eventDiv_.style.marginTop = -anchor.y + "px";
 };

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

@@ -33,16 +33,19 @@ class ADF.GMap.Views.Overlay extends google.maps.OverlayView
       @options.shadow = @view.shadow if @view.shadow
       @options.shape = @view.shape if @view.shape
     
-    @options.cursor = "hand"
+    
+    @options.cursor = "default"
+    
     if @view.draggable
       @options.cursor = "move"
     if @clickable
-      @options.cursor = "pointer"    
-
+      @options.cursor = "hand"
+      
     if @view.label != null
       @options.labelContent = @view.label
       @options.labelClass = @view.labelClass
       @options.labelAnchor = new google.maps.Point(60, 0)
+      @options.handCursor = @options.cursor
       @marker = new MarkerWithLabel @options
     else
       @marker = new google.maps.Marker @options

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

@@ -1,9 +1,10 @@
 class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
   
   opened: false
+  clickable: false
   hoverable: true
-  top: -60
-  left: 0
+  calibration: [0, -16, -20, 0]
+  mouseout: true
   
   constructor: (options) ->
     super(options)
@@ -14,7 +15,7 @@ class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
     @openOverlayOnHover()
     
   onMarkerMouseOut: () =>
-    @hideOverlayAfterTime()
+    @hideOverlayAfterTime() if @mouseout
 
   openOverlayOnHover: () =>
     @map.hideAllOverlays()
@@ -30,7 +31,8 @@ class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
     setTimeout(@hideOverlayIfNeeded, 1000)
 
   onRenderCompleted: () =>
-    $(@el).hover(@openOverlayOnHover, @hideOverlayAfterTime)
+    if @hoverable && @mouseout
+      $(@el).hover(@openOverlayOnHover, @hideOverlayAfterTime)
     
   calculatePosition: () ->
     arr = @getPositionArray()
@@ -43,7 +45,7 @@ class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
     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
+    return [h + @calibration[0], w + @calibration[3]] if divPixel.x <= halfWidth && divPixel.y < halfHeight
+    return [h + @calibration[0], -w + @calibration[1]] if divPixel.x > halfWidth && divPixel.y < halfHeight
+    return [@calibration[2], w + @calibration[3]] if divPixel.x <= halfWidth && divPixel.y >= halfHeight
+    return [@calibration[2], -w + @calibration[1]] if divPixel.x > halfWidth && divPixel.y >= halfHeight

data/lib/socmap_adf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socmap_adf
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4555781509594738467
+      hash: 822801186377206797
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4555781509594738467
+      hash: 822801186377206797
 requirements: []
 rubyforge_project: socmap_adf
 rubygems_version: 1.8.24