From 3a9a5220a1716551655a5d4ba90a1f9a8f6662bc Mon Sep 17 00:00:00 2001
From: Ilyas Ronef <ilyas@DivanDesign.ru>
Date: Tue, 27 Feb 2024 18:13:46 +0400
Subject: [PATCH 1/2] =?UTF-8?q?+=20Parameters=20=E2=86=92=20`params.marker?=
 =?UTF-8?q?s[i].icon`:=20The=20new=20optional=20parameter.=20Allows=20you?=
 =?UTF-8?q?=20to=20customaize=20marker=20icons.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md           | 25 +++++++++++++++++++++++++
 README_ru.md        | 25 +++++++++++++++++++++++++
 jQuery.ddMap.js     | 34 +++++++++++++++++++++++++++++++++-
 jQuery.ddMap.min.js |  3 +--
 4 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3640910..1bfdde7 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,31 @@ That's all!
 	* Valid values: `string`
 	* Default value: `''`
 	
+* `params.markers[i].icon`
+	* Desctription: Custom marker icon data.
+	* Valid values: `objectPlain`
+	* Default value: — (default icon)
+	
+* `params.markers[i].icon.src`
+	* Desctription: Address of an image.
+	* Valid values: `string`
+	* **Required**
+	
+* `params.markers[i].icon.size`
+	* Desctription: Icon size.
+	* Valid values: `objectPlain`
+	* **Required**
+	
+* `params.markers[i].icon.size.width`
+	* Desctription: Image width in px.
+	* Valid values: `integer`
+	* **Required**
+	
+* `params.markers[i].icon.size.height`
+	* Desctription: Image height in px.
+	* Valid values: `integer`
+	* **Required**
+	
 * `params.apiKey`
 	* Desctription: Yandex Maps API key.  
 		_For now it is working without key, but Yandex mark it as required, so it is recommended to set it._
diff --git a/README_ru.md b/README_ru.md
index 5b2365a..09b7c33 100644
--- a/README_ru.md
+++ b/README_ru.md
@@ -99,6 +99,31 @@ $('.map').ddMap({
 	* Допустимые значения: `string`
 	* Значение по умолчанию: `''`
 	
+* `params.markers[i].icon`
+	* Описание: Кастомная иконка маркера.
+	* Допустимые значения: `objectPlain`
+	* Значение по умолчанию: — (дефолтная иконка)
+	
+* `params.markers[i].icon.src`
+	* Описание: Адрес изображения.
+	* Допустимые значения: `string`
+	* **Обязателен**
+	
+* `params.markers[i].icon.size`
+	* Описание: Размер изображения.
+	* Допустимые значения: `objectPlain`
+	* **Обязателен**
+	
+* `params.markers[i].icon.size.width`
+	* Описание: Ширина в px.
+	* Допустимые значения: `integer`
+	* **Обязателен**
+	
+* `params.markers[i].icon.size.height`
+	* Описание: Высота px.
+	* Допустимые значения: `integer`
+	* **Обязателен**
+	
 * `params.apiKey`
 	* Описание: API-ключ Яндекс Карт.  
 		_Пока что работает и без ключа, но Яндекс декларирует его обязательным, так что рекомендуется использовать._
diff --git a/jQuery.ddMap.js b/jQuery.ddMap.js
index 0a35f28..96db3fc 100644
--- a/jQuery.ddMap.js
+++ b/jQuery.ddMap.js
@@ -233,6 +233,38 @@
 							Array.isArray(markerData.latLng) &&
 							markerData.latLng.length == 2
 						){
+							var
+								markerOptions = $.extend(
+									true,
+									{},
+									theInstance.markerOptions
+								)
+							;
+							
+							//If marker has a custom icon
+							if (
+								typeof markerData.icon == 'object'
+								&& typeof markerData.icon.src == 'string'
+								&& markerData.icon.src.length > 0
+								&& typeof markerData.icon.size == 'object'
+								&& $.isNumeric(markerData.icon.size.width)
+								&& $.isNumeric(markerData.icon.size.height)
+							){
+								markerData.icon.size.width = parseInt(markerData.icon.size.width);
+								markerData.icon.size.height = parseInt(markerData.icon.size.height);
+								
+								markerOptions.iconLayout = 'default#image';
+								markerOptions.iconImageHref = markerData.icon.src;
+								markerOptions.iconImageSize = [
+									markerData.icon.size.width,
+									markerData.icon.size.height
+								];
+								markerOptions.iconImageOffset = [
+									markerData.icon.size.width / -2,
+									markerData.icon.size.height * -1
+								];
+							}
+							
 							//Создаём метку
 							geoObjects.add(
 								new ymaps.Placemark(
@@ -243,7 +275,7 @@
 											$.trim(markerData.content) :
 											''
 									},
-									theInstance.markerOptions
+									markerOptions
 								)
 							);
 						}
