Changeset 159 for trunk

Timestamp:

03/16/2006 05:30:30 AM (6 years ago)

Author:

cirrus

Message:

Added: Custom maps support. Ability to enable/disable map types (e.g. satellite, hybrid, etc.). Closes #100
Bugfix: Fixed foreach array error. Closes #98
Change: Gearth now uses title_small for the filename.
Change: Gearth default zoom location now calculated from the config file min/max lon/lat options.
Change: Suggest search minor javascript change.

Location:

trunk

Files:

• config-sample/config.php (modified) (2 diffs)
• globals/language/english.php (modified) (1 diff)
• globals/language/greek.php (modified) (1 diff)
• includes/pages/gearth/gearth_download.php (modified) (3 diffs)
• includes/pages/gmap/gmap_js.php (modified) (1 diff)
• includes/pages/users/users.php (modified) (1 diff)
• templates/basic/includes/main_menu.tpl (modified) (1 diff)
• templates/basic/includes/pages/gmap/gmap_js.tpl (modified) (3 diffs)
• tools/gmaps (added)
• tools/gmaps/proxy.php (added)
• tools/gmaps/server.php (added)

trunk/config-sample/config.php

@@ -60 +60 @@
                 'smtp' => '', // if not set default used from php.ini file
                 'smtp_port' => '25',
-                'from' => 'hostmaster@wind.cube.gr',
+                'from' => 'hostmaster@server.example.org',
                 'from_name' => 'WiND Hostmaster'
                 ),
@@ -70 +70 @@
         'gmap' => array(
                 'server' => 'maps.google.com',
+                'maps_available' => array(
+                        'satellite' => true,
+                        'map' => false,
+                        'hybrid' => false,
+                        //Sample scripts for custom image map server can be found in the tools subdirectory
+                        /*'custom_maps' => array(
+                              0 => array(
+                                      'url' => 'http://server.example.org/maps/index.php?', 
+                                      'name' => 'Custom1',
+                                      'coordinates_type' => 'map'
+                                      ),
+                                1 => array(
+                                        'url' => 'http://server.example.org/maps/index.php?',
+                                        'name' => 'Custom2',
+                                        'coordinates_type' => 'satellite'
+                                        ),
+                                ),*/
+                        'default' => 'satellite'
+                        ),
                 'keys' => array( // Domains must be as in $_SERVER['SERVER_NAME'] variable
                         'server.example.org/path' => 'example_key'

trunk/globals/language/english.php

@@ -29 +29 @@
 
         'site_title' => "WiND - Wireless Nodes Database",
-        
+        'title_small' => "WiND",        
+
         'forward_text' => "Click here to go directly to the next page...",
         

trunk/globals/language/greek.php

@@ -30 +30 @@
         
         'site_title' => "WiND - Wireless Nodes Database",
+        'title_small' => "WiND",
         
         'forward_text' => "ΑΜ ΎεΜ επιΞÏ

trunk/includes/pages/gearth/gearth_download.php

@@ -219 +219 @@
                         $xml .= "<kml xmlns='http://earth.google.com/kml/2.0'>\n";
                         $xml .= "<Folder>\n";
-                        $xml .= "<name>AWMN</name>\n";
+                        $xml .= "<name>".$lang['title_small']."</name>\n";
                         $xml .= "<open>1</open>\n";
                         $xml .= "<description>".$lang['all_nodes']."</description>\n";
@@ -228 +228 @@
                                 $xml .= "<range>1600</range>\n";
                         } else {
-                                $xml .= "<longitude>23.763247</longitude>\n";
-                                $xml .= "<latitude>37.980869</latitude>\n";
+                                $long = str_replace(",",".",($vars['gmap']['bounds']['max_longitude'] + $vars['gmap']['bounds']['min_longitude'])/2);
+                                $lat = str_replace(",",".",($vars['gmap']['bounds']['max_latitude'] + $vars['gmap']['bounds']['min_latitude'])/2);
+                                $xml .= "<longitude>".$long."</longitude>\n";
+                                $xml .= "<latitude>".$lat."</latitude>\n";
                                 $xml .= "<range>40000</range>\n";
                         }
@@ -351 +353 @@
 
                         header("Expires: 0");
-                        header("Content-Disposition: attachment; filename=awmn.kml");
+                        header("Content-Disposition: attachment; filename=".$lang['title_small'].".kml");
                         header("Content-type: application/vnd.google-earth.kml; charset=".$lang['charset']);
                         echo $xml;

trunk/includes/pages/gmap/gmap_js.php

@@ -72 +72 @@
                 }
                 $this->tpl['link_xml_page'] = makelink(array("page" => "gmap", "subpage" => "xml", "node" => get('node')), FALSE, TRUE, FALSE);
