1 files changed, 8 insertions, 27 deletions

diff --git a/gmap_arcgis.js b/gmap_arcgis.js
index f28106a..aad3872 100644
--- a/gmap_arcgis.js
+++ b/gmap_arcgis.js
@@ -1,8 +1,5 @@
 // $Id$
 
-// Load Google Maps API
-//google.load("maps", "3");
-
 // Global variables
 var map, mapExtension, gOverlays;
 
@@ -14,28 +11,17 @@ function gmap_arcgis() {
    */
   setTimeout(function() {
     // Variables
-    var polygons = new Array();
-    var labels   = new Array();
-    var fields   = new Array();
-    var id       = 'auto1map';
-    var content, label;
+    var id = 'auto1map';
    
-    // Get data from Drupal
-    if (Drupal.settings.gmap_arcgis !== undefined) {
-      // Get array of labels
-      if (Drupal.settings.gmap_arcgis.labels !== undefined) {
-        labels = Drupal.settings.gmap_arcgis.labels;
-      }
-      // Get Map Id
-      if (Drupal.settings.gmap_arcgis.id !== undefined) {
-        id = Drupal.settings.gmap_arcgis.id;
-      }
+    // Get Map Id
+    if (Drupal.settings.gmap_arcgis.id !== undefined) {
+      id = Drupal.settings.gmap_arcgis.id;
     }
   
     // Get an existing GMap instance using Drupal GMap Module API
     map = Drupal.gmap.getMap(id).map;
 
-    gmapArcgisShowPolygons(map, Drupal.settings.gmap_arcgis.polygons);
+    //gmapArcgisShowPolygons(map, Drupal.settings.gmap_arcgis.polygons);
     
   }, 5);
 }
@@ -65,7 +51,7 @@ function showPolygon(map, polygon) {
     return;
   }
 
-  uri    = polygon['base'] + polygon['service'];
+  uri    = polygon['uri'];
   layers = polygon['layers'];
 
   polygon.overlay = new gmaps.ags.MapOverlay(uri, {
@@ -97,12 +83,7 @@ function blockUI() {
 $(document).ready(function() {
   google.setOnLoadCallback(gmap_arcgis);
   $('#edit-lista-uc').change(function() {
-      // TODO: this is still needed?
-      //oelem = $("option:selected", this).val();
-      //marcador = Drupal.gmap.getMap('auto1map').vars.markers[oelem];
-      //GEvent.trigger(marcador.marker,"click");
-
-      $('#header').hide();
-      $('#nav').hide();
+    $('#header').hide();
+    $('#nav').hide();
   });
 });