googlestaticmap 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5927d0355fe8b5d37805cdd00be4c0101d160d43
-  data.tar.gz: 7678c34e611f1515334a2fc686e8509b6fa50120
+  metadata.gz: 7b5b6fcba846462e64275c8edcedc7e4b42d85de
+  data.tar.gz: 1d921c206a737b39936ce5668767a939e228e019
 SHA512:
-  metadata.gz: 1cea618d5b2937fe8f500c7dd88ce5814c93d10b7362cfc73999215876131f3eb959ec3e82ea863a63a86dce61fa925e9b7ea1599828d869c1502f8ae715ad86
-  data.tar.gz: 23564bec56865aedd2acbc028341389270571140054d1aea0dcf9f8966835f55bad4a81b0728fd41323e424d3b1af8f83075588557897ff290c0210612a93a52
+  metadata.gz: 3a93b1e16dc3779d1465f43ec6d79c76dcdf0ed4a51eaca0a7c5a8d35a434c944e602bbd5be6b80fab97a63e7b136d238cedcf2010bd498f003a909c8f833f56
+  data.tar.gz: f7aa37ed92164ea33e8be0437d817c3908d7250c0358dedc4b30b16dddc8986558a6998e6655a72fa105d4147a227d044087907b8177f095e4ccb61472b499f5

data/History.txt

@@ -1,3 +1,7 @@
+== 1.2.5 / 2018-05-07
+* Added styles, plain_string options to GoogleStaticMap (thanks anplug!)
+* Added anchor option to MapMarker (thanks anplug!)
+
 == 1.2.4 / 2017-03-05
 * Added language option (thanks kntmrkm!)
 

data/README.md

@@ -30,7 +30,7 @@ this URL as the src of an img element on an HTML page
 When using the url function you can force the final url to use http or https:
 
     image_url = map.url('http')
-    
+
 Get a map with blue markers at the White House and the Supreme Court, zoomed
 the closest that the map can be with both markers visible, at the default
 size.  image will be the binary data of the map

data/lib/googlestaticmap.rb

@@ -87,6 +87,16 @@ class GoogleStaticMap
   #           see https://developers.google.com/maps/documentation/static-maps/intro for details
   attr_accessor :language
 
+  # Styles - see https://developers.google.com/maps/documentation/maps-static/styling
+  # styles is should be represented as array of objects
+  # [{feature: 'featureArgument, element: 'elementArgument', rule1: 'rule1Arguement', rule2: 'rule2Arguement', ...},
+  # ...]
+  attr_accessor :styles
+
+  # In case when some parameter should be inserted manually
+  # For example, using https://mapstyle.withgoogle.com/ tool and inserting generated style as is
+  attr_accessor :plain_string
+
   # Takes an optional hash of attributes
   def initialize(attrs={})
     defaults = {:width => 500, :height => 350, :markers => [],
@@ -123,7 +133,7 @@ class GoogleStaticMap
     attrs = GoogleStaticMapHelpers.safe_instance_variables(self,
               ["markers", "paths", "width", "height", "center",
                "proxy_address", "proxy_port", "api_key", "client_id",
-               "private_key"],
+               "private_key", "styles", "plain_string"],
               :cgi_escape_values => true).to_a
     attrs << ["size", "#{@width}x#{@height}"] if @width && @height
     @markers.each {|m| attrs << ["markers",m.to_s] }
@@ -131,7 +141,9 @@ class GoogleStaticMap
     attrs << ["center", @center.to_s] if !@center.nil?
     attrs << ["key", @api_key] if !@api_key.nil?
     attrs << ["client", @client_id] if !@client_id.nil?
+    get_styles.each { |style| attrs << style } if !@styles.nil?
     path << attrs.sort_by {|k,v| k}.collect {|attr| "#{attr[0]}=#{attr[1]}"}.join("&")
+    path << "&#{@plain_string}" if !@plain_string.nil?
     if (!@api_key.nil? || !@client_id.nil?) && !@private_key.nil?
       signature = GoogleStaticMapHelpers.sign(path, @private_key)
       path << "&signature=" << signature
@@ -175,6 +187,14 @@ class GoogleStaticMap
     end
   end
 
