X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fgooglemap%2Fstatic%2Fjs%2Fgooglemap.js;h=39e80cc0834b759d1ac09dcf5a80554813d29d63;hb=c5795ba59e99c3a9b7481f4965814eca3e9a950d;hp=c9d392322bfef8fd7a9f766b1266522865db6382;hpb=d1e5d12b2b9519801f7b981a2177b3f36115714a;p=myslice.git
diff --git a/plugins/googlemap/static/js/googlemap.js b/plugins/googlemap/static/js/googlemap.js
index c9d39232..39e80cc0 100644
--- a/plugins/googlemap/static/js/googlemap.js
+++ b/plugins/googlemap/static/js/googlemap.js
@@ -1,341 +1,309 @@
/**
- * Description: display a query result in a googlemap
- * Copyright (c) 2012 UPMC Sorbonne Universite - INRIA
+ * Description: display a query result in a Google map
+ * Copyright (c) 2012-2013 UPMC Sorbonne Universite - INRIA
* License: GPLv3
*/
-/*
- * It's a best practice to pass jQuery to an IIFE (Immediately Invoked Function
- * Expression) that maps it to the dollar sign so it can't be overwritten by
- * another library in the scope of its execution.
+/* BUGS:
+ * - infowindow is not properly reopened when the maps does not have the focus
*/
-(function($){
-
- var PLUGIN_NAME = 'GoogleMap';
-
- // routing calls
- jQuery.fn.GoogleMap = function( method ) {
- if ( methods[method] ) {
- return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ));
- } else if ( typeof method === 'object' || ! method ) {
- return methods.init.apply( this, arguments );
- } else {
- jQuery.error( 'Method ' + method + ' does not exist on jQuery.' + PLUGIN_NAME );
- }
- };
-
- /***************************************************************************
- * Public methods
- ***************************************************************************/
-
- var methods = {
-
- /**
- * @brief Plugin initialization
- * @param options : an associative array of setting values
- * @return : a jQuery collection of objects on which the plugin is
- * applied, which allows to maintain chainability of calls
- */
- init : function( options ) {
-
- return this.each(function(){
-
- var $this = $(this);
-
- /* An object that will hold private variables and methods */
- var plugin = new GoogleMaps(options);
- $this.data('Manifold', plugin);
-
- plugin.initialize();
+// events that happen in the once-per-view range
+googlemap_debug=false;
+// more on a on-per-record basis
+googlemap_debug_detailed=false;
- /* Events */
- $this.on('show.' + PLUGIN_NAME, methods.show);
-
- $this.set_query_handler(options.query_uuid, plugin.query_handler);
- $this.set_record_handler(options.query_uuid, plugin.record_handler);
- $this.set_record_handler(options.query_all_uuid, plugin.record_handler_all);
+(function($){
- }); // this.each
+ var GoogleMap = Plugin.extend({
+
+ init: function(options, element) {
+ this._super(options, element);
+
+ /* Member variables */
+ // query status
+ this.received_all = false;
+ this.received_set = false;
+ this.in_set_backlog = [];
+
+ // we keep a couple of global hashes
+ // lat_lon --> { marker,
}
+ // hrn --> {
, }
+ this.by_lat_lon = {};
+ this.by_hrn = {};
+
+ /* XXX Events */
+ this.elmt().on('show', this, this.on_show);
+ // TODO in destructor
+ // $(window).unbind('QueryTable');
+
+ var query = manifold.query_store.find_analyzed_query(this.options.query_uuid);
+ this.object = query.object;
+
+ var keys = manifold.metadata.get_key(this.object);
+ //
+ this.key = (keys && keys.length == 1) ? keys[0] : null;
+
+ //// Setup query and record handlers
+ // this query is the one about the slice itself
+ // event related to this query will trigger callbacks like on_new_record
+ this.listen_query(options.query_uuid);
+ // this one is the complete list of resources
+ // and will be bound to callbacks like on_all_new_record
+ this.listen_query(options.query_all_uuid, 'all');
+
+ /* GUI setup and event binding */
+ this.initialize_map();
}, // init
- /**
- * @brief Plugin destruction
- * @return : a jQuery collection of objects on which the plugin is
- * applied, which allows to maintain chainability of calls
- */
- destroy : function( ) {
-
- return this.each(function() {
- var $this = $(this);
- var hazelnut = $this.data('Manifold');
-
- // Unbind all events using namespacing
- $(window).unbind(PLUGIN_NAME);
-
- // Remove associated data
- hazelnut.remove();
- $this.removeData('Manifold');
- });
-
- }, // destroy
-
- show : function( ) {
- google.maps.event.trigger(map, 'resize');
- } // show
+ /* PLUGIN EVENTS */
- }; // var methods;
+ on_show: function(e) {
+ if (googlemap_debug) messages.debug("googlemap.on_show");
+ var googlemap = e.data;
+ google.maps.event.trigger(googlemap.map, 'resize');
+ }, // on_show
- /***************************************************************************
- * Plugin object
- ***************************************************************************/
+ /* GUI EVENTS */
- function GoogleMaps(options)
- {
- /* member variables */
- this.options = options;
+ /* GUI MANIPULATION */
- // query status
- this.received_all = false;
- this.received_set = false;
- this.in_set_buffer = Array();
-
- var object = this;
-
- /**
- */
- this.initialize = function() {
- this.map = null;
+ initialize_map: function() {
this.markerCluster = null;
- this.markers = [];
- this.coords = new Array();
- var myLatlng = new google.maps.LatLng(options.latitude, options.longitude);
+ var center = new google.maps.LatLng(this.options.latitude, this.options.longitude);
var myOptions = {
- zoom: options.zoom,
- center: myLatlng,
- mapTypeId: google.maps.MapTypeId.ROADMAP
+ zoom: this.options.zoom,
+ center: center,
+ mapTypeId: google.maps.MapTypeId.ROADMAP,
}
-
- this.map = new google.maps.Map(document.getElementById("map"), myOptions);
+
+ var domid = this.options.plugin_uuid + '--' + 'googlemap';
+ var elmt = document.getElementById(domid);
+ if (googlemap_debug) messages.debug("gmap.initialize_map based on domid=" + domid + " elmt=" + elmt);
+ this.map = new google.maps.Map(elmt, myOptions);
this.infowindow = new google.maps.InfoWindow();
- }
-
- /**
- */
- this.new_record = function(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);
+ }, // initialize_map
+
+ // xxx probably not the right place
+ // The function accepts both records and their key
+ record_hrn : function (record) {
+ var key_value;
+ switch (manifold.get_type(record)) {
+ case TYPE_VALUE:
+ key_value = record;
+ break;
+ case TYPE_RECORD:
+ if ( ! this.key in record ) return;
+ key_value = record[this.key];
+ break;
+ default:
+ throw "Not implemented";
+ break;
}
- // If the node is attached to the slice, action will be Remove; else action will be add to slice
- if (typeof(record['sliver']) != 'undefined') {
- data.current_resources.push(record['urn']);
- action="del";
- action_class="ui-icon-circle-minus";
- action_message="Remove from slice";
- }else{
- action="add";
- action_class="ui-icon-circle-plus";
- action_message="Add to slice";
+ // XXX BACKSLASHES original code was reading like this
+ //return this.escape_id(key_value).replace(/\\/g, '');
+ // however this sequence removes backslashes from hrn's and as a result
+ // queryupdater was getting all mixed up
+ // querytable does publish hrn's with backslashes and that seems like the thing to do
+ return key_value;
+ },
+
+ // return { marker: gmap_marker, ul :
}
+ create_marker_struct: function (object,lat,lon) {
+ // the DOM fragment
+ var dom = $("
").addClass("geo").append(object+"(s)");
+ var ul = $("
").addClass("geo");
+ dom.append(ul);
+ // add a gmap marker to the mix
+ var marker = new google.maps.Marker({
+ 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),
+ });
+ return {marker:marker, ul:ul};
+ },
+
+ // add an entry in the marker
tag for that record
+ // returns { checkbox : }
+ create_record_checkbox: function (record,ul,checked) {
+ var checkbox = $("", {type:'checkbox', checked:checked, class:'geo'});
+ var hrn=this.record_hrn(record);
+ ul.append($("
").addClass("geo").append(checkbox).
+ append($("").addClass("geo").append(hrn)));
+ var googlemap=this;
+ // the callback for when a user clicks
+ // NOTE: this will *not* be called for changes done by program
+ checkbox.change( function (e) {
+ if (googlemap_debug) messages.debug("googlemap click handler checked= " + this.checked + " hrn=" + hrn);
+ manifold.raise_event (googlemap.options.query_uuid,
+ this.checked ? SET_ADD : SET_REMOVED, hrn);
+ });
+ return checkbox;
+ },
+
+ // retrieve DOM checkbox and make sure it is checked/unchecked
+ set_checkbox: function(record, checked) {
+ var hrn=this.record_hrn (record);
+ if (! hrn) { messages.warning ("googlemap.set_checkbox: record has no hrn"); return; }
+ var checkbox_s = this.by_hrn [ hrn ];
+ if (! checkbox_s ) { messages.warning ("googlemap.set_checkbox: could not spot checkbox for hrn "+hrn); return; }
+ checkbox_s.checkbox.prop('checked',checked);
+ }, // set_checkbox
+
+ // this record is *in* the slice
+ new_record: function(record) {
+ if (googlemap_debug_detailed) messages.debug ("new_record");
+ if (!(record['latitude'])) return false;
+
+ // 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);
+ }
+
+ // 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);
+ if ( ! this.key in record ) return;
+ var key_value = record[this.key];
+ // see XXX BACKSLASHES
+ //var hrn = this.escape_id(key_value).replace(/\\/g, '');
+ var hrn = key_value;
+ this.by_hrn[hrn] = {
+ checkbox: checkbox,
+ // xxx Thierry sept 2013
+ // xxx actually we might have just used a domid-based scheme instead of the hash
+ // since at this point we only need to retrieve the checkbox from an hrn
+ // but I was not sure enough that extra needs would not show up so I kept this in place
+ // xxx not sure these are actually useful :
+ value: key_value,
+ record: record,
}
- // XXX not working
- if (!(record['latitude'])) {
- return true;
+ }, // new_record
+
+ arm_marker: function(marker, map) {
+ if (googlemap_debug_detailed) messages.debug ("arm_marker content="+marker.content);
+ var googlemap = this;
+ google.maps.event.addListener(marker, 'click', function () {
+ googlemap.infowindow.close();
+ googlemap.infowindow.setContent(marker.content);
+ googlemap.infowindow.open(map, marker);
+ });
+ }, // arm_marker
+
+ /*************************** QUERY HANDLER ****************************/
+
+ /*************************** RECORD HANDLER ***************************/
+ 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, true);
+ else
+ // store for later update of checkboxes
+ this.in_set_backlog.push(record);
+ },
+
+ 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 (spinning)");
+ this.spin();
+ },
+
+ on_query_done: function() {
+ if (googlemap_debug) messages.debug("on_query_done");
+ if (this.received_all) {
+ this.unspin();
+ }
+ this.received_set = true;
+ },
+
+ on_field_state_changed: function(data) {
+ if (googlemap_debug_detailed) 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;
}
-
- //jQuery(".map-button").click(button_click);
- //if(jQuery.inArray(record, rows)>-1){
- var marker = new google.maps.Marker({
- position: myLatlng,
- title: get_value(record['hostname']),
- // This should be done by the rendering
- content: '