From 3337f7216edef84f9133b9b97954716220ae12cd Mon Sep 17 00:00:00 2001
From: djerom <robot@pitc.com>
Date: Sat, 16 Jul 2022 17:42:31 +0500
Subject: [PATCH] adas

---
 package.json                | 12 +++++++++---
 svgmap/drawers/well-ring.js |  2 +-
 svgmap/svg-map-builder.js   |  3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6dd344b..fb83232 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "app_mapbuilder",
+  "name": "@timal/app_mapbuilder",
   "version": "1.0.0",
   "description": "Svg map builder tools",
   "main": "index.js",
@@ -8,9 +8,15 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://git.dev.aurora.hub01.site/djerom/app_mapbuilder.git"
+    "url": "http://git.db.timal.kz/djerom/app_mapbuilder.git"
   },
   "keywords": [],
   "author": "",
-  "license": "ISC"
+  "license": "ISC",
+  "directories": {
+    "test": "test"
+  },
+  "publishConfig": {
+    "registry": "https://npm.db.timal.kz/"
+  }
 }
diff --git a/svgmap/drawers/well-ring.js b/svgmap/drawers/well-ring.js
index 6572b9d..cf1a2c7 100644
--- a/svgmap/drawers/well-ring.js
+++ b/svgmap/drawers/well-ring.js
@@ -8,7 +8,7 @@ function pt(wopt, wwpt, rmm, ppu, style) {
 }
 
 function it(rmm, ppu, style) {
-	return SvgNodes.circle(rmm * ppu).add_style(style.wit);
+	return SvgNodes.circle(rmm * ppu).add_style(style);
 }
 
 module.exports = {
diff --git a/svgmap/svg-map-builder.js b/svgmap/svg-map-builder.js
index c2c8681..404a403 100644
--- a/svgmap/svg-map-builder.js
+++ b/svgmap/svg-map-builder.js
@@ -27,7 +27,8 @@ function build_pt_layer(wells, settings, style) {
 	const wells_layer = corel_layer("wells");
 	const rings_layer = corel_layer("rings");
 	// Круги
-	rings_layer.append(wells.map((x) => well_ring.pt(x.wopt, x.wwpt, t2r(x.wlpt), ppu, style).move(x.lx, x.ly)));
+	rings_layer.append(wells.map((x) => well_ring.it(t2r(x.wwit), ppu, style.wit).move(x.lx, x.ly)));
+	rings_layer.append(wells.map((x) => well_ring.it(t2r(x.wsit), ppu, style.sit).move(x.lx, x.ly)));
 
 	// Знак скважины
 	wells_layer.append(