Merge pull request #1 from rabrux/master

add avoidOuterPins support

README.md

@@ -50,6 +50,7 @@ const map = new DottedMap({
   countries: ['FRA'] // look into `countries.geo.json` to see which keys to use. You can also omit this parameter and the whole world will be used
   region: { lat: { min, max }, lng: { min, max } }, // if not present, it will fit the countries (and if no country is specified, the whole world)
   grid: 'vertical' | 'diagonal', // how points should be aligned
+  avoidOuterPins: false | true, // if it's true, prevent adding pins when they are outside of region/countries
 });
 
 // Add some points/change the color of existing points

index.d.ts

@@ -5,6 +5,7 @@ namespace DottedMapLib {
     countries?: string[];
     region?: { lat: { min: number; max: number }; lng: { min: number; max: number } };
     grid?: 'vertical' | 'diagonal';
+    avoidOuterPins?: false | true;
   }
 
   interface SvgOptions {

index.js

@@ -61,7 +61,7 @@ const computeGeojsonBox = (geojson) => {
   }
 };
 
-function DottedMap({ height = 0, width = 0, countries = [], region, grid = 'vertical' }) {
+function DottedMap({ height = 0, width = 0, countries = [], region, grid = 'vertical', avoidOuterPins = false }) {
   if (height <= 0 && width <= 0) {
     throw new Error('height or width is required');
   }
@@ -118,6 +118,10 @@ function DottedMap({ height = 0, width = 0, countries = [], region, grid = 'vert
   return {
     addPin({ lat, lng, data, svgOptions }) {
       const [googleX, googleY] = proj4(proj4.defs('GOOGLE'), [lng, lat]);
+      if (avoidOuterPins) {
+        const wgs84Point = proj4(proj4.defs('GOOGLE'), proj4.defs('WGS84'), [googleX, googleY])
+        if (!inside(wgs84Point, poly)) return;
+      }
       let [rawX, rawY] = [(width * (googleX - X_MIN)) / X_RANGE, (height * (Y_MAX - googleY)) / Y_RANGE];
       const y = Math.round(rawY / ystep);
       if (y % 2 === 0 && grid === 'diagonal') {