Increase project leave max zoom to 16 (#526)

* Increase project leave max zoom to 16 * Fix poi click without project
2gis · Feb 3, 2020 · 3441573 · 3441573
1 parent 2b7831e
commit 3441573
Showing 10 changed files with 24 additions and 19 deletions.
diff --git a/config.main.json b/config.main.json
@@ -22,7 +22,7 @@
     "firmInfoFields": "items.reviews,items.links,items.external_content",
     "geoAdditionalFields": "items.geometry.selection,items.links,items.adm_div,items.address,items.floors,items.description",
     "geoclickerCatalogApiKey": "ruregt3044",
-    "projectLeaveMaxZoom": 13,
+    "projectLeaveMaxZoom": 16,
     "flampUrl": "http://flamp.ru/r/",
     "flampGoogleAnalytics": "utm_source=api2gis&utm_medium=api&utm_campaign=geoclicker",
     "gaCode": "UA-38243181-2",

diff --git a/src/DGCustomization/test/DGMapSpec.js b/src/DGCustomization/test/DGMapSpec.js
@@ -84,19 +84,19 @@ describe('DGMap', function () {
 
     describe('#panBy', function () {
         it('should set zoom to 13 after panBy to place without project', function () {
-            map.setView([55.005582426668404, 82.93081283569337], 15, {animate: false});
+            map.setView([55.005582426668404, 82.93081283569337], 18, {animate: false});
             map.panBy([1e15, 0]);
-            expect(map.getZoom()).to.be(13);
+            expect(map.getZoom()).to.be(16);
         });
     });
 
     describe('#getBoundsZoom', function () {
-        it('should return 13', function () {
+        it('should return 16', function () {
             var sw = DG.latLng(54.97369439559682, 80.59043041467668),
                 ne = DG.latLng(54.97441793550156, 80.59262982606889),
                 b = DG.latLngBounds(sw, ne);
 
-            expect(map.getBoundsZoom(b)).to.be(13);
+            expect(map.getBoundsZoom(b)).to.be(16);
         });
     });
 });
diff --git a/src/DGEntrance/src/DGEntrance.js b/src/DGEntrance/src/DGEntrance.js
@@ -168,7 +168,8 @@ DG.Entrance = DG.FeatureGroup.extend({
     },
 
     _getFitZoom: function() {
-        return this._map.projectDetector.getProject().maxZoom || DG.Entrance.SHOW_FROM_ZOOM;
+        var project = this._map.projectDetector.getProject();
+        return project ? project.maxZoom : DG.Entrance.SHOW_FROM_ZOOM;
     },
 
     _isAllowedZoom: function() {

diff --git a/src/DGGeoclicker/src/handler/Default.js b/src/DGGeoclicker/src/handler/Default.js
@@ -51,13 +51,18 @@ DG.Geoclicker.Handler.Default = DG.Class.extend({
     },
 
     _getDirectionsUrl: function(name) {
+        var project = this._map.projectDetector.getProject();
+        if (!project) {
+            return '';
+        }
+
         return DG.Util.template(DG.config.ppnotLink, {
-            'domain': this._map.projectDetector.getProject().domain,
-            'projectCode': this._map.projectDetector.getProject().code,
+            'domain': project.domain,
+            'projectCode': project.code,
             'center': this._map.getCenter().lng + ',' + this._map.getCenter().lat,
             'zoom': this._map.getZoom(),
             'name': encodeURIComponent(name),
-            'rsType': this._map.projectDetector.getProject().transport ? 'bus' : 'car',
+            'rsType': project.transport ? 'bus' : 'car',
             'point': this._popup._latlng.lng + ',' + this._popup._latlng.lat
         });
     },

diff --git a/src/DGGeoclicker/src/handler/House.js b/src/DGGeoclicker/src/handler/House.js
@@ -45,12 +45,13 @@ DG.Geoclicker.Handler.House = DG.Geoclicker.Handler.Default.extend({
     },
 
     _firmCardSetup: function() { //() -> Object
+        var project = this._controller.getMap().projectDetector.getProject();
         return {
             render: this._view.renderTemplate,
             lang: this._map.getLang(),
-            domain: this._controller.getMap().projectDetector.getProject().domain,
+            domain: project ? project.domain : 'ru',
             ajax: DG.bind(this._api.getFirmInfo, this._api),
-            timezoneOffset: this._controller.getMap().projectDetector.getProject().timeOffset,
+            timezoneOffset: project ? project.timeOffset : 0,
             map: this._map,
             popup: this._popup,
             isMobile: DG.Browser.mobile,

diff --git a/src/DGLocation/src/DGLocation.js b/src/DGLocation/src/DGLocation.js
@@ -144,7 +144,8 @@ DG.Control.Location = DG.RoundControl.extend({
             if (this._isOutsideMapBounds()) {
                 this.options.onLocationOutsideMapBounds(this);
             } else if (this._locateOptions.setView) {
-                var zoom = this._map.projectDetector.getProject().maxZoom || DG.config.projectLeaveMaxZoom;
+                var project = this._map.projectDetector.getProject();
+                var zoom = project ? project.maxZoom : DG.config.projectLeaveMaxZoom;
                 zoom = Math.min(this._locateOptions.maxZoom, zoom);
                 this._map.setView(this._event.latlng, zoom);
             }

diff --git a/src/DGProjectDetector/test/ProjectDetectorInSpec.js b/src/DGProjectDetector/test/ProjectDetectorInSpec.js
@@ -1,10 +1,9 @@
 describe('DG.ProjectDetectorIn', function () {
     var map,
-        spy,
         mapContainer,
         initZoom = 17,
         maxZoom = 18,
-        maxDesertZoom = 13,
+        maxDesertZoom = 16,
         start,
         project1,
         project2,

diff --git a/src/DGProjectDetector/test/ProjectDetectorInitSpec.js b/src/DGProjectDetector/test/ProjectDetectorInitSpec.js
@@ -2,7 +2,7 @@ describe('DG.ProjectDetectorInit', function () {
     var map,
         mapContainer,
         maxZoom = 18,
-        maxDesertZoom = 13,
+        maxDesertZoom = 16,
         project1,
         desert1;
 

diff --git a/src/DGProjectDetector/test/ProjectDetectorOutOfWorldSpec.js b/src/DGProjectDetector/test/ProjectDetectorOutOfWorldSpec.js
@@ -1,10 +1,9 @@
 describe('DG.ProjectDetectorOut', function () {
     var map,
-        spy,
         mapContainer,
         initZoom = 17,
         maxZoom = 18,
-        maxDesertZoom = 13,
+        maxDesertZoom = 16,
         start,
         project1,
         project2,

diff --git a/src/DGProjectDetector/test/ProjectDetectorUnderSpec.js b/src/DGProjectDetector/test/ProjectDetectorUnderSpec.js
@@ -1,10 +1,9 @@
 describe('DG.ProjectDetectorUnder', function () {
     var map,
-        spy,
         mapContainer,
         initZoom = 1,
         maxZoom = 18,
-        maxDesertZoom = 13,
+        maxDesertZoom = 16,
         start,
         project1,
         project2,