socmap_adf 0.0.10 → 0.0.11

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

@@ -1,5 +1,6 @@
 # Default requires for ADF modules
 #= require_self
+#= require_tree ./templates
 #= require_tree ./views
 
 ADF.GMap =

data/lib/assets/javascripts/socmap_adf/modules/gmap/templates/context_menu_item.jst.eco

@@ -0,0 +1 @@
+<div class="menu_element"><%= @title %></div>

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

@@ -0,0 +1,54 @@
+class ADF.GMap.Views.ContextMenu extends ADF.MVC.Views.Base
+
+  itemTemplate: JST['socmap_adf/modules/gmap/templates/context_menu_item']
+  position: {x:null, y:null}
+  latLng: null
+  
+  constructor: (options) ->
+    super(options)
+    @gElement = options.gElement
+    @map = options.mapModel
+    @eventBus.on "ADF.GMap.Views.ContextMenu.hide", @hide
+    @overlay = new google.maps.OverlayView()
+    @overlay.draw = () ->
+    @overlay.setMap(@map.getGMap())
+    
+  render: () ->
+    newElement = @make("div", {"class": "map_context_menu", "style" : "display:none;position:absolute;z-index:10;"} )
+    @setElement( newElement )
+    @map.getMapElement().append($(@el))
+    google.maps.event.addDomListener @gElement, 'rightclick', @onRightClicked
+    @map.getMapElement().bind "mouseleave", @onMapMouseout
+    $("body").bind "click", @onBodyClicked
+    @
+    
+  show: () ->
+    $(@el).css({"top" : @position.y, "left": @position.x})
+    $(@el).show()
+    @eventBus.trigger "ADF.GMap.Views.ContextMenu.isShowed"
+    
+  hide: () =>
+    $(@el).hide()
+    @eventBus.trigger "ADF.GMap.Views.ContextMenu.isHidden"
+    
+  onRightClicked: (e) =>
+    @eventBus.trigger "ADF.GMap.Views.ContextMenu.hide"
+    @hide()
+
+    point = @overlay.getProjection().fromLatLngToContainerPixel(e.latLng)
+    @position = point
+    @latLng = e.latLng
+    @show()
+    
+  onBodyClicked: (e) =>
+    @hide()
+    
+  onMapMouseout: (e) =>
+    @hide()
+    
+  bindItem: (title, callback) =>
+    item = @itemTemplate({title : title})
+    $(@el).append($(item))
+    $(@el).find(".menu_element").last().bind "click", () =>
+      callback(@latLng)
+    @

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

@@ -102,7 +102,7 @@ class ADF.GMap.Views.Overlay extends google.maps.OverlayView
     @markerClickEvent = google.maps.event.addDomListener @marker, 'click', (e) =>
       if @view.clickable 
         @view.beforeMarkerClicked()
-        if @hidden
+        if @hidden && @view.openOnClick
           @show()  
           @draw()
 

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

@@ -15,6 +15,7 @@ class ADF.GMap.Views.OverlayView extends ADF.MVC.Views.Base
   customMarker: null
   zindex: 1
   clickable: true
+  openOnClick: true
   asLabel: false
   showAfterDrag: false
   clustering: false
@@ -133,6 +134,11 @@ class ADF.GMap.Views.OverlayView extends ADF.MVC.Views.Base
 
   setMarker: (marker) ->
     @marker = marker
+    
+  addContextMenu: () ->
+    if @marker
+      @contextMenu = new ADF.GMap.Views.ContextMenu({gElement : @marker, mapModel: @map})
+      @contextMenu.render()
 
   # Callback methods
   onRenderCompleted: () ->

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

@@ -1,12 +1,17 @@
 class ADF.GMap.Views.Polygon extends ADF.MVC.Views.Base
   
+  label: false
+  content: false 
+  
   initialize: () ->
     @mapView = @options.mapView
     @zone = @options.model
-    @onShapeClickedCallback = @options.onShapeClicked
-    @onPolygonDrawCompleted = @options.onPolygonDrawCompleted
-    @onPolygonDrawStarted = @options.onPolygonDrawStarted
-    @pathChanged = if typeof @options.pathChanged == 'function' then @options.pathChanged
+    @label = @options.label if @options.label?
+    @content = @options.content if @options.content?
+    @onShapeClicked = @options.onShapeClicked if typeof @options.onShapeClicked == 'function'
+    @onPolygonDrawCompleted =  @options.onPolygonDrawCompleted if typeof @options.onPolygonDrawCompleted == 'function'
+    @onPolygonDrawStarted = @options.onPolygonDrawStarted if typeof @options.onPolygonDrawStarted == 'function'
+    @pathChanged = @options.pathChanged if typeof @options.pathChanged == 'function'
     @initialized = false
         
   initZone: (allowDraw) -> 
