decidim 0.0.5 → 0.0.6

data/decidim-meetings/app/assets/config/decidim_meetings_manifest.js

@@ -1,2 +0,0 @@
-//= link decidim/meetings/map.js
-//= link decidim/meetings/map.css

data/decidim-meetings/app/assets/javascripts/decidim/meetings/map.js.es6.erb

@@ -1,97 +0,0 @@
-// = require leaflet
-// = require leaflet-tilelayer-here
-// = require leaflet-svg-icon
-// = require leaflet.markercluster
-// = require jquery-tmpl
-// = require_self
-
-/* globals L */
-
-L.DivIcon.SVGIcon.DecidimIcon = L.DivIcon.SVGIcon.extend({
-  options: {
-    fillColor: '#ef604d',
-    opacity: 0
-  },
-  _createPathDescription: function() {
-    return 'M14 1.17a11.685 11.685 0 0 0-11.685 11.685c0 11.25 10.23 20.61 10.665 21a1.5 1.5 0 0 0 2.025 0c0.435-.435 10.665-9.81 10.665-21A11.685 11.685 0 0 0 14 1.17Zm0 17.415A5.085 5.085 0 1 1 19.085 13.5 5.085 5.085 0 0 1 14 18.585Z';
-  },
-  _createCircle: function() {
-    return ""
-  }
-});
-
-const popupTemplateId = 'meeting-popup';
-$.template('meeting-popup', $(`#${popupTemplateId}`).html());
-
-const addMarkers = (meetingsData, markerClusters, map) => {
-  const bounds = new L.LatLngBounds(meetingsData.map((meeting) => [meeting.latitude, meeting.longitude]));
-
-  meetingsData.forEach((meeting) => {
-    let marker = L.marker([meeting.latitude, meeting.longitude], {
-      icon: new L.DivIcon.SVGIcon.DecidimIcon()
-    });
-    let node = document.createElement('div');
-
-    $.tmpl('meeting-popup', meeting).appendTo(node);
-
-    marker.bindPopup(node, {
-      maxwidth: 640,
-      minWidth: 500,
-      keepInView: true,
-      className: 'map-info'
-    }).openPopup();
-
-    markerClusters.addLayer(marker);
-  });
-
-  map.addLayer(markerClusters);
-  map.fitBounds(bounds, { padding: [100, 100] });
-};
-
-const loadMap = (mapId, meetingsData) => {
-  let markerClusters = L.markerClusterGroup();
-  const { hereAppId, hereAppCode } = window.DecidimMeetings.mapConfiguration;
-
-  if (window.DecidimMeetings.currentMap) {
-    window.DecidimMeetings.currentMap.remove();
-    window.DecidimMeetings.currentMap = null;
-  }
-
-  const map = L.map(mapId);
-
-  L.tileLayer.here({
-    appId: hereAppId,
-    appCode: hereAppCode,
-  }).addTo(map);
-
-  if (meetingsData.length > 0) {
-    addMarkers(meetingsData, markerClusters, map);
-  } else {
-    map.fitWorld();
-  }
-
-  map.scrollWheelZoom.disable();
-
-  return map;
-};
-
-window.DecidimMeetings = {
-  loadMap,
-  currentMap: null,
-  mapConfiguration: {}
-};
-
-$(() => {
-  const mapId = 'meetings-map';
-  const $map = $(`#${mapId}`);
-
-  const meetingsData = $map.data('meetings');
-  const hereAppId = $map.data('here-app-id');
-  const hereAppCode = $map.data('here-app-code');
-
-  window.DecidimMeetings.mapConfiguration = { hereAppId, hereAppCode };
-
-  if ($map.length > 0) {
-    window.DecidimMeetings.currentMap = loadMap(mapId, meetingsData);
-  }
-});

data/decidim-meetings/app/assets/stylesheets/decidim/meetings/map.css

@@ -1,3 +0,0 @@
-/* = require leaflet */
-/* = require MarkerCluster */
-/* = require MarkerCluster.Default */