diff --git a/jQuery.ddMap.min.js b/jQuery.ddMap.min.js
index c0a65d6..c4bf811 100644
--- a/jQuery.ddMap.min.js
+++ b/jQuery.ddMap.min.js
@@ -1,2 +1 @@
-/* jQuery.ddMap v2.0 (2023-05-22) | © https://Ronef.ru */
-!function(e){class t{static isStaticInited=!1;static initStatic(t){if(!this.isStaticInited&&(this.isStaticInited=!0,"undefined"==typeof ymaps)){var n="//api-maps.yandex.ru/2.1/?lang="+navigator.language;t.apiKey.length>0&&(n+="&apikey="+t.apiKey),e("head").append('<script defer src="'+n+'"><\/script>')}}constructor(e){var t=this,n=t.constructor;t.markers=new Array,t.$element="map",t.defaultZoom=15,t.defaultType="map",t.scrollZoom=!1,t.mapCenterOffset=!1,t.markerOptions={},t.controls=[{name:"zoomControl"},{name:"typeSelector"},{name:"fullscreenControl"},{name:"geolocationControl"},{name:"rulerControl"}],t.mapOptions={suppressMapOpenBlock:!0},t.apiConnectionAttempts=0,t.setProps(e),n.initStatic({apiKey:void 0===e.apiKey?"":e.apiKey}),t.constructor_init()}constructor_init(){var t=this;"undefined"==typeof ymaps?(t.apiConnectionAttempts++,t.apiConnectionAttempts<10&&setTimeout(t.constructor_init.bind(t),500+100*t.apiConnectionAttempts)):ymaps.ready((function(){var n=t.prepareMarkers(),r=n.getLength();if(r>0){t.$element=e(t.$element),t.$element.trigger("ddBeforeInit"),t.$element.empty(),0==t.$element.height()&&t.$element.height(400);var a=new ymaps.Map(t.$element.get(0),{center:n.get(0).geometry.getCoordinates(),zoom:t.defaultZoom,type:"yandex#"+t.defaultType,controls:[]},t.mapOptions);if(Array.isArray(t.controls)&&t.controls.forEach((e=>{e.name&&a.controls.add(e.name,e.options)})),t.scrollZoom||a.behaviors.disable("scrollZoom"),a.geoObjects.add(n),r>1&&(t.$element.is(":hidden")?a.events.once("sizechange",(function(){a.setBounds(n.getBounds())})):a.setBounds(n.getBounds())),Array.isArray(t.mapCenterOffset)&&2==t.mapCenterOffset.length){var o=a.getGlobalPixelCenter();a.setGlobalPixelCenter([o[0]-t.mapCenterOffset[0],o[1]-t.mapCenterOffset[1]])}t.$element.on("resize",(()=>{a.container.fitToViewport()})).data("ddMap",{map:a}).trigger("ddAfterInit")}}))}prepareMarkers(){var t=this,n=new ymaps.GeoObjectCollection;return Array.isArray(t.markers)?(2==t.markers.length&&e.isNumeric(t.markers[0])&&e.isNumeric(t.markers[1])?n.add(new ymaps.Placemark(t.markers,{},t.markerOptions)):t.markers.forEach((r=>{e.isPlainObject(r)&&Array.isArray(r.latLng)&&2==r.latLng.length&&n.add(new ymaps.Placemark(r.latLng,{balloonContent:"string"==typeof r.content?e.trim(r.content):""},t.markerOptions))})),n):n}setProps(t){var n=this;e.isPlainObject(t)&&Object.entries(t).forEach((([t,r])=>{void 0!==n[t]&&(e.isPlainObject(n[t])?e.extend(n[t],r):n[t]=r)}))}}e.fn.ddMap=function(n){return e(this).each((function(){new t(e.extend(n,{$element:this}))}))}}(jQuery);
\ No newline at end of file
+!function(e){class t{static isStaticInited=!1;static initStatic(t){if(!this.isStaticInited&&(this.isStaticInited=!0,"undefined"==typeof ymaps)){var n="//api-maps.yandex.ru/2.1/?lang="+navigator.language;t.apiKey.length>0&&(n+="&apikey="+t.apiKey),e("head").append('<script defer src="'+n+'"><\/script>')}}constructor(e){var t=this,n=t.constructor;t.markers=new Array,t.$element="map",t.defaultZoom=15,t.defaultType="map",t.scrollZoom=!1,t.mapCenterOffset=!1,t.markerOptions={},t.controls=[{name:"zoomControl"},{name:"typeSelector"},{name:"fullscreenControl"},{name:"geolocationControl"},{name:"rulerControl"}],t.mapOptions={suppressMapOpenBlock:!0},t.apiConnectionAttempts=0,t.setProps(e),n.initStatic({apiKey:void 0===e.apiKey?"":e.apiKey}),t.constructor_init()}constructor_init(){var t=this;"undefined"==typeof ymaps?(t.apiConnectionAttempts++,t.apiConnectionAttempts<10&&setTimeout(t.constructor_init.bind(t),500+100*t.apiConnectionAttempts)):ymaps.ready((function(){var n=t.prepareMarkers(),i=n.getLength();if(i>0){t.$element=e(t.$element),t.$element.trigger("ddBeforeInit"),t.$element.empty(),0==t.$element.height()&&t.$element.height(400);var r=new ymaps.Map(t.$element.get(0),{center:n.get(0).geometry.getCoordinates(),zoom:t.defaultZoom,type:"yandex#"+t.defaultType,controls:[]},t.mapOptions);if(Array.isArray(t.controls)&&t.controls.forEach((e=>{e.name&&r.controls.add(e.name,e.options)})),t.scrollZoom||r.behaviors.disable("scrollZoom"),r.geoObjects.add(n),i>1&&(t.$element.is(":hidden")?r.events.once("sizechange",(function(){r.setBounds(n.getBounds())})):r.setBounds(n.getBounds())),Array.isArray(t.mapCenterOffset)&&2==t.mapCenterOffset.length){var o=r.getGlobalPixelCenter();r.setGlobalPixelCenter([o[0]-t.mapCenterOffset[0],o[1]-t.mapCenterOffset[1]])}t.$element.on("resize",(()=>{r.container.fitToViewport()})).data("ddMap",{map:r}).trigger("ddAfterInit")}}))}prepareMarkers(){var t=this,n=new ymaps.GeoObjectCollection;return Array.isArray(t.markers)?(2==t.markers.length&&e.isNumeric(t.markers[0])&&e.isNumeric(t.markers[1])?n.add(new ymaps.Placemark(t.markers,{},t.markerOptions)):t.markers.forEach((i=>{if(e.isPlainObject(i)&&Array.isArray(i.latLng)&&2==i.latLng.length){var r=e.extend(!0,{},t.markerOptions);"object"==typeof i.icon&&"string"==typeof i.icon.src&&i.icon.src.length>0&&"object"==typeof i.icon.size&&e.isNumeric(i.icon.size.width)&&e.isNumeric(i.icon.size.height)&&(i.icon.size.width=parseInt(i.icon.size.width),i.icon.size.height=parseInt(i.icon.size.height),r.iconLayout="default#image",r.iconImageHref=i.icon.src,r.iconImageSize=[i.icon.size.width,i.icon.size.height],r.iconImageOffset=[i.icon.size.width/-2,-1*i.icon.size.height]),n.add(new ymaps.Placemark(i.latLng,{balloonContent:"string"==typeof i.content?e.trim(i.content):""},r))}})),n):n}setProps(t){var n=this;e.isPlainObject(t)&&Object.entries(t).forEach((([t,i])=>{void 0!==n[t]&&(e.isPlainObject(n[t])?e.extend(n[t],i):n[t]=i)}))}}e.fn.ddMap=function(n){return e(this).each((function(){new t(e.extend(n,{$element:this}))}))}}(jQuery);
\ No newline at end of file

