socmap_adf 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.0.8
+
+### Features & Enhancements
+* Overlay push module is depricated now and will be removed on version 1.0.0
+* Add Overlay push logic to Overlay module
+* Flash overlay on drag hide all overlays
+
+# 0.0.6
+
+### Bug fixes
+* MiniMap getGmap error fixed.
+
 # 0.0.3
 
 ### Bug fixes

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 YOURNAME
+Copyright 2012 Arturs Braucs @ Creative Mobile
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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

@@ -95,6 +95,9 @@ class ADF.GMap.Views.Overlay extends google.maps.OverlayView
         @show()
         @draw()
       @view.onMarkerMoved(@view.point)
+      
+    @markerDragEvent = google.maps.event.addListener @marker, 'drag', (e) =>
+      @view.onMarkerDrag()
     
     @markerClickEvent = google.maps.event.addDomListener @marker, 'click', (e) =>
       if @view.clickable 
@@ -133,6 +136,7 @@ class ADF.GMap.Views.Overlay extends google.maps.OverlayView
     google.maps.event.clearListeners(@getMarker(), "click")
     google.maps.event.clearListeners(@getMarker(), "mouseover")
     google.maps.event.clearListeners(@getMarker(), "mouseout")
+    google.maps.event.removeListener(@markerDragEvent)
       
   # = Show or Hide overlay
   show: ( animation = false ) ->

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

@@ -71,8 +71,9 @@ class ADF.GMap.Views.OverlayView extends ADF.MVC.Views.Base
     @data
 
   pushOverlay: () ->
-    @overlay = new ADF.GMap.Views.Overlay(@map.getGMap(), @)
-    @map.addOverlay(@overlay)
+    if @map && @point
+      @overlay = new ADF.GMap.Views.Overlay(@map.getGMap(), @)
+      @map.addOverlay(@overlay)
 
   getMapElement: () ->
     @map.getMapElement()
@@ -142,4 +143,5 @@ class ADF.GMap.Views.OverlayView extends ADF.MVC.Views.Base
   onMarkerMouseOut: () ->
   onOverlayShowed: () ->
   onMarkerMoved: (point) ->
+  onMarkerDrag: () ->
   unbindMap: () ->

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

@@ -8,7 +8,6 @@ class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
   
   constructor: (options) ->
     super(options)
-    @clickable = false
     @pushOverlay()
     
   onMarkerMouseOver: () =>
@@ -34,6 +33,9 @@ class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
     if @hoverable && @mouseout
       $(@el).hover(@openOverlayOnHover, @hideOverlayAfterTime)
     
+  onMarkerDrag: () ->
+    @map.hideAllOverlays()
+    
   calculatePosition: () ->
     arr = @getPositionArray()
     @setPosition(arr[0], arr[1])

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

@@ -0,0 +1,40 @@
+ADF.Overlay.Views.New ||= {}
+
+class ADF.Overlay.Views.New.FlashOverlay extends ADF.Overlay.Views.FlashOverlay
+  
+  hidden: false
+  draggable: true
+  clickEvent: null
+  
+  opened: false
+  clickable: false
+  hoverable: true
+  calibration: [0, -16, -20, 0]
+  mouseout: true
+  
+  constructor: (options) ->
+    super(options)
+    @clickableArea = if options.area then options.area else @map.getGMap()
+    @initOverlay()
+
+  initOverlay: () ->
+    if not @overlay 
+      if @point && @point.lat() > 0 && @point.lng() > 0
+        @pushOverlay()
+      else
+        @bindMap()
+    else
+      @overlay.view = @
+      @redraw()
+
+  bindMap: () ->
+    @clickEvent = google.maps.event.addListener @clickableArea, 'click', @onClicked unless @clickEvent?
+    
+  unbindMap: () ->
+    google.maps.event.removeListener(@clickEvent) if @clickEvent?
+    @clickEvent = null
+    
+  onClicked: (e) =>
+    @point = e.latLng
+    @unbindMap()
+    @pushOverlay()

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

@@ -0,0 +1,34 @@
+ADF.Overlay.Views.New ||= {}
+
+class ADF.Overlay.Views.New.Default extends ADF.GMap.Views.OverlayView 
+  
+  hidden: false
+  draggable: true
+  clickEvent: null
+  
+  constructor: (options) ->
+    super(options)
+    @clickableArea = if options.area then options.area else @map.getGMap()
+    @initOverlay()
+
+  initOverlay: () ->
+    if not @overlay 
+      if @point && @point.lat() > 0 && @point.lng() > 0
+        @pushOverlay()
+      else
+        @bindMap()
+    else
+      @overlay.view = @
+      @redraw()
+
+  bindMap: () ->
+    @clickEvent = google.maps.event.addListener @clickableArea, 'click', @onClicked unless @clickEvent?
+    
+  unbindMap: () ->
+    google.maps.event.removeListener(@clickEvent) if @clickEvent?
+    @clickEvent = null
+    
+  onClicked: (e) =>
+    @point = e.latLng
+    @unbindMap()
+    @pushOverlay()

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

@@ -14,4 +14,4 @@ class ADF.Map.Views.PolygonLabel extends ADF.Overlay.Views.Overlay
     @top = 45
     @initResize()
     @redraw()
-    return this
+    @

data/lib/assets/javascripts/socmap_adf/modules/overlay_push/init.js.coffee

@@ -1,3 +1,4 @@
+# DEPRICATED
 # Default requires for ADF modules
 #= require_self
 #= require_tree ./views

data/lib/socmap_adf/version.rb

@@ -1,3 +1,3 @@
 module SocmapAdf
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/socmap_adf.gemspec

@@ -19,8 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.rubyforge_project = "socmap_adf"
-
   s.add_dependency "rails"
-
   s.add_development_dependency "sqlite3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socmap_adf
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,8 +143,11 @@ files:
 - 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/new/flash_overlay.js.coffee
+- lib/assets/javascripts/socmap_adf/modules/overlay/views/new/overlay.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
+- lib/assets/javascripts/socmap_adf/modules/overlay_push/.DS_Store
 - lib/assets/javascripts/socmap_adf/modules/overlay_push/init.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/overlay_push/templates/colibration.jst.eco
 - lib/assets/javascripts/socmap_adf/modules/overlay_push/views/flash_new.js.coffee
@@ -200,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1446775132721988935
+      hash: 4199976749007262182
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1446775132721988935
+      hash: 4199976749007262182
 requirements: []
 rubyforge_project: socmap_adf
 rubygems_version: 1.8.24