@@ -16,44 +21,57 @@ class ADF.GMap.Views.Polygon extends ADF.MVC.Views.Base
       @startDrawing()
     else 
       @zone.setPolygonMap( @map )
-      @onPolygonDrawCompleted() if @onPolygonDrawCompleted? && allowDraw
+      @onPolygonDrawCompleted() if allowDraw
       @setPolygonHandlers() 
+      
     @mapView.getMap().addOverlay(@)
+    @setLabel() if @label
+    @onZoneInitialized()
   
   isClustering: () ->
     false
   
-  setLabel: ( label ) ->
-    bounds = new google.maps.LatLngBounds();
+  setContent: ( content ) ->
+    @content = content
+    @labelView.setContent( content )
+    @labelView.render()
+    
+  setLabel: ( label = null) ->
+    @label = label if label
+    bounds = new google.maps.LatLngBounds()
 
     i = 0
     while i < @zone.getPolygon().getPath().length
       bounds.extend(@zone.getPolygon().getPath().getAt(i))
       i++
     point = bounds.getCenter()
-    
+ 
     unless @labelView
       @labelView = new ADF.Map.Views.PolygonLabel
         point: point
         map : @mapView.getMap()
         model: @zone
-        hidden: false
-        label: label
+        hidden: true
+        label: @label
+        content: @content
+        clickable: false
+        template: @zonePopupTemplate
     else
-      @labelView.point = point
-      @labelView.label = label
-      @labelView.render()
-    
-  startDrawing: ->
+      @labelView.overlay.setPosition(point)
+      @labelView.setLabel @label
+      
+  setColors: (fillColor, strokeColor) ->
+    @zone.setColors(fillColor, strokeColor)
+     
+  startDrawing: =>
     return if @zone.readOnly
     @drawingManager = new google.maps.drawing.DrawingManager
       drawingMode: google.maps.drawing.OverlayType.POLYGON
       polygonOptions: @zone.mapObject.polygon_options_defaults
       map: @map
       drawingControl: false
-      
-    @onPolygonStartDrawing()
-    @onPolygonDrawStarted() if @onPolygonDrawStarted?
+
+    @onPolygonDrawStarted()
     google.maps.event.addListener @drawingManager, 'polygoncomplete', @polygonCompleteHandler
  
   # stopDrawing: ->
@@ -74,34 +92,58 @@ class ADF.GMap.Views.Polygon extends ADF.MVC.Views.Base
   setMap: (map) ->
     @zone.setPolygonMap(map)
   
+  # Depricated
   removeFromMap: () ->
     @zone.removeFromMap()
     @labelView.remove() if @labelView
+    
+  remove: () ->
+    @zone.getPolygon().setMap(null)
+    @labelView.remove() if @labelView
   
   polygonCompleteHandler: ( newShape ) =>
     @zone.setPolygon( newShape )
     @setPolygonHandlers()
-    @onPolygonDrawComplete()
-    @onPolygonDrawCompleted() if @onPolygonDrawCompleted?
+    @onPolygonDrawCompleted()
 
+  onMouseOut: (e) =>
+    @labelView.hideOverlayAfterTime() if @labelView
+      
+  onMouseOver: (e) =>
+    @labelView.openOverlayOnHover() if @labelView && !@isEditable() && @content
+  
+  onMouseMove: (e) =>
+    @labelView.hide() if @isEditable() && @labelView && @labelView.opened
+      
   setPolygonHandlers: () ->
-    google.maps.event.addListener @zone.getPolygon(), 'click', @newShapeClickHandler
+    google.maps.event.addListener @zone.getPolygon(), 'click', @newShapeClickHandler if @isEditable()
+    google.maps.event.addListener @zone.getPolygon(), 'mouseout', @onMouseOut
+    google.maps.event.addListener @zone.getPolygon(), 'mouseover', @onMouseOver
+    google.maps.event.addListener @zone.getPolygon(), 'mousemove', @onMouseMove
     google.maps.event.addListener @map, 'click', @clearSelection
     google.maps.event.addListener @zone.getPolygon().getPath(), 'set_at', @pathChanged
     google.maps.event.addListener @zone.getPolygon().getPath(), 'insert_at', @pathChanged
     google.maps.event.addListener @zone.getPolygon().getPath(), 'remove_at', @pathChanged
     @zone.setEditable()
-    
+   
+  
+  isEditable: () ->
+    @zone.getPolygon().getEditable()
+     
   clearSelection: => 
     @zone.setUnEditable( )
       
   newShapeClickHandler: ( e )  =>   
     @zone.setEditable()
     @onShapeClicked()
