Changeset 1980356 for leaflet-map

Timestamp:

11/26/2018 04:15:02 AM (7 years ago)

Author:

bozdoz

Message:

v2.11.5 assumed booleans and maxbounds

Location:

leaflet-map

Files:

• tags/2.11.5 (copied) (copied from leaflet-map/trunk)
• tags/2.11.5/CODE_OF_CONDUCT.md (copied) (copied from leaflet-map/trunk/CODE_OF_CONDUCT.md)
• tags/2.11.5/CONTRIBUTING.md (copied) (copied from leaflet-map/trunk/CONTRIBUTING.md)
• tags/2.11.5/LICENSE (copied) (copied from leaflet-map/trunk/LICENSE)
• tags/2.11.5/README.md (copied) (copied from leaflet-map/trunk/README.md) (16 diffs)
• tags/2.11.5/class.admin.php (copied) (copied from leaflet-map/trunk/class.admin.php)
• tags/2.11.5/class.geocoder.php (copied) (copied from leaflet-map/trunk/class.geocoder.php)
• tags/2.11.5/class.leaflet-map.php (copied) (copied from leaflet-map/trunk/class.leaflet-map.php)
• tags/2.11.5/class.plugin-option.php (copied) (copied from leaflet-map/trunk/class.plugin-option.php)
• tags/2.11.5/class.plugin-settings.php (copied) (copied from leaflet-map/trunk/class.plugin-settings.php)
• tags/2.11.5/images (copied) (copied from leaflet-map/trunk/images)
• tags/2.11.5/index.php (copied) (copied from leaflet-map/trunk/index.php)
• tags/2.11.5/languages (copied) (copied from leaflet-map/trunk/languages)
• tags/2.11.5/leaflet-map.php (copied) (copied from leaflet-map/trunk/leaflet-map.php) (2 diffs)
• tags/2.11.5/readme.txt (copied) (copied from leaflet-map/trunk/readme.txt) (4 diffs)
• tags/2.11.5/scripts (copied) (copied from leaflet-map/trunk/scripts)
• tags/2.11.5/scripts/construct-leaflet-map.js (copied) (copied from leaflet-map/trunk/scripts/construct-leaflet-map.js)
• tags/2.11.5/scripts/construct-leaflet-map.min.js (copied) (copied from leaflet-map/trunk/scripts/construct-leaflet-map.min.js)
• tags/2.11.5/scripts/get-shortcode.js (deleted)
• tags/2.11.5/scripts/get-shortcode.min.js (deleted)
• tags/2.11.5/scripts/leaflet-svg-icon.js (modified) (1 diff)
• tags/2.11.5/scripts/leaflet-svg-icon.min.js (modified) (1 diff)
• tags/2.11.5/scripts/shortcode-helper.js (copied) (copied from leaflet-map/trunk/scripts/shortcode-helper.js)
• tags/2.11.5/scripts/shortcode-helper.min.js (copied) (copied from leaflet-map/trunk/scripts/shortcode-helper.min.js)
• tags/2.11.5/shortcodes (copied) (copied from leaflet-map/trunk/shortcodes)
• tags/2.11.5/shortcodes/class.circle-shortcode.php (copied) (copied from leaflet-map/trunk/shortcodes/class.circle-shortcode.php)
• tags/2.11.5/shortcodes/class.geojson-shortcode.php (copied) (copied from leaflet-map/trunk/shortcodes/class.geojson-shortcode.php)
• tags/2.11.5/shortcodes/class.image-shortcode.php (copied) (copied from leaflet-map/trunk/shortcodes/class.image-shortcode.php) (1 diff)
• tags/2.11.5/shortcodes/class.line-shortcode.php (copied) (copied from leaflet-map/trunk/shortcodes/class.line-shortcode.php)
• tags/2.11.5/shortcodes/class.map-shortcode.php (copied) (copied from leaflet-map/trunk/shortcodes/class.map-shortcode.php) (4 diffs)
• tags/2.11.5/shortcodes/class.marker-shortcode.php (copied) (copied from leaflet-map/trunk/shortcodes/class.marker-shortcode.php)
• tags/2.11.5/shortcodes/class.shortcode.php (modified) (1 diff)
• tags/2.11.5/style.css (copied) (copied from leaflet-map/trunk/style.css)
• tags/2.11.5/templates (copied) (copied from leaflet-map/trunk/templates)
• tags/2.11.5/templates/shortcode-helper.php (copied) (copied from leaflet-map/trunk/templates/shortcode-helper.php) (5 diffs)
• trunk/README.md (modified) (16 diffs)
• trunk/leaflet-map.php (modified) (2 diffs)
• trunk/readme.txt (modified) (4 diffs)
• trunk/scripts/leaflet-svg-icon.js (modified) (1 diff)
• trunk/scripts/leaflet-svg-icon.min.js (modified) (1 diff)
• trunk/shortcodes/class.image-shortcode.php (modified) (1 diff)
• trunk/shortcodes/class.map-shortcode.php (modified) (4 diffs)
• trunk/shortcodes/class.shortcode.php (modified) (1 diff)
• trunk/templates/shortcode-helper.php (modified) (5 diffs)

leaflet-map/tags/2.11.5/README.md

