c80_map_floors 0.1.0.22 → 0.1.0.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/buttons/button_back_to_map.js +1 -1
- data/app/assets/javascripts/map_objects/area.js +2 -2
- data/app/assets/javascripts/map_objects/building.js +4 -3
- data/app/assets/stylesheets/view/elems/building_info.scss +4 -0
- data/lib/c80_map_floors/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 97104ee323ae38e43a71acf2da183a8a0f367c74
|
|
4
|
+
data.tar.gz: 40efbd7f707c3dc7b0e21889b458370963f2096a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d8c52788fcae7da9598755f28b5467f80b0d52ccaa77e50b8f0352be3b1e4481c942a0bc72d5c02c0077dedd1021ea8066a2987a8d40d69a44f16f049e6f28e3
|
|
7
|
+
data.tar.gz: d7b760f5dd25f50ff3be8ab774191ac37ce798c15f5d7dba4ab95fbf847de05cc1fd8ace1477de87de72b6f3d37177e0ffb5404d897bf10e4aa817261f5ddb32
|
|
@@ -63,7 +63,7 @@ function BackToMapButton() {
|
|
|
63
63
|
};
|
|
64
64
|
var __show = function () {
|
|
65
65
|
// фиксируем
|
|
66
|
-
var building_info_top = _$building_info.offset().top;
|
|
66
|
+
var building_info_top = _$building_info.offset().top - _map.container.offset().top;
|
|
67
67
|
var building_info_height = _$building_info.height();
|
|
68
68
|
|
|
69
69
|
// считаем
|
|
@@ -151,12 +151,12 @@ function Area() {
|
|
|
151
151
|
//_map.y = _map.normalizeY(_map.CY - _map.scale * _cy - _map.container.offset().top);
|
|
152
152
|
|
|
153
153
|
var x = _map.normalizeX({
|
|
154
|
-
x: _map.CX - scale * _cx - _map.container.offset().left,
|
|
154
|
+
x: _map.CX - scale * _cx,// - _map.container.offset().left,
|
|
155
155
|
scale: scale
|
|
156
156
|
});
|
|
157
157
|
|
|
158
158
|
var y = _map.normalizeY({
|
|
159
|
-
y: _map.CY - scale * _cy - _map.container.offset().top,
|
|
159
|
+
y: _map.CY - scale * _cy,// - _map.container.offset().top,
|
|
160
160
|
scale: scale
|
|
161
161
|
});
|
|
162
162
|
|
|
@@ -32,6 +32,7 @@ function Building() {
|
|
|
32
32
|
_this._admin_label = null; // админский лейбл - айдишник и название Здания (привязанного к полигону), видимый в режиме редактирования
|
|
33
33
|
|
|
34
34
|
var _zoomToMe = function () {
|
|
35
|
+
console.log('<_zoomToMe>');
|
|
35
36
|
|
|
36
37
|
/* рассчитаем масштаб, при котором можно вписать прямоугольник дома в прямоугольник рабочей области */
|
|
37
38
|
|
|
@@ -43,12 +44,12 @@ function Building() {
|
|
|
43
44
|
scale = _map.normalizeScale(scale);
|
|
44
45
|
|
|
45
46
|
var x = _map.normalizeX({
|
|
46
|
-
x: _map.CX - scale * _cx
|
|
47
|
+
x: _map.CX - scale * _cx, // + _map.container.offset().left,
|
|
47
48
|
scale: scale
|
|
48
49
|
});
|
|
49
50
|
|
|
50
51
|
var y = _map.normalizeY({
|
|
51
|
-
y: _map.CY - scale * _cy - _map.container.offset().top,
|
|
52
|
+
y: _map.CY - scale * _cy, // - _map.container.offset().top,
|
|
52
53
|
scale: scale
|
|
53
54
|
});
|
|
54
55
|
|
|
@@ -290,8 +291,8 @@ function Building() {
|
|
|
290
291
|
|
|
291
292
|
|
|
292
293
|
};
|
|
293
|
-
|
|
294
294
|
_this.exit = function () {
|
|
295
|
+
|
|
295
296
|
if (_$image_bg != null) _$image_bg.remove();
|
|
296
297
|
if (_image_overlay != null) {
|
|
297
298
|
_image_overlay.remove();
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: c80_map_floors
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.0.
|
|
4
|
+
version: 0.1.0.23
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- C80609A
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-03-
|
|
11
|
+
date: 2017-03-30 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|