fix minor issues

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/it3s/meppit-map-rails.git
-  revision: 652be84ee87f5ce1d53866c9574278d53450db10
+  revision: e91cb7605515395ab692b5cf6bdbfd95f65719d6
   specs:
     meppit-map-rails (0.2.0)
       coffee-rails

app/assets/javascripts/components/colorPicker.js.coffee

@@ -45,12 +45,12 @@ App.components.colorPicker = ->
     @onChange color if @getValue() isnt color
 
   onFieldChange: ->
-    @onChange @fieldEl.val()
+    @onChange @fieldEl.val() if @getValue() isnt @fieldEl.val()
 
   onChange: (color) ->
     @setValue color
-    @_triggerFieldChange ?= _.debounce () -> @fieldEl?.trigger 'change', 100
-    @_triggerFieldChange()
+    @fieldEl?.val @getValue()
+    @fieldEl?.trigger 'change'
     App.mediator.publish 'colorpicker:changed', color
 
   update: ->

app/assets/javascripts/components/editLayers.js.coffee

@@ -29,22 +29,6 @@ DataForm = ->
   onChange: ->
     App.mediator.publish 'layerData:changed', @index
 
-  _getRule: ->
-    tags = @fields['tags'].val()
-    if tags.length > 0
-      {
-        operator: 'has'
-        property: 'tags'
-        value: tags.split(',')
-      }
-    else
-      null
-
-  _setRule: (rule) ->
-    if rule? and rule.operator == 'has' and rule.property == 'tags' and rule.value?
-      value = JSON.parse(rule.value).join(',')
-      @fields['tags'].setComponentValue('tags', value)
-
   getValue: ->
     vals = {}
     _.each @_params, (key) =>
@@ -70,6 +54,22 @@ DataForm = ->
     _.each @fields, (el, key) =>
       el.change _.debounce(@onChange.bind(this), 100)
 
+  _getRule: ->
+    tags = @fields['tags'].val()
+    if tags.length > 0
+      {
+        operator: 'has'
+        property: 'tags'
+        value: tags.split(',')
+      }
+    else
+      null
+
+  _setRule: (rule) ->
+    if rule? and rule.operator == 'has' and rule.property == 'tags' and rule.value?
+      value = JSON.parse(rule.value).join(',')
+      @fields['tags'].setComponentValue('tags', value)
+
 
 LayerItem = ->
   template: JST['templates/layerItem']

app/assets/javascripts/components/map.js.coffee

@@ -219,6 +219,7 @@ App.components.map = ->
         height: @container.css('height')
         width: @container.css('width')
         'z-index': @container.css('z-index')
+      @map.zoomIn 2, animate: false
     top = $("#header").height()
     $(window).scrollTop(0)
     @container.css
@@ -228,7 +229,6 @@ App.components.map = ->
       height: $(window).height() - top
       width: $(window).width()
       'z-index': 9
-    @map.zoomIn 2, animate: false
     @map.refresh()
     @expanded = true
 

app/models/concerns/layers.rb

@@ -11,7 +11,7 @@ def layers
     end
 
     def layers_values
-      layers.map do |l|
+      (layers.map do |l|
         {
           id: l.id,
           name: l.name,
@@ -21,7 +21,7 @@ def layers_values
           position: l.position,
           rule: l.rule,
         }
-      end
+      end).sort_by { |layer| layer[:position] }
     end
 
     def save_layers_from_attributes