socmap_adf 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.0.2
+
+### Features & Enhancements
+
+* Add OpenStreetMap tiles on Google Map Api v3
+* mapView.setMapTypeId - with OSM
+
+
 # 0.0.1
 
 ### Features & Enhancements

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

@@ -30,7 +30,12 @@ class ADF.Map.Models.Map extends Backbone.Model
   initGMap: (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
+    
+  setMapTypeId: (mapTypeId) =>
+    @loadOSM() if mapTypeId == "OSM"
+    @map.setMapTypeId(mapTypeId)
 
   getGMap: () ->
     return @map
@@ -60,4 +65,14 @@ class ADF.Map.Models.Map extends Backbone.Model
     @markerClusterer.clearMarkers()
 
   clusterOverlay: (overlay) ->
-    @markerClusterer.addMarker(overlay) if @markerClusterer
+    @markerClusterer.addMarker(overlay) if @markerClusterer
+    
+  loadOSM: () ->
+    @map.mapTypes.set("OSM", new google.maps.ImageMapType(
+        getTileUrl: (coord, zoom) =>
+            return "http://tile.openstreetmap.org/" + zoom + "/" + coord.x + "/" + coord.y + ".png"
+        tileSize: new google.maps.Size(256, 256)
+        name: "OpenStreetMap"
+        maxZoom: 18
+    ))
+    

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

@@ -50,6 +50,9 @@ class ADF.Map.Views.Main extends ADF.MVC.Views.Base
 
   setZoom: (zoom) ->
     @getGMap().setZoom(zoom)
+    
+  setMapTypeId: (mapTypeId) ->
+    @model.setMapTypeId(mapTypeId)
 
   setCenterWithOffset: (position, offsetx, offsety) ->
     @model.setCenter(position)

data/lib/socmap_adf/version.rb

@@ -1,3 +1,3 @@
 module SocmapAdf
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socmap_adf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &71872880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71872880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &71871960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +39,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71871960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Socmap App Design Framework - javascript + CSS
 email:
 - arturs@creo.mobi
@@ -42,6 +52,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
 - .rvmrc
 - CHANGELOG.md
@@ -49,10 +60,13 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- lib/.DS_Store
+- lib/assets/.DS_Store
 - lib/assets/.gitkeep
 - lib/assets/javascripts/.DS_Store
 - lib/assets/javascripts/socmap_adf/.DS_Store
 - lib/assets/javascripts/socmap_adf/init.js.coffee.erb
+- 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/modules/.DS_Store
@@ -108,6 +122,7 @@ files:
 - lib/assets/javascripts/socmap_adf/modules/map/views/main.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/map/views/moving_pin.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/map/views/tooltip.js.coffee
+- lib/assets/javascripts/socmap_adf/modules/marker/.DS_Store
 - lib/assets/javascripts/socmap_adf/modules/marker/init.js.coffee
 - lib/assets/javascripts/socmap_adf/modules/marker/views/.DS_Store
 - lib/assets/javascripts/socmap_adf/modules/marker/views/main.js.coffee
@@ -183,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -280538705
+      hash: 2364184370769170331
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,11 +207,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -280538705
+      hash: 2364184370769170331
 requirements: []
 rubyforge_project: socmap_adf
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Socmap App Design Framework
-test_files: []
+test_files:
+- test/socmap-adf_test.rb
+- test/test_helper.rb