From a47d9bff80aa2404a3e9a024ead18477dd8161ff Mon Sep 17 00:00:00 2001
From: Ilyas Ronef <ilyas@DivanDesign.ru>
Date: Tue, 27 Feb 2024 18:30:50 +0400
Subject: [PATCH 2/2] Prerelease

---
 CHANGELOG.md        | 4 ++++
 CHANGELOG_ru.md     | 4 ++++
 README.md           | 2 +-
 README_ru.md        | 2 +-
 jQuery.ddMap.js     | 4 ++--
 jQuery.ddMap.min.js | 1 +
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f94b303..c8c857a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # jQuery.ddMap changelog
 
 
+## Version 2.1 (2024-02-27)
+* \+ Parameters → `params.markers[i].icon`: The new optional parameter. Allows you to customaize marker icons.
+
+
 ## Version 2.0 (2023-05-22)
 * \* The library has been renamed from `ddYMap` to `ddMap`: `jQuery.fn.ddYMap` → `jQuery.fn.ddMap`.
 * \+ You may not to think about including Yandex Map script, the library will do it automatically.
diff --git a/CHANGELOG_ru.md b/CHANGELOG_ru.md
index de37293..9e732db 100644
--- a/CHANGELOG_ru.md
+++ b/CHANGELOG_ru.md
@@ -1,6 +1,10 @@
 # jQuery.ddMap changelog
 
 