data/decidim-meetings/app/services/decidim/meetings/static_map_generator.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-require "httparty"
-
-module Decidim
-  module Meetings
-    # This class generates a url to create a static map image for a geocoded meeting
-    class StaticMapGenerator
-      BASE_HOST = "image.maps.cit.api.here.com"
-      BASE_PATH = "/mia/1.6/mapview"
-
-      def initialize(meeting, options = {})
-        @meeting = meeting
-        @options = options
-
-        @options[:zoom] ||= 15
-        @options[:width] ||= 120
-        @options[:height] ||= 120
-      end
-
-      def data
-        return if Decidim.geocoder.nil?
-
-        Rails.cache.fetch(@meeting.cache_key) do
-          request = HTTParty.get(uri)
-          request.body
-        end
-      end
-
-      private
-
-      def uri
-        params = {
-          c: "#{@meeting.latitude}, #{@meeting.longitude}",
-          z: @options[:zoom],
-          w: @options[:width],
-          h: @options[:height],
-          f: "1",
-          app_id: Decidim.geocoder&.fetch(:here_app_id),
-          app_code: Decidim.geocoder&.fetch(:here_app_code)
-        }
-
-        uri = URI.parse("https://#{BASE_HOST}#{BASE_PATH}").tap do |uri|
-          uri.query = URI.encode_www_form params
-        end
-
-        uri
-      end
-    end
-  end
-end

data/decidim-meetings/app/views/decidim/meetings/meetings/_address_details.html.erb

@@ -1,5 +0,0 @@
-<div class="address__details">
-  <strong><%== translated_attribute meeting.location %></strong><br />
-  <span><%= meeting.address %></span><br />
-  <span><%== translated_attribute meeting.location_hints %></span>
-</div>

data/decidim-meetings/spec/controllers/meetings_controller_spec.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-require "spec_helper"
-
-module Decidim
-  module Meetings
-    describe MeetingsController, type: :controller do
-      let(:organization) { create(:organization) }
-      let(:feature) { create(:feature, organization: organization, manifest_name: "meetings") }
-      let(:meeting) { create(:meeting, feature: feature) }
-
-      load_routes Decidim::Meetings::ListEngine
-
-      before do
-        @request.env["decidim.current_organization"] = organization
-        @request.env["decidim.current_participatory_process"] = feature.participatory_process
-        @request.env["decidim.current_feature"] = feature
-      end
-
-      describe "GET static_map" do
-        let(:params) do
-          {
-            id: meeting.id,
-            feature_id: feature.id,
-            participatory_process_id: feature.participatory_process.id
-          }
-        end
-        let(:data) { "1234" }
-
-        it "generates a static map image data using the StaticMapGenerator" do
-          generator = double()
-
-          expect(StaticMapGenerator).to receive(:new).with(meeting).and_return(generator)
-          expect(generator).to receive(:data).and_return(data)
-          expect(controller).to receive(:send_data).with(data, type: "image/jpeg", disposition: "inline")
-
-          get :static_map, format: "image/jpeg", params: params
-        end
-      end
-    end
-  end
-end

data/decidim-meetings/spec/services/static_map_generator_spec.rb

@@ -1,33 +0,0 @@
-require "spec_helper"
-
-module Decidim
-  module Meetings
-    describe StaticMapGenerator do
-      let(:meeting) { create(:meeting) }
-      let(:options) do
-        {
-          zoom: 10,
-          width: 200,
-          height: 200
-        }
-      end
-      let(:body) { "1234" }
-      subject { described_class.new(meeting, options) }
-
-      before do
-        Decidim.geocoder = {
-          here_app_id: '1234',
-          here_app_code: '5678'
-        }
-
-        stub_request(:get, Regexp.new(StaticMapGenerator::BASE_HOST)).to_return(body: body)
-      end
-
-      describe "#data" do
-        it "returns the request body" do
-          expect(subject.data).to eq(body)
-        end
-      end
-    end
-  end
-end