+                $this->tpl['maps_available'] = $vars['gmap']['maps_available'];
                 
                 echo template($this->tpl, __FILE__);

trunk/includes/pages/users/users.php

@@ -146 +146 @@
                         $ret = $ret && $form_user->db_set_multi(array('owner' => 'N'), "users_nodes", "user_id", $ins_id);
                         $ret = $ret && $db->del('users_nodes', "user_id = '".$ins_id."' AND owner = 'Y'");
-                        foreach($_POST['node_id_owner'] as $value) {
+                        foreach((array)$_POST['node_id_owner'] as $value) {
                                 $ret = $ret && $db->del('users_nodes', "node_id = '".$value."' AND owner = 'Y'");
                                 $ret = $ret && $db->add('users_nodes', array("user_id" => $ins_id, "node_id" => $value, 'owner' => 'Y'));

trunk/templates/basic/includes/main_menu.tpl

@@ -84 +84 @@
                                                                                         <td>
                                                                                                 <div>
-                                                                                                <input type="text" id="q" name="q" autocomplete="off" onkeydown="if(hov!=-1) this.value = origval;" onfocus="hover('',this.value);" onkeyup="hover(event.keyCode,this.value);"  onblur="setTimeout('hideSearch()',500); hov=0;" />
+                                                                                                <input type="text" id="q" name="q" autocomplete="off" onkeydown="" onfocus="hover('',this.value);" onkeyup="hover(event.keyCode,this.value);"  onblur="setTimeout('hideSearch()',500); hov=0;" />
                                                                                                 </div>
                                                                                                 <div align="left" id="searchResult" name="searchResult" style="font-family:Arial; font-size:12px; background-color: white; border:#000000 dashed 1px; padding:0px; display: none; position: absolute; width: 150px;"></div>

trunk/templates/basic/includes/pages/gmap/gmap_js.tpl

@@ -128 +128 @@
 
 {literal}
+
+function copy_obj(o) {
+        var c = new Object(); for (var e in o) { c[e] = o[e]; } return c;
+}
+
 function gmap_onload() {
         ch_p2p = document.getElementsByName("p2p")[0];
@@ -134 +139 @@
         ch_unlinked = document.getElementsByName("unlinked")[0];
         if (GBrowserIsCompatible()) {
-                map = new GMap(document.getElementById("map"));
+{/literal}
+{foreach from=$maps_available item=map_enabled key=map_name}
+        {if $map_enabled===true}
+                {if $map_types != null}
+                        {assign var=map_types value="`$map_types`,"}
+                {/if}
+                {assign var=map_types value="`$map_types` G_`$map_name`_TYPE"}
+        {/if}
+{/foreach}
+{foreach from=$maps_available.custom_maps item=custom_type}
+        {if $custom_type.coordinates_type == "map"}
+                G_CUSTOM_{$custom_type.name|upper}_TYPE = copy_obj(G_MAP_TYPE);
+        {elseif $custom_type.coordinates_type == "satellite"}
+                G_CUSTOM_{$custom_type.name|upper}_TYPE = copy_obj(G_SATELLITE_TYPE);
+        {/if}
+        G_CUSTOM_{$custom_type.name|upper}_TYPE.baseUrls = new Array();
+        G_CUSTOM_{$custom_type.name|upper}_TYPE.baseUrls[0] = "{$custom_type.url}";
+        G_CUSTOM_{$custom_type.name|upper}_TYPE.lowResBaseUrls = new Array();
+        G_CUSTOM_{$custom_type.name|upper}_TYPE.lowResBaseUrls[0] = "{$custom_type.url}";
+        {literal}
+                G_CUSTOM_{/literal}{$custom_type.name|upper}{literal}_TYPE.getLinkText = function() { return '{/literal}{$custom_type.name}{literal}'; }
+        {/literal}
+        {if $map_types != null}
+                        {assign var=map_types value="`$map_types`,"}
+         {/if}
+         {assign var=map_types value="`$map_types` G_CUSTOM_`$custom_type.name`_TYPE"}
+{/foreach}
+{literal}
+                var map_types = [{/literal}{$map_types|upper}{literal}];
+                map = new GMap(document.getElementById("map"), map_types);
+
+                if(map_types.length > 1)
+                        map.addControl(new GMapTypeControl());
+
+                map.setMapType(G_CUSTOM_{/literal}{$maps_available.default|upper}{literal}_TYPE);
+
                 var center = new GPoint({/literal}{$center_longitude}{literal}, 
                                                                 {/literal}{$center_latitude}{literal});
@@ -148 +188 @@
                 map.centerAndZoom(center, zoom);
                 map.addControl(new GLargeMapControl());
-                map.setMapType(G_SATELLITE_TYPE);
                 GEvent.addListener(map, "moveend", gmap_reload);
                 GEvent.addListener(map, "zoom",