TILES-4794 fixed copyright (#567)

Co-authored-by: Vladimir-Ayrikh <[email protected]>
2gis · Nov 28, 2022 · 7f37021 · 7f37021
1 parent 5bb4c3e
commit 7f37021
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 48 deletions.
diff --git a/src/DGAttribution/lang/ar.js b/src/DGAttribution/lang/ar.js
@@ -1,7 +1,6 @@
 DG.Control.Attribution.Dictionary.ar = {
     license_agreement: 'إتفاقية ترخيص',
     work_on: 'يعمل بتطبيق 2GIS',
-    work_on_with_osm: 'API 2GIS',
     open_on: 'Open in 2GIS',
     route_on: 'Route on 2GIS'
 };
diff --git a/src/DGAttribution/lang/cs.js b/src/DGAttribution/lang/cs.js
@@ -1,5 +1,4 @@
 DG.Control.Attribution.Dictionary.cs = {
     license_agreement: 'Licenční smlouva',
-    work_on: 'Pracuje na API 2GIS',
-    work_on_with_osm: 'API 2GIS'
+    work_on: 'Pracuje na API 2GIS'
 };
diff --git a/src/DGAttribution/lang/en.js b/src/DGAttribution/lang/en.js
@@ -1,5 +1,4 @@
 DG.Control.Attribution.Dictionary.en = {
     license_agreement: 'License agreement',
-    work_on: 'Uses 2GIS API',
-    work_on_with_osm: '2GIS API'
+    work_on: 'Uses 2GIS API'
 };
diff --git a/src/DGAttribution/lang/es.js b/src/DGAttribution/lang/es.js
@@ -1,5 +1,4 @@
 DG.Control.Attribution.Dictionary.es = {
     license_agreement : 'Acuerdo de licencia',
-    work_on: '2GIS API',
-    work_on_with_osm: '2GIS API'
+    work_on: '2GIS API'
 };
diff --git a/src/DGAttribution/lang/it.js b/src/DGAttribution/lang/it.js
@@ -1,5 +1,4 @@
 DG.Control.Attribution.Dictionary.it = {
     license_agreement : 'Accordo di licenza',
-    work_on: '2GIS API',
-    work_on_with_osm: '2GIS API'
+    work_on: '2GIS API'
 };
diff --git a/src/DGAttribution/lang/ru.js b/src/DGAttribution/lang/ru.js
@@ -1,7 +1,6 @@
 DG.Control.Attribution.Dictionary.ru = {
     license_agreement: 'Лицензионное соглашение',
     work_on: 'Работает на API 2ГИС',
-    work_on_with_osm: 'API 2ГИС',
     open_on: 'Открыть в 2ГИС',
     route_on: 'Доехать с 2ГИС'
 };
diff --git a/src/DGAttribution/src/DGAttribution.js b/src/DGAttribution/src/DGAttribution.js
@@ -127,13 +127,9 @@ DG.Control.Attribution.include({
         }
     },
 
-    _update: function(lang, osm, countryCode) {
+    _update: function(lang, countryCode) {
         if (!this._map) { return; }
 
-        if (typeof osm !== 'undefined') {
-            this._osm = osm;
-        }
-
         if (typeof countryCode !== 'undefined') {
             this._countryCode = countryCode;
         }
@@ -194,10 +190,8 @@ DG.Control.Attribution.include({
         var isHideButton = btn.label == 'open_on' || btn.label == 'route_on' || this._logotype;
 
         return {
-            'osm': this._osm,
             'logotype': isHideButton,
             'work_on': this.t('work_on'),
-            'work_on_with_osm': this.t('work_on_with_osm'),
             'lang': lang,
             'copyright_apilink': this._getLink('copyright_apilink'),
             'copyright_license': this._getLink('copyright_license'),

diff --git a/src/DGAttribution/templates/copyright.dust b/src/DGAttribution/templates/copyright.dust
@@ -1,12 +1,7 @@
 <div class="dg-attribution__copyright">
     <ul class="dg-attribution__links">
         <li class="dg-attribution__link-item">
-            {?osm}
-            © <a href="http://www.openstreetmap.org/copyright" target="_blank" class="dg-attribution__link">OpenStreetMap contributors</a>,{~s}
-            <a href="{copyright_apilink}" target="_blank" class="dg-attribution__link" dir="{dir}">{work_on_with_osm}</a>
-            {:else}
             <a href="{copyright_apilink}" target="_blank" class="dg-attribution__link" dir="{dir}">{work_on}</a>
-            {/osm}
         </li>
         <li class="dg-attribution__link-item">
             <a href="{copyright_license}" target="_blank" class="dg-attribution__link">{license_agreement}</a>

diff --git a/src/DGAttribution/test/DGAttributionSpec.js b/src/DGAttribution/test/DGAttributionSpec.js
@@ -6,7 +6,6 @@ describe('DG.Control.Attribution', function() {
             es: 'licencia',
             cs: 'smlouva'
         },
-        osmCopyright = 'OpenStreetMap',
 
         latLngWithoutProject = [54.83391822270635, 80.34439086914064],
         latLngCenterNsk = [55.017493, 82.819576],
@@ -25,7 +24,7 @@ describe('DG.Control.Attribution', function() {
     });
 
     after(function() {
-        dictionaryLicense = osmCopyright = latLngWithoutProject = latLngCenterNsk = mapContainer = map = attribution = null;
+        dictionaryLicense = latLngWithoutProject = latLngCenterNsk = mapContainer = map = attribution = null;
     });
 
     describe('check init', function() {
@@ -48,18 +47,4 @@ describe('DG.Control.Attribution', function() {
             });
         });
     });
-
-    describe('project leave', function() {
-        it('should add osm copyright', function() {
-            map.setView(latLngWithoutProject, 15, {animate: false});
-            expect(attribution.innerHTML).to.contain(osmCopyright);
-        });
-    });
-
-    describe('project enter', function() {
-        it('should remove osm copyright', function() {
-            map.setView(latLngCenterNsk, 19, {animate: false});
-            expect(attribution.innerHTML).not.contain(osmCopyright);
-        });
-    });
 });
diff --git a/src/DGProjectDetector/src/DGProjectDetector.js b/src/DGProjectDetector/src/DGProjectDetector.js
@@ -1,7 +1,6 @@
 DG.ProjectDetector = DG.Handler.extend({
     initialize: function(map) { // (Object)
         this._map = map;
-        this._osmViewport = false;
         this._project = undefined;
         this._loadProjectList();
     },
@@ -52,22 +51,14 @@ DG.ProjectDetector = DG.Handler.extend({
             return;
         }
 
-        if (this._osmViewport === (this._project && this._centerInProject(this._project, 'contains'))) {
-            this._osmViewport = !this._osmViewport;
-            this._map.attributionControl._update(null, this._osmViewport);
-        }
-
         if (this._project && this._zoomInProject(this._project) && this._centerInProject(this._project)) {
             return;
         }
 
         this._searchProject();
 
         if (this._project) {
-            if (this._osmViewport === (this._project && this._centerInProject(this._project, 'contains'))) {
-                this._osmViewport = !this._osmViewport;
-            }
-            this._map.attributionControl._update(null, this._osmViewport, this._project.country_code);
+            this._map.attributionControl._update(null, this._project.country_code);
         }
     },