@@ -1 @@
-Leaflet Map WordPress Plugin
-========
+# Leaflet Map WordPress Plugin
 
 ![Leaflet](https://img.shields.io/badge/leaflet-1.3.4-green.svg?style=flat)
-![WordPress](https://img.shields.io/badge/wordpress-4.9.8-green.svg?style=flat)
+![WordPress](https://img.shields.io/badge/wordpress-5.0-green.svg?style=flat)
 
 ![Header Image](https://ps.w.org/leaflet-map/assets/banner-1544x500.png?rev=1693083)
 
-Add a map generated with [LeafletJS](http://leafletjs.com/): an open-source JavaScript library for mobile-friendly interactive maps. Map tiles are provided by default through [OpenStreetMap](http://www.openstreetmap.org/), or [MapQuest](https://www.mapquest.ca/) (with an app key).  Can be set per map with shortcode attributes or through the dashboard settings.
+Add a map generated with [LeafletJS](http://leafletjs.com/): an open-source JavaScript library for mobile-friendly interactive maps. Map tiles are provided by default through [OpenStreetMap](http://www.openstreetmap.org/), or [MapQuest](https://www.mapquest.ca/) (with an app key). Can be set per map with shortcode attributes or through the dashboard settings.
 
 ![Admin Screenshot](https://imgur.com/W4BGTif.jpg)
 
-Installation
-------------
-
-* (simple) Install via the WordPress plugins page on your WordPress site: `/wp-admin/plugin-install.php` (search Leaflet)
-
-* (needlessly complicated) Copy this repo (or download a release of it) into your WordPress plugins directory: `/wp-content/plugins/`. You might also need to name the directory 'leaflet-map', like so: `git clone https://github.com/bozdoz/wp-plugin-leaflet-map.git leaflet-map`
-
-General Usage
--------------
+## Installation
+
+- (simple) Install via the WordPress plugins page on your WordPress site: `/wp-admin/plugin-install.php` (search Leaflet)
+
+- (needlessly complicated) Copy this repo (or download a release of it) into your WordPress plugins directory: `/wp-content/plugins/`. You might also need to name the directory 'leaflet-map', like so: `git clone https://github.com/bozdoz/wp-plugin-leaflet-map.git leaflet-map`
+
+## General Usage
 
 ```
@@ -35 +32 @@
 ```
 
-You can have SVG markers, add shapes, geojson, kml, images, and more!  See available shortcodes below.
-
-Developing
-----------
-
-This plugin uses Docker for development.  Simply 1. [install Docker](https://www.docker.com/get-started), 2. fork/clone the repo, and 3. execute this command from the repo's root directory in your terminal:
+You can have SVG markers, add shapes, geojson, kml, images, and more! See available shortcodes below.
+
+## Developing
+
+This plugin uses Docker for development. Simply 1. [install Docker](https://www.docker.com/get-started), 2. fork/clone the repo, and 3. execute this command from the repo's root directory in your terminal:
 
 ```bash
@@ -55 +51 @@
 You can also use these NPM scripts to interact with Docker, if you make changes to Docker-related files:
 
-To start: 
+To start:
 
 ```bash
@@ -69 +65 @@
 That's all for now! Thanks!
 
-Available Shortcodes
---------------------
+## Available Shortcodes
 
 ### [leaflet-map]
@@ -76 +71 @@
 ![Alternate map tiles](https://imgur.com/oURcNiX.jpg)
 
-Height, width, latitude, longitude and zoom are the basic attributes: 
+Height, width, latitude, longitude and zoom are the basic attributes:
 
 ```
@@ -90 +85 @@
 #### [leaflet-map] Options:
 
-Option | Default
---- | ---
-`lat` and `lng` or `address` | lat: 44.67, lng: -63.61
-`zoom` | 12
-`height` | 250
-`width` | 100%
-`fit_markers` | 0 (false)
-`zoomcontrol` | 0 (false)
-`scrollwheel` | 0 (false)
-`doubleclickzoom` | 0 (false)
-`min_zoom` | 0
-`max_zoom` | 20
-`subdomains` | abc
-`attribution` | ©Leaflet ©OpenStreetMap
-`closepopuponclick` | false
-`trackresize` | false
-`boxzoom` | true
-`dragging` | true
-`keyboard` | true
+| Option                       | Default                 |
+| ---------------------------- | ----------------------- |
+| `lat` and `lng` or `address` | lat: 44.67, lng: -63.61 |
+| `zoom`                       | 12                      |
+| `height`                     | 250                     |
+| `width`                      | 100%                    |
+| `fit_markers`                | 0 (false)               |
+| `zoomcontrol`                | 0 (false)               |
+| `scrollwheel`                | 0 (false)               |
+| `doubleclickzoom`            | 0 (false)               |
+| `min_zoom`                   | 0                       |
+| `max_zoom`                   | 20                      |
+| `subdomains`                 | abc                     |
+| `attribution`                | ©Leaflet ©OpenStreetMap |
+| `closepopuponclick`          | false                   |
+| `trackresize`                | false                   |
+| `boxzoom`                    | true                    |
+| `dragging`                   | true                    |
+| `keyboard`                   | true                    |
 
 ---
@@ -116 +111 @@
 Much the same as leaflet-map above, but uses `src` for the source image.
 
-TBH, it's a huge mess, and probably shouldn't be used.  It might make a good image viewer with optional marker highlight points.  It requires far too much manual work at the moment.  Recommended usage:
+TBH, it's a huge mess, and probably shouldn't be used. It might make a good image viewer with optional marker highlight points. It requires far too much manual work at the moment. Recommended usage:
 
 ```
 [leaflet-image src="path/to/img.jpg" zoom=1]
-[leaflet-marker draggable=1]
+[leaflet-marker draggable]
 ```
 
@@ -127 +122 @@
 #### [leaflet-image] Options:
 
-Option | Default
---- | ---
-`src` | https://lorempixel.com/1000/1000/
-`zoom` | 12
-`height` | 250
-`width` | 100%
-`fit_markers` | 0 (false)
-`zoomcontrol` | 0 (false)
-`scrollwheel` | 0 (false)
-`doubleclickzoom` | 0 (false)
-`min_zoom` | 0
-`max_zoom` | 20
-`attribution` | ©Leaflet ©OpenStreetMap
+| Option            | Default                          |
+| ----------------- | -------------------------------- |
+| `src`             | https://picsum.photos/1000/1000/ |
+| `zoom`            | 12                               |
+| `height`          | 250                              |
+| `width`           | 100%                             |
+| `fit_markers`     | 0 (false)                        |
+| `zoomcontrol`     | 0 (false)                        |
+| `scrollwheel`     | 0 (false)                        |
+| `doubleclickzoom` | 0 (false)                        |
+| `min_zoom`        | 0                                |
+| `max_zoom`        | 20                               |
+| `attribution`     | ©Leaflet ©OpenStreetMap          |
 
 ---
@@ -147 +142 @@
 ![Markers with HTML within a popup](https://imgur.com/ap38lwe.jpg)
 
-Add a marker to any map by adding `[leaflet-marker]` after any `[leaflet-map]` shortcode.  You can adjust the lat/lng in the same way, as well as some other basic functionality (popup message, draggable, visible on load).  Also, if you want to add a link to a marker popup, use `[leaflet-marker]Message here: click here[/leaflet-marker]` and add a link like you normally would with the WordPress editor.
+Add a marker to any map by adding `[leaflet-marker]` after any `[leaflet-map]` shortcode. You can adjust the lat/lng in the same way, as well as some other basic functionality (popup message, draggable, visible on load). Also, if you want to add a link to a marker popup, use `[leaflet-marker]Message here: click here[/leaflet-marker]` and add a link like you normally would with the WordPress editor.
 
 #### [leaflet-marker] Options:
 
-Option | Usage
---- | ---
-`lat` and `lng` or `address` | Location on the map; defaults to map center; `lat`/`lng` are floats, `address` is a string
-`draggable` | Make a marker draggable (`boolean`); default `false`
-`title` | Add a hover-over message to your marker (different than popup)
-`alt` | Add an alt text to the marker image
-`zindexoffset` | Define the z-index for the marker image
-`opacity` | Define the css opacity for the marker image
-`iconurl` | Give a url for the marker image file
-`iconsize` | Set the size of the icon: e.g. "80,50" for 80px width 50px height 
-`iconanchor` | Set the anchor position of the icon: e.g. "40,60" for 40px left 60px top
-`shadowurl` | Give a url for the marker shadow image file
-`shadowsize` | Set the size of the shadow: e.g. "80,50" for 80px width 50px height 
-`shadowanchor` | Set the anchor position of the shadow: e.g. "40,60" for 40px left 60px top
-`popupanchor` | Set the anchor position of the popup: e.g. "40,60" for 40px left 60px top
-`svg` | Boolean for whether the marker should be created as an svg: default `false`
-`background` | Background color for an SVG marker (above)
-`color` | color of the SVG marker (above)
-`iconclass` | className for the marker image
+| Option                       | Usage                                                                                      |
+| ---------------------------- | ------------------------------------------------------------------------------------------ |
+| `lat` and `lng` or `address` | Location on the map; defaults to map center; `lat`/`lng` are floats, `address` is a string |
+| `draggable`                  | Make a marker draggable (`boolean`); default `false`                                       |
+| `title`                      | Add a hover-over message to your marker (different than popup)                             |
+| `alt`                        | Add an alt text to the marker image                                                        |
+| `zindexoffset`               | Define the z-index for the marker image                                                    |
+| `opacity`                    | Define the css opacity for the marker image                                                |
+| `iconurl`                    | Give a url for the marker image file                                                       |
+| `iconsize`                   | Set the size of the icon: e.g. "80,50" for 80px width 50px height                          |
+| `iconanchor`                 | Set the anchor position of the icon: e.g. "40,60" for 40px left 60px top                   |
+| `shadowurl`                  | Give a url for the marker shadow image file                                                |
+| `shadowsize`                 | Set the size of the shadow: e.g. "80,50" for 80px width 50px height                        |
+| `shadowanchor`               | Set the anchor position of the shadow: e.g. "40,60" for 40px left 60px top                 |
+| `popupanchor`                | Set the anchor position of the popup: e.g. "40,60" for 40px left 60px top                  |
+| `svg`                        | Boolean for whether the marker should be created as an svg: default `false`                |
+| `background`                 | Background color for an SVG marker (above)                                                 |
+| `color`                      | color of the SVG marker (above)                                                            |
+| `iconclass`                  | className for the marker image                                                             |
 
 ---
@@ -179 +174 @@
 Add a line to the map by adding `[leaflet-line]`. You can specify the postions with a list separated by semi-colon `;` or bar `|` using lat/lng: `[leaflet-line latlngs="41, 29; 44, 18"]` or addresses: `[leaflet-line addresses="Istanbul; Sarajevo"]`, or x/y coordinates for image maps.
 
-Add a popup to the line by adding text to the content of the shortcode: 
+Add a popup to the line by adding text to the content of the shortcode:
 
 `[leaflet-line addresses="new york; chicago"]New York to Chicago[/leaflet-line]`
@@ -185 +180 @@
 #### [leaflet-line] Options
 
-Option | Usage
---- | ---
-`addresses`, `latlngs`, or `coordinates` | For geocoded addresses, latitude/longitude, or x/y coordinates for Image Maps (see [leaflet-image]); ex: `[leaflet-line latlngs="41, 29; 44, 18"]` or addresses: `[leaflet-line addresses="Istanbul; Sarajevo"]`
-`fitbounds` | Fit the map to the bounds of the line (instead of whatever center you gave the map originally)
+| Option                                   | Usage                                                                                                                                                                                      |
+| ---------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `addresses`, `latlngs`, or `coordinates` | For geocoded addresses, latitude/longitude, or x/y coordinates for Image Maps; ex: `[leaflet-line latlngs="41, 29; 44, 18"]` or addresses: `[leaflet-line addresses="Istanbul; Sarajevo"]` |
+| `fitbounds`                              | Fit the map to the bounds of the line (instead of whatever center you gave the map originally)                                                                                             |
 
 And the following Shape Options. See https://leafletjs.com/reference-1.3.4.html#path for details.
@@ -196 +191 @@
 
 ---
+
 ### [leaflet-circle]
 
@@ -204 +200 @@
 #### [leaflet-circle] Options
 
-Options | Usage 
---- | ---
-`address`, `lat/lng`, or `x/y` | For geocoded addresses, latitude/longitude, or x/y coordinates for Image Maps (see [leaflet-image]); ex: `[leaflet-circle lat=52 lng=5]` or addresses: `[leaflet-circle address="Amsterdam"]`
-`fitbounds` | Fit the map to the bounds of the circle (instead of whatever center you gave the map originally)
-radius | Radius of the circle in meters
-
-Includes all style options: See https://leafletjs.com/reference-1.3.4.html#path 
+| Options                        | Usage                                                                                                                                                                                         |
+| ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `address`, `lat/lng`, or `x/y` | For geocoded addresses, latitude/longitude, or x/y coordinates for Image Maps (see [leaflet-image]); ex: `[leaflet-circle lat=52 lng=5]` or addresses: `[leaflet-circle address="Amsterdam"]` |
+| `fitbounds`                    | Fit the map to the bounds of the circle (instead of whatever center you gave the map originally)                                                                                              |
+| radius                         | Radius of the circle in meters                                                                                                                                                                |
+
+Includes all style options: See https://leafletjs.com/reference-1.3.4.html#path
 
 ### [leaflet-geojson]
@@ -216 +212 @@
 [![Random GeoJSON created by me](https://imgur.com/fJktgtI.jpg)](https://gist.github.com/bozdoz/064a7101b95a324e8852fe9381ab9a18)
 
-Or you can add a geojson shape via a url: 
+Or you can add a geojson shape via a url:
 
 ```
@@ -224 +220 @@
 #### [leaflet-geojson] Options
 
-Option | Usage
---- | ---
-`src` | Source of the geojson file
+| Option | Usage                      |
+| ------ | -------------------------- |
+| `src`  | Source of the geojson file |
 
 ### [leaflet-kml]
@@ -232 +228 @@
 Same idea as geojson (above), but takes KML files and loads [Mapbox's togeojson library](https://github.com/mapbox/togeojson)
 
-Contributing
--------------
+## Contributing
 
 [View Contribution guidelines](https://github.com/bozdoz/wp-plugin-leaflet-map/blob/master/CONTRIBUTING.md)
 
-Wish List
----------
-
-* A map editor/shortcode generator (so users can see what they're adding to the page)
+## Wish List
+
+- A map editor/shortcode generator (so users can see what they're adding to the page)

leaflet-map/tags/2.11.5/leaflet-map.php

@@ -9 +9 @@
  * Text Domain: leaflet-map
  * Domain Path: /languages/
- * Version: 2.11.4
+ * Version: 2.11.5
  * License: GPL2
  * Leaflet Map is free software: you can redistribute it and/or modify
@@ -30 +30 @@
 }
 
-define('LEAFLET_MAP__PLUGIN_VERSION', '2.11.4');
+define('LEAFLET_MAP__PLUGIN_VERSION', '2.11.5');
 define('LEAFLET_MAP__PLUGIN_FILE', __FILE__);
 define('LEAFLET_MAP__PLUGIN_DIR', plugin_dir_path(__FILE__));

leaflet-map/tags/2.11.5/readme.txt

@@ -7 +7 @@
 Tags: leaflet, map, mobile, javascript, openstreetmap, mapquest, interactive
 Requires at least: 3.0.1
-Tested up to: 4.9.8
-Version: 2.11.4
-Stable tag: 2.11.4
+Tested up to: 5.0
+Version: 2.11.5
+Stable tag: 2.11.5
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -70 +70 @@
 = Can I have an SVG Marker? =
 
-Yes! Convert the default marker into an svg with a shortcode like this: `[leaflet-marker svg="true" color="white" iconClass="fab fa-wordpress-simple" background="red"]` The `iconClass` is perfect for adding a [font-awesome](https://fontawesome.com/icons?d=gallery) icon.
+Yes! Convert the default marker into an svg with a shortcode like this: `[leaflet-marker svg color="white" iconClass="fab fa-wordpress-simple" background="red"]` The `iconClass` is perfect for adding a [font-awesome](https://fontawesome.com/icons?d=gallery) icon.
 
 = How do I change the style for lines/geojson? =
@@ -92 +92 @@
 = Can I add a message to a marker? =
 
-Yes: `[leaflet-marker message="Hello there!" visible="true"]`, where visible designates if it is visible on page load. Otherwise it is only visible when clicked.
+Yes: `[leaflet-marker message="Hello there!" visible]`, where visible designates if it is visible on page load. Otherwise it is only visible when clicked.
 
 = Can I use your plugin with a picture instead of a map? =
@@ -119 +119 @@
 2. See the shortcode play out on the front end.
 3. For `[leaflet-image]` upload an image, and copy the URL from the right-hand side
-4. For `[leaflet-image]` paste that image URL into an attribute titled `source`: example: `src="http://lorempixel.com/1000/1000/"`.
+4. For `[leaflet-image]` paste that image URL into an attribute titled `source`: example: `src="https://picsum.photos/1000/1000/"`.
 5. See the `[leaflet-image]` on the front end.
-6. If you use `[leaflet-marker draggable=true]`, then you can drag the marker where you want it, open a developers console, and see the specific shortcode to use.
+6. If you use `[leaflet-marker draggable]`, then you can drag the marker where you want it, open a developers console, and see the specific shortcode to use.
 7. Add geojson via URL: `[leaflet-geojson src="https://example.com/path/to.geojson"]`
 8. MapQuest requires an app key, get it from their website; alternatively, you can use OpenStreetMap as a free tile service (remember to add an attribution where necessary).
 
 == Changelog ==
+
+= 2.11.5 =
+* Added assumed-boolean attributes to all shortcodes; ex: `[leaflet-marker draggable svg]` would be the same as `[leaflet-marker draggable=1 svg=1]`
 
 = 2.11.4 =

leaflet-map/tags/2.11.5/scripts/leaflet-svg-icon.js

@@ -1 +1 @@
 L.SVGIcon = L.Icon.extend({
-    options: {
-        iconSize: [26, 42],
-        popupAnchor: [1, -42],
-        tooltipAnchor: [16, -28],
-        iconClass: '',
-        background: '#2b82cb',
-        color: 'white'
-    },
-    createIcon: function (oldIcon) {
-        var div = (oldIcon && oldIcon.tagName === 'DIV') ? 
-            oldIcon : document.createElement('div');
-        var options = this.options;
-        var size = options.iconSize;
-        var x = size[0];
-        var y = size[1];
+  options: {
+    iconSize: [26, 42],
+    popupAnchor: [1, -42],
+    tooltipAnchor: [16, -28],
+    iconClass: '',
+    background: '#2b82cb',
+    color: 'white'
+  },
+  createIcon: function(oldIcon) {
+    var div =
+      oldIcon && oldIcon.tagName === 'DIV'
+        ? oldIcon
+        : document.createElement('div')
+    var options = this.options
+    var size = options.iconSize
+    var x = size[0]
+    var y = size[1]
 
-        var svgCreate = function svgCreate (tag, attrs) {
-            var el = document.createElementNS('http://www.w3.org/2000/svg', tag);
-            for (var k in attrs) {
-                el.setAttribute(k, attrs[k]);
-            }
-            return el;
-        };
+    var svgCreate = function svgCreate(tag, attrs) {
+      var el = document.createElementNS('http://www.w3.org/2000/svg', tag)
+      for (var k in attrs) {
+        el.setAttribute(k, attrs[k])
+      }
+      return el
+    }
 
-        var svg = svgCreate('svg', {
-            viewBox: '0 0 365 560'
-        });
-        
-        var path = svgCreate('path', {
-            fill: this.options.background,
-            d: 'M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,' +
-                '283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9' +
-                'C96.3,7.9,7.5,64.5,7.5,194.6c0,88.4,175.3,357.4,' +
-                '175.3,357.4S182.9,551.7,182.9,551.7z'
-        });
-        
-        svg.appendChild(path);
-        div.appendChild(svg);
-        
-        div.setAttribute('style', 'margin-left: ' + (-x/2) + 'px;' +
-            'margin-top: ' + -y + 'px;' +
-            'width: ' + x + 'px;' +
-            'height: ' + y + 'px;' 
-        );
+    var svg = svgCreate('svg', {
+      viewBox: '0 0 365 560'
+    })
 
-        // add icon
-        var i = document.createElement('i');
-        i.className = this.options.iconClass;
-        i.setAttribute('style', 'position:absolute;' +
-            'top: 34%;' +
-            'left: 50%;' +
-            'transform: translate3d(-50%, -34%, 0);' +
-            'color: ' + (this.options.color) + ';' +
-            'line-height: 0;'
-        );
-        div.appendChild(i);
+    var path = svgCreate('path', {
+      fill: this.options.background,
+      d:
+        'M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,' +
+        '283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9' +
+        'C96.3,7.9,7.5,64.5,7.5,194.6c0,88.4,175.3,357.4,' +
+        '175.3,357.4S182.9,551.7,182.9,551.7z'
+    })
 
-        return div;
-    }
-});
+    svg.appendChild(path)
+    div.appendChild(svg)
+
+    div.setAttribute(
+      'style',
+      'margin-left: ' +
+        -x / 2 +
+        'px;' +
+        'margin-top: ' +
+        -y +
+        'px;' +
+        'width: ' +
+        x +
+        'px;' +
+        'height: ' +
+        y +
+        'px;'
+    )
+
+    // add icon
+    var i = document.createElement('i')
+    i.className = this.options.iconClass
+    i.setAttribute(
+      'style',
+      'position:absolute;' +
+        'top: 20%;' +
+        'left: 50%;' +
+        'transform: translate3d(-50%, -20%, 0);' +
+        'color: ' +
+        this.options.color +
+        ';' +
+        'line-height: 0;' +
+        'display: flex;' +
+        'justify-content: center;' +
+        'align-items: center;'
+    )
+    div.appendChild(i)
+
+    return div
+  }
+})
 
 L.SVGMarker = L.Marker.extend({
-    initialize: function (latlng, options) {
-        options = options || {};
-        var svg_options = L.extend({},
-            L.SVGIcon.prototype.options, 
-            options
-        );
-        options.icon = new L.SVGIcon( svg_options );
-        L.Marker.prototype.initialize.call(this, latlng, options);
-    }
-});
+  initialize: function(latlng, options) {
+    options = options || {}
+    var svg_options = L.extend({}, L.SVGIcon.prototype.options, options)
+    options.icon = new L.SVGIcon(svg_options)
+    L.Marker.prototype.initialize.call(this, latlng, options)
+  }
+})

leaflet-map/tags/2.11.5/scripts/leaflet-svg-icon.min.js

@@ -1 @@
-L.SVGIcon=L.Icon.extend({options:{iconSize:[26,42],popupAnchor:[1,-42],tooltipAnchor:[16,-28],iconClass:"",background:"#2b82cb",color:"white"},createIcon:function(t){var e=t&&"DIV"===t.tagName?t:document.createElement("div"),o=this.options.iconSize,i=o[0],n=o[1],r=function(t,e){var o=document.createElementNS("http://www.w3.org/2000/svg",t);for(var i in e)o.setAttribute(i,e[i]);return o},a=r("svg",{viewBox:"0 0 365 560"}),c=r("path",{fill:this.options.background,d:"M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9C96.3,7.9,7.5,64.5,7.5,194.6c0,88.4,175.3,357.4,175.3,357.4S182.9,551.7,182.9,551.7z"});a.appendChild(c),e.appendChild(a),e.setAttribute("style","margin-left: "+-i/2+"px;margin-top: "+-n+"px;width: "+i+"px;height: "+n+"px;");var p=document.createElement("i");return p.className=this.options.iconClass,p.setAttribute("style","position:absolute;top: 34%;left: 50%;transform: translate3d(-50%, -34%, 0);color: "+this.options.color+";line-height: 0;"),e.appendChild(p),e}}),L.SVGMarker=L.Marker.extend({initialize:function(t,e){e=e||{};var o=L.extend({},L.SVGIcon.prototype.options,e);e.icon=new L.SVGIcon(o),L.Marker.prototype.initialize.call(this,t,e)}});
+L.SVGIcon=L.Icon.extend({options:{iconSize:[26,42],popupAnchor:[1,-42],tooltipAnchor:[16,-28],iconClass:"",background:"#2b82cb",color:"white"},createIcon:function(t){var e=t&&"DIV"===t.tagName?t:document.createElement("div"),n=this.options.iconSize,o=n[0],i=n[1],r=function(t,e){var n=document.createElementNS("http://www.w3.org/2000/svg",t);for(var o in e)n.setAttribute(o,e[o]);return n},c=r("svg",{viewBox:"0 0 365 560"}),a=r("path",{fill:this.options.background,d:"M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9C96.3,7.9,7.5,64.5,7.5,194.6c0,88.4,175.3,357.4,175.3,357.4S182.9,551.7,182.9,551.7z"});c.appendChild(a),e.appendChild(c),e.setAttribute("style","margin-left: "+-o/2+"px;margin-top: "+-i+"px;width: "+o+"px;height: "+i+"px;");var s=document.createElement("i");return s.className=this.options.iconClass,s.setAttribute("style","position:absolute;top: 20%;left: 50%;transform: translate3d(-50%, -20%, 0);color: "+this.options.color+";line-height: 0;display: flex;justify-content: center;align-items: center;"),e.appendChild(s),e}}),L.SVGMarker=L.Marker.extend({initialize:function(t,e){e=e||{};var n=L.extend({},L.SVGIcon.prototype.options,e);e.icon=new L.SVGIcon(n),L.Marker.prototype.initialize.call(this,t,e)}});

leaflet-map/tags/2.11.5/shortcodes/class.image-shortcode.php

@@ -39 +39 @@
         /* only required field for image map (src/source) */
         $src = empty($src) ? '' : $src;
-        $source = empty($source) ? 'https://lorempixel.com/1000/1000/' : $source;
+        $source = empty($source) ? 'https://picsum.photos/1000/1000/' : $source;
         $source = empty($src) ? $source : $src;
 

leaflet-map/tags/2.11.5/shortcodes/class.map-shortcode.php

@@ -55 +55 @@
      *
      * @param array|string $atts    key value pairs from shortcode 
-     * @param string       $content inner text in shortcode
      * 
      * @return array new atts, which is actually an array
      */
-    protected function getAtts($atts='', $content=null)
+    protected function getAtts($atts='')
     {
         $atts = (array) $atts;
@@ -88 +87 @@
         $atts['width'] .= is_numeric($atts['width']) ? 'px' : '';   
 
+        // maxbounds as string: maxbounds="50, -114; 52, -112"
+        $maxBounds = isset($maxbounds) ? $maxbounds : null;
+
+        if ($maxBounds) {
+            try {
+                // explode by semi-colons and commas
+                $maxBounds = preg_split("[;|,]", $maxBounds);
+                print_r($maxBounds);
+                $maxBounds = array(
+                    array(
+                        $maxBounds[0], $maxBounds[1]
+                    ),
+                    array(
+                        $maxBounds[2], $maxBounds[3]
+                    )
+                );
+                print_r($maxBounds);
+            } catch (Exception $e) {
+                $maxBounds = null;
+            }
+        }
+
         /* 
         need to allow 0 or empty for removal of attribution 
@@ -103 +124 @@
             'boxZoom' => isset($boxzoom) ? $boxzoom : null,
             'dragging' => isset($dragging) ? $dragging : null,
-            'keyboard' => isset($keyboard) ? $keyboard : null
+            'keyboard' => isset($keyboard) ? $keyboard : null,
         );
-        
+
         // filter out nulls
         $more_options = $this->LM->filter_null($more_options);
@@ -111 +132 @@
         // change string booleans to booleans
         $more_options = filter_var_array($more_options, FILTER_VALIDATE_BOOLEAN);
+
+        if ($maxBounds) {
+            $more_options['maxBounds'] = $maxBounds;
+        }
 
         // wrap as JSON

leaflet-map/tags/2.11.5/shortcodes/class.shortcode.php

@@ -40 +40 @@
      * Instantiate class and get HTML for shortcode
      *
-     * @param array  $atts    string
+     * @param array  $atts    string|array
      * @param string $content Optional
      * 
      * @return string (see above)
      */
-    public static function shortcode($atts, $content = null)
+    public static function shortcode($atts = '', $content = null)
     {
         $class = self::getClass();
-        $instance = new $class($atts, $content);
+        $instance = new $class();
+
+        // swap sequential array with associative array
+        // this enables assumed-boolean attributes,
+        // like: [leaflet-marker draggable svg]
+        // meaning draggable=1 svg=1
+        if (!empty($atts)) {
+            foreach($atts as $k => $v) {
+                if (is_numeric($k) && !key_exists($v, $atts)) {
+                    $atts[$v] = 1;
+                }
+            }
+        }
+
         return $instance->getHTML($atts, $content);
     }

leaflet-map/tags/2.11.5/templates/shortcode-helper.php

@@ -27 +27 @@
         $drag = __('Drag Me', 'leaflet-map');
 
-        echo do_shortcode('[leaflet-map zoom=2 zoomcontrol=1 doubleClickZoom=1 height=300 scrollwheel=1]');
-        echo do_shortcode(sprintf('[leaflet-marker draggable=1 visible="true"] %s [/leaflet-marker]',
+        echo do_shortcode('[leaflet-map zoom=2 zoomcontrol doubleClickZoom height=300 scrollwheel]');
+        echo do_shortcode(sprintf('[leaflet-marker draggable visible] %s [/leaflet-marker]',
             $drag
         ));
@@ -53 +53 @@
                     ),
                 __("Draggable Marker", 'leaflet-map') => array(
-                    '[leaflet-map zoom=8 lat=-33.85 lng=151.21 scrollwheel=1]',
-                    '[leaflet-marker draggable=1]',
+                    '[leaflet-map zoom=8 lat=-33.85 lng=151.21 scrollwheel]',
+                    '[leaflet-marker draggable]',
                     ),
                 __("Marker Icon", 'leaflet-map') => array(
-                    '[leaflet-map zoom=10 address="cochrane, Ontario" scrollwheel=1]',
+                    '[leaflet-map zoom=10 address="cochrane, Ontario" scrollwheel]',
                     '[leaflet-marker iconUrl="https://i.imgur.com/Q54ueuO.png" iconSize="80,50" iconAnchor="40,60"]'
                     ),
+                __("SVG Marker Icon", 'leaflet-map') => array(
+                    '[leaflet-map address="twilight lane, nova scotia" scrollwheel]',
+                    '[leaflet-marker svg background="#654" iconClass="dashicons dashicons-star-filled" color="gold"]My Favorite Place in the World[/leaflet-marker]'
+                    ),
                 __("Zoom Buttons", 'leaflet-map') => array(
-                    '[leaflet-map zoom=9 lat=48.855 lng=2.35 zoomcontrol=1]',
+                    '[leaflet-map zoom=9 lat=48.855 lng=2.35 zoomcontrol]',
                     ),
                 __("Alternate Map Tiles w/scrollwheel", 'leaflet-map') => array(
-                    '[leaflet-map zoom=2 scrollwheel=1 lat=-2.507 lng=32.902 tileurl=https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.jpg subdomains=abcd attribution="Map tiles by Stamen Design, under CC BY 3.0."]',
+                    '[leaflet-map zoom=2 scrollwheel lat=-2.507 lng=32.902 tileurl=https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.jpg subdomains=abcd attribution="Map tiles by Stamen Design, under CC BY 3.0."]',
                     ),
                 __("Marker Popup Messages (on click)", 'leaflet-map') => array(
@@ -75 +79 @@
                     ),
                 __("Basic Lines w/Scrollwheel", 'leaflet-map') => array(
-                    '[leaflet-map lat=41 lng=29 scrollwheel=1 zoom=6]',
+                    '[leaflet-map lat=41 lng=29 scrollwheel zoom=6]',
                     '[leaflet-line latlngs="41, 29; 44, 18;"]'
                     ),
@@ -84 +88 @@
                 __("Fitted Colored Line on Addresses", 'leaflet-map') => array(
                     '[leaflet-map]',
-                    '[leaflet-line color="purple" addresses="Sayulita; Puerto Vallarta;" fitline=1]'
+                    '[leaflet-line color="purple" addresses="Sayulita; Puerto Vallarta;" fitline]'
                     ),
                 __("More Crazy Line Attributes", 'leaflet-map') => array(
                     '[leaflet-map]',
-                    '[leaflet-line color="red" weight=10 dasharray="2,15" addresses="Halifax, NS; Tanzania" classname=marching-ants fitbounds=1]'
+                    '[leaflet-line color="red" weight=10 dasharray="2,15" addresses="Halifax, Nova Scotia; Tanzania" classname=marching-ants fitbounds]'
                     ),
                 __("Disable all Interaction", 'leaflet-map') => array(
@@ -95 +99 @@
                 __("Add GeoJSON by URL (with popups)", 'leaflet-map') => array(
                     '[leaflet-map doubleClickZoom=true scrollwheel=true]',
-                    '[leaflet-geojson src=https://cdn.rawgit.com/bozdoz/064a7101b95a324e8852fe9381ab9a18/raw/03f4f54b13a3a7e256732760a8b679818d9d36fc/map.geojson fitbounds=1 popup_property="popup-text"]'
+                    '[leaflet-geojson src=https://cdn.rawgit.com/bozdoz/064a7101b95a324e8852fe9381ab9a18/raw/03f4f54b13a3a7e256732760a8b679818d9d36fc/map.geojson fitbounds popup_property="popup-text"]'
                     ),
-                __("Test Image Map", 'leaflet-map') => array(
-                    '[leaflet-image zoom=1 zoomcontrol=1 scrollwheelzoom=1 attribution=0]',
+                __("Image Map", 'leaflet-map') => array(
+                    '[leaflet-image zoom=1 zoomcontrol scrollwheelzoom attribution=0]',
                     '[leaflet-marker]'
                     )

leaflet-map/trunk/README.md

@@ -1 @@
-Leaflet Map WordPress Plugin
-========
+# Leaflet Map WordPress Plugin
 
 ![Leaflet](https://img.shields.io/badge/leaflet-1.3.4-green.svg?style=flat)
-![WordPress](https://img.shields.io/badge/wordpress-4.9.8-green.svg?style=flat)
+![WordPress](https://img.shields.io/badge/wordpress-5.0-green.svg?style=flat)
 
 ![Header Image](https://ps.w.org/leaflet-map/assets/banner-1544x500.png?rev=1693083)
 
-Add a map generated with [LeafletJS](http://leafletjs.com/): an open-source JavaScript library for mobile-friendly interactive maps. Map tiles are provided by default through [OpenStreetMap](http://www.openstreetmap.org/), or [MapQuest](https://www.mapquest.ca/) (with an app key).  Can be set per map with shortcode attributes or through the dashboard settings.
+Add a map generated with [LeafletJS](http://leafletjs.com/): an open-source JavaScript library for mobile-friendly interactive maps. Map tiles are provided by default through [OpenStreetMap](http://www.openstreetmap.org/), or [MapQuest](https://www.mapquest.ca/) (with an app key). Can be set per map with shortcode attributes or through the dashboard settings.
 
 ![Admin Screenshot](https://imgur.com/W4BGTif.jpg)
 
-Installation
-------------
-
-* (simple) Install via the WordPress plugins page on your WordPress site: `/wp-admin/plugin-install.php` (search Leaflet)
-
-* (needlessly complicated) Copy this repo (or download a release of it) into your WordPress plugins directory: `/wp-content/plugins/`. You might also need to name the directory 'leaflet-map', like so: `git clone https://github.com/bozdoz/wp-plugin-leaflet-map.git leaflet-map`
-
-General Usage
--------------
+## Installation
+
+- (simple) Install via the WordPress plugins page on your WordPress site: `/wp-admin/plugin-install.php` (search Leaflet)
+
+- (needlessly complicated) Copy this repo (or download a release of it) into your WordPress plugins directory: `/wp-content/plugins/`. You might also need to name the directory 'leaflet-map', like so: `git clone https://github.com/bozdoz/wp-plugin-leaflet-map.git leaflet-map`
+
+## General Usage
 
 ```
@@ -35 +32 @@
 ```
 
-You can have SVG markers, add shapes, geojson, kml, images, and more!  See available shortcodes below.
-
-Developing
-----------
-
-This plugin uses Docker for development.  Simply 1. [install Docker](https://www.docker.com/get-started), 2. fork/clone the repo, and 3. execute this command from the repo's root directory in your terminal:
+You can have SVG markers, add shapes, geojson, kml, images, and more! See available shortcodes below.
+
+## Developing
+
+This plugin uses Docker for development. Simply 1. [install Docker](https://www.docker.com/get-started), 2. fork/clone the repo, and 3. execute this command from the repo's root directory in your terminal:
 
 ```bash
@@ -55 +51 @@
 You can also use these NPM scripts to interact with Docker, if you make changes to Docker-related files:
 
-To start: 
+To start:
 
 ```bash
@@ -69 +65 @@
 That's all for now! Thanks!
 
-Available Shortcodes
---------------------
+## Available Shortcodes
 
 ### [leaflet-map]
@@ -76 +71 @@
 ![Alternate map tiles](https://imgur.com/oURcNiX.jpg)
 
-Height, width, latitude, longitude and zoom are the basic attributes: 
+Height, width, latitude, longitude and zoom are the basic attributes:
 
 ```
@@ -90 +85 @@
 #### [leaflet-map] Options:
 
-Option | Default
---- | ---
-`lat` and `lng` or `address` | lat: 44.67, lng: -63.61
-`zoom` | 12
-`height` | 250
-`width` | 100%
-`fit_markers` | 0 (false)
-`zoomcontrol` | 0 (false)
-`scrollwheel` | 0 (false)
-`doubleclickzoom` | 0 (false)
-`min_zoom` | 0
-`max_zoom` | 20
-`subdomains` | abc
-`attribution` | ©Leaflet ©OpenStreetMap
-`closepopuponclick` | false
-`trackresize` | false
-`boxzoom` | true
-`dragging` | true
-`keyboard` | true
+| Option                       | Default                 |
+| ---------------------------- | ----------------------- |
+| `lat` and `lng` or `address` | lat: 44.67, lng: -63.61 |
+| `zoom`                       | 12                      |
+| `height`                     | 250                     |
+| `width`                      | 100%                    |
+| `fit_markers`                | 0 (false)               |
+| `zoomcontrol`                | 0 (false)               |
+| `scrollwheel`                | 0 (false)               |
+| `doubleclickzoom`            | 0 (false)               |
+| `min_zoom`                   | 0                       |
+| `max_zoom`                   | 20                      |
+| `subdomains`                 | abc                     |
+| `attribution`                | ©Leaflet ©OpenStreetMap |
+| `closepopuponclick`          | false                   |
+| `trackresize`                | false                   |
+| `boxzoom`                    | true                    |
+| `dragging`                   | true                    |
+| `keyboard`                   | true                    |
 
 ---
@@ -116 +111 @@
 Much the same as leaflet-map above, but uses `src` for the source image.
 
-TBH, it's a huge mess, and probably shouldn't be used.  It might make a good image viewer with optional marker highlight points.  It requires far too much manual work at the moment.  Recommended usage:
+TBH, it's a huge mess, and probably shouldn't be used. It might make a good image viewer with optional marker highlight points. It requires far too much manual work at the moment. Recommended usage:
 
 ```
 [leaflet-image src="path/to/img.jpg" zoom=1]
-[leaflet-marker draggable=1]
+[leaflet-marker draggable]
 ```
 
@@ -127 +122 @@
 #### [leaflet-image] Options:
 
-Option | Default
---- | ---
-`src` | https://lorempixel.com/1000/1000/
-`zoom` | 12
-`height` | 250
-`width` | 100%
-`fit_markers` | 0 (false)
-`zoomcontrol` | 0 (false)
-`scrollwheel` | 0 (false)
-`doubleclickzoom` | 0 (false)
-`min_zoom` | 0
-`max_zoom` | 20
-`attribution` | ©Leaflet ©OpenStreetMap
+| Option            | Default                          |
+| ----------------- | -------------------------------- |
+| `src`             | https://picsum.photos/1000/1000/ |
+| `zoom`            | 12                               |
+| `height`          | 250                              |
+| `width`           | 100%                             |
+| `fit_markers`     | 0 (false)                        |
+| `zoomcontrol`     | 0 (false)                        |
+| `scrollwheel`     | 0 (false)                        |
+| `doubleclickzoom` | 0 (false)                        |
+| `min_zoom`        | 0                                |
+| `max_zoom`        | 20                               |
+| `attribution`     | ©Leaflet ©OpenStreetMap          |
 
 ---
@@ -147 +142 @@
 ![Markers with HTML within a popup](https://imgur.com/ap38lwe.jpg)
 
-Add a marker to any map by adding `[leaflet-marker]` after any `[leaflet-map]` shortcode.  You can adjust the lat/lng in the same way, as well as some other basic functionality (popup message, draggable, visible on load).  Also, if you want to add a link to a marker popup, use `[leaflet-marker]Message here: click here[/leaflet-marker]` and add a link like you normally would with the WordPress editor.
+Add a marker to any map by adding `[leaflet-marker]` after any `[leaflet-map]` shortcode. You can adjust the lat/lng in the same way, as well as some other basic functionality (popup message, draggable, visible on load). Also, if you want to add a link to a marker popup, use `[leaflet-marker]Message here: click here[/leaflet-marker]` and add a link like you normally would with the WordPress editor.
 
 #### [leaflet-marker] Options:
 
-Option | Usage
---- | ---
-`lat` and `lng` or `address` | Location on the map; defaults to map center; `lat`/`lng` are floats, `address` is a string
-`draggable` | Make a marker draggable (`boolean`); default `false`
-`title` | Add a hover-over message to your marker (different than popup)
-`alt` | Add an alt text to the marker image
-`zindexoffset` | Define the z-index for the marker image
-`opacity` | Define the css opacity for the marker image
-`iconurl` | Give a url for the marker image file
-`iconsize` | Set the size of the icon: e.g. "80,50" for 80px width 50px height 
-`iconanchor` | Set the anchor position of the icon: e.g. "40,60" for 40px left 60px top
-`shadowurl` | Give a url for the marker shadow image file
-`shadowsize` | Set the size of the shadow: e.g. "80,50" for 80px width 50px height 
-`shadowanchor` | Set the anchor position of the shadow: e.g. "40,60" for 40px left 60px top
-`popupanchor` | Set the anchor position of the popup: e.g. "40,60" for 40px left 60px top
-`svg` | Boolean for whether the marker should be created as an svg: default `false`
-`background` | Background color for an SVG marker (above)
-`color` | color of the SVG marker (above)
-`iconclass` | className for the marker image
+| Option                       | Usage                                                                                      |
+| ---------------------------- | ------------------------------------------------------------------------------------------ |
+| `lat` and `lng` or `address` | Location on the map; defaults to map center; `lat`/`lng` are floats, `address` is a string |
+| `draggable`                  | Make a marker draggable (`boolean`); default `false`                                       |
+| `title`                      | Add a hover-over message to your marker (different than popup)                             |
+| `alt`                        | Add an alt text to the marker image                                                        |
+| `zindexoffset`               | Define the z-index for the marker image                                                    |
+| `opacity`                    | Define the css opacity for the marker image                                                |
+| `iconurl`                    | Give a url for the marker image file                                                       |
+| `iconsize`                   | Set the size of the icon: e.g. "80,50" for 80px width 50px height                          |
+| `iconanchor`                 | Set the anchor position of the icon: e.g. "40,60" for 40px left 60px top                   |
+| `shadowurl`                  | Give a url for the marker shadow image file                                                |
+| `shadowsize`                 | Set the size of the shadow: e.g. "80,50" for 80px width 50px height                        |
+| `shadowanchor`               | Set the anchor position of the shadow: e.g. "40,60" for 40px left 60px top                 |
+| `popupanchor`                | Set the anchor position of the popup: e.g. "40,60" for 40px left 60px top                  |
+| `svg`                        | Boolean for whether the marker should be created as an svg: default `false`                |
+| `background`                 | Background color for an SVG marker (above)                                                 |
+| `color`                      | color of the SVG marker (above)                                                            |
+| `iconclass`                  | className for the marker image                                                             |
 
 ---
@@ -179 +174 @@
 Add a line to the map by adding `[leaflet-line]`. You can specify the postions with a list separated by semi-colon `;` or bar `|` using lat/lng: `[leaflet-line latlngs="41, 29; 44, 18"]` or addresses: `[leaflet-line addresses="Istanbul; Sarajevo"]`, or x/y coordinates for image maps.
 
-Add a popup to the line by adding text to the content of the shortcode: 
+Add a popup to the line by adding text to the content of the shortcode:
 
 `[leaflet-line addresses="new york; chicago"]New York to Chicago[/leaflet-line]`
@@ -185 +180 @@
 #### [leaflet-line] Options
 
-Option | Usage
---- | ---
-`addresses`, `latlngs`, or `coordinates` | For geocoded addresses, latitude/longitude, or x/y coordinates for Image Maps (see [leaflet-image]); ex: `[leaflet-line latlngs="41, 29; 44, 18"]` or addresses: `[leaflet-line addresses="Istanbul; Sarajevo"]`
-`fitbounds` | Fit the map to the bounds of the line (instead of whatever center you gave the map originally)
+| Option                                   | Usage                                                                                                                                                                                      |
+| ---------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `addresses`, `latlngs`, or `coordinates` | For geocoded addresses, latitude/longitude, or x/y coordinates for Image Maps; ex: `[leaflet-line latlngs="41, 29; 44, 18"]` or addresses: `[leaflet-line addresses="Istanbul; Sarajevo"]` |
+| `fitbounds`                              | Fit the map to the bounds of the line (instead of whatever center you gave the map originally)                                                                                             |
 
 And the following Shape Options. See https://leafletjs.com/reference-1.3.4.html#path for details.
@@ -196 +191 @@
 
 ---
+
 ### [leaflet-circle]
 
@@ -204 +200 @@
 #### [leaflet-circle] Options
 
-Options | Usage 
---- | ---
-`address`, `lat/lng`, or `x/y` | For geocoded addresses, latitude/longitude, or x/y coordinates for Image Maps (see [leaflet-image]); ex: `[leaflet-circle lat=52 lng=5]` or addresses: `[leaflet-circle address="Amsterdam"]`
-`fitbounds` | Fit the map to the bounds of the circle (instead of whatever center you gave the map originally)
-radius | Radius of the circle in meters
-
-Includes all style options: See https://leafletjs.com/reference-1.3.4.html#path 
+| Options                        | Usage                                                                                                                                                                                         |
+| ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `address`, `lat/lng`, or `x/y` | For geocoded addresses, latitude/longitude, or x/y coordinates for Image Maps (see [leaflet-image]); ex: `[leaflet-circle lat=52 lng=5]` or addresses: `[leaflet-circle address="Amsterdam"]` |
+| `fitbounds`                    | Fit the map to the bounds of the circle (instead of whatever center you gave the map originally)                                                                                              |
+| radius                         | Radius of the circle in meters                                                                                                                                                                |
+
+Includes all style options: See https://leafletjs.com/reference-1.3.4.html#path
 
 ### [leaflet-geojson]
@@ -216 +212 @@
 [![Random GeoJSON created by me](https://imgur.com/fJktgtI.jpg)](https://gist.github.com/bozdoz/064a7101b95a324e8852fe9381ab9a18)
 
-Or you can add a geojson shape via a url: 
+Or you can add a geojson shape via a url:
 
 ```
@@ -224 +220 @@
 #### [leaflet-geojson] Options
 
-Option | Usage
---- | ---
-`src` | Source of the geojson file
+| Option | Usage                      |
+| ------ | -------------------------- |
+| `src`  | Source of the geojson file |
 
 ### [leaflet-kml]
@@ -232 +228 @@
 Same idea as geojson (above), but takes KML files and loads [Mapbox's togeojson library](https://github.com/mapbox/togeojson)
 
-Contributing
--------------
+## Contributing
 
 [View Contribution guidelines](https://github.com/bozdoz/wp-plugin-leaflet-map/blob/master/CONTRIBUTING.md)
 
-Wish List
----------
-
-* A map editor/shortcode generator (so users can see what they're adding to the page)
+## Wish List
+
+- A map editor/shortcode generator (so users can see what they're adding to the page)

leaflet-map/trunk/leaflet-map.php

@@ -9 +9 @@
  * Text Domain: leaflet-map
  * Domain Path: /languages/
- * Version: 2.11.4
+ * Version: 2.11.5
  * License: GPL2
  * Leaflet Map is free software: you can redistribute it and/or modify
@@ -30 +30 @@
 }
 
-define('LEAFLET_MAP__PLUGIN_VERSION', '2.11.4');
+define('LEAFLET_MAP__PLUGIN_VERSION', '2.11.5');
 define('LEAFLET_MAP__PLUGIN_FILE', __FILE__);
 define('LEAFLET_MAP__PLUGIN_DIR', plugin_dir_path(__FILE__));

leaflet-map/trunk/readme.txt

@@ -7 +7 @@
 Tags: leaflet, map, mobile, javascript, openstreetmap, mapquest, interactive
 Requires at least: 3.0.1
-Tested up to: 4.9.8
-Version: 2.11.4
-Stable tag: 2.11.4
+Tested up to: 5.0
+Version: 2.11.5
+Stable tag: 2.11.5
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -70 +70 @@
 = Can I have an SVG Marker? =
 
-Yes! Convert the default marker into an svg with a shortcode like this: `[leaflet-marker svg="true" color="white" iconClass="fab fa-wordpress-simple" background="red"]` The `iconClass` is perfect for adding a [font-awesome](https://fontawesome.com/icons?d=gallery) icon.
+Yes! Convert the default marker into an svg with a shortcode like this: `[leaflet-marker svg color="white" iconClass="fab fa-wordpress-simple" background="red"]` The `iconClass` is perfect for adding a [font-awesome](https://fontawesome.com/icons?d=gallery) icon.
 
 = How do I change the style for lines/geojson? =
@@ -92 +92 @@
 = Can I add a message to a marker? =
 
-Yes: `[leaflet-marker message="Hello there!" visible="true"]`, where visible designates if it is visible on page load. Otherwise it is only visible when clicked.
+Yes: `[leaflet-marker message="Hello there!" visible]`, where visible designates if it is visible on page load. Otherwise it is only visible when clicked.
 
 = Can I use your plugin with a picture instead of a map? =
@@ -119 +119 @@
 2. See the shortcode play out on the front end.
 3. For `[leaflet-image]` upload an image, and copy the URL from the right-hand side
-4. For `[leaflet-image]` paste that image URL into an attribute titled `source`: example: `src="http://lorempixel.com/1000/1000/"`.
+4. For `[leaflet-image]` paste that image URL into an attribute titled `source`: example: `src="https://picsum.photos/1000/1000/"`.
 5. See the `[leaflet-image]` on the front end.
-6. If you use `[leaflet-marker draggable=true]`, then you can drag the marker where you want it, open a developers console, and see the specific shortcode to use.
+6. If you use `[leaflet-marker draggable]`, then you can drag the marker where you want it, open a developers console, and see the specific shortcode to use.
 7. Add geojson via URL: `[leaflet-geojson src="https://example.com/path/to.geojson"]`
 8. MapQuest requires an app key, get it from their website; alternatively, you can use OpenStreetMap as a free tile service (remember to add an attribution where necessary).
 
 == Changelog ==
+
+= 2.11.5 =
+* Added assumed-boolean attributes to all shortcodes; ex: `[leaflet-marker draggable svg]` would be the same as `[leaflet-marker draggable=1 svg=1]`
 
 = 2.11.4 =

leaflet-map/trunk/scripts/leaflet-svg-icon.js

@@ -1 +1 @@
 L.SVGIcon = L.Icon.extend({
-    options: {
-        iconSize: [26, 42],
-        popupAnchor: [1, -42],
-        tooltipAnchor: [16, -28],
-        iconClass: '',
-        background: '#2b82cb',
-        color: 'white'
-    },
-    createIcon: function (oldIcon) {
-        var div = (oldIcon && oldIcon.tagName === 'DIV') ? 
-            oldIcon : document.createElement('div');
-        var options = this.options;
-        var size = options.iconSize;
-        var x = size[0];
-        var y = size[1];
+  options: {
+    iconSize: [26, 42],
+    popupAnchor: [1, -42],
+    tooltipAnchor: [16, -28],
+    iconClass: '',
+    background: '#2b82cb',
+    color: 'white'
+  },
+  createIcon: function(oldIcon) {
+    var div =
+      oldIcon && oldIcon.tagName === 'DIV'
+        ? oldIcon
+        : document.createElement('div')
+    var options = this.options
+    var size = options.iconSize
+    var x = size[0]
+    var y = size[1]
 
-        var svgCreate = function svgCreate (tag, attrs) {
-            var el = document.createElementNS('http://www.w3.org/2000/svg', tag);
-            for (var k in attrs) {
-                el.setAttribute(k, attrs[k]);
-            }
-            return el;
-        };
+    var svgCreate = function svgCreate(tag, attrs) {
+      var el = document.createElementNS('http://www.w3.org/2000/svg', tag)
+      for (var k in attrs) {
+        el.setAttribute(k, attrs[k])
+      }
+      return el
+    }
 
-        var svg = svgCreate('svg', {
-            viewBox: '0 0 365 560'
-        });
-        
-        var path = svgCreate('path', {
-            fill: this.options.background,
-            d: 'M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,' +
-                '283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9' +
-                'C96.3,7.9,7.5,64.5,7.5,194.6c0,88.4,175.3,357.4,' +
-                '175.3,357.4S182.9,551.7,182.9,551.7z'
-        });
-        
-        svg.appendChild(path);
-        div.appendChild(svg);
-        
-        div.setAttribute('style', 'margin-left: ' + (-x/2) + 'px;' +
-            'margin-top: ' + -y + 'px;' +
-            'width: ' + x + 'px;' +
-            'height: ' + y + 'px;' 
-        );
+    var svg = svgCreate('svg', {
+      viewBox: '0 0 365 560'
+    })
 
-        // add icon
-        var i = document.createElement('i');
-        i.className = this.options.iconClass;
-        i.setAttribute('style', 'position:absolute;' +
-            'top: 34%;' +
-            'left: 50%;' +
-            'transform: translate3d(-50%, -34%, 0);' +
-            'color: ' + (this.options.color) + ';' +
-            'line-height: 0;'
-        );
-        div.appendChild(i);
+    var path = svgCreate('path', {
+      fill: this.options.background,
+      d:
+        'M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,' +
+        '283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9' +
+        'C96.3,7.9,7.5,64.5,7.5,194.6c0,88.4,175.3,357.4,' +
+        '175.3,357.4S182.9,551.7,182.9,551.7z'
+    })
 
-        return div;
-    }
-});
+    svg.appendChild(path)
+    div.appendChild(svg)
+
+    div.setAttribute(
+      'style',
+      'margin-left: ' +
+        -x / 2 +
+        'px;' +
+        'margin-top: ' +
+        -y +
+        'px;' +
+        'width: ' +
+        x +
+        'px;' +
+        'height: ' +
+        y +
+        'px;'
+    )
+
+    // add icon
+    var i = document.createElement('i')
+    i.className = this.options.iconClass
+    i.setAttribute(
+      'style',
+      'position:absolute;' +
+        'top: 20%;' +
+        'left: 50%;' +
+        'transform: translate3d(-50%, -20%, 0);' +
+        'color: ' +
+        this.options.color +
+        ';' +
+        'line-height: 0;' +
+        'display: flex;' +
+        'justify-content: center;' +
+        'align-items: center;'
+    )
+    div.appendChild(i)
+
+    return div
+  }
+})
 
 L.SVGMarker = L.Marker.extend({
-    initialize: function (latlng, options) {
-        options = options || {};
-        var svg_options = L.extend({},
-            L.SVGIcon.prototype.options, 
-            options
-        );
-        options.icon = new L.SVGIcon( svg_options );
-        L.Marker.prototype.initialize.call(this, latlng, options);
-    }
-});
+  initialize: function(latlng, options) {
+    options = options || {}
+    var svg_options = L.extend({}, L.SVGIcon.prototype.options, options)
+    options.icon = new L.SVGIcon(svg_options)
+    L.Marker.prototype.initialize.call(this, latlng, options)
+  }
+})

leaflet-map/trunk/scripts/leaflet-svg-icon.min.js

@@ -1 @@
-L.SVGIcon=L.Icon.extend({options:{iconSize:[26,42],popupAnchor:[1,-42],tooltipAnchor:[16,-28],iconClass:"",background:"#2b82cb",color:"white"},createIcon:function(t){var e=t&&"DIV"===t.tagName?t:document.createElement("div"),o=this.options.iconSize,i=o[0],n=o[1],r=function(t,e){var o=document.createElementNS("http://www.w3.org/2000/svg",t);for(var i in e)o.setAttribute(i,e[i]);return o},a=r("svg",{viewBox:"0 0 365 560"}),c=r("path",{fill:this.options.background,d:"M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9C96.3,7.9,7.5,64.5,7.5,194.6c0,88.4,175.3,357.4,175.3,357.4S182.9,551.7,182.9,551.7z"});a.appendChild(c),e.appendChild(a),e.setAttribute("style","margin-left: "+-i/2+"px;margin-top: "+-n+"px;width: "+i+"px;height: "+n+"px;");var p=document.createElement("i");return p.className=this.options.iconClass,p.setAttribute("style","position:absolute;top: 34%;left: 50%;transform: translate3d(-50%, -34%, 0);color: "+this.options.color+";line-height: 0;"),e.appendChild(p),e}}),L.SVGMarker=L.Marker.extend({initialize:function(t,e){e=e||{};var o=L.extend({},L.SVGIcon.prototype.options,e);e.icon=new L.SVGIcon(o),L.Marker.prototype.initialize.call(this,t,e)}});
+L.SVGIcon=L.Icon.extend({options:{iconSize:[26,42],popupAnchor:[1,-42],tooltipAnchor:[16,-28],iconClass:"",background:"#2b82cb",color:"white"},createIcon:function(t){var e=t&&"DIV"===t.tagName?t:document.createElement("div"),n=this.options.iconSize,o=n[0],i=n[1],r=function(t,e){var n=document.createElementNS("http://www.w3.org/2000/svg",t);for(var o in e)n.setAttribute(o,e[o]);return n},c=r("svg",{viewBox:"0 0 365 560"}),a=r("path",{fill:this.options.background,d:"M182.9,551.7c0,0.1,0.2,0.3,0.2,0.3S358.3,283,358.3,194.6c0-130.1-88.8-186.7-175.4-186.9C96.3,7.9,7.5,64.5,7.5,194.6c0,88.4,175.3,357.4,175.3,357.4S182.9,551.7,182.9,551.7z"});c.appendChild(a),e.appendChild(c),e.setAttribute("style","margin-left: "+-o/2+"px;margin-top: "+-i+"px;width: "+o+"px;height: "+i+"px;");var s=document.createElement("i");return s.className=this.options.iconClass,s.setAttribute("style","position:absolute;top: 20%;left: 50%;transform: translate3d(-50%, -20%, 0);color: "+this.options.color+";line-height: 0;display: flex;justify-content: center;align-items: center;"),e.appendChild(s),e}}),L.SVGMarker=L.Marker.extend({initialize:function(t,e){e=e||{};var n=L.extend({},L.SVGIcon.prototype.options,e);e.icon=new L.SVGIcon(n),L.Marker.prototype.initialize.call(this,t,e)}});

leaflet-map/trunk/shortcodes/class.image-shortcode.php

@@ -39 +39 @@
         /* only required field for image map (src/source) */
         $src = empty($src) ? '' : $src;
-        $source = empty($source) ? 'https://lorempixel.com/1000/1000/' : $source;
+        $source = empty($source) ? 'https://picsum.photos/1000/1000/' : $source;
         $source = empty($src) ? $source : $src;
 

leaflet-map/trunk/shortcodes/class.map-shortcode.php

@@ -55 +55 @@
      *
      * @param array|string $atts    key value pairs from shortcode 
-     * @param string       $content inner text in shortcode
      * 
      * @return array new atts, which is actually an array
      */
-    protected function getAtts($atts='', $content=null)
+    protected function getAtts($atts='')
     {
         $atts = (array) $atts;
@@ -88 +87 @@
         $atts['width'] .= is_numeric($atts['width']) ? 'px' : '';   
 
+        // maxbounds as string: maxbounds="50, -114; 52, -112"
+        $maxBounds = isset($maxbounds) ? $maxbounds : null;
+
+        if ($maxBounds) {
+            try {
+                // explode by semi-colons and commas
+                $maxBounds = preg_split("[;|,]", $maxBounds);
+                print_r($maxBounds);
+                $maxBounds = array(
+                    array(
+                        $maxBounds[0], $maxBounds[1]
+                    ),
+                    array(
+                        $maxBounds[2], $maxBounds[3]
+                    )
+                );
+                print_r($maxBounds);
+            } catch (Exception $e) {
+                $maxBounds = null;
+            }
+        }
+
         /* 
         need to allow 0 or empty for removal of attribution 
@@ -103 +124 @@
             'boxZoom' => isset($boxzoom) ? $boxzoom : null,
             'dragging' => isset($dragging) ? $dragging : null,
-            'keyboard' => isset($keyboard) ? $keyboard : null
+            'keyboard' => isset($keyboard) ? $keyboard : null,
         );
-        
+
         // filter out nulls
         $more_options = $this->LM->filter_null($more_options);
@@ -111 +132 @@
         // change string booleans to booleans
         $more_options = filter_var_array($more_options, FILTER_VALIDATE_BOOLEAN);
+
+        if ($maxBounds) {
+            $more_options['maxBounds'] = $maxBounds;
+        }
 
         // wrap as JSON

leaflet-map/trunk/shortcodes/class.shortcode.php

@@ -40 +40 @@
      * Instantiate class and get HTML for shortcode
      *
-     * @param array  $atts    string
+     * @param array  $atts    string|array
      * @param string $content Optional
      * 
      * @return string (see above)
      */
-    public static function shortcode($atts, $content = null)
+    public static function shortcode($atts = '', $content = null)
     {
         $class = self::getClass();
-        $instance = new $class($atts, $content);
+        $instance = new $class();
+
+        // swap sequential array with associative array
+        // this enables assumed-boolean attributes,
+        // like: [leaflet-marker draggable svg]
+        // meaning draggable=1 svg=1
+        if (!empty($atts)) {
+            foreach($atts as $k => $v) {
+                if (is_numeric($k) && !key_exists($v, $atts)) {
+                    $atts[$v] = 1;
+                }
+            }
+        }
+
         return $instance->getHTML($atts, $content);
     }

leaflet-map/trunk/templates/shortcode-helper.php

@@ -27 +27 @@
         $drag = __('Drag Me', 'leaflet-map');
 
-        echo do_shortcode('[leaflet-map zoom=2 zoomcontrol=1 doubleClickZoom=1 height=300 scrollwheel=1]');
-        echo do_shortcode(sprintf('[leaflet-marker draggable=1 visible="true"] %s [/leaflet-marker]',
+        echo do_shortcode('[leaflet-map zoom=2 zoomcontrol doubleClickZoom height=300 scrollwheel]');
+        echo do_shortcode(sprintf('[leaflet-marker draggable visible] %s [/leaflet-marker]',
             $drag
         ));
@@ -53 +53 @@
                     ),
                 __("Draggable Marker", 'leaflet-map') => array(
-                    '[leaflet-map zoom=8 lat=-33.85 lng=151.21 scrollwheel=1]',
-                    '[leaflet-marker draggable=1]',
+                    '[leaflet-map zoom=8 lat=-33.85 lng=151.21 scrollwheel]',
+                    '[leaflet-marker draggable]',
                     ),
                 __("Marker Icon", 'leaflet-map') => array(
-                    '[leaflet-map zoom=10 address="cochrane, Ontario" scrollwheel=1]',
+                    '[leaflet-map zoom=10 address="cochrane, Ontario" scrollwheel]',
                     '[leaflet-marker iconUrl="https://i.imgur.com/Q54ueuO.png" iconSize="80,50" iconAnchor="40,60"]'
                     ),
+                __("SVG Marker Icon", 'leaflet-map') => array(
+                    '[leaflet-map address="twilight lane, nova scotia" scrollwheel]',
+                    '[leaflet-marker svg background="#654" iconClass="dashicons dashicons-star-filled" color="gold"]My Favorite Place in the World[/leaflet-marker]'
+                    ),
                 __("Zoom Buttons", 'leaflet-map') => array(
-                    '[leaflet-map zoom=9 lat=48.855 lng=2.35 zoomcontrol=1]',
+                    '[leaflet-map zoom=9 lat=48.855 lng=2.35 zoomcontrol]',
                     ),
                 __("Alternate Map Tiles w/scrollwheel", 'leaflet-map') => array(
-                    '[leaflet-map zoom=2 scrollwheel=1 lat=-2.507 lng=32.902 tileurl=https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.jpg subdomains=abcd attribution="Map tiles by Stamen Design, under CC BY 3.0."]',
+                    '[leaflet-map zoom=2 scrollwheel lat=-2.507 lng=32.902 tileurl=https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.jpg subdomains=abcd attribution="Map tiles by Stamen Design, under CC BY 3.0."]',
                     ),
                 __("Marker Popup Messages (on click)", 'leaflet-map') => array(
@@ -75 +79 @@
                     ),
                 __("Basic Lines w/Scrollwheel", 'leaflet-map') => array(
-                    '[leaflet-map lat=41 lng=29 scrollwheel=1 zoom=6]',
+                    '[leaflet-map lat=41 lng=29 scrollwheel zoom=6]',
                     '[leaflet-line latlngs="41, 29; 44, 18;"]'
                     ),
@@ -84 +88 @@
                 __("Fitted Colored Line on Addresses", 'leaflet-map') => array(
                     '[leaflet-map]',
-                    '[leaflet-line color="purple" addresses="Sayulita; Puerto Vallarta;" fitline=1]'
+                    '[leaflet-line color="purple" addresses="Sayulita; Puerto Vallarta;" fitline]'
                     ),
                 __("More Crazy Line Attributes", 'leaflet-map') => array(
                     '[leaflet-map]',
-                    '[leaflet-line color="red" weight=10 dasharray="2,15" addresses="Halifax, NS; Tanzania" classname=marching-ants fitbounds=1]'
+                    '[leaflet-line color="red" weight=10 dasharray="2,15" addresses="Halifax, Nova Scotia; Tanzania" classname=marching-ants fitbounds]'
                     ),
                 __("Disable all Interaction", 'leaflet-map') => array(
@@ -95 +99 @@
                 __("Add GeoJSON by URL (with popups)", 'leaflet-map') => array(
                     '[leaflet-map doubleClickZoom=true scrollwheel=true]',
-                    '[leaflet-geojson src=https://cdn.rawgit.com/bozdoz/064a7101b95a324e8852fe9381ab9a18/raw/03f4f54b13a3a7e256732760a8b679818d9d36fc/map.geojson fitbounds=1 popup_property="popup-text"]'
+                    '[leaflet-geojson src=https://cdn.rawgit.com/bozdoz/064a7101b95a324e8852fe9381ab9a18/raw/03f4f54b13a3a7e256732760a8b679818d9d36fc/map.geojson fitbounds popup_property="popup-text"]'
                     ),
-                __("Test Image Map", 'leaflet-map') => array(
-                    '[leaflet-image zoom=1 zoomcontrol=1 scrollwheelzoom=1 attribution=0]',
+                __("Image Map", 'leaflet-map') => array(
+                    '[leaflet-image zoom=1 zoomcontrol scrollwheelzoom attribution=0]',
                     '[leaflet-marker]'
                     )