mapkick-rb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7678cfa0645e5386090c2ce73f06ffca32e0cbe3d3643b23d241ac80036d8c9d
-  data.tar.gz: 348c96a8b02cc983dda7fcc4a655bd2bb276d20b210290d6cce424b669449eac
+  metadata.gz: 142c0d5f613b1bf31098593e360bcef22fc2f67f8bec3df00eae695ffc38374a
+  data.tar.gz: 5f9411788846f23203395f615448736c12712f4d71b0069306c0b053731e4ba7
 SHA512:
-  metadata.gz: 466776e05996b2a6cd0144c7f68e627696b6bbf85742f700ceab060a347a444a8152aa2b8fe6f30d4f0ca677985e5cbc93b7ea80c9c736500ab6e609ae620f04
-  data.tar.gz: 68f2cf1f40bdd1242a2b91ade1bfce042bf2a234c23a64ec87b9989bf6708adcbe822d11e2c477714f989ec151b15358ac082773593f0ad400730c169d12b7a2
+  metadata.gz: 3b40922653a27f565fa349d4d1687d04b2add2aacf26bcab042f6ef9a87168940e3dafe7cf39e058f93b430391fbdb484779b3fce8eec3ae4d43678d97b5fa30
+  data.tar.gz: 17a189a1a596dfa60889ba6c8c2595faeebdeeecc4235d74adc3ebba3c8a774fcbd1347b7ce0d5c579ebb7dc363a8186a0d3763eaf2f83be3fd0ce2dd7ff9a2b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1 (2023-01-24)
+
+- Updated Mapkick.js to 0.2.2
+
 ## 0.1.0 (2023-01-19)
 
 - First release

data/README.md

@@ -82,7 +82,7 @@ In `app/assets/javascripts/application.js`, add:
 Create a map
 
 ```erb
-<%= js_map [{latitude: 1.23, longitude: 4.56}] %>
+<%= js_map [{latitude: 37.7829, longitude: -122.4190}] %>
 ```
 
 ## Data
@@ -90,7 +90,7 @@ Create a map
 Data can be an array
 
 ```erb
-<%= js_map [{latitude: 1.23, longitude: 4.56}] %>
+<%= js_map [{latitude: 37.7829, longitude: -122.4190}] %>
 ```
 
 Or a URL that returns JSON (same format as above)
@@ -160,7 +160,7 @@ Mapkick.options[:height] = "400px"
 
 ## Sinatra and Padrino
 
-Download [mapkick.bundle.js](https://raw.githubusercontent.com/ankane/mapkick/master/vendor/assets/javascripts/mapkick.js) and include it manually.
+Download [mapkick.bundle.js](https://raw.githubusercontent.com/ankane/mapkick/master/vendor/assets/javascripts/mapkick.bundle.js) and include it manually.
 
 ```html
 <script src="mapkick.bundle.js"></script>

data/lib/mapkick/version.rb

@@ -1,3 +1,3 @@
 module Mapkick
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/licenses/LICENSE-mapkick-bundle.txt

@@ -1,5 +1,5 @@
 ================================================================================
-Mapkick.js 0.2.1
+Mapkick.js 0.2.2
 ================================================================================
 
 Copyright (c) 2017-2023 Andrew Kane

data/vendor/assets/javascripts/mapkick.bundle.js

@@ -1,7 +1,7 @@
 /*
  * This bundle includes:
  *
- * Mapkick.js v0.2.1
+ * Mapkick.js v0.2.2
  * https://github.com/ankane/mapkick.js
  * MIT License
  *
@@ -262,7 +262,7 @@
 
   function createMarkerImage(library, color) {
     // set height to center vertically
-    var height = 71;
+    var height = 41;
     var width = 27;
     var scale = 2;
 
@@ -450,6 +450,8 @@
           properties.icon = options.defaultIcon || "mapkick";
         }
         properties.mapkickIconSize = properties.icon === "mapkick" ? 0.5 : 1;
+        properties.mapkickIconAnchor = properties.icon === "mapkick" ? "bottom" : "center";
+        properties.mapkickIconOffset = properties.icon === "mapkick" ? [0, 10] : [0, 0];
 
         geojson.features.push({
           type: "Feature",
@@ -515,6 +517,22 @@
 
       // use a symbol layer for markers for performance
       // https://docs.mapbox.com/help/getting-started/add-markers/#approach-1-adding-markers-inside-a-map
+      // use separate layers to prevent labels from overlapping markers
+      map.addLayer({
+        id: (name + "-text"),
+        source: name,
+        type: "symbol",
+        layout: {
+          "text-field": "{label}",
+          "text-size": 11,
+          "text-anchor": "top",
+          "text-offset": [0, 1]
+        },
+        paint: {
+          "text-halo-color": "rgba(255, 255, 255, 1)",
+          "text-halo-width": 1
+        }
+      });
       map.addLayer({
         id: name,
         source: name,
@@ -523,11 +541,8 @@
           "icon-image": "{icon}-15",
           "icon-allow-overlap": true,
           "icon-size": {type: "identity", property: "mapkickIconSize"},
-          "text-field": "{label}",
-          "text-size": 11,
-          "text-anchor": "top",
-          "text-offset": [0, 1],
-          "text-allow-overlap": true
+          "icon-anchor": {type: "identity", property: "mapkickIconAnchor"},
+          "icon-offset": {type: "identity", property: "mapkickIconOffset"}
         }
       });
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mapkick-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies: []
 description:
 email: andrew@ankane.org