+## Версия 2.1 (2024-02-27)
+* \+ Параметры → `params.markers[i].icon`: Новый опциональный параметр. Позволяет кастомизировать иконки маркеров.
+
+
 ## Версия 2.0 (2023-05-22)
 * \* Библиотека переименована из `ddYMap` в `ddMap`: `jQuery.fn.ddYMap` → `jQuery.fn.ddMap`.
 * \+ Можно не думать о подключении скрипта Яндекс Карт, библиотека сделает это автоматически.
diff --git a/README.md b/README.md
index 1bfdde7..73c8ff0 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Features:
 <script src="jQuery-3.5.0.min.js"></script>
 
 <!-- jQuery.ddMap -->
-<script src="jQuery.ddMap-2.0.0.min.js"></script>
+<script src="jQuery.ddMap-2.1.0.min.js"></script>
 ```
 
 You may not to think about including Yandex Map script, the library will do it automatically.
diff --git a/README_ru.md b/README_ru.md
index 09b7c33..089e8a4 100644
--- a/README_ru.md
+++ b/README_ru.md
@@ -27,7 +27,7 @@
 <script src="jQuery-3.5.0.min.js"></script>
 
 <!-- jQuery.ddMap -->
-<script src="jQuery.ddMap-2.0.0.min.js"></script>
+<script src="jQuery.ddMap-2.1.0.min.js"></script>
 ```
 
 Можно не думать о подключении скрипта Яндекс Карт, библиотека сделает это автоматически.
