X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fgooglemap%2Fstatic%2Fjs%2Fgooglemap.js;h=3d1875717376d16164437374d7b9f445fa9a46ee;hb=dfa0e7671a6c8363cc0531bace287d638bc1d510;hp=118cfa6012876bf446d640c783c4e959b058735b;hpb=d549b83164f10793e799da646e6704844607f190;p=unfold.git

diff --git a/plugins/googlemap/static/js/googlemap.js b/plugins/googlemap/static/js/googlemap.js
index 118cfa60..3d187571 100644
--- a/plugins/googlemap/static/js/googlemap.js
+++ b/plugins/googlemap/static/js/googlemap.js
@@ -8,339 +8,416 @@
  * - infowindow is not properly reopened when the maps does not have the focus
  */
 
-googlemap_debug=true;
-googlemap_debug_detailed=false;
+GOOGLEMAP_BGCOLOR_RESET   = 0;
+GOOGLEMAP_BGCOLOR_ADDED   = 1;
+GOOGLEMAP_BGCOLOR_REMOVED = 2;
 
 (function($){
 
+    // events that happen in the once-per-view range
+    var debug=false;
+    debug=true;
+
+    // this now should be obsolete, rather use plugin_debug in plugin.js
+    // more on a on-per-record basis
+    var debug_deep=false;
+    // debug_deep=true;
+
     var GoogleMap = Plugin.extend({
 
-        init: function(options, element) {
-	    if (googlemap_debug) messages.debug("GoogleMap.init");
+        /**************************************************************************
+         *                          CONSTRUCTOR
+         **************************************************************************/
+
+        init: function(options, element) 
+        {
             this._super(options, element);
 
             /* Member variables */
-            // query status
-            this.received_all = false;
-            this.received_set = false;
-            this.in_set_buffer = [];
 
-            // key -> { marker, checked }
-            this.map_markers = {}
+            /* we keep a couple of global hashes
+             * lat_lon --> { marker, <ul> }
+             * id --> { <li>, <input> }
+             */
+            this.by_lat_lon = {};
+            /* locating checkboxes by DOM selectors might be abstruse, as we cannot safely assume 
+             * all the items will belong under the toplevel <div>
+             */
+            this.by_id = {};
+            this.by_init_id = {};
 
-            /* XXX Events XXX */
+            this.markers = Array();
+
+            /* Events */
             this.elmt().on('show', this, this.on_show);
-            // TODO in destructor
-            // $(window).unbind('Hazelnut');
+            this.elmt().on('shown.bs.tab', this, this.on_show);
+            this.elmt().on('resize', this, this.on_resize);
 
             var query = manifold.query_store.find_analyzed_query(this.options.query_uuid);
-            this.method = query.object;
-
-            var keys = manifold.metadata.get_key(this.method);
-            this.key = (keys && keys.length == 1) ? keys[0] : null;
+            this.object = query.object;
+
+            /* see querytable.js for an explanation */
+            var keys = manifold.metadata.get_key(this.object);
+            this.canonical_key = (keys && keys.length == 1) ? keys[0] : undefined;
+            this.init_key = this.options.init_key;
+            this.init_key = this.init_key || this.canonical_key;
+
+            /* sanity check */
+            if ( ! this.init_key ) 
+                messages.warning ("QueryTable : cannot find init_key");
+            if ( ! this.canonical_key )
+                messages.warning ("QueryTable : cannot find canonical_key");
+            if (debug)
+                messages.debug("googlemap: canonical_key="+this.canonical_key+" init_key="+this.init_key);
 
-            /* Setup query and record handlers */
             this.listen_query(options.query_uuid);
-            this.listen_query(options.query_all_uuid, 'all');
 
             /* GUI setup and event binding */
             this.initialize_map();
+
         }, // init
 
-        /* PLUGIN EVENTS */
+        /**************************************************************************
+         *                         PLUGIN EVENTS
+         **************************************************************************/
 
         on_show: function(e) {
-	    if (googlemap_debug) messages.debug("on_show");
-            var self = e.data;
-            google.maps.event.trigger(self.map, 'resize');
-        }, // on_show
-
-        /* GUI EVENTS */
+	        if (debug) messages.debug("googlemap.on_show");
+            var googlemap = e.data;
+            google.maps.event.trigger(googlemap.map, 'resize');
+        }, 
 
-        /* GUI MANIPULATION */
+        /**************************************************************************
+         *                        GUI MANIPULATION
+         **************************************************************************/
 
-        /**
-         */
-        initialize_map: function() {
-	    if (googlemap_debug) messages.debug("initialize_map");
+        initialize_map: function() 
+        {
             this.markerCluster = null;
-            this.coords = new Array();
+            //create empty LatLngBounds object in order to automatically center the map on the displayed objects
+            this.bounds = new google.maps.LatLngBounds();
+            var center = new google.maps.LatLng(this.options.latitude, this.options.longitude);
 
-            var myLatlng = new google.maps.LatLng(this.options.latitude, this.options.longitude);
             var myOptions = {
                 zoom: this.options.zoom,
-                center: myLatlng,
+                center: center,
+		        scrollwheel: false,
                 mapTypeId: google.maps.MapTypeId.ROADMAP,
             }
 	    
-            var domid = this.options.plugin_uuid + manifold.separator + 'map';
-	    var el = document.getElementById(domid);
-	    if (googlemap_debug) messages.debug("gmap.initialize_map based on  domid=" + domid + " el=" + el);
-            this.map = new google.maps.Map(el, myOptions);
+            var domid = this.id('googlemap');
+	        var elmt = document.getElementById(domid);
+            this.map = new google.maps.Map(elmt, myOptions);
             this.infowindow = new google.maps.InfoWindow();
-        }, // initialize_map
 
-        set_checkbox: function(record, checked) {
-	    if (googlemap_debug_detailed) messages.debug ("set_checkbox");
-            /* Default: checked = true */
-            if (typeof checked === 'undefined')
-                checked = true;
-
-            var key_value;
-            /* The function accepts both records and their key */
-            switch (manifold.get_type(record)) {
-            case TYPE_VALUE:
-                key_value = record;
-                break;
-            case TYPE_RECORD:
-                /* XXX Test the key before ? */
-                key_value = record[this.key];
-                break;
-            default:
-                throw "Not implemented";
-                break;
-            }
-
-            // we cannot directly edit html, since nothing but marker is displayed
-            //var checkbox_id = this.id('checkbox', this.id_from_key(this.key, key_value));
-            //checkbox_id = '#' + checkbox_id.replace(/\./g, '\\.');
-            //$(checkbox_id, this.table.fnGetNodes()).attr('checked', checked);
-
-            var dict_info = this.map_markers[unfold.escape_id(key_value).replace(/\\/g, '')];
-
-
-            // Update the marker content
-            dict_info.in_set = checked;
-            dict_info.marker.content = this.get_marker_content(dict_info.record, checked);
-
-	    // Thierry - this code seems to cause the googlemap area to go all grayed out 
-	    // once all the quesries have come back
-	    // BEG turning off temporarily
-	    //            // Update opened infowindow
-	    //            // XXX Factor this code
-	    //            this.infowindow.close();
-	    //            this.infowindow.open(this.map, dict_info.marker);
-	    //            this.infowindow.setContent(dict_info.marker.content);
-	    //            this.elts('map-button').unbind('click').click(this, this._button_click);
-	    // END turning off temporarily
-            //var button = this.checkbox(record, checked);
-            //this.elmt('checkbox', this.id_from_record(method, record)).html(button);
-        }, 
-
-        checkbox: function(record, checked) {
-	    if (googlemap_debug_detailed) messages.debug ("checkbox");
-            if (typeof checked === 'undefined')
-                checked = false;
-
-            var method  = manifold.query_store.find_analyzed_query(this.options.query_uuid).object;
-            var action = checked ? 'checked' : 'del';
-            var ctx = {
-                action_class  : checked ? 'ui-icon-circle-minus' : 'ui-icon-circle-plus',
-                action_message: checked ? 'Remove from slice' : 'Add to slice',
-            };
-            var button = this.load_template('template', ctx);
-
-            var id_record = this.id_from_record(method, record);
-            if (!id_record)
-                return 'ERROR';
-            var id = this.id('checkbox', this.id_from_record(method, record));
-            return "<div id='" + id + "'>" + button + "</div>";
-        },
-        
-        get_marker_content: function(record, checked) {
-	    if (googlemap_debug_detailed) messages.debug ("get_marker_content");
-            return '<p><b>' + this.method + '</b>: ' + get_value(record['resource_hrn']) + '<br/><b>network</b>: ' + get_value(record['network'])+'</p>' + this.checkbox(record, checked);
-        },
-
-        /**
-         */
-        new_record: function(record) {
-	    if (googlemap_debug_detailed) messages.debug ("new_record");
-            // get the coordinates
-            var latitude=get_value(record['latitude']);
-            var longitude=get_value(record['longitude']);
-            var hash = latitude + longitude;
-
-            // check to see if we've seen this hash before
-            if(this.coords[hash] == null) {
-                // get coordinate object
-                var myLatlng = new google.maps.LatLng(latitude, longitude);
-                // store an indicator that we've seen this point before
-                this.coords[hash] = 1;
-            } else {
-                // add some randomness to this point 1500 = 100 meters, 15000 = 10 meters
-                var lat = latitude + (Math.random() -.5) / 1500; 
-                var lng = longitude + (Math.random() -.5) / 1500; 
-
-                // get the coordinate object
-                var myLatlng = new google.maps.LatLng(lat, lng);
-            }
-            // XXX not working
-            if (!(record['latitude'])) {
-                return true;
-            }
+        }, // initialize_map
 
-            //jQuery(".map-button").click(button_click);
-            //if(jQuery.inArray(record, rows)>-1){
+        // return { marker: gmap_marker, ul : <ul DOM> }
+        create_marker_struct: function(object, lat, lon) 
+        {
+            /* the DOM fragment */
+            var dom = $("<p>").addClass("geo").append(object+"(s)");
+            var ul = $("<ul>").addClass("geo");
+            dom.append(ul);
+            /* add a gmap marker to the mix */
             var marker = new google.maps.Marker({
-                position: myLatlng,
-                title: get_value(record['hostname']),
-                // This should be done by the rendering
-                content: this.get_marker_content(record, false),
+                position: new google.maps.LatLng(lat, lon),
+                title: object,
+                /* gmap can deal with a DOM element but not a jquery object */
+                content: dom.get(0),
+                keys: Array(),
             }); 
+            //extend the bounds to include each marker's position
+            this.bounds.extend(marker.position);
+            return { marker: marker, ul: ul };
+        },
 
-            this.addInfoWindow(marker, this.map);
-            var key_value = (this.key in record) ? record[this.key] : null;
-            if (!key_value)
-                return;
-            this.map_markers[unfold.escape_id(key_value).replace(/\\/g, '')] = {
-                marker: marker,
-                in_set: false,
-                record: record,
-                value: key_value
-            }
-            //}
-
-        }, // new_record
-
-        addInfoWindow: function(marker, map) {
-	    if (googlemap_debug_detailed) messages.debug ("addInfoWindow");
-            var self = this;
-            google.maps.event.addListener(marker, 'click', function () {     
-                if(self.infowindow){
-                    self.infowindow.close();
+        /* given an input <ul> element, this method inserts a <li> with embedded checkbox 
+         * for displaying/selecting the resource corresponding to the input record
+         * returns the created <input> element for further checkbox manipulation
+         */
+        create_record_checkbox: function (record, ul, checked)
+        {
+            var key, key_value, data;
+
+            var checkbox = $("<input>", {type:'checkbox', checked:checked, class:'geo'});
+            var id = record[this.canonical_key];
+            var init_id = record[this.init_key];
+
+            // xxx use init_key to find out label - or should we explicitly accept an incoming label_key ?
+            var label = init_id;
+
+            key = this.canonical_key;
+            key_value = manifold.record_get_value(record, key);
+
+            ul.append($("<li>").addClass("geo")
+              .append($('<div>') // .addId(this.id_from_key(key, key_value))
+                .append(checkbox)
+                .append($("<span>").addClass("geo")
+                  .append(label)
+                )
+              )
+            );
+
+            // XXX STATE / BACKGROUND
+
+            // hash by id and by init_id 
+            this.by_id[id]=checkbox;
+            this.by_init_id[init_id] = checkbox;
+
+            /* the callback for when a user clicks
+             * NOTE: this will *not* be called for changes done by program
+             */
+            var self=this;
+            checkbox.change( function (e) {
+                data = {
+                    state: STATE_SET,
+                    key  : null,
+                    op   : this.checked ? STATE_SET_ADD : STATE_SET_REMOVE,
+                    value: id
                 }
-                self.infowindow.setContent(marker.content);// = new google.maps.InfoWindow({ content: marker.content });
-                self.infowindow.open(map, marker);
-                // onload of the infowindow on the map, bind a click on a button
-                google.maps.event.addListener(self.infowindow, 'domready', function() {
-                    self.elts('map-button').unbind('click').click(self, self._button_click);
-		    //                    jQuery(".map-button").click({instance: instance_, infoWindow: object.infowindow}, button_click);                     
-                });
+                manifold.raise_event(self.options.query_uuid, FIELD_STATE_CHANGED, data);
             });
-        }, // addInfoWindow
+            return checkbox;
+        },
+            
+        set_checkbox_from_record_key: function (record_key, checked) 
+        {
+            if (checked === undefined) checked = true;
+
+            var checkbox = this.by_init_id [record_key];
+            if (!checkbox) {
+                console.log("googlemap.set_checkbox_from_record - not found " + record_key);
+                return;
+            }
 
+            checkbox.attr('checked', checked);
+        },
 
-        /*************************** QUERY HANDLER ****************************/
 
-        /*************************** RECORD HANDLER ***************************/
+        set_checkbox_from_data: function(id, checked) 
+        {
+            var checkbox = this.by_id[id];
+            if (!checkbox) {
+                console.log("googlemap.set_checkbox_from_data - id not found " + id);
+                return;
+            }
+            checkbox.attr('checked', checked);
+        }, 
 
-        on_new_record: function(record) {
-	    if (googlemap_debug_detailed) messages.debug("on_new_record");
-            if (this.received_all)
-                // update checkbox for record
-                this.set_checkbox(record);
+        set_bgcolor: function(key_value, class_name)
+        {
+            var elt = $(document.getElementById(this.id_from_key(this.canonical_key, key_value)))
+            if (class_name == GOOGLEMAP_BGCOLOR_RESET)
+                elt.removeClass('added removed');
             else
-                // store for later update of checkboxes
-                this.in_set_buffer.push(record);
+                elt.addClass((class_name == GOOGLEMAP_BGCOLOR_ADDED ? 'added' : 'removed'));
         },
 
-        on_clear_records: function(record) {
-	    if (googlemap_debug_detailed) messages.debug("on_clear_records");
-        },
 
-        // Could be the default in parent
-        on_query_in_progress: function() {
-	    if (googlemap_debug) messages.debug("on_query_in_progress");
-            this.spin();
-        },
-
-        on_query_done: function() {
-	    if (googlemap_debug) messages.debug("on_query_done");	    
-            if (this.received_all)
-                this.unspin();
-            this.received_set = true;
-        },
+        /**
+         * Populates both this.by_lat_lon and this.arm_marker arrays
+         */
+        new_record: function(record) 
+        {
+            var record_key;
 
-        on_field_state_changed: function(data) {
-	    if (googlemap_debug) messages.debug("on_field_state_changed");	    
-            switch(data.request) {
-            case FIELD_REQUEST_ADD:
-            case FIELD_REQUEST_ADD_RESET:
-                this.set_checkbox(data.value, true);
-                break;
-            case FIELD_REQUEST_REMOVE:
-            case FIELD_REQUEST_REMOVE_RESET:
-                this.set_checkbox(data.value, false);
-                break;
-            default:
-                break;
-            }
-        },
+            if (!(record['latitude'])) 
+                return;
 
+            /* get the coordinates*/
+            var latitude  = unfold.get_value(record['latitude']);
+            var longitude = unfold.get_value(record['longitude']);
+            var lat_lon = latitude + longitude;
+
+    	    // check if we've seen anything at that place already
+    	    // xxx might make sense to allow for some fuzziness, 
+    	    // i.e. consider 2 places equal if not further away than 300m or so...
+    	    var marker_s = this.by_lat_lon[lat_lon];
+    	    if ( marker_s == null ) {
+        	    marker_s = this.create_marker_struct(this.object, latitude, longitude);
+        	    this.by_lat_lon[lat_lon] = marker_s;
+        	    this.arm_marker(marker_s.marker, this.map);
+	        }
+
+            /* Add key to the marker */
+            record_key = manifold.record_get_value(record, this.canonical_key);
+            marker_s.marker.keys.push(record_key);
+	    
+    	    // now add a line for this resource in the marker
+    	    // xxx should compute checked here ?
+    	    // this is where the checkbox will be appended
+    	    var ul = marker_s.ul;
+    	    var checkbox = this.create_record_checkbox(record, ul, false);
+        }, // new_record
 
-        // all
+        arm_marker: function(marker, map)
+        {
+            var self = this;
+            google.maps.event.addListener(marker, 'click', function () {
+                self.infowindow.close();
+                self.infowindow.setContent(marker.content);
+                self.infowindow.open(map, marker);
+            });
+        }, // arm_marker
 
-        on_all_new_record: function(record) {
-	    if (googlemap_debug_detailed) messages.debug("on_all_new_record");
-            this.new_record(record);
+        clear_map: function()
+        {
+            /* XXX */
         },
 
-        on_all_clear_records: function() {
-	    if (googlemap_debug) messages.debug("on_all_clear_records");	    
-        },
+        filter_map: function()
+        {
+            var self = this;
+            var visible;
+
+            /* Loop on every marker and sets it visible */
+            $.each(this.markers, function(i, marker) {
+                /* For a marker to be visible, at least one of its keys has to
+                 * be visible */
+                visible = false;
+                $.each(marker.keys, function(j, key) {
+                    visible = visible || manifold.query_store.get_record_state(self.options.query_uuid, key, STATE_VISIBLE);
+                });
+                marker.setVisible(visible);
+            });
 
-        on_all_query_in_progress: function() {
-	    if (googlemap_debug) messages.debug("on_all_query_in_progress");
-            // XXX parent
-            this.spin();
+            this.do_clustering();
         },
 
-        on_all_query_done: function() {
-	    if (googlemap_debug) messages.debug("on_all_query_done");
-            // MarkerClusterer
-            var markers = [];
-            $.each(this.map_markers, function (k, v) { markers.push(v.marker); });
-
-            this.markerCluster = new MarkerClusterer(this.map, markers, {zoomOnClick: false});
+        do_clustering: function()
+        {
+            this.markerCluster = new MarkerClusterer(this.map, this.markers, {zoomOnClick: false});
+            this.markerCluster.setIgnoreHidden(true);
             google.maps.event.addListener(this.markerCluster, "clusterclick", function (cluster) {
                 var cluster_markers = cluster.getMarkers();
                 var bounds  = new google.maps.LatLngBounds();
-                /* 
-                 * date: 24/05/2012
-                 * author: lbaron
-                 * Firefox JS Error - replaced $.each by JQuery.each
-                 */                  
-                jQuery.each(cluster_markers, function(i, marker){
+                $.each(cluster_markers, function(i, marker){
                     bounds.extend(marker.getPosition()); 
                 });
-
                 //map.setCenter(bounds.getCenter(), map.getBoundsZoomLevel(bounds));
                 this.map.fitBounds(bounds);
             });
+            //now fit the map to the bounds
+            this.map.fitBounds(this.bounds);
+            // Fix the zoom of fitBounds function, it's too close when there is only 1 marker
+            if (this.markers.length==1) {
+                this.map.setZoom(this.map.getZoom()-4);
+            }
+        },
 
+        redraw_map: function()
+        {
+            // Let's clear the table and only add lines that are visible
             var self = this;
-            if (this.received_set) {
-                /* XXX needed ? XXX We uncheck all checkboxes ... */
-                //$("[id^='datatables-checkbox-" + this.options.plugin_uuid +"']").attr('checked', false);
+            this.clear_map();
 
-                /* ... and check the ones specified in the resource list */
-                $.each(this.in_set_buffer, function(i, record) {
-                    self.set_checkbox(record, true);
-                });
-		// reset 
-		self.in_set_buffer = [];
+            /* Add records to internal hash structure */
+            var record_keys = [];
+            manifold.query_store.iter_records(this.options.query_uuid, function (record_key, record) {
+                self.new_record(record);
+                record_keys.push(record_key);
+            });
 
-                this.unspin();
-            }
-            this.received_all = true;
+            /* Add markers to cluster */
+            this.markers = Array();
+            $.each(this.by_lat_lon, function (k, s) {
+                self.markers.push(s.marker); 
+            });
+
+            this.do_clustering();
+
+
+            /* Set checkbox and background color */
+            $.each(record_keys, function(i, record_key) {
+                var state = manifold.query_store.get_record_state(self.options.query_uuid, record_key, STATE_SET);
+                var warnings = manifold.query_store.get_record_state(self.options.query_uuid, record_key, STATE_WARNINGS);
+                switch(state) {
+                    // XXX The row and checkbox still does not exists !!!!
+                    case STATE_SET_IN:
+                    case STATE_SET_IN_SUCCESS:
+                    case STATE_SET_OUT_FAILURE:
+                        self.set_checkbox_from_record_key(record_key, true);
+                        break;
+                    case STATE_SET_OUT:
+                    case STATE_SET_OUT_SUCCESS:
+                    case STATE_SET_IN_FAILURE:
+                        break;
+                    case STATE_SET_IN_PENDING:
+                        self.set_checkbox_from_record_key(record_key, true);
+                        self.set_bgcolor(record_key, GOOGLEMAP_BGCOLOR_ADDED);
+                        break;
+                    case STATE_SET_OUT_PENDING:
+                        self.set_bgcolor(record_key, GOOGLEMAP_BGCOLOR_REMOVED);
+                        break;
+                }
+                //self.change_status(record_key, warnings); // XXX will retrieve status again
+            });
+        },
 
-        }, // on_all_query_done
+       /**************************************************************************
+        *                           QUERY HANDLERS
+        **************************************************************************/ 
 
-        /************************** PRIVATE METHODS ***************************/
+        on_filter_added: function(filter)
+        {
+            this.filter_map();
+        },
+
+        on_filter_removed: function(filter)
+        {
+            this.filter_map();
+        },
+        
+        on_filter_clear: function()
+        {
+            this.filter_map();
+        },
 
-        _button_click: function(e) {
-	    if (googlemap_debug) messages.debug("_button_click");
-            var self   = e.data;
+        on_query_in_progress: function() 
+        {
+            this.spin();
+        },
 
-            var escaped_key = self.key_from_id($(this).parent().attr('id'), 'checkbox');
-            var info_dict = self.map_markers[escaped_key];
-            var in_set = info_dict.in_set;
-            var value = info_dict.value;
+        on_query_done: function()
+        {
+            this.redraw_map();
+            this.unspin();
+        },
 
-            var escaped_key = self.map_markers[self.key_from_id($(this).parent().attr('id'), 'checkbox')]
-            manifold.raise_event(self.options.query_uuid, (in_set) ? SET_REMOVED : SET_ADD, value);
-        } // _button_click
+        on_field_state_changed: function(data)
+        {
+            switch(data.state) {
+                case STATE_SET:
+                    switch(data.value) {
+                        case STATE_SET_IN:
+                        case STATE_SET_IN_SUCCESS:
+                        case STATE_SET_OUT_FAILURE:
+                            this.set_checkbox_from_data(data.key, true);
+                            this.set_bgcolor(data.key, QUERYTABLE_BGCOLOR_RESET);
+                            break;  
+                        case STATE_SET_OUT:
+                        case STATE_SET_OUT_SUCCESS:
+                        case STATE_SET_IN_FAILURE:
+                            this.set_checkbox_from_data(data.key, false);
+                            this.set_bgcolor(data.key, QUERYTABLE_BGCOLOR_RESET);
+                            break;
+                        case STATE_SET_IN_PENDING:
+                            this.set_checkbox_from_data(data.key, true);
+                            this.set_bgcolor(data.key, QUERYTABLE_BGCOLOR_ADDED);
+                            break;  
+                        case STATE_SET_OUT_PENDING:
+                            this.set_checkbox_from_data(data.key, false);
+                            this.set_bgcolor(data.key, QUERYTABLE_BGCOLOR_REMOVED);
+                            break;
+                    }
+                    break;
+
+                case STATE_WARNINGS:
+                    //this.change_status(data.key, data.value);
+                    break;
+            }
+        },
 
     });