jekyll-maps 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 215805100683263283d367bc71dbdb0011b12d39
-  data.tar.gz: b12411f9d3189ad09cb47d274b24d01a10060448
+SHA256:
+  metadata.gz: 5d5dffc1c1df660cb9f9c4c0df61c45474a1f6f104f0071f029c361b3249199b
+  data.tar.gz: 25ff1ed47a8eda9b6c7d47b234b6241738709b084b3cf9bb637aeb81ef4f0abd
 SHA512:
-  metadata.gz: cbc3dcb446af807b3ebbe4784037a57e08a7ce68d30bfe4aa41321c16a966473fe9b9f6ce0b34e315757c41651cfb6c2bdbcf23bb42c48c188c4bcd7182732ee
-  data.tar.gz: 0fa3f7762910acae8e39c7dd382459912675cdaf91d7d17f1e3f77a7072d28766b129f2cb6ff6f8617af0e3b86c4f2f3d4a7cd2d9413af323593b3fb21a1b2b8
+  metadata.gz: b798ed260312306b4a3ceee2a331d21bd2213e868787e98812b1c641ae0e7e4ce6df7b3202a578fa0b01c3307a89318fcbb86c96705c2408437555db0824863c
+  data.tar.gz: 3647aa55db8ec0bfa68a1bf088552c78d6e634aaa3b0af0282340b13623b3df6c8b399e1a2e5762f5835d0158e9e9a4371369341b0bb6e62aa665205c292ea00

data/lib/jekyll-maps/google_map_api.js

@@ -79,7 +79,8 @@ var jekyllMaps = (function() {
         position: position,
         title: location.title,
         image: location.image,
-        url: location.url.length > 0 ? mapOptions.baseUrl + location.url : '',
+        icon: location.icon || mapOptions.markerIcon,
+        url: markerUrl(mapOptions.baseUrl, location.url),
         map: map
       })
       if (mapOptions.showMarkerPopup) marker.addListener('click', markerPopup)
@@ -87,6 +88,12 @@ var jekyllMaps = (function() {
       return marker
     }
 
+    function markerUrl(baseUrl, url) {
+      if (/^(https?|\/\/)/.test(url)) return url
+
+      return url.length > 0 ? baseUrl + url : ''
+    }
+
     function markerPopup() {
       var contentHtml =
         '<div class="map-info-window"><h5>' + this.title + '</h5>'

data/lib/jekyll-maps/google_map_tag.rb

@@ -58,7 +58,8 @@ HTML
           :baseUrl         => site.baseurl || "/",
           :useCluster      => !@args[:flags][:no_cluster],
           :showMarker      => @args[:attributes][:show_marker] != "false",
-          :showMarkerPopup => @args[:attributes][:show_popup] != "false"
+          :showMarkerPopup => @args[:attributes][:show_popup] != "false",
+          :markerIcon      => @args[:attributes][:marker_icon]
         }
         if @args[:attributes][:zoom]
           opts[:customZoom] = @args[:attributes][:zoom].to_i

data/lib/jekyll-maps/location_finder.rb

@@ -25,6 +25,7 @@ module Jekyll
           :latitude  => @options[:attributes][:latitude],
           :longitude => @options[:attributes][:longitude],
           :title     => @options[:attributes][:marker_title] || page["title"],
+          :icon      => @options[:attributes][:marker_icon] || page["marker_icon"],
           :url       => @options[:attributes][:marker_url] || fetch_url(page),
           :image     => @options[:attributes][:marker_img] || page["image"] || ""
         }
@@ -103,6 +104,7 @@ module Jekyll
           :latitude  => location["latitude"],
           :longitude => location["longitude"],
           :title     => location["title"] || document["title"],
+          :icon      => location["marker_icon"] || document["marker_icon"],
           :url       => location["url"] || fetch_url(document),
           :image     => location["image"] || document["image"] || ""
         }

data/lib/jekyll-maps/options_parser.rb

@@ -16,6 +16,7 @@ module Jekyll
         latitude
         longitude
         marker_title
+        marker_icon
         marker_img
         marker_url
       ).freeze

data/lib/jekyll-maps/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Maps
-    VERSION = "2.1.2".freeze
+    VERSION = "2.2.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-maps
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Anatoliy Yastreb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Jekyll Google Maps integration