c80_map 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/src/main.js +22 -12
- data/lib/c80_map/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 00cefeb01c3455c7866f1ece324752417a4530cf
|
|
4
|
+
data.tar.gz: 538d327fac62d8c677ab8129c3b12eeebc1614d2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6a16a9ba993b3778f1242bfdae40c9bba6c8c5df6ac972eb53de80e4709dad07e5343099f47cc72554fbbe7f051fc9b44dd84e1c7686ba9399e7bcccfcc272f3
|
|
7
|
+
data.tar.gz: 5c085c42894667f41377a0ae92e5a993d296b38b500ddab5e23bea6421d18472d22deb735f12b5af14164b14ed3aa5964cc8c092ce8c76fbf4b4845278aea6d8
|
|
@@ -3,7 +3,12 @@
|
|
|
3
3
|
var IS_ADMIN = false;
|
|
4
4
|
var map_on_index_page = null;
|
|
5
5
|
|
|
6
|
-
var InitMap = function () {
|
|
6
|
+
var InitMap = function (params) {
|
|
7
|
+
|
|
8
|
+
var dnd_enable = true;
|
|
9
|
+
if (params != undefined && params["dnd_enable"] != undefined) {
|
|
10
|
+
dnd_enable = params["dnd_enable"];
|
|
11
|
+
}
|
|
7
12
|
|
|
8
13
|
// - to delete start -----------------------------------------------------------------------------------------------------------------------
|
|
9
14
|
var scale = 0.599999;
|
|
@@ -27,7 +32,8 @@ var InitMap = function () {
|
|
|
27
32
|
y: y,
|
|
28
33
|
mapwidth: MAP_WIDTH,
|
|
29
34
|
mapheight: MAP_HEIGHT,
|
|
30
|
-
height: window_height
|
|
35
|
+
height: window_height,
|
|
36
|
+
dnd_enable: dnd_enable
|
|
31
37
|
}
|
|
32
38
|
);
|
|
33
39
|
|
|
@@ -56,7 +62,8 @@ var clog = function () {
|
|
|
56
62
|
skin: '', // css class name
|
|
57
63
|
scale: 1,
|
|
58
64
|
x: 0,
|
|
59
|
-
y: 0
|
|
65
|
+
y: 0,
|
|
66
|
+
dnd_enable: true
|
|
60
67
|
};
|
|
61
68
|
self.svg = null;
|
|
62
69
|
self.svg_overlay = null;
|
|
@@ -82,6 +89,7 @@ var clog = function () {
|
|
|
82
89
|
self.drawn_buildings = []; // если имеются нарисованные но несохранённые Здания - они хранятся тут
|
|
83
90
|
self.save_preloader_klass = null;
|
|
84
91
|
self.last_clicked_g = null; // начали просматривать area\building (запустили сессию), и здесь храним ссылку на последний кликнутый полигон из svg_overlay в течение сессии
|
|
92
|
+
self.dnd_enable = null; // если да, то можно карту dnd мышкой
|
|
85
93
|
|
|
86
94
|
// true, если:
|
|
87
95
|
//- юзер еще не кликал по кнопкам zoom
|
|
@@ -414,17 +422,19 @@ var clog = function () {
|
|
|
414
422
|
self.map.on('mousemove', function (event) {
|
|
415
423
|
self.dragging = true;
|
|
416
424
|
|
|
417
|
-
|
|
418
|
-
|
|
425
|
+
if (self.dnd_enable) {
|
|
426
|
+
var x = event.pageX - map.data('mouseX') + self.x;
|
|
427
|
+
var y = event.pageY - map.data('mouseY') + self.y;
|
|
419
428
|
|
|
420
|
-
|
|
421
|
-
|
|
429
|
+
x = self.normalizeX(x);
|
|
430
|
+
y = self.normalizeY(y);
|
|
422
431
|
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
432
|
+
//clog("<Map.mousemove> x = " + x + "; y = " + y);
|
|
433
|
+
//clog("<Map.mousemove> Call moveTo.");
|
|
434
|
+
self.moveTo(x, y);
|
|
435
|
+
map.data('lastX', x);
|
|
436
|
+
map.data('lastY', y);
|
|
437
|
+
}
|
|
428
438
|
});
|
|
429
439
|
|
|
430
440
|
$(document).on('mouseup', function (event) {
|
data/lib/c80_map/version.rb
CHANGED