Changeset 257

Timestamp:

07/08/10 14:14:35 (19 months ago)

Author:

horaciogd

Message:

O cambio fundamental consiste no engadido dun sistema para cargar marcadores a través de json. Este permite unha carga moito mais lixeira e rápida dos marcadores primeiro e unha posterior carga dos datos de cada marcador ao abrir a xanela.

Ademais pulironse algúns aspectos da transformación dos tres arrays para gadar os datos dos marcadores.

var marcadores = [];
var contidosHTML = [];
var URLsons = [];

Estos arrays non estaban ben concevidos xa que en javascript non existen os arrays asociativos e, en moitos navegadores, variables como a seguinte producían problemas.

marcadores["id_"+id]

Agora estou tratando de concevir a nova version do plugin para traballar con programación orientada a obxectos.

A idea é grabar os datos a través do obxecto GisMarker?(), recuperar os dato que se garden de cada un dos marcadores a través de metodos como GisMarker?.openWindow(), chamala a cada variable a través da sentencia var marcador = eval('marcador_'+ id), e aprobeitar a funcion typeof para comprobar que a variable existe sen javascript devolva un erro.

Finalmente incorporouse o map_loader como un custom control do mapa.

Location:

esqueletos/plugins_escoitar

Files:

• gis/lang/gis_gl.php (modified) (1 diff)
• gis/modeles/carte_gis_sommaire.html (modified) (1 diff)
• gis/rss-gis-1.html (deleted)
• gis/rss-gis-2.html (deleted)
• gis/rss-gis-3a.html (deleted)
• gis/rss-gis-3b.html (deleted)
• gis/rss-gis-4.html (deleted)
• gis/rss-gis-4b.html (deleted)
• gis/rss-gis-fearth.html (deleted)
• gis/rss-gis.html (modified) (1 diff)
• gis/rss-gis_flash.html (deleted)
• googlemap_api/img_pack/ie/loader-center.gif (added)
• googlemap_api/img_pack/ie/loader-left.gif (added)
• googlemap_api/img_pack/ie/loader-right.gif (added)
• googlemap_api/img_pack/png/loader-center.png (added)
• googlemap_api/img_pack/png/loader-left.png (added)
• googlemap_api/img_pack/png/loader-right.png (added)
• googlemap_api/inc-gis_sommaire_map.html (modified) (3 diffs)
• googlemap_api/inc_public_map_js.html (modified) (3 diffs)
• googlemap_api/js/customControls.js (modified) (1 diff)
• googlemap_api/js/geomap.js (modified) (6 diffs)

esqueletos/plugins_escoitar/gis/lang/gis_gl.php

@@ -10 +10 @@
         "api_carte_geomap" => "API Google Maps",
         "api_carte_openlayer" => "API Open Layers",
-        "explication_pages_prive" => "Choisissez les rubriques dans lesquelles le plugin sera disponible.",
+        "explication_pages_prive" => "Escolle as seccións nas que queres utilizar o plugin.",
         "explication_swfobject" => "Désactiver l'insertion du script swf_object dans les pages publiques (si vous n'utilisez pas le lecteur de son dans les infobulles).",
         "desactiver_swfobject" => "Désactiver swf_object",
         "formats_documents" => "Format des documents",
         "pages_public" => "Partie publique",
-        "pages_prive" => "Partie privée",
+        "pages_prive" => "Espazo privado",
         "parametres_formulaire" => "Paramètres du formulaire public",
         "rubrique_cible" => "Rubrique cible",

esqueletos/plugins_escoitar/gis/modeles/carte_gis_sommaire.html