-    @onShapeClickedCallback() if @onShapeClickedCallback?
-                    
+  
+  addContextMenu: () ->
+    @contextMenu = new ADF.GMap.Views.ContextMenu({gElement : @zone.getPolygon(), mapModel: @mapView.getMap()})
+    @contextMenu.render()
+                   
   # Callback Methods
-  onPolygonDrawComplete: ->   
-  onPolygonStartDrawing: ->
-  onShapeClicked: ->
-  pathChanged: =>
+  onPolygonDrawCompleted: =>   
+  onPolygonDrawStarted: =>
+  onShapeClicked: =>
+  pathChanged: =>
+  onZoneInitialized: =>

data/lib/assets/javascripts/socmap_adf/modules/image_uploader/views/main.js.coffee

@@ -5,12 +5,12 @@ class ADF.ImageUploader.Views.Main extends ADF.MVC.Views.Base
   events:
     "click .btn_close" : "onCloseClicked"
 
-
   initialize: () ->
     _.bindAll(this, 'render')
     @onComplete = @options.onComplete if @options.onComplete
-    @onCancel = @options.onCancel if @options.onComplete
+    @onCancel = @options.onCancel if @options.onCancel
     @image = @options.image if @options.image
+    @template = @options.template if @options.template
 
   render: () ->
     options =
@@ -52,18 +52,16 @@ class ADF.ImageUploader.Views.Main extends ADF.MVC.Views.Base
     @image = responseJSON.uploader_url
     @showImage(@image)
     @$(".btn_close").show()
-    if @onComplete
-      @onComplete(responseJSON)
+    @onComplete(responseJSON) if @onComplete
 
   onCloseClicked: () ->
     @$(".uploaded_picture").hide()
     @$(".btn_close").hide()
     @$(".image_holder").show()
-    if @onCancel
-      @onCancel()
+    @onCancel() if @onCancel
     return false
 
   showImage: (image_url) ->
     @$(".image_holder").hide()
     @$(".uploaded_picture").attr("src", image_url)
-    @$(".uploaded_picture").show()
+    @$(".uploaded_picture").show()

data/lib/assets/javascripts/socmap_adf/modules/map/views/main.js.coffee

@@ -78,5 +78,9 @@ class ADF.Map.Views.Main extends ADF.MVC.Views.Base
       @model.getGMap().setZoom(@model.getGMap().getZoom() - 1)
       @setCenterWithOffset(@model.getGMap().getCenter(), 0, -300) if centerWithOffset
     
+  addContextMenu: () ->
+    @contextMenu = new ADF.GMap.Views.ContextMenu({gElement : @getGMap(), mapModel: @model})
+    @contextMenu.render()
+    
   # Callback methods
   onRenderCompleted: () ->

data/lib/assets/javascripts/socmap_adf/modules/minimap/views/main.js.coffee

@@ -67,5 +67,9 @@ class ADF.Minimap.Views.Main extends ADF.MVC.Views.Base
       @model.getGMap().setZoom(@model.getGMap().getZoom() - 1)
       @setCenterWithOffset(@model.getGMap().getCenter(), 0, -300) if centerWithOffset
     
+  addContextMenu: () ->
+    @contextMenu = new ADF.GMap.Views.ContextMenu({gElement : @getGMap(), mapModel: @model})
+    @contextMenu.render()
+        
   # Callback methods
   onRenderCompleted: () ->

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

@@ -5,10 +5,13 @@ class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
   hoverable: true
   calibration: [0, -16, -20, 0]
   mouseout: true
+  openOnClick: false
   
   constructor: (options) ->
     super(options)
     @pushOverlay()
+    @eventBus.on "ADF.GMap.Views.ContextMenu.isShowed", @setUnHoverable
+    @eventBus.on "ADF.GMap.Views.ContextMenu.isHidden", @setHoverable
     
   onMarkerMouseOver: () =>
     @openOverlayOnHover()
@@ -40,6 +43,13 @@ class ADF.Overlay.Views.FlashOverlay extends ADF.GMap.Views.OverlayView
     arr = @getPositionArray()
     @setPosition(arr[0], arr[1])
     
+  setUnHoverable: () =>
+    @hoverable = false
+    @hide()
+    
+  setHoverable: () =>
+    @hoverable = true
+    
   getPositionArray: () ->
     halfWidth = @map.getMapElement().width() / 2
     halfHeight = @map.getMapElement().height() / 2

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

@@ -1,17 +1,34 @@
-class ADF.Map.Views.PolygonLabel extends ADF.Overlay.Views.Overlay
+class ADF.Map.Views.PolygonLabel extends ADF.Overlay.Views.FlashOverlay
   
   template: JST['socmap_adf/modules/overlay/templates/polygon_label']
   dontRenderMarker: true
