Changeset 12269

Timestamp:

09/14/07 10:41:05 (1 year ago)

Author:

w_i

Message:

Added reverse geocoding, started adding optional xep key support

Files:

• trunk/midcom/midcom.helper.datamanager2/callback/select/countries.php (added)
• trunk/midcom/midcom.helper.datamanager2/static/position/position_widget.css (modified) (2 diffs)
• trunk/midcom/midcom.helper.datamanager2/static/position/refresh_geoclue.png (deleted)
• trunk/midcom/midcom.helper.datamanager2/static/position/refresh_geodata.png (added)
• trunk/midcom/midcom.helper.datamanager2/static/position/widget.js (modified) (8 diffs)
• trunk/midcom/midcom.helper.datamanager2/widget/position.php (modified) (7 diffs)

trunk/midcom/midcom.helper.datamanager2/static/position/position_widget.css

@@ -4 +4 @@
-}
-
-clue_butto
+data_bt
-{
-    margin-right: 5px;
@@ -10 +10 @@
-    width: 16px;
-    height: 16px;
-clue
+data
-    cursor: pointer;
-}

trunk/midcom/midcom.helper.datamanager2/static/position/widget.js

@@ -1 +1 @@
-var widgets = [];
-var current_pos = null;
+var position_marker = null;
-var widgets_mapstrations = [];
-
@@ -10 +11 @@
-        widgets[w.id] = widget;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        widgets_mapstrations[widget_id] = mapstration;
@@ -24 +42 @@
-            current_pos = point;
-            
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-        indicator.hide();
-
-clue
-clue
-clue
+data
+data
+data
-            indicator.show();
-        });
-
-
-
-
-
-
+
+
+
-            var get_params = {
-
+
+
+
+
-            };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            jQuery.ajax({
-                type: "GET",
@@ -73 +73 @@
-                error: function(request, type, expobj){
-                    parse_error(request.responseText);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                },
-                success: function(data){
@@ -85 +156 @@
-            function parse_error(error_string)
-                {
+                indicator.hide();
+                geodata_btn.show();
+                
-                status_box.html(error_string);
-                }
@@ -114 +188 @@
-        {
-            indicator.hide();
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-            current_pos = new LatLonPoint(location_data['latitude'],location_data['longitude']);
@@ -140 +205 @@
-            }
-            
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-        function get_key_name(key)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-
@@ -207 +237 @@
-}
-
-
+widget_id,
-{
-    current_pos = new LatLonPoint(lat,lon);
+    set_marker('Current position','',widget_id);
+}
+
+function set_marker(label, info, widget_id)
+{
+    // console.log("set_marker label: "+label+" info: "+info+" widget_id: "+widget_id);
+    
+    if (position_marker != null)
+    {
+         widgets_mapstrations[widget_id].removeMarker(position_marker);
+    }
+    
+    position_marker = new Marker(current_pos);
+    
+    if (label != undefined)
+    {
+        position_marker.setLabel(label);                
+    }
+    
+    if (   info != undefined
+        && info != '')
+    {
+        position_marker.setInfoBubble(info);
+    }
+    
+    widgets_mapstrations[widget_id].addMarker(position_marker);
+
+    // if (info != undefined)
+    // {
+    //     position_marker.openBubble();
+    // }
-}
-

trunk/midcom/midcom.helper.datamanager2/widget/position.php

@@ -64 +64 @@
-    var $service = null;
-    
+    var $_countrylist = array();
+    
+    var $_other_xep_keys = array();
+    
-    /**
-     * The initialization event handler post-processes the maxlength setting.
@@ -137 +141 @@
-        $_MIDCOM->add_jquery_state_script($script);
-        
+        $this->_get_country_list();
+        
+        $this->_other_xep_keys = array(
+            'area',
+            'building',
+            'description',
+            'floor',
+            'region',
+            'room',
+            'text',
+            'uri',
+        );
+        
-        return true;
-    }
@@ -201 +218 @@
-        $html = "\n<div id=\"{$this->_element_id}_tab_content_place\" class=\"position_widget_tab_content_place\"><!-- tab_content_place starts -->\n";        
-        
-clue_button\" id='{$this->_element_id}_geoclue_butto
+data_btn\" id='{$this->_element_id}_geodata_bt
-        $html .= "<div class=\"indicator\" id='{$this->_element_id}_indicator' style=\"display: none;\"></div>";
-        
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        $city_name = '';
@@ -235 +255 @@
-        $html .= "<input size=\"40\" class=\"shorttext position_widget_input position_widget_input_place_postalcode\" id=\"{$this->_element_id}_input_place_postalcode\" name=\"{$this->_element_id}_input_place_postalcode\" type=\"text\" value=\"{$this->_type->location->postalcode}\" />";
-        $html .= "</label>";
-
+
+
+
+
+
+
+
+
+
+
+
+
-        $html .= "<div id=\"{$this->_element_id}_status_box\" class=\"status_box\"></div>";
-        
@@ -311 +342 @@
-
-        $orp_map = new org_routamc_positioning_map("{$this->_element_id}_map");
-        //$orp_map->add_object($this->_type->storage);
-        $html .= $orp_map->show(420,300,false);
-
@@ -395 +425 @@
-    }
-    
+    function _get_country_list()
+    {
+        $this->_countrylist = array
+        (
+            '' => $this->_l10n_midcom->get('select your country'),
+        );
+        
+        $qb = org_routamc_positioning_country_dba::new_query_builder();
+        $qb->add_constraint('code', '<>', '');
+        $qb->add_order('name', 'ASC');
+        $countries = $qb->execute_unchecked();
+
+        if (count($countries) == 0)
+        {
+            debug_push_class(__CLASS__, __FUNCTION__);
+            debug_add('Cannot render country list: No countries found. You have to use org.routamc.positioning to import countries to database.');
+            debug_pop();
+        }
+        
+        foreach ($countries as $country)
+        {
+            $this->_countrylist[$country->code] = $country->name;
+        }
+    }
+    
+    function _render_country_list($current='')
+    {
+        $html = '';
+        
+        if (   empty($this->_countrylist)
+            || count($this->_countrylist) == 1)
+        {
+            $html .= "<label for='{$this->_element_id}_input_place_country' id='{$this->_element_id}_input_place_country_label'>";
+            $html .= "<span class=\"field_text\">" . $_MIDCOM->i18n->get_string('country', 'org.routamc.positioning') . "</span>";
+            $html .= "<input size=\"30\" class=\"shorttext position_widget_input position_widget_input_place_country\" id=\"{$this->_element_id}_input_place_country\" name=\"{$this->_element_id}_input_place_country\" type=\"text\" value=\"{$current}\" />";
+            $html .= "</label>";
+                    
+            return $html;
+        }
+        
+        $html .= "<label for='{$this->_element_id}_input_place_country' id='{$this->_element_id}_input_place_country_label'>";
+        $html .= "<span class=\"field_text\">" . $_MIDCOM->i18n->get_string('country', 'org.routamc.positioning') . "</span>";
+        $html .= "<select class=\"dropdown position_widget_input position_widget_input_place_country\" id=\"{$this->_element_id}_input_place_country\" name=\"{$this->_element_id}_input_place_country\">";
+
+        foreach ($this->_countrylist as $code => $name)
+        {
+            $selected = '';
+            if ($code == $current)
+            {
+                $selected = 'selected="selected"';
+            }
+            $html .= "<option value=\"{$code}\" {$selected}>{$name}</option>";
+        }
+        
+        $html .= "</select>";
+        $html .= "</label>";
+        
+        return $html;
+    }
+    
-    function get_default()
-    {        
@@ -404 +494 @@
-        }
-        
-
+'{$this->_element_id}',
-        $_MIDCOM->add_jquery_state_script($script);
-