dotted-map 2.1.1 → 2.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotted-map",
-  "version": "2.1.1",
+  "version": "2.2.3",
   "description": "Create a SVG map filled with dots for the world or countries",
   "main": "./index.js",
   "exports": {
@@ -9,7 +9,8 @@
   },
   "module": "./src/with-countries.js",
   "scripts": {
-    "build": "webpack"
+    "build": "webpack",
+    "test": "node test.js"
   },
   "keywords": [
     "map",

package/src/without-countries.js

@@ -17,6 +17,14 @@ function DottedMapWithoutCountries({ map, avoidOuterPins = false }) {
 
   return {
     addPin({ lat, lng, data, svgOptions }) {
+      const pin = this.getPin({ lat, lng });
+      const point = { ...pin, data, svgOptions };
+
+      points[[point.x, point.y].join(';')] = point;
+
+      return point;
+    },
+    getPin({ lat, lng }) {
       const [googleX, googleY] = proj4(proj4.defs('GOOGLE'), [lng, lat]);
       if (avoidOuterPins) {
         const wgs84Point = proj4(proj4.defs('GOOGLE'), proj4.defs('WGS84'), [
@@ -39,11 +47,18 @@ function DottedMapWithoutCountries({ map, avoidOuterPins = false }) {
         localx += 0.5;
       }
 
-      const point = { x: localx, y: localy, data, svgOptions };
+      const [localLng, localLat] = proj4(
+        proj4.defs('GOOGLE'),
+        proj4.defs('WGS84'),
+        [
+          (localx * X_RANGE) / width + X_MIN,
+          Y_MAX - (localy * Y_RANGE) / height,
+        ],
+      );
 
-      points[[x, y].join(';')] = point;
+      const pin = { x: localx, y: localy, lat: localLat, lng: localLng };
 
-      return point;
+      return pin;
     },
     getPoints() {
       return Object.values(points);

package/without-countries.d.ts

@@ -44,6 +44,8 @@ namespace DottedMapWithoutCountriesLib {
   type Point = {
     x: number;
     y: number;
+    lat: number;
+    lng: number;
     data?: any;
     svgOptions?: SvgOptions;
   };
@@ -55,6 +57,9 @@ export default class DottedMapWithoutCountries {
   addPin(
     pin: DottedMapWithoutCountriesLib.Pin,
   ): DottedMapWithoutCountriesLib.Point;
+  getPin(
+    pin: DottedMapWithoutCountriesLib.Pin,
+  ): DottedMapWithoutCountriesLib.Point;
   getPoints(): DottedMapWithoutCountriesLib.Point[];
   getSVG(settings: DottedMapWithoutCountriesLib.SvgSettings): string;
   image: {

package/without-countries.js

@@ -1 +1 @@
-!function(o,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("proj4"),require("@turf/boolean-point-in-polygon")):"function"==typeof define&&define.amd?define(["proj4","@turf/boolean-point-in-polygon"],e):"object"==typeof exports?exports["dotted-map"]=e(require("proj4"),require("@turf/boolean-point-in-polygon")):o["dotted-map"]=e(o.proj4,o["@turf/boolean-point-in-polygon"])}(this,(function(o,e){return(()=>{"use strict";var t={620:o=>{o.exports=e},25:e=>{e.exports=o}},r={};function n(o){var e=r[o];if(void 0!==e)return e.exports;var i=r[o]={exports:{}};return t[o](i,i.exports,n),i.exports}n.n=o=>{var e=o&&o.__esModule?()=>o.default:()=>o;return n.d(e,{a:e}),e},n.d=(o,e)=>{for(var t in e)n.o(e,t)&&!n.o(o,t)&&Object.defineProperty(o,t,{enumerable:!0,get:e[t]})},n.o=(o,e)=>Object.prototype.hasOwnProperty.call(o,e),n.r=o=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(o,"__esModule",{value:!0})};var i={};return(()=>{n.r(i),n.d(i,{default:()=>a});var o=n(25),e=n.n(o),t=n(620),r=n.n(t);const a=function({map:o,avoidOuterPins:t=!1}){const{points:n,X_MIN:i,Y_MAX:a,X_RANGE:s,Y_RANGE:p,region:l,grid:u,width:d,height:c,ystep:f}=o;return{addPin({lat:o,lng:l,data:g,svgOptions:y}){const[v,b]=e()(e().defs("GOOGLE"),[l,o]);if(t){const o=e()(e().defs("GOOGLE"),e().defs("WGS84"),[v,b]);if(!r()(o,poly))return}let[j,x]=[d*(v-i)/s,c*(a-b)/p];const h=Math.round(x/f);h%2==0&&"diagonal"===u&&(j-=.5);const O=Math.round(j);let[m,$]=[O,Math.round(h)*f];h%2==0&&"diagonal"===u&&(m+=.5);const M={x:m,y:$,data:g,svgOptions:y};return n[[O,h].join(";")]=M,M},getPoints:()=>Object.values(n),getSVG:({shape:o="circle",color:e="current",backgroundColor:t="transparent",radius:r=.5})=>`<svg viewBox="0 0 ${d} ${c}" xmlns="http://www.w3.org/2000/svg" style="background-color: ${t}">\n        ${Object.values(n).map((({x:t,y:n,svgOptions:i={}})=>{const a=i.radius||r;if("circle"===o)return`<circle cx="${t}" cy="${n}" r="${a}" fill="${i.color||e}" />`;if("hexagon"===o){const o=Math.sqrt(3)*a;return`<polyline points="${[[t+o,n-a],[t+o,n+a],[t,n+2*a],[t-o,n+a],[t-o,n-a],[t,n-2*a]].map((o=>o.join(","))).join(" ")}" fill="${i.color||e}" />`}})).join("\n")}\n      </svg>`,image:{region:l,width:d,height:c}}}})(),i})()}));
+!function(o,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("proj4"),require("@turf/boolean-point-in-polygon")):"function"==typeof define&&define.amd?define(["proj4","@turf/boolean-point-in-polygon"],e):"object"==typeof exports?exports["dotted-map"]=e(require("proj4"),require("@turf/boolean-point-in-polygon")):o["dotted-map"]=e(o.proj4,o["@turf/boolean-point-in-polygon"])}(this,(function(o,e){return(()=>{"use strict";var t={620:o=>{o.exports=e},25:e=>{e.exports=o}},n={};function r(o){var e=n[o];if(void 0!==e)return e.exports;var i=n[o]={exports:{}};return t[o](i,i.exports,r),i.exports}r.n=o=>{var e=o&&o.__esModule?()=>o.default:()=>o;return r.d(e,{a:e}),e},r.d=(o,e)=>{for(var t in e)r.o(e,t)&&!r.o(o,t)&&Object.defineProperty(o,t,{enumerable:!0,get:e[t]})},r.o=(o,e)=>Object.prototype.hasOwnProperty.call(o,e),r.r=o=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(o,"__esModule",{value:!0})};var i={};return(()=>{r.r(i),r.d(i,{default:()=>a});var o=r(25),e=r.n(o),t=r(620),n=r.n(t);const a=function({map:o,avoidOuterPins:t=!1}){const{points:r,X_MIN:i,Y_MAX:a,X_RANGE:s,Y_RANGE:l,region:p,grid:u,width:d,height:c,ystep:f}=o;return{addPin({lat:o,lng:e,data:t,svgOptions:n}){const i={...this.getPin({lat:o,lng:e}),data:t,svgOptions:n};return r[[i.x,i.y].join(";")]=i,i},getPin({lat:o,lng:r}){const[p,g]=e()(e().defs("GOOGLE"),[r,o]);if(t){const o=e()(e().defs("GOOGLE"),e().defs("WGS84"),[p,g]);if(!n()(o,poly))return}let[y,v]=[d*(p-i)/s,c*(a-g)/l];const b=Math.round(v/f);b%2==0&&"diagonal"===u&&(y-=.5);const j=Math.round(y);let[x,O]=[j,Math.round(b)*f];b%2==0&&"diagonal"===u&&(x+=.5);const[h,m]=e()(e().defs("GOOGLE"),e().defs("WGS84"),[x*s/d+i,a-O*l/c]);return{x,y:O,lat:m,lng:h}},getPoints:()=>Object.values(r),getSVG:({shape:o="circle",color:e="current",backgroundColor:t="transparent",radius:n=.5})=>`<svg viewBox="0 0 ${d} ${c}" xmlns="http://www.w3.org/2000/svg" style="background-color: ${t}">\n        ${Object.values(r).map((({x:t,y:r,svgOptions:i={}})=>{const a=i.radius||n;if("circle"===o)return`<circle cx="${t}" cy="${r}" r="${a}" fill="${i.color||e}" />`;if("hexagon"===o){const o=Math.sqrt(3)*a;return`<polyline points="${[[t+o,r-a],[t+o,r+a],[t,r+2*a],[t-o,r+a],[t-o,r-a],[t,r-2*a]].map((o=>o.join(","))).join(" ")}" fill="${i.color||e}" />`}})).join("\n")}\n      </svg>`,image:{region:p,width:d,height:c}}}})(),i})()}));