+  mouseout: false
+  hoverable: false
   
   initialize: () ->
     super()
     @label = @options.label
+    @content = @options.content
+    @template = @options.template if @options.template
+    @customMarker = new ADF.Zone.Views.LabelMarker()
+    
+  setContent: (content) ->
+    @content = content
   
   render: ->
-    $(@el).html( @template( {label: @label } ) )
+    $(@el).html( @template() )
     @onRenderCompleted()
-    @left = 400
-    @top = 45
     @initResize()
     @redraw()
-    @
+    @onRenderCompleted()
+    @
+    
+  onRenderCompleted: () ->
+    @$(".content").html(@content)
+    $(@el).hover(@openOverlayOnHover, @hideOverlayAfterTime)
+    
+  onOverlayShowed: () =>
+    @_setScrollable()
+
+  _setScrollable: () =>
+    @$(".scrollable").nanoScroller({autoresize: true})

data/lib/assets/javascripts/socmap_adf/modules/zone/models/polygon.js.coffee

@@ -55,6 +55,13 @@ class ADF.Zone.Models.Polygon extends Backbone.Model
   createPolygonFromPoints: ( options ) ->
     @GPolygon.setOptions options
     @setEditable()
+  
+  setColors: (fillColor, strokeColor) ->
+    @GPolygon.setOptions({fillColor: fillColor, strokeColor: strokeColor})
+    @polygon_options_defaults["strokeColor"] = strokeColor 
+    @polygon_options_defaults["fillColor"] = fillColor
+    @polygon_options_readonly["strokeColor"] = strokeColor
+    @polygon_options_readonly["fillColor"] = fillColor
     
   getCoordinates: ->
     points = [] 

data/lib/assets/javascripts/socmap_adf/modules/zone/views/label_marker.js.coffee

@@ -0,0 +1,26 @@
+class ADF.Zone.Views.LabelMarker
+
+  icon: null
+  iconUrl:  null
+  iconSize: new google.maps.Size(1,20)
+  iconOrigin: new google.maps.Point(0,0)
+  iconAnchor: new google.maps.Point(0,0)
+
+  shadow: null
+
+  shape: null
+  
+  constructor: () ->
+    @initMarkerImages()
+
+  initMarkerImages: () ->
+    @icon = new google.maps.MarkerImage(@iconUrl, @iconSize, @iconOrigin, @iconAnchor)
+
+  getIcon: () ->
+    @icon
+
+  getShadow: () ->
+    @shadow
+
+  getShape: () ->
+    @shape

data/lib/socmap_adf/version.rb

@@ -1,3 +1,3 @@
 module SocmapAdf
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socmap_adf
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,6 +69,7 @@ files:
 - lib/assets/javascripts/socmap_adf/lib/.DS_Store
 - lib/assets/javascripts/socmap_adf/lib/adf_delegate.js.coffee
 - lib/assets/javascripts/socmap_adf/lib/adf_view.js.coffee
+- lib/assets/javascripts/socmap_adf/lib/vendor/file_uploader/fileuploader.js
 - lib/assets/javascripts/socmap_adf/modules/.DS_Store
 - lib/assets/javascripts/socmap_adf/modules/cluster/init.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/cluster/lib/elycharts.js
@@ -101,7 +102,9 @@ files:
 - lib/assets/javascripts/socmap_adf/modules/form/views/field_sets.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/gmap/.DS_Store
 - lib/assets/javascripts/socmap_adf/modules/gmap/init.js.coffee
+- lib/assets/javascripts/socmap_adf/modules/gmap/templates/context_menu_item.jst.eco
 - lib/assets/javascripts/socmap_adf/modules/gmap/views/.DS_Store
+- lib/assets/javascripts/socmap_adf/modules/gmap/views/context_menu.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/gmap/views/custom_marker.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/gmap/views/marker.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/gmap/views/marker_with_label.js
@@ -177,6 +180,7 @@ files:
 - lib/assets/javascripts/socmap_adf/modules/zone/init.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/zone/models/polygon.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/zone/templates/main.jst.eco
+- lib/assets/javascripts/socmap_adf/modules/zone/views/label_marker.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/zone/views/main.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/zone/views/test.js.coffee
 - lib/assets/javascripts/socmap_adf/requiress.js.coffee.erb
@@ -203,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -302836586570035622
+      hash: 57803292243622167
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -302836586570035622
+      hash: 57803292243622167
 requirements: []
 rubyforge_project: socmap_adf
 rubygems_version: 1.8.24