@@ -10 +10 @@
 [(#INCLURE{fond=inc-gis_sommaire_map}{recherche}{id_secteur}{id_rubrique=#GET{id_rubrique}}{id_groupe}{id_mot}{id_auteur}{id_article}
 {limit=#ENV{limit}}{latit}{lonxit}{zoom}{type}{id_carte_gis}{control}{control_type=#ENV{control_type}}{control_move=#ENV{control_move}}
-{control_zoom=#ENV{control_zoom}}{load_map=#ENV{load_map}}{count=15}{num=5})]
+{control_zoom=#ENV{control_zoom}}{load_map=#ENV{load_map}}{count=15}{num=15})]
 
 <div id="map[(#ENV{id_carte_gis}|?{[(#ENV{id_carte_gis})],1})]" class="carte_gis"[(#ENV{style}|!={'non'}|?{' '})style="[width:(#GET{width});][ height:(#GET{height});]"]></div>
-<div id="map_loader">
-        <!--
-        <div class="up">
-                <div class="left"></div>
-                <div class="middle"></div>
-                <div class="right"></div>
-        </div>
-        <div class="content">
-                ....
-        </div>
-        <div class="down">
-                <div class="left"></div>
-                <div class="middle"></div>
-                <div class="right"></div>
-        </div>
-        -->
-        <div class="new">
-                <div class="left"></div>
-                <div class="middle"></div>
-                <div class="right"></div>
-        </div>
-</div>

esqueletos/plugins_escoitar/gis/rss-gis.html

@@ -22 +22 @@
         <item>
         <title>[(#TITRE|supprimer_numero|texte_backend)]</title>
-        [<guid isPermaLink="true">(#URL_ARTICLE|url_absolue)</guid>]
+        [<guid isPermaLink="true">#URL_SITE_SPIP/article(#ID_ARTICLE)</guid>]
         [<link>(#URL_ARTICLE|url_absolue)</link>]
         <description>&lt;p&gt;[(#CHAPO|sinon{#DESCRIPTIF}|supprimer_tags|texte_backend)]&lt;/p&gt;

esqueletos/plugins_escoitar/googlemap_api/inc-gis_sommaire_map.html

@@ -15 +15 @@
         var markerManager[(#GET{id_carte_gis})];
         <BOUCLE_centrado(GIS){id_article?}{id_rubrique ?}{0,1}>
-        #SET{latitude,#ENV{latit,#LAT,#CONFIG**{geomap/latitude,0}}}
-        #SET{lonxitude,#ENV{lonxit,#LONX,#CONFIG**{geomap/longitude,0}}}
-        #SET{zoommapa, #ENV{zoom,#ZOOM,#CONFIG**{geomap/zoom,0}}
+        #SET{latitude,#ENV{latit,#LAT,#CONFIG**{geomap/latitude,42.94033923363181}}}
+        #SET{lonxitude,#ENV{lonxit,#LONX,#CONFIG**{geomap/longitude,-7.921142578125}}}
+        #SET{zoommapa, #ENV{zoom,#ZOOM,#CONFIG**{geomap/zoom,8}}
         </BOUCLE_centrado>
         #SET{latitude,#ENV{latit,#CONFIG**{geomap/latitude,0}}}
@@ -46 +46 @@
                                 [(#ENV{control_move}|!={'non'}|?{' '})
                                 map[(#GET{id_carte_gis})].addControl(new mapMoveControl());
+                                ]
+                        ]
+                        [(#GET{control}|=={'custom'}|?{' '})
+                                [(#ENV{control_loader}|!={'non'}|?{' '})
+                                map[(#GET{id_carte_gis})].addControl(new mapLoaderControl());
                                 ]
                         ]
@@ -88 +93 @@
                         <//B_kml_art>
 
-
                         msg[(#GET{id_carte_gis})] = "<div id='precarga'><:gis:loading_last_msg:><br><img src='" + URLbaseGis + "img_pack/loading.gif' /></div>";
-                        $("#map_loader .middle").append(msg[(#GET{id_carte_gis})]);
+                        $("#map_loader_msg").append(msg[(#GET{id_carte_gis})]);
                         $("#map_loader").show();
-                        jQuery.get('[(#URL_PAGE{rss-gis})]', {[id_rubrique:(#ID_RUBRIQUE)][, id_mot:(#ID_MOT)][, id_auteur:(#ID_AUTEUR)][, limit:(#ENV{limit, 50})]}, function(xml[(#GET{id_carte_gis})]){
-                                var count = 0;
-                                var num = 0;
-                                /*lastArticlesManager[(#GET{id_carte_gis})][num] = new GMarkerManager(map[(#GET{id_carte_gis})]);
-                                lastArticlesManager[(#GET{id_carte_gis})]MarkersId[num] =  new Array ();*/
-                                jQuery("item", xml[(#GET{id_carte_gis})]).each(function(item[(#GET{id_carte_gis})]){
-                                        var xmlItem[(#GET{id_carte_gis})] = xml[(#GET{id_carte_gis})].documentElement.getElementsByTagName("item")[item[(#GET{id_carte_gis})]];
-                                        agregarMarcador(xmlItem[(#GET{id_carte_gis})],'[(#GET{id_carte_gis})]',0,17,markerManager[(#GET{id_carte_gis})]);
-                                        /*var idMarker[(#GET{id_carte_gis})] = creaMarcador(map[(#GET{id_carte_gis})], this);
-                                        var idMarker[(#GET{id_carte_gis})] = creaMarcador2(map[(#GET{id_carte_gis})], this);
-                                        if (idMarker[(#GET{id_carte_gis})]) {
-                                                lastArticlesManager[(#GET{id_carte_gis})][num].addMarker(marcadores["id_"+idMarker[(#GET{id_carte_gis})]], 0);
-                                                lastArticlesManager[(#GET{id_carte_gis})]MarkersId[num][count] = idMarker[(#GET{id_carte_gis})];
-                                                count++;
-                                                if (count>=[(#ENV{count, 10})]){
-                                                        lastArticlesManager[(#GET{id_carte_gis})][num].refresh();
-                                                        num++;
-                                                        count = 0;
-                                                        lastArticlesManager[(#GET{id_carte_gis})][num] = new GMarkerManager(map[(#GET{id_carte_gis})]);
-                                                        lastArticlesManager[(#GET{id_carte_gis})]MarkersId[num] =  new Array ();
-                                                }
-                                        }*/
+                        $.getJSON('[(#URL_PAGE{json-gis-simple})][&recherche=(#RECHERCHE)][&id_rubrique=(#ID_RUBRIQUE)][&id_mot=(#ID_MOT)][&id_auteur=(#ID_AUTEUR)][&limit=(#ENV{limit, 50})]', function(data[(#GET{id_carte_gis})]) {
+                                $.each(data[(#GET{id_carte_gis})].items, function(i,item[(#GET{id_carte_gis})]){
+                                        agregarMarcadorJson(item[(#GET{id_carte_gis})],'[(#GET{id_carte_gis})]',0,17,markerManager[(#GET{id_carte_gis})]);
                                 });
-                                msg[(#GET{id_carte_gis})] = "<div id='precarga'><:gis:loading_msg:><br><img src='" + URLbaseGis + "img_pack/loading.gif' /></div>";
-                                $("#map_loader .middle").empty();
-                                $("#map_loader .middle").append(msg[(#GET{id_carte_gis})]);
-                                //var coordenadas = calculaRecuadro (map[(#GET{id_carte_gis})]);
-                                var latitudes = calculaIntervalos(41.750, 43.7823, 3);
-                                var lonxitudes = calculaIntervalos(-9.3713, -6.6028, 3);
-                                var zoom = map[(#GET{id_carte_gis})].getZoom();
-                                //url[(#GET{id_carte_gis})] = '[(#URL_PAGE{rss-gis-4})][&id_rubrique=(#ID_RUBRIQUE)][&id_mot=(#ID_MOT)][&id_auteur=(#ID_AUTEUR)][&limit=(#ENV{num, 6})]&lat0=' + latitudes[0] + '&lat1=' + latitudes[1] + '&lat2=' + latitudes[2] + '&lat3=' + latitudes[3] + '&lonx0=' + lonxitudes[0] + '&lonx1=' + lonxitudes[1] + '&lonx2=' + lonxitudes[2] + '&lonx3=' + lonxitudes[3];
-                                //$("#map_loader .middle").append(url[(#GET{id_carte_gis})]);
-                                jQuery.get('[(#URL_PAGE{rss-gis-4b})]', {[id_rubrique:(#ID_RUBRIQUE)][, id_mot:(#ID_MOT)][, id_auteur:(#ID_AUTEUR)][, limit:(#ENV{num, 6})], lat0:latitudes[0], lat1:latitudes[1], lat2:latitudes[2], lat3:latitudes[3], lonx0:lonxitudes[0], lonx1:lonxitudes[1], lonx2:lonxitudes[2], lonx3:lonxitudes[3]}, function(xml[(#GET{id_carte_gis})]){
-                                        jQuery("item", xml[(#GET{id_carte_gis})]).each(function(item[(#GET{id_carte_gis})]){
-                                                var xmlItem[(#GET{id_carte_gis})] = xml[(#GET{id_carte_gis})].documentElement.getElementsByTagName("item")[item[(#GET{id_carte_gis})]];
-                                                agregarMarcador(xmlItem[(#GET{id_carte_gis})],'[(#GET{id_carte_gis})]',0,17,markerManager[(#GET{id_carte_gis})]);
-                                });
-                                        //leeMarcadores(map[(#GET{id_carte_gis})], markerManager[(#GET{id_carte_gis})], markerManager[(#GET{id_carte_gis})]MarkersId,  zoom - 1, xml[(#GET{id_carte_gis})], false);
-                                        $("#map_loader").hide();
-                                        $("#map_loader .middle").empty();
-                                        markerManager[(#GET{id_carte_gis})].refresh();
-                                });
+                                $("#map_loader").hide();
+                                $("#map_loader_msg").empty();
+                                loadMarkers('[(#URL_PAGE{json-gis-zoom-simple-2})][&recherche=(#RECHERCHE)][&id_rubrique=(#ID_RUBRIQUE)][&id_mot=(#ID_MOT)][&id_auteur=(#ID_AUTEUR)][&limit=(#ENV{num, 15})]', '[(#GET{id_carte_gis})]', '<:gis:loading_msg:>', 41.750, 43.7823, -9.3713, -6.6028);
                         });
+                        
                         GEvent.addListener(map[(#GET{id_carte_gis})], "zoomend", function(before, after) {
                                 if (before<after) {
-                                
-                                if (!procura) {
-                                        if ($("#map_loader").is(":hidden")) {
-                                                var msg[(#GET{id_carte_gis})] = "<div id='precarga'><:gis:loading_msg:><br><img src='" + URLbaseGis + "img_pack/loading.gif' /></div>";
-                                                $("#map_loader .middle").append(msg[(#GET{id_carte_gis})]);
-                                                $("#map_loader").show();
+                                        if (!procura) {
+                                                var coordenadas = calculaRecuadro (map[(#GET{id_carte_gis})]);
+                                                loadMarkers('[(#URL_PAGE{json-gis-zoom-simple-2})][&recherche=(#RECHERCHE)][&id_rubrique=(#ID_RUBRIQUE)][&id_mot=(#ID_MOT)][&id_auteur=(#ID_AUTEUR)][&limit=(#ENV{num, 15})]', '[(#GET{id_carte_gis})]', '<:gis:loading_msg:>', coordenadas[0], coordenadas[1], coordenadas[2], coordenadas[3]);
+                                        } else {
+                                                clearManagers();
+                                                var coordenadas = calculaRecuadro (map[(#GET{id_carte_gis})]);
+                                                var msg4 = "<div id='precarga'><:gis:loading_msg:><br><img src='" + URLbaseGis + "img_pack/loading.gif' /></div>";
+                                                var palabras = $("#search").attr("value");
+                                                cargaMarcadoresProcura (map[(#GET{id_carte_gis})], markerManager[(#GET{id_carte_gis})]Procura, false, coordenadas, palabras, 20, msg4, false);
                                         }
-                                        var coordenadas = calculaRecuadro (map[(#GET{id_carte_gis})]);
-                                        var latitudes = calculaIntervalos(coordenadas[0], coordenadas[1], 3);
-                                        var lonxitudes = calculaIntervalos(coordenadas[2], coordenadas[3], 3);
-                                        var zoom = map[(#GET{id_carte_gis})].getZoom();
-                                        //url[(#GET{id_carte_gis})] = '[(#URL_PAGE{rss-gis-4})][&id_rubrique=(#ID_RUBRIQUE)][&id_mot=(#ID_MOT)][&id_auteur=(#ID_AUTEUR)][&limit=(#ENV{num, 10})]&lat0=' + latitudes[0] + '&lat1=' + latitudes[1] + '&lat2=' + latitudes[2] + '&lat3=' + latitudes[3] + '&lonx0=' + lonxitudes[0] + '&lonx1=' + lonxitudes[1] + '&lonx2=' + lonxitudes[2] + '&lonx3=' + lonxitudes[3];
-                                        //$("#map_loader .middle").append(url[(#GET{id_carte_gis})]);
-                                        jQuery.get('[(#URL_PAGE{rss-gis-4b})]', {[id_rubrique:(#ID_RUBRIQUE)][, id_mot:(#ID_MOT)][, id_auteur:(#ID_AUTEUR)][, limit:(#ENV{num, 10})], lat0:latitudes[0], lat1:latitudes[1], lat2:latitudes[2], lat3:latitudes[3], lonx0:lonxitudes[0], lonx1:lonxitudes[1], lonx2:lonxitudes[2], lonx3:lonxitudes[3]}, function(xml[(#GET{id_carte_gis})]){
-                                                jQuery("item", xml[(#GET{id_carte_gis})]).each(function(item[(#GET{id_carte_gis})]){
-                                                        var xmlItem[(#GET{id_carte_gis})] = xml[(#GET{id_carte_gis})].documentElement.getElementsByTagName("item")[item[(#GET{id_carte_gis})]];
-                                                agregarMarcador(xmlItem[(#GET{id_carte_gis})],'[(#GET{id_carte_gis})]',0,17,markerManager[(#GET{id_carte_gis})]);
-                                        });
-                                                //leeMarcadores(map[(#GET{id_carte_gis})], markerManager[(#GET{id_carte_gis})], markerManager[(#GET{id_carte_gis})]MarkersId, zoom, xml[(#GET{id_carte_gis})], false);
-                                                $("#map_loader").hide();
-                                                $("#map_loader .middle").empty();
-                                                markerManager[(#GET{id_carte_gis})].refresh();
-                                        });
-                                } else {
-                                        clearManagers();
-                                        var coordenadas = calculaRecuadro (map[(#GET{id_carte_gis})]);
-                                        var msg4 = "<div id='precarga'><:gis:loading_msg:><br><img src='" + URLbaseGis + "img_pack/loading.gif' /></div>";
-                                        var palabras = $("#search").attr("value");
-                                        cargaMarcadoresProcura (map[(#GET{id_carte_gis})], markerManager[(#GET{id_carte_gis})]Procura, false, coordenadas, palabras, 20, msg4, false);
-                                }
-                                
                                 }
                         });

esqueletos/plugins_escoitar/googlemap_api/inc_public_map_js.html

@@ -22 +22 @@
         <B_autores><BOUCLE_autores(AUTEURS){id_article}>, "[(#URL_AUTEUR|url_absolue|texte_backend)]", "[(#NOM|texte_backend)]"</BOUCLE_autores></B_autores>, "", ""<//B_autores>
         <B_tags><BOUCLE_tags(MOTS){id_article}{type=marker_icon}>, "#URL_SITE_SPIP/IMG/[(#LOGO_MOT|fichier)]"</BOUCLE_tags></B_tags>, ""<//B_tags>
+        , "[(#ID_ARTICLE)]"
         );
         </BOUCLE_un_article>
@@ -102 +103 @@
                         if (data[5] != "") lng = parseFloat(data[5]);
                         if (data[6] != "") son = data[6];
-                        if (data[1] != "") id = extraerID(data[1]);
+                        if (data[14] != "") id = data[14];
                         var html = "<div id='window_" + id +"' class='window_content'><div id='player'></div><h3><a href='" + data[1] + "'>" + data[0] + "</a></h3><P>" + data[2] + "</P>";
                         if ((data[7] != "") && (data[8] != "")) {
@@ -122 +123 @@
                                 icono_categoria.iconAnchor = new GPoint((MarkerBaseWidth/2), MarkerBaseHeight);
                                 icono_categoria.infoWindowAnchor = new GPoint(5, 1);
-                
+                                
                                 // creamos el marcador con los datos almacenados en las variables
-                                var marcador = creaMarcador(point, html, icono_categoria, son, '[(#GET{id_carte_gis})]');
-                                markerManager[(#GET{id_carte_gis})].addMarker(marcador, 0, 17);
+                                eval('marcador_' + id + ' = new marcadorInfo();');
+                                var marcador = eval('marcador_' + id);
+                                marcador.html = html;
+                                marcador.son = son;
+                                marcador.marker = creaMarcador(point, html, icono_categoria, son, '[(#GET{id_carte_gis})]');
+
+                                // creamos el marcador con los datos almacenados en las variables
+                                // var marcador = creaMarcador(point, html, icono_categoria, son, '[(#GET{id_carte_gis})]');
+                                markerManager[(#GET{id_carte_gis})].addMarker(marcador.marker, 0, 17);
                 
                                 // recollemos a informacion que sexa necesaria en distintos arrays, usando como identificador a id do artigo
-                                marcadores["id_"+id] = marcador;
-                                contidosHTML["id_"+id] = html;
-                                URLsons["id_"+id] = son;
+                                // marcadores["id_"+id] = marcador;
+                                // contidosHTML["id_"+id] = html;
+                                // URLsons["id_"+id] = son;
                 
                         }

esqueletos/plugins_escoitar/googlemap_api/js/customControls.js

@@ -438 +438 @@
 mapLoaderControl.prototype = new GControl();
 mapLoaderControl.prototype.initialize = function(map) {
+        
         var container = document.createElement("div");
-        container.id = "mapLoader";
-        var top = document.createElement("div");
-        top.style.width= "250px";
-        top.style.height= "8px";
-        top.style.position = "relative";
-        var imgTop = document.createElement("img");
-        imgTop.src = URLbase + "img_pack/up_loader.png";
-        imgTop.style.position = "absolute";
-        imgTop.style.top= "0px";
-        top.appendChild(imgTop);
-        var text = document.createElement("div");
-        text.id = "mapLoaderText";
-        text.style.width = "250px";
-        text.style.backgroundImage = "url(" + URLbase + "img_pack/" + images_folder + "/alpha.png)";
-        var bottom = document.createElement("div");
-        bottom.style.width= "250px";
-        bottom.style.height= "8px";
-        bottom.style.position = "relative";
-        var imgBottom = document.createElement("img");
-        imgBottom.src = URLbase + "img_pack/" + images_folder + "/down_loader.png";
-        imgBottom.style.position = "absolute";
-        imgBottom.style.top= "0px";
-        bottom.appendChild(imgBottom);
-        container.appendChild(top);
-        container.appendChild(text);
-        container.appendChild(bottom);
+        container.id = "map_loader";
+        container.style.width = "295px";
+        container.style.height = "54px";
+        container.style.border = "1px";
+        
+        var left = document.createElement("img");
+        left.src = URLbase + "img_pack/" + images_folder + "/loader-left." + images_extension;
+        left.style.height = "54px";
+        left.style.width= "8px";
+        left.style.position = "absolute";
+        left.style.top= "0px";
+        left.style.left = "0px";
+        container.appendChild(left);
+        
+        var middle = document.createElement("div");
+        middle.style.height = "54px";
+        middle.style.width = "279px";
+        middle.style.position = "absolute";
+        middle.style.top = "0px";
+        middle.style.left = "8px";
+        middle.style.backgroundImage = "url(" + URLbase + "img_pack/" + images_folder + "/loader-center." + images_extension + ")";
+        var content = document.createElement("div");
+        content.id = "map_loader_content";
+        content.style.margin = "8px 0";
+        var msg = document.createElement("span");
+        msg.id = "map_loader_msg";
+        content.appendChild(msg);
+        var loading = document.createElement("img");
+        loading.src = URLbase + "/img_pack/loading.gif";
+        content.appendChild(loading);
+        middle.appendChild(content);
+        container.appendChild(middle);
+        
+        var right = document.createElement("img");
+        right.src = URLbase + "img_pack/" + images_folder + "/loader-right." + images_extension;
+        right.style.height = "54px";
+        right.style.width = "8px";
+        right.style.position = "absolute";
+        right.style.top = "0px";
+        right.style.left = "287px";
+        container.appendChild(right);
+        
         map.getContainer().appendChild(container);
+        
         return container;
 }
 mapLoaderControl.prototype.getDefaultPosition = function() {
-        return new GControlPosition(G_ANCHOR_TOP_LEFT, new GSize(80, 60));
-}
+        return new GControlPosition(G_ANCHOR_TOP_LEFT, new GSize(15, 45));
+}

esqueletos/plugins_escoitar/googlemap_api/js/geomap.js

@@ -1 @@
-//array para gadar os marcadores
-var marcadores = [];
-//array para gardar o html contido das xanelas de cada marcador
-var contidosHTML = [];
-//array para gardar as URL dos sonidos que se reproduciran en cada xanela
-var URLsons = [];
+//***********
+// Gis Marker
+//***********
+function GisMarker() {
+        this.id = false;
+        this.html = false;
+        this.enclosure = false;
+        this.json = false;
+        this.marker = false;
+}
+GisMarker.prototype.openWindow = function() {
+        openWindow(this);
+}
+function openWindow(marcador) {
+        //cando se abre a ventana do marcador executamos as seguintes intsruccions
+        GEvent.addListener(marcador.marker,"infowindowopen", function() {
+                tb_init('a.thickbox');
+                if (marcador.son!="") {
+                        var fo = new FlashObject(URLbaseGis + "/img_pack/musicplayer.swf?autoplay=true&song_url=" + marcador.son, "player_x", "17", "17", "6", "#FFFFFF");
+                        fo.write("player");
+                }
+        });
+        if (marcador.html=="") {
+                var msg = "<div id='precarga'>loading marker data...<br><img src='" + URLbaseGis + "img_pack/loading.gif' /></div>";
+                $("#map_loader_msg").append(msg);
+                $("#map_loader").show();
+                $.getJSON(marcador.json, function(jsonData) {
+                        $.each(jsonData.item, function(i,item){
+                                marcador.html = "<div id='window_" + item.id +"' class='window_content'><div id='player'></div><h3><a href='" + item.link + "'>" + item.title + "</a></h3>" + item.description + "</div>";
+                                if (typeof(item.enclosure) != "undefined") {
+                                        marcador.son = item.enclosure.url;
+                                }
+                                $("#map_loader").hide();
+                                $("#map_loader_msg").empty();
+                                marcador.marker.openInfoWindowHtml(marcador.html);
+                        });
+                });
+        } else {
+                marcador.marker.openInfoWindowHtml(marcador.html);
+        }
+}
+
 
 function getNodeText(node){
         return node.text || node.firstChild ? node.firstChild.nodeValue : "";
 }
-
 //GL recoller a id da URL do artigo
 //ENG get id from the article'URL
@@ -27 +62 @@
         return url;
 }
-
 function coordenadas (articulo){
         $.ajax({
@@ -38 +72 @@
 }
 
-function creaMarcador(point, html, icon, son, idmap) {
-        //creamos un obxecto GMarker e o gradamos nunha variable
-        var marcador = new GMarker(point, icon);
-        //engadimos un evento para que ao pulsar no marcador se abra a ventana co html indicado
-        var map = eval('map'+idmap);
-        GEvent.addListener(marcador, "click", function() {
-                marcador.openInfoWindowHtml(html);
-                //cando se abre a ventana do marcador executamos as seguintes intsruccions
-                GEvent.addListener(marcador,"infowindowopen", function() {
-                        if(son){
-                                //esta parte del codigo enbebe un obxecto flah na ventana creado con flashobject.js
-                                var fo = new FlashObject(URLbaseGis + "/img_pack/musicplayer.swf?autoplay=true&song_url=" + son, "player_x", "17", "17", "6", "#FFFFFF");
-                                fo.write("player");
-                        }
-                        tb_init('a.thickbox');
+function agregarMarcadorJson (jsonItem, idmap, minZoom, maxZoom, markerMngerXD) {
+        //almacenamos en distintas variables la informacion contenida nen los chilNodes de cada item-marcador do xml
+        var markerMgr = eval('markerManager'+idmap);
+        if ((typeof(jsonItem.lat) == "undefined")||(typeof(jsonItem.lonx) == "undefined")) return;
+        else {
+                var lat = parseFloat(jsonItem.lat);
+                var lng = parseFloat(jsonItem.lonx);
+                var id = parseInt(jsonItem.id);
+                
+                var point = new GPoint(lng,lat);
+                var icono_categoria = new GIcon();
+                icono_categoria.image = (jsonItem.icon != "" ? jsonItem.icon : MarkerImgBase);
+                icono_categoria.shadow = URLbase + "img_pack/shadow.png";
+                icono_categoria.iconSize = new GSize(MarkerBaseWidth, MarkerBaseHeight);
+                icono_categoria.shadowSize = new GSize(37, 34); 
+                icono_categoria.iconAnchor = new GPoint((MarkerBaseWidth/2), MarkerBaseHeight);
+                icono_categoria.infoWindowAnchor = new GPoint(5, 1);
+                
+                eval('marcador_' + id + ' = new GisMarker();');
+                var marcador = eval('marcador_' + id);
+                marcador.html = "";;
+                marcador.son = "";
+                marcador.json = jsonItem.data;
+                marcador.id = id;
+                marcador.marker = new GMarker(point, icono_categoria);
+                GEvent.addListener(marcador.marker, "click", function() {
+                        marcador.openWindow();
                 });
-        });             
-        return marcador;
-}
-/****************************************************
-esta funcion es identica a la anterior pero obvia utilizar eval
-presupone que el valos de map se itroducira atraves de una variable del mapa
-****************************************************/
-/*function nuevoMarcador(mapa, point, html, icon, son) {
-        //creamos un obxecto GMarker e o gradamos nunha variable
-        var marcador = new GMarker(point, icon);
-        //engadimos un evento para que ao pulsar no marcador se abra a ventana co html indicado
-        GEvent.addListener(marcador, "click", function() {
-                marcador.openInfoWindowHtml(html);
-                //cando se abre a ventana do marcador executamos as seguintes intsruccions
-                GEvent.addListener(mapa, "infowindowopen", function() {
-                        //$('a.thickbox').lightBox();
-                        if(son){
-                                //esta parte del codigo enbebe un obxecto flah na ventana creado con flashobject.js
-                                var fo = new FlashObject(URLbaseGis + "/plugins/gis/img_pack/musicplayer.swf?autoplay=true&song_url=" + son, "player_x", "17", "17", "6", "#FFFFFF");
-                                fo.write("player");
-                                tb_init('a.thickbox');
-                        }
-                });
-        });             
-        return marcador;
-}*/
-
+                markerMgr.addMarker(marcador.marker, minZoom,  maxZoom);
+        }       
+}
 function agregarMarcador (xmlItem, idmap, minZoom, maxZoom) {
         //almacenamos en distintas variables la informacion contenida nen los chilNodes de cada item-marcador do xml
@@ -86 +108 @@
         var xmlLng = $("geo_long",xmlItem);
         var xmlSon = $("enclosure",xmlItem);
-        var marker = eval('markerManager'+idmap);
+        var markerMgr = eval('markerManager'+idmap);
+        //var marcadores = eval('marcadores'+idmap);
         if ((xmlLat.length == 0) || (xmlLng.length == 0)) return;
         else {
@@ -108 +131 @@
                 icono_categoria.iconAnchor = new GPoint((MarkerBaseWidth/2), MarkerBaseHeight);
                 icono_categoria.infoWindowAnchor = new GPoint(5, 1);
-                        
+                
                 // creamos el marcador con los datos almacenados en las variables
-                var marcador = creaMarcador(point, html, icono_categoria, son, idmap);
-                // recollemos a informacion que sexa necesaria en distintos arrays, usando como identificador a id do artigo
-                marcadores["id_"+id] = marcador;
-                contidosHTML["id_"+id] = html;
-                URLsons["id_"+id] = son;
-                //engadimos o marcador ao markerManager antes "map.addOverlay(marker);"
-                if (maxZoom) {
-                        if(marker){
-                                marker.addMarker(marcador, minZoom,  maxZoom);
-                        }
-                        else{
-                                markerManager.addMarker(marcador, minZoom,  maxZoom);
-                        }
-                } else if (marker){
-                        eval(marker).addMarker(marcador, minZoom);
-                }
+                eval('marcador_' + id + ' = new GisMarker();');
+                var marcador = eval('marcador_' + id);
+                marcador.html = "";;
+                marcador.son = "";
+                marcador.json = jsonItem.data;
+                marcador.id = id;
+                marcador.marker = new GMarker(point, icono_categoria);
+                GEvent.addListener(marcador.marker, "click", function() {
+                        marcador.openWindow();
+                });
+                markerMgr.addMarker(marcador.marker, minZoom,  maxZoom);
         }       
 }
 
-/****************************************************
-esta funcion es identica a la anterior pero en lugar de a–adir
-os marcadores directamente al marker manager, simplemente los 
-a–ade al array de maracdores y devuelve su id para que sean 
-a–adidos a un manager u otro en una funcion de nivel superior 
-****************************************************/
-/*function creaMarcador2 (mapa, xmlItem, returnAlways) {
-        //almacenamos en distintas variables la informacion contenida nen los chilNodes de cada item-marcador do xml
-        var xmlLat = $("geo_lat",xmlItem);
-        var xmlLng = $("geo_long",xmlItem);
-        var xmlSon = $("enclosure",xmlItem);
-        //var marker = eval('markerManager'+idmap);
-        if ((xmlLat.length != 0) && (xmlLng.length != 0)) {
-                var lat = parseFloat(xmlLat.text());
-                var lng = parseFloat(xmlLng.text());
-                var id = extraerID($("link",xmlItem).text());
-                var html = $("description",xmlItem).text();
-                var icon = $("geo_icon",xmlItem).text();
-                var son;
-                if (xmlSon.length != 0) son = xmlSon.attr("url");
-                //creamos un Gpoint para situar nel o marcador
-                var point = new GPoint(lng,lat);
-                //creamos un icono para o marcador
-                var icono_categoria = new GIcon();
-                icono_categoria.image = (icon != "" ? icon : MarkerImgBase);
-                icono_categoria.shadow = URLbase + "img_pack/shadow.png";
-                icono_categoria.iconSize = new GSize(MarkerBaseWidth, MarkerBaseHeight);
-                icono_categoria.shadowSize = new GSize(37, 34); 
-                icono_categoria.iconAnchor = new GPoint((MarkerBaseWidth/2), MarkerBaseHeight);
-                icono_categoria.infoWindowAnchor = new GPoint(5, 1);
-                // creamos el marcador con los datos almacenados en las variables
-                var marcador = nuevoMarcador(mapa, point, html, icono_categoria, son);
-                if (!marcadores["id_"+id]) {
-                        marcadores["id_"+id] = marcador;
-                        contidosHTML["id_"+id] = html;
-                        URLsons["id_"+id] = son;
-                        return id;
-                } else if (returnAlways) {
-                        return id;
-                } else {
-                        return false;
-                }
-        }       
-}*/
-
-/****************************************************
-estas son funciones nuevas para distintas formas de lectura del 
-los distintos rss
-****************************************************/
-//lectura generica de items dentro de un xml
-/*function leeMarcadores(mapa, manager, arrayMarkers, minzoom, xml, returnAlways){
+function loadMarkers(url, idmap, msg, minLat, maxLat, monLonx, maxLonx) {
+        var latitudes = calculaIntervalos(minLat, maxLat, 3);
+        var lonxitudes = calculaIntervalos(monLonx, maxLonx, 3);
+        var map = eval('map' + idmap);
+        var markerMgr = eval('markerManager'+idmap);
+        var zoom = map.getZoom();
+        if(zoom>=2) {
+                zoom = zoom - 2;
+        }
         var count = 0;
-        $("item", xml).each(function(){
-                var idMarker = creaMarcador2(mapa, this, returnAlways);
-                if (idMarker) {
-                        if(arrayMarkers) {
-                                arrayMarkers[count] = idMarker;
-                        }
-                        if (minzoom) {
-                                manager.addMarker(marcadores["id_"+idMarker], minzoom, 17);
-                        } else {
-                                manager.addMarker(marcadores["id_"+idMarker], 0, 17);
-                        }
-                        count++;
-                }
-        });
-}
-*/
+        if ($("#map_loader").is(":hidden")) {
+                var loading_msg = "<div id='precarga'>" +msg+ "<br><img src='" +URLbaseGis+ "img_pack/loading.gif' /><"+"/div>";
+                $("#map_loader_msg").append(loading_msg);
+                $("#map_loader").show();
+        }
+        for (i=0; i<3; i++) {
+                for(u=0; u<3; u++) {
+                        $.getJSON(url+ '&minlat=' +latitudes[i]+ '&maxlat=' +latitudes[(i+1)]+ '&minlonx=' +lonxitudes[u]+ '&maxlonx=' +lonxitudes[(u+1)], function(data) {
+                                $.each(data.items, function(i, item){
+                                        agregarMarcadorJson(item, idmap, zoom, 17, markerMgr);
+                                });
+                                count++;
+                                if(count==9) {
+                                        $("#map_loader").hide();
+                                        $("#map_loader_msg").empty();   
+                                }
+                        });
+                }
+        }
+}
+        
+
 //rss de procura
 function cargaMarcadoresProcura (mapa, manager, arrayMarkers, coordenadas, palabras, limite, msg, callBack) {
@@ -253 +235 @@
 
 
-function abrirVentana(identificador, idmap) {
+function abrirVentana(id, idmap) {
         var map = eval('map'+ idmap);
+        var marcador = eval('marcador_'+ id);
         map.closeInfoWindow();
-        GEvent.addListener(marcadores["id_"+identificador], "infowindowopen", function() {
-                if(URLsons["id_"+identificador]){
-                        //esta parte del codigo enbebe un obxecto flah na ventana creado con flashobject.js
-                        var fo = new FlashObject( URLbaseGis + "/img_pack/musicplayer.swf?autoplay=true&song_url=" + URLsons["id_"+identificador], "player_x", "17", "17", "6", "#FFFFFF");
-                        fo.write("player");
-                }
-                tb_init('a.thickbox');
-        });
-        marcadores["id_"+identificador].openInfoWindowHtml(contidosHTML["id_"+identificador]);
-}
+        map.setCenter(marcador.marker.getLatLng());
+        marcador.openWindow();
+}