decidim-core 0.20.0 → 0.20.1

data/config/locales/pl.yml

@@ -551,16 +551,6 @@ pl:
     gamification:
       all_badges_link: Zobacz wszystkie dostępne odznaki.
       badges:
-        continuity:
-          conditions:
-            - Chodź tu często
-          description: Ta odznaka jest przyznawana podczas regularnego odwiedzania platformy. Lubimy mieć cię tutaj!
-          description_another: Ten użytkownik nawiązał połączenie przez %{score} kolejnych dni w pewnym momencie.
-          description_own: W pewnym momencie łączyłeś się przez %{score} kolejnych dni.
-          name: Ciągłość
-          next_level_in: Łącz przez %{score} kolejnych dni, aby przejść do następnego poziomu!
-          unearned_another: Ten użytkownik nie zalogował się przez więcej niż jeden kolejny dzień.
-          unearned_own: Nie łączyłeś się przez więcej niż jeden kolejny dzień.
         followers:
           conditions:
             - Bycie aktywnym i podążanie za innymi ludźmi z pewnością sprawi, że inne osoby będą za Tobą podążać.

data/config/locales/pt-BR.yml

@@ -539,16 +539,6 @@ pt-BR:
     gamification:
       all_badges_link: Veja todos os emblemas disponíveis.
       badges:
-        continuity:
-          conditions:
-            - Vem aqui com frequência
-          description: Esse selo é concedido quando você visita a plataforma regularmente. Nós gostamos de ter você por aqui!
-          description_another: Este usuário se conectou por %{score} dias consecutivos em algum momento.
-          description_own: Você se conectou por %{score} dias consecutivos em algum momento.
-          name: Continue
-          next_level_in: Conecte-se para %{score} dias consecutivos para chegar ao próximo nível!
-          unearned_another: Este usuário não fez login por mais de um dia consecutivo.
-          unearned_own: Você não se conectou por mais de um dia consecutivo.
         followers:
           conditions:
             - Ser ativo e seguir outras pessoas certamente fará com que outras pessoas o sigam.

data/config/locales/pt.yml

@@ -539,16 +539,6 @@ pt:
     gamification:
       all_badges_link: Veja todos os crachás disponíveis.
       badges:
-        continuity:
-          conditions:
-            - Vem aqui com frequência
-          description: Esse selo é concedido quando você visita a plataforma regularmente. Nós gostamos de ter você por aqui!
-          description_another: Este usuário conectou por %{score} dias consecutivos em algum momento.
-          description_own: Você se conectou por %{score} dias consecutivos em algum momento.
-          name: Continuidade
-          next_level_in: Ligue por %{score} dias consecutivos para chegar ao próximo nível!
-          unearned_another: Este usuário não fez login por mais de um dia consecutivo.
-          unearned_own: Você não se conectou por mais de um dia consecutivo.
         followers:
           conditions:
             - Ser ativo e seguir outras pessoas certamente fará com que outras pessoas o sigam.

data/config/locales/sv.yml

@@ -561,16 +561,6 @@ sv:
     gamification:
       all_badges_link: Se alla tillgängliga märken.
       badges:
-        continuity:
-          conditions:
-            - Kommer ofta hit
-          description: Du får detta märke om du regelbundet besöker plattformen. Vi gillar att ha dig här!
-          description_another: Deltagaren har någon gång varit ansluten %{score} på dagar i följd.
-          description_own: Du har någon gång varit ansluten varje dag under %{score} dagar.
-          name: Kontinuitet
-          next_level_in: Kom till nästa nivå genom att ansluta %{score} dagar i följd!
-          unearned_another: Deltagaren har inte loggat in mer än en dag i följd.
-          unearned_own: Du har inte anslutit dig mer än en dag i följd.
         followers:
           conditions:
             - Bästa sättet att få andra att följa dig är att vara aktiv och följa andra människor.

data/config/locales/tr-TR.yml

@@ -554,16 +554,6 @@ tr:
     gamification:
       all_badges_link: Tüm mevcut rozetleri görün.
       badges:
-        continuity:
-          conditions:
-            - Buraya sık sık gel
-          description: Bu rozeti, platformu düzenli bir şekilde ziyaret ettiğinizde verilir. Burada olmanızı seviyoruz!
-          description_another: Bu kullanıcı bir noktada %{score} ardışık gün için bağlandı.
-          description_own: Bir noktada %{score} ardışık gün için bağlandınız.
-          name: süreklilik
-          next_level_in: Bir sonraki seviyeye geçmek için %{score} ardışık güne bağlanın!
-          unearned_another: Bu kullanıcı art arda birden fazla gün için giriş yapmadı.
-          unearned_own: Birden fazla ardışık güne bağlı değilsiniz.
         followers:
           conditions:
             - Aktif olmak ve diğer insanları takip etmek kesinlikle başka insanların sizi takip etmesini sağlayacaktır.

data/lib/decidim/core/engine.rb

@@ -100,13 +100,11 @@ module Decidim
 
       initializer "decidim.geocoding" do
         if Decidim.geocoder.present?
-          Geocoder.configure(
+          config = {
             # geocoding service (see below for supported options):
-            lookup: :here,
+            lookup: :here
             # IP address geocoding service (see below for supported options):
             # :ip_lookup => :maxmind,
-            # to use an API key:
-            api_key: [Decidim.geocoder&.fetch(:here_app_id), Decidim.geocoder&.fetch(:here_app_code)]
             # geocoding service request timeout, in seconds (default 3):
             # :timeout => 5,
             # set default units to kilometers:
@@ -114,7 +112,14 @@ module Decidim
             # caching (see below for details):
             # :cache => Redis.new,
             # :cache_prefix => "..."
-          )
+          }
+          # to use an API key:
+          config[:api_key] = if Decidim.geocoder[:here_api_key].present?
+                               Decidim.geocoder.fetch(:here_api_key)
+                             else
+                               [Decidim.geocoder.fetch(:here_app_id), Decidim.geocoder.fetch(:here_app_code)]
+                             end
+          Geocoder.configure(config)
         end
       end
 

data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb

@@ -139,7 +139,6 @@ shared_examples "global search of participatory spaces" do
       "resource_id" => space.id,
       "resource_type" => space.class.name
     }.merge(searchable_resource_attrs_mapper.call(space, locale))
-    h.merge
     h
   end
 end

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.20.0"
+      "0.20.1"
     end
   end
 end

data/vendor/assets/javascripts/leaflet-tilelayer-here.js