diff --git a/jQuery.ddMap.js b/jQuery.ddMap.js
index 96db3fc..160caf7 100644
--- a/jQuery.ddMap.js
+++ b/jQuery.ddMap.js
@@ -1,12 +1,12 @@
 /**
  * jQuery.ddMap
- * @version 2.0 (2023-05-22)
+ * @version 2.1 (2024-02-27)
  * 
  * @see {@link README.md}
  * 
  * @link https://code.divandesign.ru/jquery/ddmap
  * 
- * @copyright 2013–2023 [Ronef]{@link https://Ronef.ru }
+ * @copyright 2013–2024 [Ronef]{@link https://Ronef.ru }
  */
 
 (function($){
diff --git a/jQuery.ddMap.min.js b/jQuery.ddMap.min.js
index c4bf811..881ee99 100644
--- a/jQuery.ddMap.min.js
+++ b/jQuery.ddMap.min.js
@@ -1 +1,2 @@
+/* jQuery.ddMap v2.1 (2024-02-27) | © https://Ronef.ru */
 !function(e){class t{static isStaticInited=!1;static initStatic(t){if(!this.isStaticInited&&(this.isStaticInited=!0,"undefined"==typeof ymaps)){var n="//api-maps.yandex.ru/2.1/?lang="+navigator.language;t.apiKey.length>0&&(n+="&apikey="+t.apiKey),e("head").append('<script defer src="'+n+'"><\/script>')}}constructor(e){var t=this,n=t.constructor;t.markers=new Array,t.$element="map",t.defaultZoom=15,t.defaultType="map",t.scrollZoom=!1,t.mapCenterOffset=!1,t.markerOptions={},t.controls=[{name:"zoomControl"},{name:"typeSelector"},{name:"fullscreenControl"},{name:"geolocationControl"},{name:"rulerControl"}],t.mapOptions={suppressMapOpenBlock:!0},t.apiConnectionAttempts=0,t.setProps(e),n.initStatic({apiKey:void 0===e.apiKey?"":e.apiKey}),t.constructor_init()}constructor_init(){var t=this;"undefined"==typeof ymaps?(t.apiConnectionAttempts++,t.apiConnectionAttempts<10&&setTimeout(t.constructor_init.bind(t),500+100*t.apiConnectionAttempts)):ymaps.ready((function(){var n=t.prepareMarkers(),i=n.getLength();if(i>0){t.$element=e(t.$element),t.$element.trigger("ddBeforeInit"),t.$element.empty(),0==t.$element.height()&&t.$element.height(400);var r=new ymaps.Map(t.$element.get(0),{center:n.get(0).geometry.getCoordinates(),zoom:t.defaultZoom,type:"yandex#"+t.defaultType,controls:[]},t.mapOptions);if(Array.isArray(t.controls)&&t.controls.forEach((e=>{e.name&&r.controls.add(e.name,e.options)})),t.scrollZoom||r.behaviors.disable("scrollZoom"),r.geoObjects.add(n),i>1&&(t.$element.is(":hidden")?r.events.once("sizechange",(function(){r.setBounds(n.getBounds())})):r.setBounds(n.getBounds())),Array.isArray(t.mapCenterOffset)&&2==t.mapCenterOffset.length){var o=r.getGlobalPixelCenter();r.setGlobalPixelCenter([o[0]-t.mapCenterOffset[0],o[1]-t.mapCenterOffset[1]])}t.$element.on("resize",(()=>{r.container.fitToViewport()})).data("ddMap",{map:r}).trigger("ddAfterInit")}}))}prepareMarkers(){var t=this,n=new ymaps.GeoObjectCollection;return Array.isArray(t.markers)?(2==t.markers.length&&e.isNumeric(t.markers[0])&&e.isNumeric(t.markers[1])?n.add(new ymaps.Placemark(t.markers,{},t.markerOptions)):t.markers.forEach((i=>{if(e.isPlainObject(i)&&Array.isArray(i.latLng)&&2==i.latLng.length){var r=e.extend(!0,{},t.markerOptions);"object"==typeof i.icon&&"string"==typeof i.icon.src&&i.icon.src.length>0&&"object"==typeof i.icon.size&&e.isNumeric(i.icon.size.width)&&e.isNumeric(i.icon.size.height)&&(i.icon.size.width=parseInt(i.icon.size.width),i.icon.size.height=parseInt(i.icon.size.height),r.iconLayout="default#image",r.iconImageHref=i.icon.src,r.iconImageSize=[i.icon.size.width,i.icon.size.height],r.iconImageOffset=[i.icon.size.width/-2,-1*i.icon.size.height]),n.add(new ymaps.Placemark(i.latLng,{balloonContent:"string"==typeof i.content?e.trim(i.content):""},r))}})),n):n}setProps(t){var n=this;e.isPlainObject(t)&&Object.entries(t).forEach((([t,i])=>{void 0!==n[t]&&(e.isPlainObject(n[t])?e.extend(n[t],i):n[t]=i)}))}}e.fn.ddMap=function(n){return e(this).each((function(){new t(e.extend(n,{$element:this}))}))}}(jQuery);
\ No newline at end of file