From cfb26c5af37da595a7a81f90065fde9537dbc6b1 Mon Sep 17 00:00:00 2001 From: Silvio Date: Thu, 17 May 2012 17:19:37 -0300 Subject: Syncing with svn --- gmap_arcgis.js | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'gmap_arcgis.js') diff --git a/gmap_arcgis.js b/gmap_arcgis.js index 9960f94..af85eaf 100644 --- a/gmap_arcgis.js +++ b/gmap_arcgis.js @@ -35,8 +35,6 @@ function gmap_arcgis() { id = Drupal.settings.gmap_arcgis.id; } } - - // Get an existing GMap instance using Drupal GMap Module API // and add an ArcGIS extension to it @@ -70,16 +68,14 @@ function gmap_arcgis() { icon.infoAnchor = new GPoint(info[4][0], info[4][1]); icon.infoWindowAnchor = new GPoint(info[5][0], info[5][1]); } + GEvent.addListener(map, "moveend", function() { showLabels(label[0], fields, content, icon); }); showLabels(label[0], fields, content, icon); } for (j = 0; j < polygons.length; j++) { - showPolygons(polygons[j]); } - - }, 5); //setTimeout($.unblockUI, 10000); @@ -112,7 +108,6 @@ function showLabelsCallback(fields, content, icon) { // Label title var title = '{' + fields[1] + '}'; - // JS literal class esri.arcgis.gmaps.MarkerOptions var myMarkerOptions = { title:title, icon:icon }; @@ -129,14 +124,12 @@ function showLabelsCallback(fields, content, icon) { // Add polygons from a given ArcGIS MapServer Layer function showPolygons(uri) { pol = new esri.arcgis.gmaps.DynamicMapServiceLayer(uri, null, 0.55); - GEvent.addListener(pol,"load",function(g){ map.addOverlay(g);setTimeout($.unblockUI, 6000);}); - } // Callback for showPolygons function showPolygonsCallback(mapservicelayer, error) { - map.addOverlay(mapservicelayer); + map.addOverlay(mapservicelayer); } // Add custom marker @@ -149,7 +142,6 @@ function createMarker(point, name, html, icone) { icon.iconAnchor = new GPoint(6, 20); icon.infoWindowAnchor = new GPoint(5, 1); - var marker = new GMarker(point); GEvent.addListener(marker, "click", function() { marker.openInfoWindowHtml(html); }); return marker; @@ -167,15 +159,5 @@ $(document).ready(function() { $('#nav').hide(); //get(Drupal.gmap.getMap('auto1map').vars.behavior); - }); - - //$('auto1map').append('
oi oi oi
'); - -}); - -$(document).ready(function() { - $("#uc-form").show(); - }); - -- cgit v1.2.3