ms-map

8ddad0f7 · Yuri Bondarenko · 972748fd · 8ddad0f7 · 8ddad0f7 · 8ddad0f7
Commit 8ddad0f7 authored May 11, 2019 by Yuri Bondarenko
20 changed files
--- a/.eslintrc.json
+++ b/.eslintrc.json
 {
 	"parserOptions": {
-		"ecmaVersion": 8,
+		"ecmaVersion": 9,
 		"sourceType": "module",
 		"ecmaFeatures": {}
 	},

--- a/gulpfile.js
+++ b/gulpfile.js
@@ -83,9 +83,7 @@ const Clean = cb => {
 };
 task("CLEAN", Clean);
-/**
+// ========================== CSS ============================
- * CSS
- */
 const devCss = cb => {
 	cb();
 	return src("./src/assets/css/*.css")
@@ -136,7 +134,16 @@ const prodJs = cb => {
 // Оптимизация картинок для dev
 const devImgComponents = cb => {
 	cb();
-	return src(["./src/assets/img/**/*", "./src/components/**/*.png", "./src/components/**/*.jpg", "./src/components/**/*.jpeg", "./src/components/**/*.gif", "./src/components/**/*.svg"])
+	// prettier-ignore
+	return src([
+		"node_modules/lightgallery.js/dist/img/*",
+		"./src/assets/img/**/*",
+		"./src/components/**/*.png",
+		"./src/components/**/*.jpg",
+		"./src/components/**/*.jpeg",
+		"./src/components/**/*.gif",
+		"./src/components/**/*.svg"
+	])
 		.pipe(cache(imagemin()))
 		.pipe(dest("./dev/assets/img"));
 };
@@ -144,11 +151,41 @@ const devImgComponents = cb => {
 // Оптимизация картинок для prod
 const prodImgComponents = cb => {
 	cb();
-	return src(["src/assets/img/**/*", "src/components/**/*.png", "src/components/**/*.jpg", "src/components/**/*.jpeg", "src/components/**/*.gif", "src/components/**/*.svg"])
+	// prettier-ignore
+	return src([
+		"node_modules/lightgallery.js/dist/img/*",
+		"src/assets/img/**/*",
+		"src/components/**/*.png",
+		"src/components/**/*.jpg",
+		"src/components/**/*.jpeg",
+		"src/components/**/*.gif",
+		"src/components/**/*.svg"
+	])
 		.pipe(cache(imagemin()))
 		.pipe(dest("prod/assets/img"));
 };
+// ================== FONTS ============================
+const devFonts = cb => {
+	cb();
+	// prettier-ignore
+	return src([
+		"node_modules/lightgallery.js/dist/fonts/*",
+		"src/assets/fonts/**/*"
+	])
+		.pipe(dest("dev/assets/fonts"));
+};
+const prodFonts = cb => {
+	cb();
+	// prettier-ignore
+	return src([
+		"node_modules/lightgallery.js/dist/fonts/*",
+		"src/assets/fonts/**/*"
+	])
+		.pipe(dest("prod/assets/fonts"));
+};
 // ================== HTML ============================
 // HTML для dev
 const devHtml = () => {
@@ -185,7 +222,7 @@ function browserSyncReload(done) {
 task(
 	"DEV",
-	series(devImgComponents, devCss, devJs, devHtml, () => {
+	series(devImgComponents, devFonts, devCss, devJs, devHtml, () => {
 		watch(["./src/assets/css/*.css", "./src/components/**/*.css"], devCss);
 		watch(["./src/assets/js/*.js", "./src/components/**/*.js"], devJs);
 		watch("./src/**/*.html", series(devHtml, browserSyncReload));
@@ -197,4 +234,4 @@ task(
 // ================== PROD ============================
 // Публикация на prod
-task("PROD", series(prodImgComponents, prodCss, prodJs, prodHtml));
+task("PROD", series(prodImgComponents, prodFonts, prodCss, prodJs, prodHtml));
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,6 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
 			"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
-			"dev": true,
 			"requires": {
 				"@babel/highlight": "^7.0.0"
 			}
@@ -39,7 +38,6 @@
 			"version": "7.4.4",
 			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz",
 			"integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==",
-			"dev": true,
 			"requires": {
 				"@babel/types": "^7.4.4",
 				"jsesc": "^2.5.1",
@@ -78,6 +76,19 @@
 				"@babel/types": "^7.4.4"
 			}
 		},
+		"@babel/helper-create-class-features-plugin": {
+			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz",
+			"integrity": "sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==",
+			"requires": {
+				"@babel/helper-function-name": "^7.1.0",
+				"@babel/helper-member-expression-to-functions": "^7.0.0",
+				"@babel/helper-optimise-call-expression": "^7.0.0",
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@babel/helper-replace-supers": "^7.4.4",
+				"@babel/helper-split-export-declaration": "^7.4.4"
+			}
+		},
 		"@babel/helper-define-map": {
 			"version": "7.4.4",
 			"resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz",
@@ -103,7 +114,6 @@
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
 			"integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
-			"dev": true,
 			"requires": {
 				"@babel/helper-get-function-arity": "^7.0.0",
 				"@babel/template": "^7.1.0",
@@ -114,7 +124,6 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
 			"integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
-			"dev": true,
 			"requires": {
 				"@babel/types": "^7.0.0"
 			}
@@ -132,7 +141,6 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz",
 			"integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==",
-			"dev": true,
 			"requires": {
 				"@babel/types": "^7.0.0"
 			}
@@ -164,7 +172,6 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
 			"integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
-			"dev": true,
 			"requires": {
 				"@babel/types": "^7.0.0"
 			}
@@ -172,8 +179,7 @@
 		"@babel/helper-plugin-utils": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
-			"integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
+			"integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="
-			"dev": true
 		},
 		"@babel/helper-regex": {
 			"version": "7.4.4",
@@ -201,7 +207,6 @@
 			"version": "7.4.4",
 			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz",
 			"integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==",
-			"dev": true,
 			"requires": {
 				"@babel/helper-member-expression-to-functions": "^7.0.0",
 				"@babel/helper-optimise-call-expression": "^7.0.0",
@@ -223,7 +228,6 @@
 			"version": "7.4.4",
 			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
 			"integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
-			"dev": true,
 			"requires": {
 				"@babel/types": "^7.4.4"
 			}
@@ -255,7 +259,6 @@
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
 			"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
-			"dev": true,
 			"requires": {
 				"chalk": "^2.0.0",
 				"esutils": "^2.0.2",
@@ -265,8 +268,7 @@
 		"@babel/parser": {
 			"version": "7.4.4",
 			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz",
-			"integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==",
+			"integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w=="
-			"dev": true
 		},
 		"@babel/plugin-proposal-async-generator-functions": {
 			"version": "7.2.0",
@@ -279,6 +281,15 @@
 				"@babel/plugin-syntax-async-generators": "^7.2.0"
 			}
 		},
+		"@babel/plugin-proposal-class-properties": {
+			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz",
+			"integrity": "sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==",
+			"requires": {
+				"@babel/helper-create-class-features-plugin": "^7.4.4",
+				"@babel/helper-plugin-utils": "^7.0.0"
+			}
+		},
 		"@babel/plugin-proposal-json-strings": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
@@ -740,7 +751,6 @@
 			"version": "7.4.4",
 			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
 			"integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
-			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.0.0",
 				"@babel/parser": "^7.4.4",
@@ -751,7 +761,6 @@
 			"version": "7.4.4",
 			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz",
 			"integrity": "sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==",
-			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.0.0",
 				"@babel/generator": "^7.4.4",
@@ -768,7 +777,6 @@
 			"version": "7.4.4",
 			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
 			"integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
-			"dev": true,
 			"requires": {
 				"esutils": "^2.0.2",
 				"lodash": "^4.17.11",
@@ -1220,7 +1228,6 @@
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
 			"requires": {
 				"color-convert": "^1.9.0"
 			}
@@ -2569,7 +2576,6 @@
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dev": true,
 			"requires": {
 				"ansi-styles": "^3.2.1",
 				"escape-string-regexp": "^1.0.5",
@@ -2813,7 +2819,6 @@
 			"version": "1.9.3",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
 			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dev": true,
 			"requires": {
 				"color-name": "1.1.3"
 			}
@@ -2821,8 +2826,7 @@
 		"color-name": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-			"dev": true
 		},
 		"color-support": {
 			"version": "1.1.3",
@@ -3340,7 +3344,6 @@
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
 			"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-			"dev": true,
 			"requires": {
 				"ms": "^2.1.1"
 			}
@@ -4130,8 +4133,7 @@
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-			"dev": true
 		},
 		"eslint": {
 			"version": "5.16.0",
@@ -4260,8 +4262,7 @@
 		"esutils": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
-			"dev": true
 		},
 		"etag": {
 			"version": "1.8.1",
@@ -5843,8 +5844,7 @@
 		"globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-			"dev": true
 		},
 		"globby": {
 			"version": "9.2.0",
@@ -8048,8 +8048,7 @@
 		"has-flag": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-			"dev": true
 		},
 		"has-gulplog": {
 			"version": "0.1.0",
@@ -9090,8 +9089,7 @@
 		"js-tokens": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-			"dev": true
 		},
 		"js-yaml": {
 			"version": "3.13.1",
@@ -9112,8 +9110,7 @@
 		"jsesc": {
 			"version": "2.5.2",
 			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-			"dev": true
 		},
 		"jshint": {
 			"version": "2.10.2",
@@ -9293,6 +9290,11 @@
 				"type-check": "~0.3.2"
 			}
 		},
+		"lg-thumbnail.js": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/lg-thumbnail.js/-/lg-thumbnail.js-1.1.0.tgz",
+			"integrity": "sha512-QyYrSaT3q003iOjR1AM8+L1Jh3fhpLaNvvRpNLeE+RltjLEJPwIVMVqy1UMb3C7xyWy7TdyOfIKJxsCVP3yIbA=="
+		},
 		"liftoff": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
@@ -9309,6 +9311,11 @@
 				"resolve": "^1.1.7"
 			}
 		},
+		"lightgallery.js": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/lightgallery.js/-/lightgallery.js-1.1.3.tgz",
+			"integrity": "sha512-eo96ApfhSyb+Gv421ntAKxkw3CvJ9UBF9/XjiUfwz0rNWYszSsauG3se+FL606+wrMpsp/wFweqSMPTzoiLbnQ=="
+		},
 		"limiter": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.4.tgz",
@@ -9427,8 +9434,7 @@
 		"lodash": {
 			"version": "4.17.11",
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-			"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+			"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-			"dev": true
 		},
 		"lodash._basecopy": {
 			"version": "3.0.1",
@@ -10071,8 +10077,7 @@
 		"ms": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-			"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+			"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-			"dev": true
 		},
 		"multipipe": {
 			"version": "0.1.2",
@@ -13069,8 +13074,7 @@
 		"source-map": {
 			"version": "0.5.7",
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-			"dev": true
 		},
 		"source-map-resolve": {
 			"version": "0.5.2",
@@ -13984,7 +13988,6 @@
 			"version": "5.5.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"dev": true,
 			"requires": {
 				"has-flag": "^3.0.0"
 			}
@@ -14317,8 +14320,7 @@
 		"to-fast-properties": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+			"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
-			"dev": true
 		},
 		"to-object-path": {
 			"version": "0.3.0",
@@ -14419,8 +14421,7 @@
 		"trim-right": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+			"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
-			"dev": true
 		},
 		"trim-trailing-lines": {
 			"version": "1.1.1",

--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
 		"@babel/core": "^7.4.4",
 		"@babel/polyfill": "^7.4.4",
 		"@babel/preset-env": "^7.4.4",
+		"@babel/plugin-proposal-class-properties": "^7.4.4",
 		"babel-loader": "^8.0.5",
 		"browser-sync": "^2.26.5",
 		"eslint": "^5.16.0",
@@ -30,6 +31,8 @@
 		"webpack-stream": "^5.2.1"
 	},
 	"dependencies": {
+		"lg-thumbnail.js": "^1.1.0",
+		"lightgallery.js": "^1.1.3",
 		"swiper": "^4.5.0"
 	}
 }
--- a/src/assets/css/app.css
+++ b/src/assets/css/app.css
 /* Vendor Css */
 @import url("../../../node_modules/swiper/dist/css/swiper.min.css");
+@import url("../../../node_modules/lightgallery.js/dist/css/lightgallery.min.css");
 /* Project CSS */
 @import url("../../components/ms-header/ms-header.css");

--- a/src/assets/js/app.js
+++ b/src/assets/js/app.js
 import msMiniGallery from "../../components/ms-mini-gallery/ms-mini-gallery";
 import msInfoCarousel from "../../components/ms-info-carousel/ms-info-carousel";
+import msMap from "../../components/ms-map/ms-map";
 document.addEventListener("DOMContentLoaded", async () => {
 	/**
@@ -38,4 +39,12 @@ document.addEventListener("DOMContentLoaded", async () => {
 			}
 		}
 	});
+	/**
+	 * карта
+	 */
+	new msMap({
+		mapId: "5cc82180e6b9d406cb074a77",
+		templateFolder: "acapella-2019"
+	});
 });
--- a/src/components/ms-info-carousel/ms-info-carousel.html
+++ b/src/components/ms-info-carousel/ms-info-carousel.html
 <section class="ms-info-carousel swiper-container">
 	<!-- prettier-ignore -->
-	<div class="ms-info-carousel__list swiper-wrapper">
+	<div class="ms-info-carousel__list swiper-wrapper" id="ms-ingo-carousel__gallery">
        @@include( 'ms-info-carousel__item.html', {
            "title": "Идея фестиваля",

--- a/src/components/ms-info-carousel/ms-info-carousel.js
+++ b/src/components/ms-info-carousel/ms-info-carousel.js
@@ -2,6 +2,9 @@
 *
 */
 import { Swiper, Navigation, Pagination, Scrollbar } from "swiper/dist/js/swiper.esm.js";
+// import lightGallery from "lightgallery.js/dist/js/lightgallery";
+import "lightgallery.js";
+import "lg-thumbnail.js";
 /**
 *
@@ -14,5 +17,11 @@ Swiper.use([Navigation, Pagination, Scrollbar]);
 export default class msMiniGallery {
 	constructor(selector, options) {
 		new Swiper(selector, options);
+		/* global lightGallery */
+		lightGallery(document.getElementById("ms-ingo-carousel__gallery"), {
+			thumbnail: true,
+			selector: ".ms-info-carousel__picture"
+		});
 	}
 }
--- a/src/components/ms-info-carousel/ms-info-carousel__item.html
+++ b/src/components/ms-info-carousel/ms-info-carousel__item.html
@@ -5,7 +5,7 @@
 			@@dscr
 		</div>
 	</div>
-	<div class="ms-info-carousel__picture">
+	<div class="ms-info-carousel__picture" data-src="@@img">
 		<img src="@@img" alt="@@title" />
 	</div>
 </div>
--- a/src/components/ms-map/close.svg
+++ b/src/components/ms-map/close.svg
+<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.279552 1.6281C-0.0928893 1.25565 -0.0928895 0.651787 0.279552 0.279337C0.651994 -0.0931125 1.25584 -0.0931125 1.62828 0.279338L9.72067 8.3719C10.0931 8.74435 10.0931 9.34821 9.72067 9.72066C9.34823 10.0931 8.74438 10.0931 8.37194 9.72066L0.279552 1.6281Z" fill="#B6B6B6"/>
+<path d="M9.72045 1.6281C10.0929 1.25565 10.0929 0.651787 9.72045 0.279337C9.34801 -0.0931125 8.74416 -0.0931125 8.37172 0.279338L0.279331 8.3719C-0.0931103 8.74435 -0.0931105 9.34821 0.279331 9.72066C0.651773 10.0931 1.25562 10.0931 1.62806 9.72066L9.72045 1.6281Z" fill="#B6B6B6"/>
+</svg>
--- a/src/components/ms-map/icon-pin-active.svg
+++ b/src/components/ms-map/icon-pin-active.svg
+<svg width="39" height="53" viewBox="0 0 39 53" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M36.8135 10.6C33.6225 4.29889 27.4771 0.353333 20.5044 0C19.8544 0 19.2044 0 18.4953 0C11.4635 0.294444 5.37709 4.29889 2.18618 10.6C-1.12291 17.0778 -0.650183 24.5567 3.42709 30.6222L18.0225 52.2344C18.3771 52.7056 18.9089 53 19.4998 53C20.0907 53 20.6225 52.7056 20.9771 52.2344L35.5725 30.6222C39.6498 24.6156 40.0635 17.1367 36.8135 10.6ZM19.4998 24.1444C15.8953 24.1444 12.9998 21.2589 12.9998 17.6667C12.9998 14.0744 15.8953 11.1889 19.4998 11.1889C23.1044 11.1889 25.9998 14.0744 25.9998 17.6667C25.9998 21.2589 23.1044 24.1444 19.4998 24.1444Z" fill="#F04E43"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="39" height="53" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/src/components/ms-map/icon-pin.svg
+++ b/src/components/ms-map/icon-pin.svg
+<svg width="16" height="20" viewBox="0 0 16 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="8" fill="#F04E43"/>
+<g filter="url(#filter0_d)">
+<circle cx="8" cy="8" r="3.5" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d" x="0.5" y="4.5" width="15" height="15" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>
--- a/src/components/ms-map/map-city.svg
+++ b/src/components/ms-map/map-city.svg
--- a/src/components/ms-map/map-pattern.svg
+++ b/src/components/ms-map/map-pattern.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="519"
+   height="1004"
+   viewBox="0 0 519 1004"
+   fill="none"
+   version="1.1"
+   id="svg34"
+   sodipodi:docname="map-pattern.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata40">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs38" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="1000"
+     id="namedview36"
+     showgrid="false"
+     inkscape:zoom="2.6593976"
+     inkscape:cx="102.58405"
+     inkscape:cy="710.92354"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg34" />
+  <path
+     style="fill:#ffc0b6"
+     d="M 156.10156 416.91602 C 139.26356 416.92002 104.49186 434.71988 92.505859 446.54688 C 80.521214 458.37243 90.68914 485.60816 90.460938 502.44531 L 90.304688 502.44531 L 90.304688 503.31836 C 90.304688 520.31036 83.554063 536.60509 71.539062 548.62109 C 59.523963 560.63609 43.228228 567.38672 26.236328 567.38672 C 9.2444881 567.38672 -7.0513763 560.63609 -19.066406 548.62109 C -31.081506 536.60509 -37.832031 520.30936 -37.832031 503.31836 L -37.832031 502.44531 L -165.92383 502.44531 L -165.92383 503.31836 C -165.92983 512.83136 -168.05267 522.2225 -172.13867 530.8125 C -176.22567 539.4035 -182.17283 546.97637 -189.54883 552.98438 C -196.92583 558.99137 -205.54516 563.28387 -214.78516 565.54688 C -224.02516 567.80887 -233.6527 567.98736 -242.9707 566.06836 L -280.45312 669.11719 C -274.47012 676.79019 -266.81531 682.99572 -258.07031 687.26172 C -249.32431 691.52772 -239.72023 693.74237 -229.99023 693.73438 C -213.00223 693.73438 -196.70931 686.98656 -184.69531 674.97656 C -172.68031 662.96656 -165.92983 646.67745 -165.92383 629.68945 C -165.92383 612.69745 -159.1732 596.40172 -147.1582 584.38672 C -135.1432 572.37172 -118.84747 565.62109 -101.85547 565.62109 C -84.863569 565.62109 -68.567834 572.37172 -56.552734 584.38672 C -44.537634 596.40172 -37.787009 612.69745 -37.787109 629.68945 C -37.787109 646.68145 -31.036584 662.97719 -19.021484 674.99219 C -7.0063844 687.00719 9.2894 693.75781 26.28125 693.75781 C 43.27315 693.75781 59.568884 687.00719 71.583984 674.99219 C 83.599084 662.97719 90.349609 646.68145 90.349609 629.68945 C 90.349609 612.69745 97.098281 596.40172 109.11328 584.38672 C 121.12828 572.37172 137.42597 565.62109 154.41797 565.62109 C 171.40997 565.62109 187.7057 572.37172 199.7207 584.38672 C 211.7357 596.40172 218.48437 612.69745 218.48438 629.68945 C 218.48438 646.68145 225.235 662.97719 237.25 674.99219 C 249.265 687.00719 265.56073 693.75781 282.55273 693.75781 C 299.54473 693.75781 315.84047 687.00719 327.85547 674.99219 C 339.87047 662.97719 346.62109 646.68145 346.62109 629.68945 C 346.61109 621.19945 348.29236 612.79394 351.56836 604.96094 C 354.84336 597.12894 359.64627 590.02627 365.69727 584.07227 L 343.49219 523.06445 C 338.83619 537.64345 329.11684 550.07347 316.08984 558.10547 C 303.06284 566.13847 287.58966 569.24147 272.47266 566.85547 C 257.35566 564.46947 243.59283 556.7507 233.67383 545.0957 C 223.75383 533.4417 218.33548 518.62236 218.39648 503.31836 L 218.39648 502.44727 L 218.55273 502.44727 C 218.31873 485.61227 222.63634 459.97444 210.65234 448.14844 C 198.66734 436.32344 172.93756 416.92602 156.10156 416.91602 z "
+     id="path2" />
+  <path
+     d="M-37.6972 102.915C-37.6972 111.329 -36.04 119.66 -32.8203 127.433C-29.6006 135.206 -24.8814 142.269 -18.9321 148.218C-12.9828 154.167 -5.92004 158.887 1.85304 162.106C9.62611 165.326 17.9572 166.983 26.3708 166.983C34.7843 166.983 43.1155 165.326 50.8886 162.106C58.6616 158.887 65.7244 154.167 71.6737 148.218C77.6229 142.269 82.3422 135.206 85.5619 127.433C88.7816 119.66 90.4388 111.329 90.4388 102.915C90.4517 93.3656 92.5993 83.9396 96.7245 75.3268C100.85 66.7141 106.848 59.1324 114.281 53.1365C121.714 47.1407 130.393 42.8822 139.683 40.6727C148.974 38.4632 158.641 38.3586 167.977 40.3664L153.323 0.156386L89.7686 0.15638C87.5481 15.3725 79.9289 29.2824 68.3023 39.3463C56.6756 49.4101 41.8171 54.9565 26.4398 54.9728C11.0626 54.989 -3.80759 49.4741 -15.4555 39.4348C-27.1034 29.3956 -34.752 15.5018 -37.0047 0.290387L-57.5341 56.7408C-51.2758 62.695 -46.291 69.8573 -42.8813 77.7941C-39.4716 85.7309 -37.708 94.2771 -37.6972 102.915Z"
+     fill="#FFC0B6"
+     id="path4" />
+  <path
+     d="m 26.3708,60.714076 c 15.395,-0.006 45.69501,-4.48974 57.33621,-14.56394 C 95.34811,36.075836 87.5524,15.2348 89.7686,1.71661e-4 l -4.4678,-3.9e-7 C 80.3598,11.5285 72.1447,21.3536 61.6736,28.258 51.2025,35.1624 38.9356,38.8426 26.3931,38.8426 13.8506,38.8426 1.58371,35.1624 -8.88739,28.258 -19.3585,21.3535 -27.5736,11.5284 -32.5146,1.60971e-4 l -4.4678,-3.91e-7 V 0.13419 c 2.2356,15.20651 -10.342527,38.673944 1.288373,48.721744 11.63082,10.0478 46.694827,11.855442 62.064827,11.858142 z"
+     id="path6"
+     inkscape:connector-curvature="0"
+     style="fill:#ffc0b6"
+     sodipodi:nodetypes="ccccsscccccc" />
+  <path
+     d="m -43.901513,234.62324 c 0,8.414 3.349313,15.2409 6.569013,23.0139 3.2197,7.773 10.589971,16.49032 16.539271,22.43932 5.9493,5.95 13.8097197,8.54188 21.58281968,11.76088 7.77307002,3.22 16.79178432,15.31446 25.20528432,15.31446 8.4135,0 31.03365,-5.04122 38.80665,-8.26122 7.7731,-3.219 16.34,-14.70645 22.2893,-20.65645 5.9492,-5.949 3.148,-14.5161 6.3677,-22.2891 3.2197,-7.773 10.893305,-15.35195 10.893205,-23.76595 0,-16.992 5.99805,-24.2624 18.01315,-36.2784 12.015,-12.015 16.65422,-5.60413 33.64622,-5.60413 16.992,0 26.51955,-7.53895 38.53455,4.47605 12.015,12.016 13.12462,25.67883 13.12462,42.67083 0,12.838 14.76173,18.98657 21.97573,29.60557 7.213,10.619 17.451,18.827 29.385,23.558 L 174.344,58.0366 167.888,40.2772 c -9.336,-2.0079 -19.003,-1.9032 -28.294,0.3063 -9.291,2.2095 -17.97,6.468 -25.402,12.4639 -7.433,5.9959 -13.432,13.5775 -17.5567,22.1903 -4.1252,8.6127 -6.2728,18.0387 -6.2858,27.5883 0,8.414 -1.6572,16.745 -4.8769,24.518 -3.2197,7.773 -7.9389,14.836 -13.8882,20.785 -5.9492,5.949 -13.012,10.668 -20.7851,13.888 -7.7731,3.22 -16.1042,4.877 -24.5178,4.877 -8.4135,0 -16.74461,-1.657 -24.51769,-4.877 -7.77308,-3.22 -14.83591,-7.939 -20.78511,-13.888 -5.9493,-5.949 -10.6685,-13.012 -13.8882,-20.785 -3.2198,-7.773 -4.8769,-16.104 -4.8769,-24.518 0.0104,-8.6645 -1.743,-17.2404 -5.1533,-25.2056 -3.4104,-7.9651 -8.4063,-15.1528 -14.6836,-21.1252 l -4.4678,12.1524 -35.7423,98.2914 c 16.3091,1.002 17.32985,20.98385 28.50835,32.90085 -59.48746,69.12385 25.465737,18.44439 25.423537,34.78339 z"
+     id="path10"
+     inkscape:connector-curvature="0"
+     style="fill:#fa7d4e"
+     sodipodi:nodetypes="csccsccsccscsccccscccscsssccccccccc" />
+  <path
+     d="m -293.947,757.78 c -0.159,8.513 1.38,16.972 4.528,24.883 3.148,7.911 7.841,15.115 13.805,21.191 5.964,6.077 13.079,10.904 20.93,14.199 7.851,3.294 16.28,4.991 24.794,4.992 8.514,0 16.943,-1.698 24.794,-4.992 7.85,-3.295 14.966,-8.122 20.93,-14.199 5.964,-6.076 10.657,-13.28 13.804,-21.191 3.148,-7.911 4.688,-16.37 4.529,-24.883 0,-16.992 6.75,-33.288 18.765,-45.303 12.015,-12.015 28.311,-18.765 45.303,-18.765 16.9914,0 33.2873,6.75 45.3024,18.765 12.0151,12.015 18.7651,28.311 18.7651,45.303 0,16.992 6.75,33.288 18.7651,45.303 12.01504,12.015 28.31097,18.765 45.3029,18.765 16.9918,0 33.2878,-6.75 45.3028,-18.765 12.0151,-12.015 18.7651,-28.311 18.7651,-45.303 0,-16.992 20.57627,-25.31131 32.59187,-37.32631 12.015,-12.015 25.12032,-9.72474 42.11132,-9.72474 16.992,0 10.95326,-2.82203 22.96826,9.19297 12.015,12.015 20.89212,20.86608 20.89212,37.85808 0,16.992 2.49576,40.73292 14.51076,52.74792 12.015,12.015 42.13727,24.08279 59.12927,24.08279 16.992,0 42.86003,-14.19491 54.87503,-26.20991 12.015,-12.015 42.16331,-30.43812 42.16331,-47.43012 0.007,-16.117 -26.88234,-34.83068 -15.93934,-46.66368 10.943,-11.833 25.943,-19.107 42.011,-20.371 l -35.586,-97.822 -4.468,-12.063 c -6.051,5.954 -10.855,13.055 -14.13,20.887 -3.276,7.833 -4.957,16.239 -4.947,24.729 0,16.992 -6.75,33.288 -18.765,45.303 -12.015,12.015 -28.311,18.765 -45.303,18.765 -16.992,0 -33.288,-6.75 -45.303,-18.765 -12.015,-12.015 -18.765,-28.311 -18.765,-45.303 0,-16.992 -6.75,-33.288 -18.765,-45.303 -12.015,-12.015 -28.311,-18.765 -45.303,-18.765 -16.992,0 -33.288,6.75 -45.303,18.765 -12.015,12.015 -18.765,28.311 -18.765,45.303 0,16.992 -6.7499,33.288 -18.765,45.303 -12.0151,12.015 -28.311,18.765 -45.3029,18.765 -16.99187,0 -33.28783,-6.75 -45.3029,-18.765 -12.0151,-12.015 -18.765,-28.311 -18.765,-45.303 0,-16.992 -6.75,-33.288 -18.7651,-45.303 -12.0151,-12.015 -28.3111,-18.765 -45.3031,-18.765 -16.992,0 -33.288,6.75 -45.303,18.765 -12.015,12.015 -18.765,28.311 -18.765,45.303 0.004,13.338 -4.156,26.345 -11.9,37.205 -7.744,10.859 -18.686,19.03 -31.298,23.372 -12.612,4.342 -26.265,4.638 -39.053,0.846 -12.788,-3.791 -24.073,-11.481 -32.28,-21.995 l -3.843,10.544 -17.379,47.805 c 5.056,9.313 7.712,19.739 7.729,30.336 z"
+     id="path12"
+     inkscape:connector-curvature="0"
+     style="fill:#fa7d4e"
+     sodipodi:nodetypes="cscccccccsssscscscsssssscscccccsssssssssscssssccsccccc" />
+  <path
+     d="M-101.765 295.119C-93.3517 295.119 -85.0205 296.777 -77.2475 299.996C-69.4744 303.216 -62.4116 307.935 -56.4624 313.885C-50.5131 319.834 -45.7938 326.897 -42.5741 334.67C-39.3544 342.443 -37.6973 350.774 -37.6973 359.187C-37.6973 376.179 -30.9473 392.475 -18.9322 404.49C-6.91711 416.505 9.37881 423.255 26.3707 423.255C43.3626 423.255 59.6585 416.505 71.6736 404.49C83.6887 392.475 90.4387 376.179 90.4387 359.187C90.4387 342.196 97.1887 325.9 109.204 313.885C121.219 301.869 137.515 295.119 154.507 295.119C171.499 295.119 187.794 301.869 199.81 313.885C211.825 325.9 218.575 342.196 218.575 359.187C218.583 369.587 221.122 379.827 225.972 389.026C230.822 398.225 237.838 406.105 246.413 411.988C254.989 417.87 264.867 421.577 275.196 422.789C285.524 424 295.992 422.681 305.696 418.944L265.665 308.769L258.963 290.54C247.029 285.809 236.792 277.601 229.579 266.982C222.365 256.363 218.508 243.822 218.508 230.984C218.508 213.993 211.758 197.697 199.743 185.682C187.727 173.666 171.431 166.916 154.44 166.916C137.448 166.916 121.152 173.666 109.137 185.682C97.1217 197.697 90.3717 213.993 90.3717 230.984C90.3717 247.976 83.6217 264.272 71.6066 276.287C59.5915 288.302 43.2956 295.052 26.3037 295.052C9.31181 295.052 -6.98412 288.302 -18.9992 276.287C-31.0143 264.272 -37.7643 247.976 -37.7643 230.984C-37.7662 214.69 -43.9767 199.008 -55.1319 187.131C-66.2872 175.254 -81.5488 168.073 -97.8112 167.051L-103.619 182.978L-154.329 322.44C-148.421 313.983 -140.555 307.082 -131.402 302.324C-122.249 297.567 -112.081 295.095 -101.765 295.119Z"
+     id="path14"
+     fill="#FF9191" />
+  <path
+     d="M-293.947 885.938C-294.106 894.451 -292.567 902.91 -289.419 910.821C-286.271 918.732 -281.578 925.936 -275.614 932.013C-269.65 938.089 -262.535 942.916 -254.684 946.211C-246.833 949.506 -238.404 951.203 -229.89 951.203C-221.376 951.203 -212.947 949.506 -205.096 946.211C-197.246 942.916 -190.13 938.089 -184.166 932.013C-178.202 925.936 -173.509 918.732 -170.362 910.821C-167.214 902.91 -165.674 894.451 -165.833 885.938C-165.834 871.815 -161.167 858.086 -152.559 846.889C-143.951 835.691 -131.884 827.652 -118.235 824.021C-104.586 820.39 -90.1196 821.372 -77.0857 826.812C-64.0517 832.253 -53.181 841.848 -46.164 854.106L99.0389 854.106C104.64 844.31 112.73 836.169 122.491 830.506C132.251 824.844 143.334 821.862 154.618 821.862C165.902 821.862 176.985 824.844 186.746 830.506C196.506 836.169 204.596 844.31 210.197 854.106L211.225 854.106L213.079 859.757C214.861 863.749 216.238 867.91 217.189 872.178L236.177 930.013C244.993 939.315 256.396 945.759 268.912 948.511C281.428 951.262 294.482 950.196 306.386 945.449C318.29 940.703 328.496 932.494 335.685 921.885C342.874 911.276 346.714 898.754 346.71 885.938C346.705 872.597 350.866 859.586 358.613 848.724C366.36 837.861 377.306 829.69 389.923 825.35C402.539 821.01 416.196 820.718 428.986 824.516C441.776 828.314 453.061 836.011 461.264 846.533L411.515 709.774L405.752 693.958C389.688 695.222 374.691 702.493 363.748 714.321C352.806 726.15 346.722 741.667 346.71 757.78C346.71 774.772 339.96 791.068 327.945 803.083C315.93 815.098 299.634 821.848 282.642 821.848C265.65 821.848 249.355 815.098 237.339 803.083C225.324 791.068 218.574 774.772 218.574 757.78C218.574 740.788 211.824 724.492 199.809 712.477C187.794 700.462 171.498 693.712 154.506 693.712C137.514 693.712 121.219 700.462 109.204 712.477C97.1884 724.492 90.4384 740.788 90.4384 757.78C90.4384 774.772 83.6884 791.068 71.6734 803.083C59.6583 815.098 43.3623 821.848 26.3704 821.848C9.37855 821.848 -6.91738 815.098 -18.9325 803.083C-30.9475 791.068 -37.6975 774.772 -37.6975 757.78C-37.6975 740.788 -44.4476 724.492 -56.4626 712.477C-68.4777 700.462 -84.7736 693.712 -101.765 693.712C-118.757 693.712 -135.053 700.462 -147.068 712.477C-159.083 724.492 -165.833 740.788 -165.833 757.78C-165.674 766.293 -167.214 774.752 -170.362 782.663C-173.509 790.574 -178.202 797.778 -184.166 803.854C-190.13 809.931 -197.246 814.758 -205.096 818.052C-212.947 821.347 -221.376 823.044 -229.89 823.044C-238.404 823.044 -246.833 821.347 -254.684 818.052C-262.535 814.758 -269.65 809.931 -275.614 803.854C-281.578 797.778 -286.271 790.574 -289.419 782.663C-292.567 774.752 -294.106 766.293 -293.947 757.78C-293.937 747.191 -296.562 736.765 -301.587 727.444L-305.251 737.496L-337.218 825.355C-324.595 829.691 -313.641 837.859 -305.884 848.72C-298.127 859.581 -293.954 872.592 -293.947 885.938Z"
+     id="path16"
+     fill="#FF9191" />
+  <path
+     d="M491.109 928.584L474.78 883.705C474.78 884.442 474.78 885.201 474.78 885.939C474.773 901.682 480.589 916.871 491.109 928.584Z"
+     fill="#FF9191"
+     id="path18" />
+  <path
+     d="M410.778 966.024C398.489 966.027 386.46 969.562 376.124 976.207C365.787 982.853 357.578 992.33 352.474 1003.51L469.06 1003.51C463.965 992.328 455.761 982.849 445.427 976.203C435.093 969.556 423.065 966.023 410.778 966.024Z"
+     fill="#FFC0B6"
+     id="path20" />
+  <path
+     d="m 410.778,949.895 c -15.176,0.007 -29.857,5.4 -41.429,15.218 -11.573,9.817 -19.286,23.423 -21.767,38.397 h 4.892 c 5.104,-11.181 27.13927,-4.70361 37.47627,-11.34961 10.337,-6.645 15.98465,-1.67153 28.27265,-1.67553 12.287,0 12.61584,-12.42039 22.94984,-5.77339 10.334,6.646 22.79224,7.61653 27.88824,18.79853 h 4.892 c -2.476,-14.972 -10.185,-28.577 -21.754,-38.396 -11.569,-9.818 -26.247,-15.211 -41.421,-15.219 z"
+     id="path22"
+     inkscape:connector-curvature="0"
+     style="fill:#ffc0b6"
+     sodipodi:nodetypes="ccccccccccc" />
+  <path
+     d="M26.3709 38.8475C38.9139 38.8471 51.1812 35.1661 61.6524 28.2608C72.1235 21.3555 80.3383 11.5293 85.2786 0.000156403L-32.5368 0.000146103C-27.5965 11.5293 -19.3818 21.3555 -8.91062 28.2608C1.56053 35.1661 13.8278 38.8471 26.3709 38.8475Z"
+     fill="#F05070"
+     id="path24" />
+  <path
+     d="M217.078 872.178C216.127 867.911 214.75 863.75 212.967 859.757L217.078 872.178Z"
+     fill="#F05070"
+     id="path26" />
+  <path
+     d="m 282.643,949.895 c -8.707,-0.005 -17.321,-1.791 -25.312,-5.248 -7.991,-3.458 -15.189,-8.514 -21.153,-14.857 l 7.416,23.031 16.844,50.689 h 87.121 c 2.482,-14.977 10.198,-28.586 21.776,-38.405 11.577,-9.818 26.263,-15.208 41.443,-15.21 15.174,0.008 29.852,5.402 41.421,15.22 11.569,9.818 19.278,23.423 21.754,38.395 h 44.41 l -18.452,-50.733 -8.802,-24.193 c -10.496,-11.723 -16.288,-26.911 -16.263,-42.645 v -2.234 l -13.403,-37.172 c -8.183,-10.595 -19.479,-18.359 -32.303,-22.202 -12.823,-3.842 -26.528,-3.57 -39.189,0.778 -12.66,4.348 -23.64,12.555 -31.396,23.466 -7.756,10.91 -11.898,23.977 -11.845,37.364 -0.029,16.972 -6.792,33.239 -18.804,45.23 -12.012,11.991 -28.291,18.726 -45.263,18.726 z"
+     id="path28"
+     inkscape:connector-curvature="0"
+     style="fill:#f05070"
+     sodipodi:nodetypes="ccccccccscccccccccccsc" />
+  <path
+     d="M154.507 821.871C143.223 821.867 132.139 824.847 122.379 830.508C112.618 836.169 104.528 844.31 98.9273 854.106L210.086 854.106C204.485 844.31 196.395 836.169 186.634 830.508C176.874 824.847 165.79 821.867 154.507 821.871Z"
+     fill="#F05070"
+     id="path30" />
+  <path
+     d="M-165.833 503.318C-165.833 503.027 -165.833 502.737 -165.833 502.447C-165.833 485.461 -159.086 469.17 -147.075 457.16C-135.064 445.149 -118.774 438.401 -101.788 438.401C-84.8016 438.401 -68.5114 445.149 -56.5005 457.16C-44.4896 469.17 -37.742 485.461 -37.742 502.447C-37.742 502.737 -37.742 503.028 -37.742 503.318C-37.742 520.31 -30.992 536.606 -18.9769 548.621C-6.96185 560.636 9.33411 567.386 26.326 567.386C43.3179 567.386 59.6138 560.636 71.6288 548.621C83.6439 536.606 90.3939 520.31 90.3939 503.318C90.3939 503.028 90.3939 502.737 90.3939 502.447C90.3939 485.461 97.1416 469.17 109.152 457.16C121.163 445.149 137.454 438.401 154.44 438.401C171.426 438.401 187.716 445.149 199.727 457.16C211.738 469.171 218.485 485.461 218.485 502.447C218.485 502.737 218.485 503.028 218.485 503.318C218.424 518.622 223.844 533.442 233.763 545.097C243.682 556.751 257.446 564.47 272.563 566.856C287.68 569.243 303.152 566.139 316.178 558.107C329.205 550.074 338.927 537.644 343.583 523.066L343.27 522.194L336.099 502.447L310.745 432.772L305.719 418.944C296.014 422.681 285.546 424 275.218 422.788C264.89 421.577 255.011 417.87 246.436 411.988C237.86 406.105 230.844 398.225 225.994 389.026C221.144 379.827 218.605 369.586 218.597 359.187C218.597 342.195 211.847 325.9 199.832 313.885C187.817 301.869 171.521 295.119 154.529 295.119C137.537 295.119 121.241 301.869 109.226 313.885C97.211 325.9 90.461 342.195 90.461 359.187C90.461 376.179 83.711 392.475 71.6959 404.49C59.6808 416.505 43.3849 423.255 26.393 423.255C9.40114 423.255 -6.89485 416.505 -18.9099 404.49C-30.925 392.475 -37.675 376.179 -37.675 359.187C-37.6697 345.556 -42.0135 332.279 -50.0746 321.287C-58.1357 310.295 -69.4936 302.162 -82.4961 298.07C-95.4985 293.978 -109.467 294.142 -122.37 298.537C-135.274 302.932 -146.438 311.329 -154.239 322.507L-165.565 353.446C-165.722 355.3 -165.833 357.177 -165.833 359.098C-165.789 375.675 -172.198 391.619 -183.704 403.552L-192.215 426.964L-219.648 502.357L-242.188 564.325L-242.791 565.979C-233.473 567.898 -223.846 567.719 -214.606 565.457C-205.366 563.194 -196.746 558.903 -189.37 552.896C-181.993 546.888 -176.047 539.315 -171.96 530.724C-167.874 522.134 -165.75 512.741 -165.744 503.229L-165.833 503.318Z"
+     fill="#F05070"
+     id="path32" />
+</svg>
--- a/src/components/ms-map/ms-map.html
+++ b/src/components/ms-map/ms-map.html
+<section class="ms-map" id="ms-map">
+    <div class="ms-map__inner">
+        <div class="ms-map__container" id="ms-map__container"></div>
+        <div class="ms-map__event" id="map-event">
+            <button class="ms-map__close"></button>
+            <div class="ms-map__event-inner">
+            </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
--- a/src/components/ms-map/ms-map.js
+++ b/src/components/ms-map/ms-map.js
+/**
+ *
+ */
+export default class msMap {
+	/**
+	 * конструктор
+	 * @param {*} options параметры
+	 */
+	constructor(
+		options = {
+			mapId: "5cc82180e6b9d406cb074a77",
+			templateFolder: "acapella-2019"
+		}
+	) {
+		this.mapId = options.mapId; //id карты с moscowseasons
+		this.templateFolder = options.templateFolder; //папка шаблона для пина
+		this.showPointInfo = true; //открываем ли пин по клику
+		this.clusterer = null;
+		this.objectManager = null;
+		this.map = null;
+		this.dataPoints = {
+			items: []
+		};
+		this.coords = [];
+		this.setBasePath();
+		(async () => {
+			await this.loadData();
+			await this.initMap();
+		})();
+	}
+	/**
+	 * задаем пути к пинам
+	 */
+	setBasePath() {
+		this.basePathPin = "/templates/" + this.templateFolder + "/assets/img/ms-map/icon-pin.svg";
+		this.basePathPinActive = "/templates/" + this.templateFolder + "/assets/img/ms-map/icon-pin-active.svg";
+		if (location.hostname == "localhost") {
+			this.basePathPin = "/assets/img/ms-map/icon-pin.svg";
+			this.basePathPinActive = "/assets/img/ms-map/icon-pin-active.svg";
+		}
+		if (location.hostname == "new-year.bnweb.studio") {
+			this.basePathPin = "/acapella-2019/assets/img/ms-map/icon-pin.svg";
+			this.basePathPinActive = "/acapella-2019/assets/img/ms-map/icon-pin-active.svg";
+		}
+		if (location.hostname == "www.mos.ru" || location.host == "newmos.mos.ru") {
+			this.basePathPin = "https://moscowseasons.com/templates/" + this.templateFolder + "/assets/img/ms-map/icon-pin.svg";
+			this.basePathPinActive = "https://moscowseasons.com/templates/" + this.templateFolder + "/assets/img/ms-map/icon-pin-active.svg";
+		}
+	}
+	/**
+	 * загружаем данные
+	 */
+	async loadData() {
+		fetch("https://moscowseasons.com/graphql", {
+			method: "POST",
+			body: {
+				data: `{
+					"operationName":"map",
+					"variables":{
+						"id":"${this.mapId}"
+					},
+					"query":"query map ($id: ID) {
+						map(id: $id) {
+							slug
+							layers {
+								header
+								points {
+									address {
+										lat
+										lon
+										address
+										__typename
+									}
+									title
+									shortDesc
+									event {
+										slug
+									}
+									__typename
+								}
+								__typename
+							}
+							__typename
+						}
+						__typename
+					}"
+				}`
+			}
+		})
+			.then(response => response.json())
+			.then(data => {
+				console.log("Fetch map data: ", data);
+				let id = 1;
+				data.data.map.layers.forEach(function(layer) {
+					let points = [];
+					let id2 = 1;
+					layer.points.forEach(function(point) {
+						if (!point) return;
+						points.push({
+							id: id2,
+							title: point.title ? point.title : "",
+							group_id: id,
+							lat: point.address.lon,
+							lon: point.address.lat,
+							address: point.address.address,
+							shortDesc: point.shortDesc ? point.shortDesc : null,
+							slug: point.event ? point.event.slug : null,
+							image: point.image ? point.image.resized.url : null
+						});
+						this.coords.push(point.address.lat + "_" + point.address.lon);
+						id2++;
+					});
+					this.dataPoints.items.push({
+						id: id,
+						title: layer.header,
+						entity_type: "groups",
+						points: points
+					});
+					id++;
+				});
+				// data_points.items.push(data_points.items[0]);
+				// data_points.items = data_points.items.slice(1, 5);
+				this.dataPoints.items.forEach(function(layer) {
+					let liNode = document.createElement("li");
+					liNode.innerText = layer.title;
+					document.querySelector(".ms-map__places").appendChild(liNode);
+				});
+			});
+	}
+	/**
+	 * готовим яндекс карту
+	 */
+	async initMap() {
+		/* global ymaps */
+		ymaps.ready(function() {
+			this.map = new ymaps.Map("ms-map__container", {
+				center: [55.757, 37.62233],
+				zoom: 11
+			});
+			this.map.margin.addArea({
+				left: 0,
+				top: 0
+			});
+			this.objectManager = new ymaps.ObjectManager({
+				// Чтобы метки начали кластеризоваться, выставляем опцию.
+				clusterize: true,
+				// ObjectManager принимает те же опции, что и кластеризатор.
+				gridSize: 64,
+				// Макет метки кластера pieChart.
+				clusterIconLayout: "default#pieChart"
+			});
+			this.clusterer = new ymaps.Clusterer({
+				preset: "islands#invertedRedClusterIcons",
+				groupByCoordinates: false,
+				zoomMargin: 30,
+				clusterDisableClickZoom: false
+			});
+			let clusterObjects = [];
+			let coordsTemp = this.coords.slice();
+			this.dataPoints.items.forEach(function(layer) {
+				// Группы точек
+				this.clusterObjects[layer.title] = [];
+				layer.points.forEach(function(point) {
+					//console.log(point);
+					let lon = Number(point.lon);
+					let lat = Number(point.lat);
+					coordsTemp = coordsTemp.filter(item => item === point.lon + "_" + point.lat);
+					let repeat = coordsTemp.length;
+					//console.log(repeat);
+					if (!repeat) return;
+					let marker = new ymaps.Placemark(
+						[lat, lon],
+						{
+							hintContent: point.address,
+							//openEmptyBalloon: false,
+							slug: point.slug,
+							title: point.title,
+							image: point.image,
+							address: point.address,
+							desc: point.shortDesc
+						},
+						{
+							iconLayout: "default#image",
+							iconImageHref: this.basePathPin,
+							iconImageSize: [30, 30],
+							iconImageOffset: [-15, -15],
+							id: point.id,
+							balloonPanelMaxMapArea: 0,
+							openEmptyBalloon: false
+						}
+					);
+					marker.events.add("click", () => {
+						for (var keyLayer in clusterObjects) {
+							clusterObjects[keyLayer].forEach(function(point) {
+								point.options.set({
+									iconImageHref: this.basePathPin,
+									iconImageSize: [30, 30],
+									iconImageOffset: [-15, -15]
+								});
+							});
+						}
+						marker.options.set({
+							iconImageHref: this.basePathPinActive,
+							iconLayout: "default#image",
+							iconImageSize: [37, 50],
+							iconImageOffset: [-18, -25]
+						});
+						this.map.margin.addArea({
+							right: 0,
+							bottom: 0
+						});
+						if (!this.showPointInfo) return false;
+						if (marker.properties.get("slug") == null) {
+							document.querySelector(".ms-map__event-inner").innerHTML = "";
+							const wrapElement = document.createElement("div");
+							wrapElement.classList.add("ms-map__event-wrap");
+							const addressElement = document.createElement("div");
+							addressElement.classList.add("ms-map__event-address", "ms-map__event-address--empty");
+							addressElement.innerHTML = marker.properties.get("address");
+							const descriptionElement = document.createElement("div");
+							descriptionElement.classList.add("ms-map__event-dscr");
+							descriptionElement.innerHTML = marker.properties.get("title");
+							wrapElement.appendChild(addressElement);
+							wrapElement.appendChild(descriptionElement);
+							document.querySelector(".ms-map__event-inner").appendChild(wrapElement);
+							document.querySelector(".ms-map__close").style.display = "block";
+							if (!$(".ms-map__event").is(":visible") && $(window).width() > 641) {
+								$(".ms-map__event").show();
+							} else if (!$(".ms-map__event").is(":visible") && $(window).width() < 640) {
+								$.fancybox.open([
+									{
+										src: "#map-event",
+										slideShow: false,
+										closeBtn: false,
+										scrolling: false,
+										buttons: [],
+										touch: {
+											vertical: false
+										},
+										baseTpl: '<div class="fancybox-container" role="dialog" tabindex="-1">' + '<div class="fancybox-inner">' + '<div class="fancybox-infobar"><span data-fancybox-index></span>&nbsp;/&nbsp;<span data-fancybox-count></span></div>' + '<div class="fancybox-toolbar">{{buttons}}</div>' + '<div class="fancybox-navigation">{{arrows}}</div>' + '<div class="fancybox-stage"></div>' + '<div class="fancybox-caption"></div>' + "</div>" + "</div>"
+									}
+								]);
+							}
+						} else {
+							if (!$(".ms-map__event").is(":visible") && $(window).width() > 641) {
+								$(".ms-map__event").fadeIn();
+							} else if (!$(".ms-map__event").is(":visible") && $(window).width() <= 641) {
+								$.fancybox.open([
+									{
+										src: "#map-event",
+										slideShow: false,
+										closeBtn: false,
+										scrolling: false,
+										buttons: [],
+										touch: {
+											vertical: false
+										},
+										baseTpl: '<div class="fancybox-container" role="dialog" tabindex="-1">' + '<div class="fancybox-inner">' + '<div class="fancybox-infobar"><span data-fancybox-index></span>&nbsp;/&nbsp;<span data-fancybox-count></span></div>' + '<div class="fancybox-toolbar">{{buttons}}</div>' + '<div class="fancybox-navigation">{{arrows}}</div>' + '<div class="fancybox-stage"></div>' + '<div class="fancybox-caption"></div>' + "</div>" + "</div>"
+									}
+								]);
+							}
+							$.ajax({
+								type: "POST",
+								url: "https://moscowseasons.com/graphql",
+								dataType: "json",
+								contentType: "application/json",
+								data: JSON.stringify({
+									operationName: "event",
+									variables: {
+										slug: marker.properties.get("slug"),
+										locale: "RU"
+									},
+									query: "query event($slug: String) {  event(slug: $slug) { \n ...EventFragment __typename \n}  \n} \n fragment EventFragment on Event { \n ...ShortEventFragment __typename \n } \n fragment ShortEventFragment on Event { \n id \n locale \n slug \n title description address {\n    address\n __typename\n  }\n \n images { \n id \n url \n resized(width: 500, height: 500) {\n url \n __typename \n } \n  __typename \n } \n __typename \n } \n"
+								}),
+								success: function(data) {
+									$(".ms-map__event-inner").html("");
+									var event = data.data.event;
+									var link = "/" + event.locale.toLowerCase() + "/event/" + event.slug;
+									var target = "_blank";
+									if (window.location.host == "www.mos.ru" || window.location.host == "newmos.mos.ru") {
+										target = "_blank";
+										link = "https://moscowseasons.com/" + event.locale.toLowerCase() + "/event/" + event.slug;
+									}
+									var image_src = "";
+									if (event.images.length != 0) {
+										image_src = event.images[0].resized.url;
+									}
+									var wrap = $("<div/>", { class: "ms-map__event-wrap" });
+									var img = $("<div/>", { class: "ms-map__event-img", style: "background-image: url(" + image_src + ")" });
+									var title = $("<div/>", { class: "ms-map__event-title", text: event.title });
+									var address = $("<div/>", { class: "ms-map__event-address", text: event.address.address });
+									var description = $("<div/>", { class: "ms-map__event-dscr", html: marker.properties.get("desc") });
+									var more = $("<a/>", { class: "ms-map__event-more", text: "Подробнее", href: link, target: target });
+									wrap.append(description, address, more);
+									$(".ms-map__event-inner").append(title, img, wrap);
+									$(".ms-map__close").fadeIn();
+								}
+							});
+						}
+					});
+					clusterObjects[layer.title].push(marker);
+					clusterer.add(marker);
+				});
+				map.geoObjects.add(clusterer);
+				objectManager.add(clusterObjects);
+			});
+			// удаляем лишние контролы
+			map.controls.remove("searchControl");
+			map.controls.remove("geolocationControl");
+			map.controls.remove("typeSelector");
+			map.controls.remove("trafficControl");
+			var supportsTouch = "ontouchstart" in document.documentElement;
+			if (supportsTouch) {
+				map.behaviors.disable("drag");
+			}
+			map.controls.remove("fullscreenControl");
+			if ($(document).width() >= 1200) {
+				map.controls.remove("zoomControl");
+				var zoomControl = new ymaps.control.ZoomControl({
+					options: {
+						position: {
+							top: 108,
+							right: 10,
+							bottom: "auto",
+							left: "auto"
+						}
+					}
+				});
+				map.controls.add(zoomControl);
+			}
+			// выключаем зум по скролу
+			map.behaviors.disable(["scrollZoom"]);
+			// автомасштаб
+			map.setBounds(
+				// map.geoObjects.getBounds(),
+				clusterer.getBounds(),
+				{
+					checkZoomRange: true,
+					zoomMargin: [20, 20, 20, 20]
+				}
+			).then(function() {
+				//if( map.getZoom() > 15) map.setZoom(15);
+			});
+		});
+	}
+}
+(function($, window, document, undefined) {
+	var MSMap = (function() {
+		var initMap = function() {
+			$.ajax({
+				type: "POST",
+				url: "https://moscowseasons.com/graphql",
+				data: '{"operationName":"map","variables":{"id":"' + map_id + '"},"query":"query map ($id: ID) {  map(id: $id) { slug layers{header points{address{lat lon address __typename}  title shortDesc event {slug } __typename} __typename}  __typename } __typename }"}',
+				success: function(data) {
+					//console.log(data_points.items);
+					/* Yandex maps */
+					ymaps.ready(function() {
+						map = new ymaps.Map("ms-map__container", {
+							center: [55.757, 37.62233],
+							zoom: 11
+						});
+						map.margin.addArea({
+							left: 0,
+							top: 0
+							// width: zoom_offset,
+							// height: '100%'
+						});
+						objectManager = new ymaps.ObjectManager({
+							// Чтобы метки начали кластеризоваться, выставляем опцию.
+							clusterize: true,
+							// ObjectManager принимает те же опции, что и кластеризатор.
+							gridSize: 64,
+							// Макет метки кластера pieChart.
+							clusterIconLayout: "default#pieChart"
+						});
+						clusterer = new ymaps.Clusterer({
+							preset: "islands#invertedRedClusterIcons",
+							groupByCoordinates: false,
+							//gridSize: 120,
+							zoomMargin: 30,
+							clusterDisableClickZoom: false
+						});
+						var clusterObjects = [];
+						var coords_temp = coords.slice();
+						data_points.items.forEach(function(layer) {
+							// Группы точек
+							clusterObjects[layer.title] = [];
+							layer.points.forEach(function(point) {
+								//console.log(point);
+								var lon = Number(point.lon);
+								var lat = Number(point.lat);
+								//var repeat = coords_temp.filter(item => item === point.lon + '_' + point.lat).length;
+								var repeat = coords_temp.filter(function(item) {
+									if (item === point.lon + "_" + point.lat) {
+										return item;
+									}
+								}).length;
+								//console.log(repeat);
+								if (repeat === 0) {
+									return;
+								} else if (repeat > 1) {
+									$.each(coords_temp, function(index, coord) {
+										if (coord == point.lon + "_" + point.lat) {
+											coords_temp.splice(index, 1);
+										}
+									});
+								}
+								var marker = new ymaps.Placemark(
+									[lat, lon],
+									{
+										hintContent: point.address,
+										//openEmptyBalloon: false,
+										slug: point.slug,
+										title: point.title,
+										image: point.image,
+										address: point.address,
+										desc: point.shortDesc
+									},
+									{
+										iconLayout: "default#image",
+										iconImageHref: base_path_pin,
+										iconImageSize: [30, 30],
+										iconImageOffset: [-15, -15],
+										id: point.id,
+										balloonPanelMaxMapArea: 0,
+										openEmptyBalloon: false
+									}
+								);
+								marker.events.add("click", function(e) {
+									for (var keyLayer in clusterObjects) {
+										clusterObjects[keyLayer].forEach(function(point) {
+											point.options.set({
+												iconImageHref: base_path_pin,
+												iconImageSize: [30, 30],
+												iconImageOffset: [-15, -15]
+											});
+										});
+									}
+									marker.options.set({
+										iconImageHref: base_path_pin_active,
+										iconLayout: "default#image",
+										iconImageSize: [37, 50],
+										iconImageOffset: [-18, -25]
+									});
+									map.margin.addArea({
+										right: 0,
+										bottom: 0
+										//width: 500,
+										//height: '100%'
+									});
+									if (!point_info) return false;
+									if (marker.properties.get("slug") == null) {
+										$(".ms-map__event-inner").html("");
+										var wrap = $("<div/>", { class: "ms-map__event-wrap" });
+										var address = $("<div/>", { class: "ms-map__event-address ms-map__event-address--empty", text: marker.properties.get("address") });
+										var description = $("<div/>", { class: "ms-map__event-dscr", html: marker.properties.get("title") });
+										wrap.append(address, description);
+										$(".ms-map__event-inner").append(wrap);
+										$(".ms-map__close").fadeIn();
+										if (!$(".ms-map__event").is(":visible") && $(window).width() > 641) {
+											$(".ms-map__event").show();
+										} else if (!$(".ms-map__event").is(":visible") && $(window).width() < 640) {
+											$.fancybox.open([
+												{
+													src: "#map-event",
+													slideShow: false,
+													closeBtn: false,
+													scrolling: false,
+													buttons: [],
+													touch: {
+														vertical: false
+													},
+													baseTpl: '<div class="fancybox-container" role="dialog" tabindex="-1">' + '<div class="fancybox-inner">' + '<div class="fancybox-infobar"><span data-fancybox-index></span>&nbsp;/&nbsp;<span data-fancybox-count></span></div>' + '<div class="fancybox-toolbar">{{buttons}}</div>' + '<div class="fancybox-navigation">{{arrows}}</div>' + '<div class="fancybox-stage"></div>' + '<div class="fancybox-caption"></div>' + "</div>" + "</div>"
+												}
+											]);
+										}
+									} else {
+										if (!$(".ms-map__event").is(":visible") && $(window).width() > 641) {
+											$(".ms-map__event").fadeIn();
+										} else if (!$(".ms-map__event").is(":visible") && $(window).width() <= 641) {
+											$.fancybox.open([
+												{
+													src: "#map-event",
+													slideShow: false,
+													closeBtn: false,
+													scrolling: false,
+													buttons: [],
+													touch: {
+														vertical: false
+													},
+													baseTpl: '<div class="fancybox-container" role="dialog" tabindex="-1">' + '<div class="fancybox-inner">' + '<div class="fancybox-infobar"><span data-fancybox-index></span>&nbsp;/&nbsp;<span data-fancybox-count></span></div>' + '<div class="fancybox-toolbar">{{buttons}}</div>' + '<div class="fancybox-navigation">{{arrows}}</div>' + '<div class="fancybox-stage"></div>' + '<div class="fancybox-caption"></div>' + "</div>" + "</div>"
+												}
+											]);
+										}
+										$.ajax({
+											type: "POST",
+											url: "https://moscowseasons.com/graphql",
+											dataType: "json",
+											contentType: "application/json",
+											data: JSON.stringify({
+												operationName: "event",
+												variables: {
+													slug: marker.properties.get("slug"),
+													locale: "RU"
+												},
+												query: "query event($slug: String) {  event(slug: $slug) { \n ...EventFragment __typename \n}  \n} \n fragment EventFragment on Event { \n ...ShortEventFragment __typename \n } \n fragment ShortEventFragment on Event { \n id \n locale \n slug \n title description address {\n    address\n __typename\n  }\n \n images { \n id \n url \n resized(width: 500, height: 500) {\n url \n __typename \n } \n  __typename \n } \n __typename \n } \n"
+											}),
+											success: function(data) {
+												$(".ms-map__event-inner").html("");
+												var event = data.data.event;
+												var link = "/" + event.locale.toLowerCase() + "/event/" + event.slug;
+												var target = "_blank";
+												if (window.location.host == "www.mos.ru" || window.location.host == "newmos.mos.ru") {
+													target = "_blank";
+													link = "https://moscowseasons.com/" + event.locale.toLowerCase() + "/event/" + event.slug;
+												}
+												var image_src = "";
+												if (event.images.length != 0) {
+													image_src = event.images[0].resized.url;
+												}
+												var wrap = $("<div/>", { class: "ms-map__event-wrap" });
+												var img = $("<div/>", { class: "ms-map__event-img", style: "background-image: url(" + image_src + ")" });
+												var title = $("<div/>", { class: "ms-map__event-title", text: event.title });
+												var address = $("<div/>", { class: "ms-map__event-address", text: event.address.address });
+												var description = $("<div/>", { class: "ms-map__event-dscr", html: marker.properties.get("desc") });
+												var more = $("<a/>", { class: "ms-map__event-more", text: "Подробнее", href: link, target: target });
+												wrap.append(description, address, more);
+												$(".ms-map__event-inner").append(title, img, wrap);
+												$(".ms-map__close").fadeIn();
+											}
+										});
+									}
+								});
+								clusterObjects[layer.title].push(marker);
+								clusterer.add(marker);
+							});
+							map.geoObjects.add(clusterer);
+							objectManager.add(clusterObjects);
+						});
+						// удаляем лишние контролы
+						map.controls.remove("searchControl");
+						map.controls.remove("geolocationControl");
+						map.controls.remove("typeSelector");
+						map.controls.remove("trafficControl");
+						var supportsTouch = "ontouchstart" in document.documentElement;
+						if (supportsTouch) {
+							map.behaviors.disable("drag");
+						}
+						map.controls.remove("fullscreenControl");
+						if ($(document).width() >= 1200) {
+							map.controls.remove("zoomControl");
+							var zoomControl = new ymaps.control.ZoomControl({
+								options: {
+									position: {
+										top: 108,
+										right: 10,
+										bottom: "auto",
+										left: "auto"
+									}
+								}
+							});
+							map.controls.add(zoomControl);
+						}
+						// выключаем зум по скролу
+						map.behaviors.disable(["scrollZoom"]);
+						// автомасштаб
+						map.setBounds(
+							// map.geoObjects.getBounds(),
+							clusterer.getBounds(),
+							{
+								checkZoomRange: true,
+								zoomMargin: [20, 20, 20, 20]
+							}
+						).then(function() {
+							//if( map.getZoom() > 15) map.setZoom(15);
+						});
+					});
+				}
+			});
+			$(".ms-map__close").click(function() {
+				$(this).fadeOut();
+				if ($(window).width() < 640) {
+					$.fancybox.close();
+				} else {
+					$(".ms-map__event").fadeOut();
+				}
+				$(".ms-map__event-inner").html("");
+			});
+		};
+		return {
+			/**
+			 * инициализация модуля
+			 */
+			init: function() {
+				var t = setInterval(function() {
+					try {
+						if (ymaps) {
+							initMap();
+							clearInterval(t);
+						}
+					} catch (err) {
+						throw "ymaps not loaded yet";
+					}
+				}, 400);
+			}
+		};
+	})();
+	// Export
+	window.MSMap = MSMap;
+})(jQuery, this, this.document);
--- a/src/components/ms-map/ms-map.less
+++ b/src/components/ms-map/ms-map.less
+.ms-map {
+	position: relative;
+	padding: 0 65px 120px;
+	margin-bottom: 80px;
+	@media @m {
+		padding: 0 40px 90px;
+		margin-bottom: 70px;
+	}
+	@media @s {
+		padding: 0 15px 60px;
+		margin-bottom: 60px;
+	}
+	&::before {
+		content: "";
+		display: block;
+		position: absolute;
+		top: -300px;
+		bottom: 0;
+		left: 0;
+		width: 520px;
+		background-image: url('@@path/img/ms-map/map-pattern.svg');
+		background-repeat: no-repeat;
+		background-position: top left;
+		background-size: 100% auto;
+		z-index: 0;
+		@media @m {
+			background-size: 80% auto;
+		}
+	}
+	&::after {
+		content: '';
+		display: block;
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 400px;
+		background-color: #F4F5F6;
+		background-image: url('@@path/img/ms-map/map-city.svg');
+		background-position: center bottom;
+		background-repeat: no-repeat;
+		background-size: 100% auto;
+		z-index: 0;
+	}
+	h2 {
+		font-size: 40px;
+		font-weight: normal;
+		margin-top: 0;
+		margin-bottom: 20px;
+		font-family: @f-circe;
+		color: #111;
+		padding: 0 60px 0 60px;
+		@media @xl {
+			padding: 0 4.16666vw 0 5.55555vw;
+		}
+		@media @m {
+			margin-top: 0;
+		}
+		@media @s {
+			font-size: 28px;
+		}
+	}
+	&__inner {
+		position: relative;
+	}
+	&__container {
+		width: 100%;
+		height: 650px;
+		border-radius: 6px;
+		overflow: hidden;
+		position: relative;
+		z-index: 1;
+		@media @m {
+			width: 100%;
+			margin: 0;
+			height: 720 / 768 * 100vw;
+			overflow: hidden;
+		}
+		@media @s {
+			height: 85vh;
+			width: 100%;
+			margin: 0;
+			border-radius: 0;
+		}
+	}
+	&__event {
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		right: 0;
+		width: 470px;
+		height: auto;
+		color: black;
+		font-family: 'Muller';
+		text-align: justify;
+		display: none;
+		background: white;
+		box-shadow: 0 30px 40px rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		@media @m {
+			left: 20px;
+			right: 20px;
+			top: 20px;
+			bottom: 20px;
+			width: auto;
+		}
+		@media @s {
+			display: none;
+			padding: 0;
+			position: fixed;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			transform: none;
+			z-index: 999999;
+			height: 100%;
+		}
+		&-inner {
+			padding: 30px;
+			text-align: center;
+			max-width: 450px;
+			margin: 0 auto;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			height: 100%;
+			@media @m {
+				align-items: center;
+				justify-content: flex-start;
+				text-align: left;
+			}
+			@media @s {
+				overflow-y: auto;
+				display: block;
+				padding: 15px 20px;
+			}
+		}
+		&-img {
+			width: 100%;
+			min-height: 220px;
+			background-size: cover;
+			background-position: center;
+			margin-bottom: 20px;
+			@media @m {
+				min-height: 200px;
+				min-width: 200px;
+				//margin-right: 20px;
+				margin-bottom: 30px;
+			}
+			@media @s {
+				min-height: 200px;
+				min-width: 200px;
+				margin-right: 0;
+				margin-bottom: 20px;
+			}
+		}
+		&-title {
+			font-size: 21px;
+			font-weight: 700;
+			line-height: 1.3;
+			margin-bottom: 20px;
+			margin-top: 15px;
+			text-align: left;
+			@media @m {
+				padding-right: 30px;
+			}
+			@media @s {
+				font-size: 20px;
+				line-height: 1.2;
+			}
+		}
+		&-address {
+			font-size: 13px;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			margin-bottom: 20px;
+			text-align: left;
+			font-weight: 400;
+			@media @m {
+				justify-content: flex-start;
+			}
+			@media @s {
+				font-size: 14px;
+			}
+			&::before {
+				content: '';
+				display: block;
+				width: 12px;
+				min-width: 12px;
+				height: 15px;
+				background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='15' viewBox='0 0 12 15' fill='none'%3E%3Cpath d='M5.50405 14.975C4.90405 14.175 4.40405 13.375 3.80405 12.675C3.00405 11.475 2.10405 10.275 1.30405 9.075C0.704052 8.275 0.204052 7.375 0.104052 6.375C-0.0959482 5.475 0.00405183 4.475 0.304052 3.575C0.704052 2.475 1.50405 1.575 2.50405 0.875C3.10405 0.475 3.80405 0.175 4.50405 0.075C5.80405 -0.125 7.00405 0.075 8.20405 0.675C9.70405 1.475 10.6041 2.775 11.0041 4.475C11.4041 6.175 10.9041 7.775 9.90405 9.175C9.20405 10.175 8.40405 11.175 7.70405 12.175C7.00405 12.975 6.40405 13.875 5.70405 14.775C5.70405 14.875 5.60405 14.875 5.50405 14.975ZM5.60405 2.975C4.10405 2.875 3.00405 4.175 3.00405 5.475C3.00405 6.975 4.30405 8.075 5.50405 8.075C6.90405 8.075 8.10405 6.975 8.10405 5.475C8.10405 4.075 7.00405 2.875 5.60405 2.975Z' fill='%23F34640'/%3E%3C/svg%3E");
+				margin-right: 10px;
+			}
+			&--empty {
+				margin-top: 30px;
+			}
+		}
+		&-dscr {
+			margin-bottom: 15px;
+			font-size: 14px;
+			line-height: 21 / 14;
+			text-align: left;
+			font-weight: 400;
+			@media @s {
+				font-size: 16px;
+				line-height: 1.3;
+			}
+		}
+		&-more {
+			color: #A0C548;
+			font-size: 16px;
+			font-weight: 700;
+			text-decoration: none;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			@media @m {
+				justify-content: flex-start;
+			}
+			&::after {
+				content: "";
+				display: block;
+				width: 8px;
+				height: 13px;
+				border-radius: 50%;
+				margin-left: 10px;
+				background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='13' viewBox='0 0 8 13' fill='none'%3E%3Cpath d='M1 12L6.5 6.2L1 1' stroke='%2396C858' stroke-width='1.3437' stroke-miterlimit='10'/%3E%3C/svg%3E");
+				background-position: center;
+				background-repeat: no-repeat;
+			}
+		}
+		.fancybox-close-small {
+			display: none;
+		}
+	}
+	&__close {
+		position: absolute;
+		top: 22px;
+		right: 22px;
+		width: 25px;
+		height: 25px;
+		background: none;
+		border: none;
+		border-radius: 50%;
+		background-color: white;
+		background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='17' height='17' viewBox='0 0 17 17' fill='none'%3E%3Cg clip-path='url(%23clip0)'%3E%3Cpath d='M10.0035 8.5008L16.6885 1.81576C17.1038 1.40078 17.1038 0.727457 16.6885 0.312477C16.2732 -0.102857 15.6005 -0.102857 15.1852 0.312477L8.50018 6.99751L1.81478 0.312477C1.39945 -0.102857 0.726835 -0.102857 0.311501 0.312477C-0.103834 0.727457 -0.103834 1.40078 0.311501 1.81576L6.99689 8.5008L0.311501 15.1858C-0.103834 15.6008 -0.103834 16.2741 0.311501 16.6891C0.519168 16.8964 0.791332 17.0003 1.06314 17.0003C1.33495 17.0003 1.60712 16.8964 1.81478 16.6888L8.50018 10.0037L15.1852 16.6888C15.3929 16.8964 15.665 17.0003 15.9369 17.0003C16.2087 17.0003 16.4808 16.8964 16.6885 16.6888C17.1038 16.2738 17.1038 15.6005 16.6885 15.1855L10.0035 8.5008Z' fill='%23A0C548'/%3E%3C/g%3E%3Cdefs%3E%3CclipPath id='clip0'%3E%3Crect width='17' height='17' fill='white'/%3E%3C/clipPath%3E%3C/defs%3E%3C/svg%3E");
+		background-size: 13px 13px;
+		background-repeat: no-repeat;
+		background-position: center;
+		appearance: none;
+		cursor: pointer;
+		display: none;
+		z-index: 9;
+		@media @m {
+			top: 15px;
+			right: 15px;
+		}
+		@media @s {
+			top: 20px;
+			right: 20px;
+		}
+	}
+	&__pattern {
+		position: absolute;
+		&--1 {
+			left: 0;
+			top: -20%;
+			width: 12%;
+			@media @m {
+				width: 20%;
+				top: -15%;
+			}
+			@media @s {
+				width: 30%;
+				top: -15%;
+			}
+		}
+		&--2 {
+			left: 0;
+			bottom: -10%;
+			width: 7%;
+			@media @m {
+				bottom: -5%;
+				width: 14%;
+			}
+			@media @s {
+				display: none;
+			}
+		}
+		&--3 {
+			right: 15%;
+			bottom: -7%;
+			width: 7%;
+			@media @m {
+				right: 15%;
+				bottom: -7%;
+				width: 12%;
+			}
+			@media @s {
+				display: none;
+			}
+		}
+	}
+}
+.fancybox-slide.fancybox-slide--html {
+	@media @m {
+		transform: translateX(0)!important
+	}
+}
\ No newline at end of file
--- a/src/index.html
+++ b/src/index.html
@@ -27,7 +27,7 @@
 			@@include( './components/ms-info-carousel/ms-info-carousel.html' )
 			<!-- Карта -->
-			<!-- @ @include( './components/ms-map/ms-map.html' ) -->
+			@@include( './components/ms-map/ms-map.html' )
 			<!-- Коломенское  -->
 			<!-- @ @include( './components/ms-koloma/ms-koloma.html' ) -->

--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -27,11 +27,7 @@ module.exports = {
 								"@babel/preset-env",
 								{
 									useBuiltIns: "usage",
-									targets: [
+									targets: ["last 4 versions", "ie >= 11", "iOS >= 9"]
-										"last 4 versions",
-										"ie >= 11",
-										"iOS >= 9"
-									]
 								}
 							]
 						]

--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -26,11 +26,7 @@ module.exports = {
 								"@babel/preset-env",
 								{
 									useBuiltIns: "usage",
-									targets: [
+									targets: ["last 4 versions", "ie >= 11", "iOS >= 9"]
-										"last 4 versions",
-										"ie >= 11",
-										"iOS >= 9"
-									]
 								}
 							]
 						]