+  def get_styles
+    @styles.map do |style|
+      values = style.each_pair.map do |(key, value)|
+        "#{key.to_s}:#{value}"
+      end
+      ["style", values.join(CGI.escape('|'))]
+    end
+  end
 end
 
 # Container class for a location on the map.  Set either a latitude and
@@ -231,6 +251,10 @@ class MapMarker
   # visible region and its opacity/transparency.
   attr_accessor :shadow
 
+  # Manage position of marker (anchor:center/bottom/top..)
+  # See - https://developers.google.com/maps/documentation/maps-static/intro#Markers
+  attr_accessor :anchor
+
   # Takes an optional hash of attributes
   def initialize(attrs={})
     attrs.each {|k,v| self.send("#{k}=".to_sym,v)}

data/test/tc_google_static_map.rb

@@ -117,6 +117,39 @@ class GoogleStaticMapTest < Test::Unit::TestCase #:nodoc: all
     assert_no_match /^https:\/\/maps.googleapis.com/, f
   end
 
+  def test_url_styles
+    g = default_map
+    g.styles = [
+      { feature: 'road.local', element: 'geometry', color: '0x00ff00' },
+      { feature: 'landscape', element: 'geometry.fill', color: '0x000000' },
+      { element: 'labels', invert_lightness: true },
+      { feature: 'road.arterial', element: 'labels', invert_lightness: false }
+    ]
+    u = nil
+
+    assert_nothing_raised { u = g.url }
+    assert_equal 11, u.split("&").length, u
+    assert !u.include?("styles"), "styles have to be convered to array of 'style'"
+    assert u.include?('style=feature:road.local%7Celement:geometry%7Ccolor:0x00ff00'), u
+    assert u.include?('style=feature:landscape%7Celement:geometry.fill%7Ccolor:0x000000'), u
+    assert u.include?('style=element:labels%7Cinvert_lightness:true&style=feature:road.arterial%7Celement:labels%7Cinvert_lightness:false'), u
+
+    assert_nothing_raised {g.relative_url}
+  end
+
+  def test_url_plain_string
+    g = default_map
+    g.plain_string = "style=feature:road.local%7Celement:geometry%7Ccolor:0x00ff00&style=feature:landscape%7Celement:geometry.fill%7Ccolor:0x000000"
+    u = nil
+
+    assert_nothing_raised { u = g.url }
+    assert_equal 9, u.split("&").length, u
+    assert !u.include?("plain_string")
+    assert u.include?('&style=feature:road.local%7Celement:geometry%7Ccolor:0x00ff00&style=feature:landscape%7Celement:geometry.fill%7Ccolor:0x000000')
+
+    assert_nothing_raised {g.relative_url}
+  end
+
   def test_url_api_key
     g = default_map
     g.api_key = "asdfapikey"

data/test/tc_map_marker.rb

@@ -27,16 +27,18 @@ class MapMarkerTest < Test::Unit::TestCase #:nodoc: all
     assert_equal "B", m.label
     assert_equal "http://www.google.com", m.icon
     assert_equal false, m.shadow
+    assert_equal 'center', m.anchor
   end
 
   def test_get_string
     m = default_marker
     s = nil
     assert_nothing_raised {s = m.to_s}
-    assert_equal 6, s.split(MAP_SEPARATOR).length
+    assert_equal 7, s.split(MAP_SEPARATOR).length
     assert s.include?(CGI.escape("Washington, DC"))
     assert s.include?("color:green")
     assert s.include?("icon:http://www.google.com")
+    assert s.include?("anchor:center")
   end
 
   def test_string_is_a_valid_ruby_uri
@@ -51,6 +53,7 @@ class MapMarkerTest < Test::Unit::TestCase #:nodoc: all
                   :size => "tiny",
                   :label => "B",
                   :icon => "http://www.google.com",
+                  :anchor => 'center',
                   :shadow => false)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: googlestaticmap
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Brent Sowers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,13 +92,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Class for retrieving maps from the Google Maps Static API service
 test_files:
 - test/tc_map_path_and_polygon.rb
-- test/tc_helper.rb
-- test/tc_google_static_map.rb
 - test/tc_map_location.rb
+- test/tc_google_static_map.rb
+- test/tc_helper.rb
 - test/tc_map_marker.rb