hdabo: comparison web/hdalab/static/hdalab/js/gomina.js

Mercurial Mercurial > hdabo / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

web/hdalab/static/hdalab/js/gomina.js

changeset 127	8642f1fb6499
parent 119	e3ebe3545f72
child 131	9d5d9e6b7fbf

equal deleted inserted replaced

-:f937ccc6c144
+:8642f1fb6499
 maxYear: 2010,
 tlPixels: 960,
 tlGamma: 6,
 heatGamma: 4,
 displayedDates: [-5000,0,500,1000,1200,1400,1600,1700,1750,1800,1850,1900,1950,2010],
-urls: {}
+mappingLibrary: 'leaflet',
 }
 function yearToPx(year) {
 return gomNs.tlPixels * Math.pow( ( year - gomNs.minYear ) / ( gomNs.maxYear - gomNs.minYear ), gomNs.tlGamma );
 }
 _html += '<img id="img_wikipedia" src="'
 + data.thumbnail
 + '" />';
 }
 if (data.abstract) {
-_html += '<p>' + _(data.abstract).escape() + '</p>';
+_html += '<p>' + _(data.abstract).escape().replace(/(^.{0,240})([\s]|$)(.*)/,'$1&hellip;') + '</p>';
 }
-if (data.links) {
+/*            if (data.links) {
 var _lC = data.requested_label.toLowerCase();
 var _t = data.links.map(function(d) {
 return (d.subject.toLowerCase() == _lC) ? d.object : d.subject;
 });
 _t.sort();
 return '<li class="content-tag-item"><a href="#" onclick="tagInfo($(this).text()); return false;">'
 + d
 + '</a></li>';
 }).join('')
 + '</ul>';
-}
+} */
 $("#tagdata").html(_html);
 });
-filterTag(_taglabel);
+addFilter('tag', _taglabel);
 $("#showlist").removeClass("actif");
 }