@@ -3,164 +3,209 @@
 // Tile layer for HERE maps tiles.
 L.TileLayer.HERE = L.TileLayer.extend({
 
-	options: {
-		subdomains: '1234',
-		minZoom: 2,
-		maxZoom: 18,
-
-		// 🍂option scheme: String = 'normal.day'
-		// The "map scheme", as documented in the HERE API.
-		scheme: 'normal.day',
-
-		// 🍂option resource: String = 'maptile'
-		// The "map resource", as documented in the HERE API.
-		resource: 'maptile',
-
-		// 🍂option mapId: String = 'newest'
-		// Version of the map tiles to be used, or a hash of an unique map
-		mapId: 'newest',
-
-		// 🍂option format: String = 'png8'
-		// Image format to be used (`png8`, `png`, or `jpg`)
-		format: 'png8',
-
-		// 🍂option appId: String = ''
-		// Required option. The `app_id` provided as part of the HERE credentials
-		appId: '',
-
-		// 🍂option appCode: String = ''
-		// Required option. The `app_code` provided as part of the HERE credentials
-		appCode: '',
-	},
-
-
-	initialize: function initialize(options) {
-		options = L.setOptions(this, options);
-
-		// Decide if this scheme uses the aerial servers or the basemap servers
-		var schemeStart = options.scheme.split('.')[0];
-		options.tileResolution = 256;
-
-		if (L.Browser.retina) {
-			options.tileResolution = 512;
-		}
-
-// 		{Base URL}{Path}/{resource (tile type)}/{map id}/{scheme}/{zoom}/{column}/{row}/{size}/{format}
-// 		?app_id={YOUR_APP_ID}
-// 		&app_code={YOUR_APP_CODE}
-// 		&{param}={value}
-
-		var path = '/{resource}/2.1/{resource}/{mapId}/{scheme}/{z}/{x}/{y}/{tileResolution}/{format}?app_id={appId}&app_code={appCode}';
-		var attributionPath = '/maptile/2.1/copyright/{mapId}?app_id={appId}&app_code={appCode}';
-
-		var tileServer = 'base.maps.api.here.com';
-		if (schemeStart == 'satellite' ||
-				schemeStart == 'terrain' ||
-				schemeStart == 'hybrid') {
-			tileServer = 'aerial.maps.api.here.com';
-		}
-		if (options.scheme.indexOf('.traffic.') !== -1) {
-			tileServer = 'traffic.maps.api.here.com';
-		}
-
-		var tileUrl = 'https://{s}.' + tileServer + path;
-
-		this._attributionUrl = L.Util.template('https://1.' + tileServer + attributionPath, this.options);
-
-		L.TileLayer.prototype.initialize.call(this, tileUrl, options);
-
-		this._attributionText = '';
-
-	},
-
-	onAdd: function onAdd(map) {
-		L.TileLayer.prototype.onAdd.call(this, map);
-
-		if (!this._attributionBBoxes) {
-			this._fetchAttributionBBoxes();
-		}
-	},
-
-	onRemove: function onRemove(map) {
-		L.TileLayer.prototype.onRemove.call(this, map);
-
-		this._map.attributionControl.removeAttribution(this._attributionText);
-
-		this._map.off('moveend zoomend resetview', this._findCopyrightBBox, this);
-	},
-
-	_fetchAttributionBBoxes: function _onMapMove() {
-		var xmlhttp = new XMLHttpRequest();
-		xmlhttp.onreadystatechange = L.bind(function(){
-			if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
-				this._parseAttributionBBoxes(JSON.parse(xmlhttp.responseText));
-			}
-		}, this);
-		xmlhttp.open("GET", this._attributionUrl, true);
-		xmlhttp.send();
-	},
-
-	_parseAttributionBBoxes: function _parseAttributionBBoxes(json) {
-		if (!this._map) { return; }
-		var providers = json[this.options.scheme.split('.')[0]] || json.normal;
-		for (var i=0; i<providers.length; i++) {
-			if (providers[i].boxes) {
-				for (var j=0; j<providers[i].boxes.length; j++) {
-					var box = providers[i].boxes[j];
-					providers[i].boxes[j] = L.latLngBounds( [ [box[0], box[1]], [box[2], box[3]] ]);
-				}
-			}
-		}
-
-		this._map.on('moveend zoomend resetview', this._findCopyrightBBox, this);
-
-		this._attributionProviders = providers;
-
-		this._findCopyrightBBox();
-	},
-
-	_findCopyrightBBox: function _findCopyrightBBox() {
-		if (!this._map) { return; }
-		var providers = this._attributionProviders;
-		var visibleProviders = [];
-		var zoom = this._map.getZoom();
-		var visibleBounds = this._map.getBounds();
-
-		for (var i=0; i<providers.length; i++) {
-			if (providers[i].minLevel < zoom && providers[i].maxLevel > zoom)
-
-			if (!providers[i].boxes) {
-				// No boxes = attribution always visible
-				visibleProviders.push(providers[i]);
-				break;
-			}
-
-			for (var j=0; j<providers[i].boxes.length; j++) {
-				var box = providers[i].boxes[j];
-				if (visibleBounds.overlaps(box)) {
-					visibleProviders.push(providers[i]);
-					break;
-				}
-			}
-		}
-
-		var attributions = ['<a href="https://legal.here.com/terms/serviceterms/gb/">HERE maps</a>'];
-		for (var i=0; i<visibleProviders.length; i++) {
-			var provider = visibleProviders[i];
-			attributions.push('<abbr title="' + provider.alt + '">' + provider.label + '</abbr>');
-		}
-
-		var attributionText = '© ' + attributions.join(', ') + '. ';
-
-		if (attributionText !== this._attributionText) {
-			this._map.attributionControl.removeAttribution(this._attributionText);
-			this._map.attributionControl.addAttribution(this._attributionText = attributionText);
-		}
-	},
+  options: {
+    subdomains: '1234',
+    minZoom: 2,
+    maxZoom: 18,
+
+    // 🍂option scheme: String = 'normal.day'
+    // The "map scheme", as documented in the HERE API.
+    scheme: 'normal.day',
+
+    // 🍂option resource: String = 'maptile'
+    // The "map resource", as documented in the HERE API.
+    resource: 'maptile',
+
+    // 🍂option mapId: String = 'newest'
+    // Version of the map tiles to be used, or a hash of an unique map
+    mapId: 'newest',
+
+    // 🍂option format: String = 'png8'
+    // Image format to be used (`png8`, `png`, or `jpg`)
+    format: 'png8',
+
+    // 🍂option appId: String = ''
+    // Required option. The `app_id` provided as part of the HERE credentials
+    appId: '',
+
+    // 🍂option appCode: String = ''
+    // Required option. The `app_code` provided as part of the HERE credentials
+    appCode: '',
+
+    // 🍂option useCIT: boolean = false
+    // Whether to use the CIT when loading the here-maptiles
+    useCIT: false,
+
+    // 🍂option useHTTPS: boolean = true
+    // Whether to use HTTPS when loading the here-maptiles
+    useHTTPS: true,
+
+    // 🍂option language: String = ''
+    // The language of the descriptions on the maps that are loaded
+    language: '',
+
+    // 🍂option language: String = ''
+    // The second language of the descriptions on the maps that are loaded
+    language2: '',
+  },
+
+
+  initialize: function initialize(options) {
+    options = L.setOptions(this, options);
+
+    // Decide if this scheme uses the aerial servers or the basemap servers
+    var schemeStart = options.scheme.split('.')[0];
+    options.tileResolution = 256;
+
+    // {Base URL}{Path}/{resource (tile type)}/{map id}/{scheme}/{zoom}/{column}/{row}/{size}/{format}
+    // ?apiKey={YOUR_API_KEY}
+    // &{param}={value}
+
+    var params = [
+      'apiKey=' + encodeURIComponent(options.apiKey)
+    ];
+    // Fallback to old app_id,app_code if no apiKey passed
+    if(!options.apiKey) {
+      params = [
+        'app_id=' + encodeURIComponent(options.appId),
+        'app_code=' + encodeURIComponent(options.appCode),
+      ];
+    }
+    if(options.language) {
+      params.push('lg=' + encodeURIComponent(options.language));
+    }
+    if(options.language2) {
+      params.push('lg2=' + encodeURIComponent(options.language2));
+    }
+    var urlQuery = '?' + params.join('&');
+
+    var path = '/maptile/2.1/{resource}/{mapId}/{scheme}/{z}/{x}/{y}/{tileResolution}/{format}' + urlQuery;
+    var attributionPath = '/maptile/2.1/copyright/{mapId}?apiKey={apiKey}';
+
+    var baseUrl = 'maps.ls.hereapi.com';
+
+    // Old style with apiId/apiCode for compatibility
+    if(!options.apiKey) {
+      // make sure the CIT-url can be used
+      baseUrl = 'maps' + (options.useCIT ? '.cit' : '') + '.api.here.com';
+      attributionPath = '/maptile/2.1/copyright/{mapId}?app_id={appId}&app_code={appCode}';
+    }
+
+    var tileServer = 'base.' + baseUrl;
+    if (schemeStart == 'satellite' || schemeStart == 'terrain' || schemeStart == 'hybrid') {
+      tileServer = 'aerial.' + baseUrl;
+    }
+    if (options.scheme.indexOf('.traffic.') !== -1) {
+      tileServer = 'traffic' + baseUrl;
+    }
+
+    var protocol = 'http' + (options.useHTTPS ? 's' : '');
+    var tileUrl = protocol + '://{s}.' + tileServer + path;
+
+    this._attributionUrl = L.Util.template(protocol + '://1.' + tileServer + attributionPath, this.options);
+
+    L.TileLayer.prototype.initialize.call(this, tileUrl, options);
+
+    this._attributionText = '';
+
+  },
+
+  onAdd: function onAdd(map) {
+    L.TileLayer.prototype.onAdd.call(this, map);
+
+    if (!this._attributionBBoxes) {
+      this._fetchAttributionBBoxes();
+    }
+  },
+
+  onRemove: function onRemove(map) {
+    //
+    // Remove the attribution text, and clear the cached text so it will be recalculated
+    // if/when we are shown again.
+    //
+    this._map.attributionControl.removeAttribution(this._attributionText);
+    this._attributionText = '';
+
+    this._map.off('moveend zoomend resetview', this._findCopyrightBBox, this);
+
+    //
+    // Call the prototype last, once we've tidied up our own changes
+    //
+    L.TileLayer.prototype.onRemove.call(this, map);
+  },
+
+  _fetchAttributionBBoxes: function _onMapMove() {
+    var xmlhttp = new XMLHttpRequest();
+    xmlhttp.onreadystatechange = L.bind(function(){
+      if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+        this._parseAttributionBBoxes(JSON.parse(xmlhttp.responseText));
+      }
+    }, this);
+    xmlhttp.open("GET", this._attributionUrl, true);
+    xmlhttp.send();
+  },
+
+  _parseAttributionBBoxes: function _parseAttributionBBoxes(json) {
+    if (!this._map) { return; }
+    var providers = json[this.options.scheme.split('.')[0]] || json.normal;
+    for (var i=0; i<providers.length; i++) {
+      if (providers[i].boxes) {
+        for (var j=0; j<providers[i].boxes.length; j++) {
+          var box = providers[i].boxes[j];
+          providers[i].boxes[j] = L.latLngBounds( [ [box[0], box[1]], [box[2], box[3]] ]);
+        }
+      }
+    }
+
+    this._map.on('moveend zoomend resetview', this._findCopyrightBBox, this);
+
+    this._attributionProviders = providers;
+
+    this._findCopyrightBBox();
+  },
+
+  _findCopyrightBBox: function _findCopyrightBBox() {
+    if (!this._map) { return; }
+    var providers = this._attributionProviders;
+    var visibleProviders = [];
+    var zoom = this._map.getZoom();
+    var visibleBounds = this._map.getBounds();
+
+    for (var i=0; i<providers.length; i++) {
+      if (providers[i].minLevel <= zoom && providers[i].maxLevel >= zoom) {
+
+        if (!providers[i].boxes) {
+          // No boxes = attribution always visible
+          visibleProviders.push(providers[i]);
+        } else {
+          for (var j=0; j<providers[i].boxes.length; j++) {
+            var box = providers[i].boxes[j];
+            if (visibleBounds.intersects(box)) {
+              visibleProviders.push(providers[i]);
+              break;
+            }
+          }
+        }
+      }
+    }
+
+    var attributions = ['<a href="https://legal.here.com/en-gb/terms" target="_blank" rel="noopener noreferrer">HERE maps</a>'];
+    for (var i=0; i<visibleProviders.length; i++) {
+      var provider = visibleProviders[i];
+      attributions.push('<abbr title="' + provider.alt + '">' + provider.label + '</abbr>');
+    }
+
+    var attributionText = '© ' + attributions.join(', ') + '. ';
+
+    if (attributionText !== this._attributionText) {
+      this._map.attributionControl.removeAttribution(this._attributionText);
+      this._map.attributionControl.addAttribution(this._attributionText = attributionText);
+    }
+  },
 
 });
 
 
 L.tileLayer.here = function(opts){
-	return new L.TileLayer.HERE(opts);
+  return new L.TileLayer.HERE(opts);
 }