data/decidim-meetings/vendor/assets/javascripts/leaflet-svg-icon.js

@@ -1,179 +0,0 @@
-//Leaflet-SVGIcon
-//SVG icon for any marker class
-//Ilya Atkin
-//ilya.atkin@unh.edu
-
-L.DivIcon.SVGIcon = L.DivIcon.extend({
-    options: {
-        "circleText": "",
-        "className": "svg-icon",
-        "circleAnchor": null, //defaults to [iconSize.x/2, iconSize.x/2]
-        "circleColor": null, //defaults to color
-        "circleOpacity": null, // defaults to opacity
-        "circleFillColor": "rgb(255,255,255)",
-        "circleFillOpacity": null, //default to opacity 
-        "circleRatio": 0.5,
-        "circleWeight": null, //defaults to weight
-        "color": "rgb(0,102,255)",
-        "fillColor": null, // defaults to color
-        "fillOpacity": 0.4,
-        "fontColor": "rgb(0, 0, 0)",
-        "fontOpacity": "1",
-        "fontSize": null, // defaults to iconSize.x/4
-        "iconAnchor": null, //defaults to [iconSize.x/2, iconSize.y] (point tip)
-        "iconSize": L.point(32,48),
-        "opacity": 1,
-        "popupAnchor": null,
-        "weight": 2
-    },
-    initialize: function(options) {
-        options = L.Util.setOptions(this, options)
-
-        if (!options.circleAnchor) {
-            options.circleAnchor = L.point(Number(options.iconSize.x)/2, Number(options.iconSize.x)/2)
-        }
-        if (!options.circleColor) {
-            options.circleColor = options.color
-        }
-        if (!options.circleFillOpacity) {
-            options.circleFillOpacity = options.opacity
-        }
-        if (!options.circleOpacity) {
-            options.circleOpacity = options.opacity
-        }
-        if (!options.circleWeight) {
-            options.circleWeight = options.weight
-        }
-        if (!options.fillColor) { 
-            options.fillColor = options.color
-        }
-        if (!options.fontSize) {
-            options.fontSize = Number(options.iconSize.x/4) 
-        }
-        if (!options.iconAnchor) {
-            options.iconAnchor = L.point(Number(options.iconSize.x)/2, Number(options.iconSize.y))
-        }
-        if (!options.popupAnchor) {
-            options.popupAnchor = L.point(0, (-0.75)*(options.iconSize.y))
-        }
-
-        var path = this._createPath()
-        var circle = this._createCircle()
-
-        options.html = this._createSVG()
-    },
-    _createCircle: function() {
-        var cx = Number(this.options.circleAnchor.x) 
-        var cy = Number(this.options.circleAnchor.y)
-        var radius = this.options.iconSize.x/2 * Number(this.options.circleRatio)
-        var fill = this.options.circleFillColor.replace("rgb(", "rgba(").replace(")", "," + this.options.circleFillOpacity + ")")
-        var stroke = this.options.circleColor.replace("rgb(", "rgba(").replace(")", "," + this.options.circleOpacity + ")")
-        var strokeWidth = this.options.circleWeight
-        var className = this.options.className + "-circle"
-
-        var circle = '<circle class="' + className + '" cx="' + cx + '" cy="' + cy + '" r="' + radius + '" fill="' + fill + '" stroke="' + stroke + '" stroke-width="' + strokeWidth + '"/>'
-
-        return circle
-    },
-    _createPathDescription: function() {
-        var height = Number(this.options.iconSize.y)
-        var width = Number(this.options.iconSize.x)
-        var weight = Number(this.options.weight)
-        var margin = weight / 2
-
-        var startPoint = "M " + margin + " " + (width/2) + " "
-        var leftLine = "L " + (width/2) + " " + (height - weight) + " "
-        var rightLine = "L " + (width - margin) + " " + (width/2) + " "
-        var arc = "A " + (width/4) + " " + (width/4) + " 0 0 0 " + margin + " " + (width/2) + " Z"
-
-        var d = startPoint + leftLine + rightLine + arc
-
-        return d
-    },
-    _createPath: function() {
-        var pathDescription = this._createPathDescription()
-        var strokeWidth = this.options.weight
-        var stroke = this.options.color.replace("rgb(", "rgba(").replace(")", "," + this.options.opacity + ")")
-        var fill = this.options.fillColor.replace("rgb(", "rgba(").replace(")", "," + this.options.fillOpacity + ")")
-        var className = this.options.className + "-path"
-
-        var path = '<path class="' + className + '" d="' + pathDescription + '" stroke-width="' + strokeWidth + '" stroke="' + stroke + '" fill="' + fill + '"/>'
-
-        return path
-    },
-    _createSVG: function() {
-        var path = this._createPath()
-        var circle = this._createCircle()
-        var text = this._createText()
-        var className = this.options.className + "-svg"
-
-        var style = "width:" + this.options.iconSize.x + "; height:" + this.options.iconSize.y + ";"
-
-        var svg = '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="' + className + '" style="' + style + '">' + path + circle + text + '</svg>'
-
-        return svg
-    },
-    _createText: function() {
-        var fontSize = this.options.fontSize + "px"
-        var lineHeight = Number(this.options.fontSize)
-
-        var x = Number(this.options.iconSize.x) / 2
-        var y = x + (lineHeight * 0.35) //35% was found experimentally 
-        var circleText = this.options.circleText
-        var textColor = this.options.fontColor.replace("rgb(", "rgba(").replace(")", "," + this.options.fontOpacity + ")")
-
-        var text = '<text text-anchor="middle" x="' + x + '" y="' + y + '" style="font-size: ' + fontSize + '" fill="' + textColor + '">' + circleText + '</text>'
-
-        return text
-    }
-})
-
-L.divIcon.svgIcon = function(options) {
-    return new L.DivIcon.SVGIcon(options)
-}
-
-L.Marker.SVGMarker = L.Marker.extend({
-    options: {
-        "iconFactory": L.divIcon.svgIcon,
-        "iconOptions": {}
-    },
-    initialize: function(latlng, options) {
-        options = L.Util.setOptions(this, options)
-        options.icon = options.iconFactory(options.iconOptions)
-        this._latlng = latlng
-    },
-    onAdd: function(map) {
-        L.Marker.prototype.onAdd.call(this, map)
-    },
-    setStyle: function(style) {
-        if (this._icon) {
-            var svg = this._icon.children[0]
-            var iconBody = this._icon.children[0].children[0]
-            var iconCircle = this._icon.children[0].children[1]
-
-            if (style.color && !style.iconOptions) {
-                var stroke = style.color.replace("rgb","rgba").replace(")", ","+this.options.icon.options.opacity+")")
-                var fill = style.color.replace("rgb","rgba").replace(")", ","+this.options.icon.options.fillOpacity+")")
-                iconBody.setAttribute("stroke", stroke)
-                iconBody.setAttribute("fill", fill)
-                iconCircle.setAttribute("stroke", stroke)
-
-                this.options.icon.fillColor = fill
-                this.options.icon.color = stroke
-                this.options.icon.circleColor = stroke
-            }
-            if (style.opacity) {
-                this.setOpacity(style.opacity)
-            }
-            if (style.iconOptions) {
-                if (style.color) { style.iconOptions.color = style.color }
-                iconOptions = L.Util.setOptions(this.options.icon, style.iconOptions)
-                this.setIcon(L.divIcon.svgIcon(iconOptions))
-            }
-        }
-    }
-})
-
-L.marker.svgMarker = function(latlng, options) {
-    return new L.Marker.SVGMarker(latlng, options)
-}

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

@@ -1,166 +0,0 @@
-
-// 🍂class TileLayer.HERE
-// 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);
-		}
-	},
-
-});
-
-
-L.tileLayer.here = function(opts){
-	return new L.TileLayer.HERE(opts);
-}