-function filterTag(_tagLabel) {
+function addFilter(_type, _label) {
 var _curView = gomNs.sessiondata.views[gomNs.sessiondata.view];
 if (_curView.type == 'filter') {
-_curView.tag.push(_tagLabel);
+_curView[_type].push(_label);
+console.log(_curView[_type]);
 updateFilters();
 debouncedSaveChanges();
 }
 }
-function removeFilter(_index) {
+function removeFilter(_type, _index) {
 var _curView = gomNs.sessiondata.views[gomNs.sessiondata.view];
 if (_curView.type == 'filter') {
-_curView.tag.splice(_index,1);
+_curView[_type].splice(_index,1);
 updateFilters();
 debouncedSaveChanges();
 }
 }
 function getUpdates() {
 var _params = {},
 _curView = gomNs.sessiondata.views[gomNs.sessiondata.view];
 if (_curView.type == 'filter') {
-if (_curView.period && !(_curView.period[0] == gomNs.minYear && _curView.period[1] == gomNs.maxYear)) {
+if (!(_curView.period[0] == gomNs.minYear && _curView.period[1] == gomNs.maxYear)) {
 _params.period = _curView.period.join(',');
 }
 if (_curView.tag.length) {
 _params.label = _curView.tag.join(',');
 }
+if (_curView.country.length) {
+_params.country = _curView.country.join(',');
+}
 $.getJSON(gomNs.urls['filter'], _params, updateDisplay);
+animLoad();
 }
 }
 var debouncedGetUpdates = _.debounce(getUpdates, 300);
 _curView.period[_n] = _int;
 }
 updateFilters();
 debouncedSaveChanges();
 }
+}
+}
+function removePeriod() {
+var _curView = gomNs.sessiondata.views[gomNs.sessiondata.view];
+if (_curView.type == 'filter') {
+_curView.period[0] = gomNs.minYear;
+_curView.period[1] = gomNs.maxYear;
+updateFilters();
+debouncedSaveChanges();
 }
 }
 function changeSpan(_this) {
 var _curView = gomNs.sessiondata.views[gomNs.sessiondata.view];
 var _curView = gomNs.sessiondata.views[gomNs.sessiondata.view];
 if (_curView.type != 'filter') {
 return;
 }
 var _htmFilters = '',
-_fl = _curView.tag.length;
+_fl = _curView.tag.length,
-if (!_curView.period && !_fl) {
+_cl = _curView.country.length;
+/*    if (!_curView.period && !_fl && !_cl) {
 _htmFilters = '<li class="nofilter">Aucun filtre</li>';
-}
+} */
-if (_curView.period) {
+if (_curView.period[0] == gomNs.minYear && _curView.period[1] == gomNs.maxYear) {
-_htmFilters += '<li class="filperiod"><span class="spyr" id="sp_0" onclick="changeSpan(this);">'
+_htmFilters += '<li class="filperiod">Toutes périodes</li>';
+} else {
+_htmFilters += '<li class="filperiod">Période&nbsp;: <span class="spyr" id="sp_0" onclick="changeSpan(this);">'
 + _curView.period[0]
 + '</span> à <span class="spyr" id="sp_1" onclick="changeSpan(this);">'
 + _curView.period[1]
-+ '</span></li>';
++ '</span><a href="#" class="remfil" onclick="removePeriod(); return false;">[x]</a></li>';
-$("#handle_0").css({
+}
-"left" : yearToPx(_curView.period[0])+"px",
+$("#handle_0").css({
-}).attr("year", _curView.period[0])
+"left" : yearToPx(_curView.period[0])+"px",
-.find(".handleinner")
+}).attr("year", _curView.period[0])
-.css({
+.find(".handleinner")
-"margin-left" : "-20px"
+.css({
-});
+"margin-left" : "-20px"
-$("#handle_1").css({
+});
-"left" : yearToPx(_curView.period[1])+"px",
+$("#handle_1").css({
-}).attr("year", _curView.period[1])
+"left" : yearToPx(_curView.period[1])+"px",
-.find(".handleinner")
+}).attr("year", _curView.period[1])
-.css({
+.find(".handleinner")
-"margin-left" : "0"
+.css({
-});
+"margin-left" : "0"
+});
+if (_cl) {
+_htmFilters += _(_curView.country).map(function(_t, _i) {
+return '<li class="filcountry">Pays&nbsp;: '
++ ( (typeof gomNs.countries == "object" && typeof gomNs.countries[_t] == "object") ? gomNs.countries[_t].properties.label_fr : decodeURIComponent(_t.match('[^/]+$')[0]).replace('_',' '))
++ '<a href="#" class="remfil" onclick="removeFilter(\'country\','
++ _i
++ '); return false;">[x]</a></li>';
+}).join("");
 }
 if (_fl) {
 _htmFilters += _(_curView.tag).map(function(_t, _i) {
-return '<li class="filtag">'
+return '<li class="filtag">Tag&nbsp;: '
 + _t
-+ '<a href="#" class="remfil" onclick="removeFilter('
++ '<a href="#" class="remfil" onclick="removeFilter(\'tag\','
 + _i
 + '); return false;">[x]</a></li>';
 }).join("");
 }
 $("#filters").html(_htmFilters);
 if (contentdata && contentdata.length) {
 var _htmlCl = '<ul id="contentlist">'
 + contentdata.map(function(_d) {
 var _html = '<li class="content-item"><h3>'
 + _d.title
-+ '</h3><h4><a href="'
++ '</h3>'
++ ( typeof _d.coords == "object" ?
+'<div class="maplet"><img src="http://maps.googleapis.com/maps/api/staticmap?center=47,1.5&zoom=4&size=160x160&maptype=roadmap&markers=color:red%7C'
++ _d.coords.latitude
++ ','
++ _d.coords.longitude
++ '&sensor=false" /><h4>Localisation&nbsp;: '
++ _d.coords.city_name
++ '</h4></div>'
+: '')
++ '<h4><a href="'
 + _d.url
 + '" target="_blank">'
-+ _d.url
++ _d.url.replace(/(^.{40}).+(.{30}$)/m,'$1 &hellip; $2')
 + '</a></h4><p>'
-+ _d.description
++ _d.description.replace(/(^.{0,160})([\s]|$)(.*)/,'$1&hellip;')
 + '</p><ul class="content-tags">'
 + _d.tags.map(function(_t) {
 return '<li class="content-tag-item"><a href="#" onclick="tagInfo($(this).text()); return false;"'
 + (_t.match ? ' class="tagmatch"' : '')
 + '>'
 $("#contents").html("");
 }
 }
 function updateDisplay(data) {
+animStop();
 if (gomNs.dhmPaper) {
 gomNs.dhmPaper.clear();
 } else {
 gomNs.dhmPaper = new Raphael("dateheat");
 }
 }
 if (data.tags.length) {
 var _scores = _(data.tags).map(function(_d) { return parseInt(_d.score)}),
 _maxTag = _(_scores).max(),
 _minTag = Math.min(_(_scores).min(), _maxTag - 1),
-_scale = 20 / Math.sqrt(_maxTag - _minTag),
+_scale = 10 / Math.sqrt(_maxTag - _minTag),
 _htmlTc = '<ul id="tclist">'
 + _(data.tags).map(function(_d) {
 return '<li style="font-size:'
 + parseInt(10 + _scale * Math.sqrt(_d.score - _minTag))
 + 'px;"><a href="#" onclick="tagInfo($(this).text()); return false;"'
 else {
 $("#tagcloud").html("<h4>Pas de mots-clés trouvés</h4>");
 }
 displayContents(data.contents);
 if (gomNs.countries && data.countries) {
-var _max = Math.max(1, _(data.countries).max(function(_c) { return _c.score}).score);
+var _max = Math.max(1, _(data.countries).max());
-_(data.countries).each(function(_c) {
+_(gomNs.countries).each(function(_country, _k) {
-var _cc = gomNs.countries[_c.isocode];
+var _val = data.countries[_k] || 0,
-if (_cc) {
+_gb = parseInt(255 * (1 - _val / _max )),
-var _gb = parseInt(255 * (1 - _c.score / _max ));
+_fill = ( _val ? "rgb(255," + _gb + "," + _gb + ")" : "#7070a0" ),
-_(_cc.gPolygons).each(function(_p) {
+_op = (_val ? .9 : .3);
-_p.setOptions({
+switch(gomNs.mappingLibrary) {
-"fillColor" : ( _c.score ? "rgb(255," + _gb + "," + _gb + ")" : "#7070a0" ),
+case 'gmaps':
+_(_country.gPolygons).each(function(_p) {
+_p.setOptions({
+"fillColor" : _fill,
+"fillOpacity": _op
+});
 });
-});
+break;
+case 'leaflet':
+_country.layer.setStyle({
+"fillColor" : _fill,
+"fillOpacity": _op
+})
+break;
 }
 });
 }
 if (data.disciplines) {
 var _disc = data.disciplines.filter(function(_d) {
 case 'list':
 $("#bandefiltre, .handle").hide();
 $.getJSON(gomNs.urls['filter'], {
 contentlist: _curView.list.join(',')
 }, updateDisplay);
+animLoad();
 break;
 case 'filter':
 $("#bandefiltre, .handle").show();
 updateFilters();
 break;
 } else {
 $("#partagerw").hide();
 }
 var _baseUrl = document.location.href.split("#")[0];
 $("#rourl").html(_baseUrl + "#" + data.sessionid );
-gomNs.hash = "#" + data.sessionid + (data.sessionkey ? ':' + data.sessionkey : '');
+gomNs.hash = "#" + data.sessionid + (data.sessionkey ? (':' + data.sessionkey) : '');
 document.location.hash = gomNs.hash;
 $("#rwurl").html(_baseUrl + gomNs.hash);
-gomNs.sessiondata = JSON.parse(data.data);
+gomNs.sessiondata = typeof data.data == "string" ? JSON.parse(data.data) : (typeof data.data == "object" ? data.data : {});
 if (!gomNs.sessiondata.title) {
 gomNs.sessiondata.title = 'Nouvelle session';
 }
 if (!gomNs.sessiondata.views) {
 gomNs.sessiondata.views = [];
 };
 switch(viewtype) {
 case 'filter':
 _content.period = [ gomNs.minYear, gomNs.maxYear ];
 _content.tag = [];
+_content.country = [];
 gomNs.sessiondata.view = gomNs.sessiondata.views.length;
 break;
 case 'list':
 _content.list = [];
 break;
 }
 gomNs.sessiondata.views.push(_content);
 debouncedSaveChanges();
 }
+function animLoad() {
+var _d = $("#lightboxbg"),
+_w = _d.width(),
+_h = _d.height(),
+_r = .33*Math.min(_w,_h),
+_count = 24,
+_html = '',
+_f = 2* Math.PI / _count;
+_d.empty().show();
+for (var _i = 0; _i < _count; _i++) {
+var _x = Math.floor(Math.sin(_i * _f)*_r + _w/2),
+_y = Math.floor(-Math.cos(_i * _f)*_r + _h/2),
+_el = document.createElement('div');
+_d.append(_el);
+$(_el).css({
+"position": "absolute",
+"left": _x + "px",
+"top": _y + "px",
+"width": "30px",
+"height": "30px",
+"background": "#ffffff",
+"border-radius": "15px",
+"display": "none"
+}).delay(200*_i).fadeIn(400).delay(600 + 200* _i).fadeOut();
+}
+}
+function animStop() {
+$("#lightboxbg").empty().fadeOut();
+}
 $(document).ready(function() {
-gomNs.map = new google.maps.Map(document.getElementById("map"),
+switch(gomNs.mappingLibrary) {
-{
+case 'gmaps':
-center: new google.maps.LatLng(30, 0),
+gomNs.map = new google.maps.Map(document.getElementById("map"),
-zoom: 1,
+{
-mapTypeId: google.maps.MapTypeId.SATELLITE
+center: new google.maps.LatLng(30, 0),
-});
+zoom: 1,
-$.getJSON(gomNs.urls['countries'], showCountries);
+mapTypeId: google.maps.MapTypeId.SATELLITE
+});
+$.getJSON(gomNs.urls['countries'], showCountriesGmap);
+break;
+case 'leaflet':
+gomNs.map = new L.Map('map', {
+center: new L.LatLng(30, 0),
+zoom: 1
+});
+gomNs.map.addLayer(new L.TileLayer("http://s3.amazonaws.com/com.modestmaps.bluemarble/{z}-r{y}-c{x}.jpg", {maxZoom: 9}));
+$.getJSON(gomNs.urls['countries'], showCountriesLeaflet);
+break;
+}
 var _html = gomNs.displayedDates.map(function(_v) {
 return '<li style="left: '
 + parseInt(yearToPx(_v))
 + 'px"><div class="datelabel">'
 + _v
 $(this).html(_el);
 _el.focus();
 _el.select();
 }
 });
-$("#titrevue").change(function() {
+$("#titrevue").keyup(function() {
 var _curView = gomNs.sessiondata.views[gomNs.sessiondata.view];
 _curView.name = $(this).val();
 $("#view_" + gomNs.sessiondata.view + " a").html(_.escape(_curView.name))
+$("#bloc_gestvue h2").html('Gérer la vue "' + _.escape(_curView.name) + '"');
 debouncedSaveChanges();
 });
 $("#notes").click(function() {
 if (gomNs.write_allowed) {
 if (this.children[0].tagName == 'UL') {
 addView('list', _txt);
 displayViewList();
 }
 return false;
 });
+animLoad();
 });

hdabo